Commit Graph

124422 Commits

Author SHA1 Message Date
Jay Sullivan
b6f19bd11d Merge "[Safety Labels] Filter out auto, wear and tv" into udc-dev am: 4d5ac5a89f am: d8ca8de897
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22562077

Change-Id: I85b75d9707a673c56add33f61c8533e85d9a312a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 20:25:52 +00:00
Becca Hughes
0c60452d75 [automerger skipped] Merge "Add dialog for enabling a provider in settings" into udc-dev am: e18613ccc6 am: 7d818f8f53 -s ours
am skip reason: Merged-In I404444115f178faf5545dec9686096fcdfdf73de with SHA-1 7d407abf58 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22605959

Change-Id: I3c67d2d4697b3220d2da51d9e11dd6537cce8253
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 20:25:37 +00:00
Jay Sullivan
d8ca8de897 Merge "[Safety Labels] Filter out auto, wear and tv" into udc-dev am: 4d5ac5a89f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22562077

Change-Id: I4fdeabc560b05e96633729158e904243d08b8aec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 20:23:56 +00:00
Jay Sullivan
a90fd5c5cb Merge "[Safety Labels] Filter out auto, wear and tv" into udc-dev am: 4d5ac5a89f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22562077

Change-Id: If69eb762d77b1b1ba3fe405cf78a9f23e8d16f37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 20:13:47 +00:00
Becca Hughes
167ba43c34 Merge "Add dialog for enabling a provider in settings" into udc-dev am: e18613ccc6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22605959

Change-Id: I981fe036a79c7c2476ff5ba46021ca6ace57dd97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 20:12:52 +00:00
Becca Hughes
7d818f8f53 Merge "Add dialog for enabling a provider in settings" into udc-dev am: e18613ccc6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22605959

Change-Id: Ifd7a9e4a9aa944b320db9f92add53accc7be9478
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 20:11:44 +00:00
Jay Sullivan
4d5ac5a89f Merge "[Safety Labels] Filter out auto, wear and tv" into udc-dev 2023-04-17 19:53:43 +00:00
TreeHugger Robot
94ea6ce20a Merge "Add receiver for app install/uninstall events" 2023-04-17 19:49:07 +00:00
Becca Hughes
e18613ccc6 Merge "Add dialog for enabling a provider in settings" into udc-dev 2023-04-17 19:42:57 +00:00
Fabian Kozynski
7de537bbeb Merge "Update strings for device controls settings" into udc-dev am: 2099f58d3e am: f7885593ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22623556

Change-Id: I84cc72ad680573afb5c9338d3a6718108b07dd49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 18:56:47 +00:00
Automerger Merge Worker
2c0e88e981 Merge "Fix Settings crash on non face service support devices am: e85d588904 am: f018643563" 2023-04-17 18:55:19 +00:00
lbill
f77bbf87f7 Fix Settings crash on non face service support devices am: e85d588904 am: f018643563
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22670382

Change-Id: I726332e5567197249e6ab8a94488ef652bea1ee0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 18:54:24 +00:00
Fabian Kozynski
6e7600a34c Merge "Update strings for device controls settings" into udc-dev am: 2099f58d3e am: 25cc8f2fce
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22623556

Change-Id: I211e7c7b4f5e8c4dd130e4c564ae3d05a83fa48a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 18:48:54 +00:00
lbill
d372953d69 Fix Settings crash on non face service support devices am: e85d588904 am: d4ce5542fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22670382

Change-Id: Ifaeb7fe69a6a486c8b73e8043308416479d3b0d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 18:46:17 +00:00
Fabian Kozynski
25cc8f2fce Merge "Update strings for device controls settings" into udc-dev am: 2099f58d3e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22623556

Change-Id: If4e9398bb55ccdc93538ef7e42b8eb827107d055
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 18:22:58 +00:00
Fabian Kozynski
f7885593ec Merge "Update strings for device controls settings" into udc-dev am: 2099f58d3e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22623556

Change-Id: I55256e32cc23cd7beafc2f0d6df38e165e0e6077
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 18:21:56 +00:00
lbill
d4ce5542fd Fix Settings crash on non face service support devices am: e85d588904
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22670382

Change-Id: I905e91e606f3cc1289d197f660fdea1896e94448
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 18:19:43 +00:00
lbill
f018643563 Fix Settings crash on non face service support devices am: e85d588904
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22670382

