Mike Plante b06ae0adef Fix merge conflicts when moving lockscreen setting to notifications menu %!s(int64=2) %!d(string=hai) anos
..
Resources 570dd3a611 add setting for live activity to display complex or simple view %!s(int64=2) %!d(string=hai) anos
Sources b06ae0adef Fix merge conflicts when moving lockscreen setting to notifications menu %!s(int64=2) %!d(string=hai) anos