Josh Hou
b1f9d26174
Merge "[Panlingual] Can't set per-app languages for apps on work profile page" into udc-dev
2023-03-22 05:14:47 +00:00
Wu Ahan
3a2ef6db2f
Merge "Use GlifLayout#setDescriptionText in SetupChooseLockGenericFragment" into tm-qpr-dev
2023-03-22 03:46:30 +00:00
Milton Wu
3314b8f897
Merge "Launch Face Settings when device enrolled face" into tm-qpr-dev am: 1d68fbf007
am: 544feb9013
am: cdaf1091d1
am: 6ba09ff33f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21294281
Change-Id: Ic15191edf26c598d4baccdb95ea14aa4814566e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-22 02:50:14 +00:00
Milton Wu
a514ad49ef
Merge "Launch Face Settings when device enrolled face" into tm-qpr-dev am: 1d68fbf007
am: 544feb9013
am: cdaf1091d1
am: 04c8547c58
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21294281
Change-Id: I94f216eb73b96e71b7b36e2cfc8157f2ba2fa807
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-22 02:49:18 +00:00
Milton Wu
6ba09ff33f
Merge "Launch Face Settings when device enrolled face" into tm-qpr-dev am: 1d68fbf007
am: 544feb9013
am: cdaf1091d1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21294281
Change-Id: I6964b421ee874bf8821205cf3915f7cd12f2eb11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-22 02:11:53 +00:00
Milton Wu
04c8547c58
Merge "Launch Face Settings when device enrolled face" into tm-qpr-dev am: 1d68fbf007
am: 544feb9013
am: cdaf1091d1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21294281
Change-Id: Ia622ebaa0c36fe7c602b0a196927c6b7453c3fc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-22 02:11:25 +00:00
Milton Wu
cdaf1091d1
Merge "Launch Face Settings when device enrolled face" into tm-qpr-dev am: 1d68fbf007
am: 544feb9013
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21294281
Change-Id: I748aafeb257bfc6325f5e3a0ef724dbd0e36d697
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-22 01:33:58 +00:00
Milton Wu
544feb9013
Merge "Launch Face Settings when device enrolled face" into tm-qpr-dev am: 1d68fbf007
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21294281
Change-Id: I1a80e569626469eaca583007ee94fb77bf36f03a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-22 00:57:38 +00:00
Milton Wu
1d68fbf007
Merge "Launch Face Settings when device enrolled face" into tm-qpr-dev
2023-03-22 00:26:50 +00:00
Becca Hughes
fd96488e5e
Show package name if no label
...
Test: make
Bug: 273753519
Change-Id: I78b47e8c55382ceef90329547231124db2ca27d9
2023-03-21 22:09:59 +00:00
Becca Hughes
b5f8ba6945
Add settings intent dialog
...
Add a dialog that can be launched via
an intent to prompt the user to enable
the provider for credman.
Test: make & atest & manual
Bug: 267816998
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9d74509888b7dd65b287bc68b9445d9e23809cce )
Merged-In: Id88cc7b3bf2829d075fbba87ea5dc0a245b9ae32
Change-Id: Id88cc7b3bf2829d075fbba87ea5dc0a245b9ae32
2023-03-21 22:07:29 +00:00
Automerger Merge Worker
d5fe76b56e
Merge "Merge "Update Extra dim banner for tablets" into tm-qpr-dev am: 6d6736c1c9
am: 1795481a72
am: 40019f876b
am: 877a6ffa82"
2023-03-21 19:45:06 +00:00
Sally Yuen
c047c50bb0
Merge "Update Extra dim banner for tablets" into tm-qpr-dev am: 6d6736c1c9
am: 1795481a72
am: 40019f876b
am: 877a6ffa82
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22076421
Change-Id: Iddf7bb9d700fd5c34f8b6662a9ea5a772d0b6525
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-21 19:44:54 +00:00
Sally Yuen
48c6c67a92
Merge "Update Extra dim banner for tablets" into tm-qpr-dev am: 6d6736c1c9
am: 1795481a72
am: 40019f876b
am: f464edf6dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22076421
Change-Id: I80a47fa5bb067c4aae33fdb72e568d5022412cb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-21 19:44:49 +00:00
Dmitry Dementyev
335ceeb84a
Merge "Use updated lockscreen validation API in Settings."
2023-03-21 19:22:49 +00:00
lbill
c7dd729a43
Launch Face Settings when device enrolled face
...
In legacy flow FaceEnrollIntroduction check maxFacesEnrolled()
then update introduction description and prevent user go to next
enroll step, the CUJ was not good to user, instead bring user
to Face Settings and let user decide the next action(Delete face or
change config) is more make sense.
As any applications could broadcast intent(android.settings.FACE_ENROLL)
to bring FaceEnrollIntroduction up, we add a check in onCreate() and check
if device has been enrolled max face, launch FaceSettingsInternalActivity.
In addition, skip to register any posture change callback when
maxFacesEnrolled() during activity onStart().
Test: atest SettingsGoogleUnitTests
Test: m -j SettingsGoogleRoboTests RunSettingsGoogleRoboTests
Test: m RunSettingsRoboTests ROBOTEST_FILTER= \
"FaceEnrollIntroductionTest"
Test: m RunSettingsRoboTests ROBOTEST_FILTER= \
"FingerprintEnrollIntroductionTest"
Test: Manual enrolled face, unfold device, launch Tips Security page
and click "Set up Face Unlock", device launch Face Settings insteand of
posture guidance page.
Bug: 263830403
Change-Id: Ied8b92259810f954ce6b2daaa9b87fc996ad752a
2023-03-21 19:10:57 +00:00
Sally Yuen
877a6ffa82
Merge "Update Extra dim banner for tablets" into tm-qpr-dev am: 6d6736c1c9
am: 1795481a72
am: 40019f876b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22076421
Change-Id: I907ff8fc461c9fb9c2965e2c30dc6721cc3c09a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-21 19:08:40 +00:00
Sally Yuen
f464edf6dc
Merge "Update Extra dim banner for tablets" into tm-qpr-dev am: 6d6736c1c9
am: 1795481a72
am: 40019f876b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22076421
Change-Id: I54c8118e05f1c17662bac7eb5260aaa544b3b7f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-21 19:04:37 +00:00
Sally Yuen
40019f876b
Merge "Update Extra dim banner for tablets" into tm-qpr-dev am: 6d6736c1c9
am: 1795481a72
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22076421
Change-Id: Ib68b4ee9ecbd90f565eb57ceed0e8d2eb445864a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-21 18:24:43 +00:00
Sally Yuen
1795481a72
Merge "Update Extra dim banner for tablets" into tm-qpr-dev am: 6d6736c1c9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22076421
Change-Id: I781c0e19683127e794d63949979b1b5a2eb2ff4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-21 17:46:07 +00:00
Sally Yuen
6d6736c1c9
Merge "Update Extra dim banner for tablets" into tm-qpr-dev
2023-03-21 16:33:06 +00:00
Becca Hughes
a917128931
Merge "Add settings intent dialog"
2023-03-21 15:58:37 +00:00
Jason Hsu
0effae9185
Merge "Update the strings for bluetooth hearing device details page in U" into udc-dev am: bff222ca71
am: 5413c0269c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22164162
Change-Id: Iab4e555c3c22716a35f0c727079e453240530f40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-21 13:37:36 +00:00
Jason Hsu
61d3f30778
Merge "Update the strings for bluetooth hearing device details page in U" into udc-dev am: bff222ca71
am: 8f565dda10
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22164162
Change-Id: I83118568c17545571bbbcc4ec6a5d7344798e16a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-21 13:36:36 +00:00
Jason Hsu
78a1cd282d
Merge "Update to use android:summary="%s" in ListPreference" into udc-dev am: b25a941609
am: e5ce1ad6e1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22162143
Change-Id: Ib224dcec4ec14f8131d5bce436e5940d35907ba9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-21 13:34:54 +00:00
Jason Hsu
c6cb39b965
Merge "Update to use android:summary="%s" in ListPreference" into udc-dev am: b25a941609
am: fff9b76baf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22162143
Change-Id: I102f8f24c8dfbebae6a1751cc8ca23fd04d6dd6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-21 13:33:27 +00:00
Jason Hsu
8f565dda10
Merge "Update the strings for bluetooth hearing device details page in U" into udc-dev am: bff222ca71
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22164162
Change-Id: I3bfe7886f3dee0407faa357cb3cae58e1914ee9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-21 13:00:04 +00:00
Jason Hsu
5413c0269c
Merge "Update the strings for bluetooth hearing device details page in U" into udc-dev am: bff222ca71
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22164162
Change-Id: I56b833f5f55d67bbb99db68d7ede97e0ee21873d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-21 12:59:42 +00:00
Jason Hsu
fff9b76baf
Merge "Update to use android:summary="%s" in ListPreference" into udc-dev am: b25a941609
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22162143
Change-Id: Id654d152809446154b53faa7d84010e650b3b08c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-21 12:57:18 +00:00
Jason Hsu
e5ce1ad6e1
Merge "Update to use android:summary="%s" in ListPreference" into udc-dev am: b25a941609
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22162143
Change-Id: If14fcbfa4efa74e7551d192891033fe71ba1e371
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-21 12:57:08 +00:00
Jason Hsu
bff222ca71
Merge "Update the strings for bluetooth hearing device details page in U" into udc-dev
2023-03-21 11:39:44 +00:00
Jason Hsu
b25a941609
Merge "Update to use android:summary="%s" in ListPreference" into udc-dev
2023-03-21 11:38:02 +00:00
Josh Hou
7076cbc015
[Panlingual] Can't set per-app languages for apps on work profile page
...
Use startActivityAsUser instead of startActivity API to start the AppLocalePickerActivity of different users
Bug: 274378136
Test: 1. Perform AppLocalePickerActivityTest robolectric test
2. Perform the manual test by switching different users
3. Perform the manual test by switching different profiles
Change-Id: I0dfc40b29a7a35f18f6bcffd22fb421c6ad9c230
Merged-In: I4405b3b7e832b71b9ef66fa71d9e42ce12da167c
2023-03-21 11:03:27 +00:00
Josh Hou
38df174bba
[Panlingual] Can't set per-app languages for apps on work profile page
...
Use startActivityAsUser instead of startActivity API to start the AppLocalePickerActivity of different users
Bug: 274378136
Test: 1. Perform AppLocalePickerActivityTest robolectric test
2. Perform the manual test by switching different users
3. Perform the manual test by switching different profiles
Change-Id: I4405b3b7e832b71b9ef66fa71d9e42ce12da167c
2023-03-21 10:57:42 +00:00
Matías Hernández
07394b0fdc
Fix icons of DND timelapse/event schedule types in Dark Mode
...
Instead of a fixed white color, use a theme-dependent one. Also renamed the drawables themselves since they are no longer "_white".
Fixes: 214789556
Test: Manual
Change-Id: I94d7d0308a339385988d3bb39182b2e2d2f0c3a1
2023-03-21 11:56:16 +01:00
Angela Wang
79e850c4d9
Merge "Adds illustration to Flash Notifications settings page" into udc-dev am: 6dfcad2cb2
am: 4b43e0b716
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22164175
Change-Id: I97a589a397602668a61429fd938e0bdfa0b85014
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-21 10:03:05 +00:00
Angela Wang
7d89d19dbd
Merge "Adds illustration to Flash Notifications settings page" into udc-dev am: 6dfcad2cb2
am: 2b1e10e613
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22164175
Change-Id: Ia6b1cd4d5f989281e02635d07374b502084089df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-21 10:00:59 +00:00
Angela Wang
4b43e0b716
Merge "Adds illustration to Flash Notifications settings page" into udc-dev am: 6dfcad2cb2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22164175
Change-Id: Ic88a092c01d1f0441615287485d5e0f4aef85c68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-21 09:27:18 +00:00
Angela Wang
2b1e10e613
Merge "Adds illustration to Flash Notifications settings page" into udc-dev am: 6dfcad2cb2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22164175
Change-Id: I6fb33eaa0cb8768c0a9fa123ee3c951d68456cdf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-21 09:26:28 +00:00
Angela Wang
6dfcad2cb2
Merge "Adds illustration to Flash Notifications settings page" into udc-dev
2023-03-21 08:44:04 +00:00
jasonwshsu
fd76efc7fd
Update the strings for bluetooth hearing device details page in U
...
Bug: 270086620
Test: flash rom and check the device details page UI for hearing device
Change-Id: Iae1a7fae9f51ed8318d757ed7b3eefe0261b28a1
2023-03-21 15:10:38 +08:00
Ahan Wu
ae84ac3530
Use GlifLayout#setDescriptionText in SetupChooseLockGenericFragment
...
1. Use GlifLayout#setDescriptionText to align UX.
2. Remove redundant layout resources.
3. Add two new robotests.
Bug: 236948821
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SetupChooseLockGenericTest
Test: Check UI manually
Change-Id: I85cc984527fcc746e835d8fa508e78c96dfdcb94
2023-03-21 06:27:51 +00:00
Angela Wang
139ee5037b
Adds illustration to Flash Notifications settings page
...
Bug: 274546785
Test: builds and checks the illustration manually
Change-Id: Iaaa49195fc062b2905b148352a5bd3e25807f207
2023-03-21 05:11:45 +00:00
Kweku Adams
cefae4bddd
Merge "Remove RESTRICTED bucket off code." into udc-dev am: f0c3812123
am: 8b735f191b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22075586
Change-Id: I2cbd9653446619b1d037f2c19654fd08dea89441
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-21 00:50:14 +00:00
Chaohui Wang
6d9138a9dd
Merge "Fix not displaying "Allow restricted settings"" into udc-dev am: ac67b77af7
am: 37e0f3fc17
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22135265
Change-Id: Ifbd6a72f5efeeedca6137fc3199cd9656298a5a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-21 00:45:36 +00:00
Becca Hughes
a983d78b71
[automerger skipped] Merge "Add subtitle to settings (settings)" into udc-dev am: 853c4a8683
am: 79fb783267
-s ours
...
am skip reason: Merged-In I481da16985027a49ee464623b6db166d941cab55 with SHA-1 fb4488ea83
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21911122
Change-Id: I999ece810834d51a1c80346ab97c149353fb7cb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-21 00:43:45 +00:00
Zoey Chen
37152c6d03
Merge changes I26c7d64e,I7ec6d824 into udc-dev am: 1c47f309af
am: 3feb199021
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22120466
Change-Id: I0cc20af23592faac2739f11c776112d0a3ff5dbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-21 00:30:27 +00:00
Becca Hughes
9d74509888
Add settings intent dialog
...
Add a dialog that can be launched via
an intent to prompt the user to enable
the provider for credman.
Test: make & atest & manual
Bug: 267816998
Change-Id: Id88cc7b3bf2829d075fbba87ea5dc0a245b9ae32
2023-03-21 00:00:40 +00:00
Julia Reynolds
53b196e4fe
Merge "Add missing conversation field" into udc-dev am: 2494fd0187
am: 78dbfb94aa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22118257
Change-Id: Ia4a7f7bad1b3d07244456eada807973394c0c911
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-21 00:00:26 +00:00
Betty Chang
1ad8ad8512
[automerger skipped] Merge "[LE Audio] Set activity for result after scanning the QR code" am: 9541363952
am: 00a7d0788f
am: aa7ec2d5fe
-s ours am: 8170de078c
-s ours am: 79932802dc
-s ours
...
am skip reason: Merged-In Ia252f29ad9dfdc09266e91cc9ecaa32ed8c749c2 with SHA-1 74dc069d16
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2495497
Change-Id: Ibb32cb73ae5c7b22997cd8db91a1e6f3932ed59f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 23:42:50 +00:00