Change-Id: Ia9ff008d5a3310957ffe322193bdddb1ca518f27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 18:15:27 +00:00
Becca Hughes
b69351b06d Add dialog for enabling a provider in settings
Test: manual
Bug: 277923170
Merged-In: I404444115f178faf5545dec9686096fcdfdf73de
Change-Id: I404444115f178faf5545dec9686096fcdfdf73de
2023-04-17 18:06:50 +00:00
Fabian Kozynski
2099f58d3e Merge "Update strings for device controls settings" into udc-dev 2023-04-17 18:06:33 +00:00
Becca Hughes
86e092d84a Add receiver for app install/uninstall events
In order to keep the settings list up to date
we are listening to package manager broadcasts
so when an app is installed, etc it will trigger
a refresh

Bug: 264420106
Test: ondevice & atest
Change-Id: I83be80e88dd03ebce1cb97a66fb759e1ef2537e8
2023-04-17 17:42:03 +00:00
lbill
e85d588904 Fix Settings crash on non face service support devices
Doing some improvement for stability:

1. Check hasSystemFeature(PackageManager.FEATURE_FACE) for non-face
   service devices.
2. Wrap addAuthenticatorsRegisteredCallback()
3. Find mPreference before addAuthenticatorsRegisteredCallback

Bug: 276680407
Bug: 278174667
Bug: 277647959
Bug: 277725506
Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER= \
      FaceSettingsFooterPreferenceControllerTest
Change-Id: I81346b6eb8c44106c5e52867d69c8736203dd558
2023-04-17 11:45:13 +00:00
Tetiana Meronyk
0c7c7be962 Add confirmation dialog when granting/revoking admin privileges.
Bug: 266548780
Test: atest UserDetailsSettingsTest
Change-Id: I222ab6cbda138f0df379e6b6986b5ac462479833
2023-04-17 11:31:07 +00:00
Automerger Merge Worker
156b7d6f18 Merge "Merge "Update the card preference buttons margin" into udc-dev am: ebb97daa57 am: 32c9cfa81c" 2023-04-17 09:53:28 +00:00
YK Hung
3f1bd960e0 Merge "Update the card preference buttons margin" into udc-dev am: ebb97daa57 am: 32c9cfa81c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22672141

Change-Id: I317dcbffd2de20b74fd122af1aa528ccd7f061ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 09:53:10 +00:00
YK Hung
d08179a3a4 Merge "Update the card preference buttons margin" into udc-dev am: ebb97daa57 am: fdfcc1577c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22672141

Change-Id: I6d4b8ceb4c96c373e21e391d8d9510153eb6fc2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 09:52:38 +00:00
YK Hung
fdfcc1577c Merge "Update the card preference buttons margin" into udc-dev am: ebb97daa57
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22672141

Change-Id: I65026417d504fa45093c1ec55b972fd9495a20e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 09:23:54 +00:00
YK Hung
32c9cfa81c Merge "Update the card preference buttons margin" into udc-dev am: ebb97daa57
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22672141

Change-Id: I717d2b068e4523cc1bdc444588a3d9dc7ed87bd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 09:23:49 +00:00
Wesley Wang
742e506d13 Cleanup smart battery entries (1/3)
- Remove smart battery entry from battery settings page since
   restriction app info already move to app list page and smart battery
   feature will keep as enabled, smart battery page will be empty
 - Enable battery usage list page for AOSP

Bug: 277175992
Test: make SettingsRoboTests
Change-Id: I9221cecbfc8445b8f470975551f600e94e3128d5
2023-04-17 16:50:21 +08:00
YK Hung
ebb97daa57 Merge "Update the card preference buttons margin" into udc-dev 2023-04-17 08:49:48 +00:00
Milton Wu
562bbc8193 [BiometricsV2] fix enrolling rotate failed
Clean help message during progress changed, and reload help message from
ViewModel in onStart of enrolling page.

Bug: 275513362
Test: atest FingerprintEnrollProgressViewModelTest
Test: enable biometrics v2, and manully rotate screen when help msg
      is shown, and check help msg is kept after screen rotation.
Change-Id: I44220050806038ee62750f8945b8ba8f8bb9c282
2023-04-17 08:06:53 +00:00
Automerger Merge Worker
86861d333f Merge "Merge "Customize ChooseLockGeneric SUW options" into udc-dev am: 7d3b07f6cb am: 3124580133" 2023-04-17 08:02:36 +00:00
Treehugger Robot
d18c4a531c Merge "Customize ChooseLockGeneric SUW options" into udc-dev am: 7d3b07f6cb am: 3124580133
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22304962

Change-Id: I81d9d1b017732b8e4796af4f26977f4121ad5519
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 08:01:58 +00:00
Treehugger Robot
5664c869f6 Merge "Customize ChooseLockGeneric SUW options" into udc-dev am: 7d3b07f6cb am: 930cc10239
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22304962

