Commit Graph

123846 Commits

Author SHA1 Message Date
Zoey Chen
e9f6efa2b6 [Settings] Fix the layout index
The index of language label's layout is 0 and index of num layout is 1, so the select tp speak will read the language label first.
The root cause of the incorrect index is, the language label's layout starts with the parent layout instead of the num layout in the hierarchy view. Adjust the language label's layout and add these views one by one in the parent view.

Also fix the layout's jumping when user switches the page to "Remove language"

Bug: 277173513
Test: local test
Change-Id: I0d5879a07183713fa50b38f6321a15dd32582518
2023-04-18 08:46:23 +00:00
Treehugger Robot
a790e85c8f Merge "[BiometricsV2] fix enrolling rotate failed" into udc-dev am: 2a0d6ead1a am: 9c37881b64
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22651124

Change-Id: Ibc9bdd1c17f4c8de833e7be3ed2c80f8f24901c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-18 05:45:58 +00:00
Treehugger Robot
01605466a8 Merge "[BiometricsV2] fix enrolling rotate failed" into udc-dev am: 2a0d6ead1a am: 8cf1fe7757
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22651124

Change-Id: I9431fc80ffe0ce638813ede530267e51108c478c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-18 05:28:15 +00:00
Treehugger Robot
9c37881b64 Merge "[BiometricsV2] fix enrolling rotate failed" into udc-dev am: 2a0d6ead1a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22651124

Change-Id: Id9d4afd348cd1274dc37cee3d5fa73b0e88789b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-18 05:26:25 +00:00
Ken Lin
8809994fce Smooth Display description error
Correct max refresh rate

Bug: 278111301
Test: Settings > Display > Smooth Display (and read description)
Change-Id: I9c701596712606ebd9d7d5640edd7dc3135ff5c9
2023-04-18 05:24:14 +00:00
Treehugger Robot
8cf1fe7757 Merge "[BiometricsV2] fix enrolling rotate failed" into udc-dev am: 2a0d6ead1a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22651124

Change-Id: I43de2b80470465f59792f037bd33ebf081c72474
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-18 05:07:20 +00:00
Treehugger Robot
2a0d6ead1a Merge "[BiometricsV2] fix enrolling rotate failed" into udc-dev 2023-04-18 04:56:12 +00:00
Bill Yi
630293f38d Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I46820cabb9e344157ab7d70c5242e5ee0f2581d5
2023-04-17 21:35:46 -07:00
Bill Yi
4ff10a38f4 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I1c1512d129c76bdf99c95f921b05177f361736a7
2023-04-17 21:33:14 -07:00
Bill Yi
000f82ddbf Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ifdac29e3ea12c427b173eb6a71c2fb93735bdf62
2023-04-17 21:26:39 -07:00
Bill Yi
26ca87ddff Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ie1f7a198b79b22f7e52cda13589a55549189524a
2023-04-17 21:20:25 -07:00
Bill Yi
80169f481e Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I9b0fdc708bc0a562f34e3b29a1e07734d49791da
2023-04-17 21:18:01 -07:00
Priyanka Advani
e69bc8c90e Merge "Revert "Add receiver for app install/uninstall events"" 2023-04-18 04:14:34 +00:00
Bill Yi
6c08eb4631 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I040ac2ddddb7199dd21d9bc5941eb22c32e535a9
2023-04-17 21:13:50 -07:00
Bill Yi
488128bd1d Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ida5f1de75b985bbea418a20e4537a40b213827e6
2023-04-17 21:08:01 -07:00
YK Hung
5c77d0e9ad Merge "Cleanup smart battery entries (1/3)" into udc-dev am: d9f390010b am: 74692be06c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22639713

Change-Id: I359b45c03ad73def2647113cc87798fe22d2769f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-18 02:43:54 +00:00
YK Hung
86711b3099 Merge "Cleanup smart battery entries (1/3)" into udc-dev am: d9f390010b am: 5b55ef3c9e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22639713

Change-Id: I3eedbe5aaf8f2a6e2cfe262ad67795f0f1f0e682
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-18 02:42:49 +00:00
YK Hung
5b55ef3c9e Merge "Cleanup smart battery entries (1/3)" into udc-dev am: d9f390010b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22639713

Change-Id: I8e5dde75c20ade2e97220f79893d608d1908be3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-18 02:25:03 +00:00
YK Hung
74692be06c Merge "Cleanup smart battery entries (1/3)" into udc-dev am: d9f390010b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22639713

Change-Id: Ib0ce398e1d92751367123891c9930735626ae62f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-18 02:22:49 +00:00
YK Hung
d9f390010b Merge "Cleanup smart battery entries (1/3)" into udc-dev 2023-04-18 01:59:06 +00:00
Daniel Chapin
b215d94d51 Revert "Destroy activity in onStop()"
This reverts commit 7a89f15fed.

Reason for revert: Droidfood blocking bug b/278178618

Change-Id: Ie26b73e1e9584f632625375d36168a42e95e5f02
2023-04-18 00:16:21 +00:00
Priyanka Advani
57a077f8a5 Revert "Add receiver for app install/uninstall events"
This reverts commit 86e092d84a.

Reason for revert: Probable culprit for b/278615544.

Change-Id: I5ff8730ab3e1974967b8c9f840f0ee3110dad483
2023-04-17 23:05:32 +00:00
Jay Sullivan
70b6694fa1 Merge "[Safety Labels] Filter out auto, wear and tv" into udc-dev am: 4d5ac5a89f am: a90fd5c5cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22562077

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

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

Change-Id: I6748ff3f2cb180aae4135104f5111464e9744fa7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 20:57:04 +00:00
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