Change-Id: Ib746440c38ffecae6b90a9c4014b04ea850dfd2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 08:01:54 +00:00
Treehugger Robot
930cc10239 Merge "Customize ChooseLockGeneric SUW options" into udc-dev am: 7d3b07f6cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22304962

Change-Id: Ibc9d1a20f9ee6daa0c3df6815f243c30a801de26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 07:32:00 +00:00
Treehugger Robot
3124580133 Merge "Customize ChooseLockGeneric SUW options" into udc-dev am: 7d3b07f6cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22304962

Change-Id: Ia4eff855d2e880af0fc1c9133bc0077e7c3a3070
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 07:31:57 +00:00
Treehugger Robot
7d3b07f6cb Merge "Customize ChooseLockGeneric SUW options" into udc-dev 2023-04-17 06:59:18 +00:00
ykhung
1d51ffc91e Update the card preference buttons margin
old: https://screenshot.googleplex.com/BtqQdQwDcLqRuKf
new: https://screenshot.googleplex.com/BJWhutT5SVHpXyb

Bug: 246960554
Test: presubmit
Change-Id: I329938ec25db0b92cff0cf067f31b5f0fc1674aa
2023-04-17 14:57:41 +08:00
Treehugger Robot
2420d9c05e Merge "Fix enrolled pages not hide during SUW" into udc-dev am: 019e8ceb72 am: 359615c024
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22613578

Change-Id: Idf00721e50d2d5ae2b7c74eca6e88e92bc748450
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 06:29:08 +00:00
Treehugger Robot
c9e78ece91 Merge "Fix enrolled pages not hide during SUW" into udc-dev am: 019e8ceb72 am: fab1be2d09
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22613578

Change-Id: I1b1b7406c75d1609c5d662689120ec88cbb36d5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 06:28:14 +00:00
Treehugger Robot
359615c024 Merge "Fix enrolled pages not hide during SUW" into udc-dev am: 019e8ceb72
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22613578

Change-Id: I44a659148fe12da3505564dba64317e8ad90fea3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 06:00:45 +00:00
Treehugger Robot
fab1be2d09 Merge "Fix enrolled pages not hide during SUW" into udc-dev am: 019e8ceb72
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22613578

Change-Id: I28d978d96816f1c8aa3f3bdcbb442719ebf4b060
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 06:00:45 +00:00
Treehugger Robot
019e8ceb72 Merge "Fix enrolled pages not hide during SUW" into udc-dev 2023-04-17 05:23:17 +00:00
Chaohui Wang
c853f1dc01 Merge "Migrate latest changes in "Alarms and Reminders"" into udc-dev am: a42119c6a8 am: f0a01a9a73
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22635695

Change-Id: I1b8bcfcd056abb5ab15f187c4c7d248bcb0b093f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-15 17:30:28 +00:00
Chaohui Wang
59fd95e696 Merge "Migrate latest changes in "Alarms and Reminders"" into udc-dev am: a42119c6a8 am: a6bb9038c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22635695

Change-Id: Ife9a26287e2fcf0e86d9a007cad3e0e8425f4a82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-15 17:29:32 +00:00
Chaohui Wang
a6bb9038c6 Merge "Migrate latest changes in "Alarms and Reminders"" into udc-dev am: a42119c6a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22635695

Change-Id: Ic86209951ecff51aec422dc56f9b383cc8dd4512
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-15 17:06:21 +00:00
Chaohui Wang
f0a01a9a73 Merge "Migrate latest changes in "Alarms and Reminders"" into udc-dev am: a42119c6a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22635695

Change-Id: I556c81bd80aa5ede978f838bbb77f6dd74636794
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-15 17:01:37 +00:00
Chaohui Wang
a42119c6a8 Merge "Migrate latest changes in "Alarms and Reminders"" into udc-dev 2023-04-15 16:32:54 +00:00
Treehugger Robot
4a408c1735 Merge "Store the PIN length to disk when Pin auto confirm feature is enabled" into udc-dev am: e1ae1c6516 am: 1a2bc80528
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22550309

Change-Id: I43bdee3754fd3388d6eadab9e5185e61e06074cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 21:24:42 +00:00
Treehugger Robot
1913ccb650 Merge "Store the PIN length to disk when Pin auto confirm feature is enabled" into udc-dev am: e1ae1c6516 am: 5d0874cb25
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22550309

Change-Id: I1f787a88856556a7ca122e91ea34c40678ce3ce3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 21:14:27 +00:00