TreeHugger Robot
145b0966a0
[automerger skipped] Merge "Show package name if no label" into udc-dev am: 9848eb9053
am: b3d17fded1
-s ours
...
am skip reason: Merged-In I78b47e8c55382ceef90329547231124db2ca27d9 with SHA-1 fd96488e5e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22163925
Change-Id: Ic0f310e9f657c1319898ed8bbb26561147f87cbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-23 02:06:14 +00:00
Jason Hsu
3a3b673f5e
Merge "Correct the char limit for strings" into udc-dev am: 72237b55f8
am: f6d4ab89ef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22200384
Change-Id: I4cdee0dd868e33d0db5bd83d5e055078ea8bba6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-23 01:40:08 +00:00
Wu Ahan
d49f7cf8ef
Merge "Use GlifLayout#setDescriptionText in SetupChooseLockGenericFragment" into tm-qpr-dev am: 3a2ef6db2f
am: 0067e9581b
am: 2034c0c395
am: 05f2c3221a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22099962
Change-Id: Ie3e516ae433f022131e148f5f4e1b9be43c17b61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-22 23:02:29 +00:00
TreeHugger Robot
b3d17fded1
Merge "Show package name if no label" into udc-dev am: 9848eb9053
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22163925
Change-Id: I727b2425c258f0a1d7e016d7c46ce01eb0b63dd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-22 22:58:14 +00:00
TreeHugger Robot
9848eb9053
Merge "Show package name if no label" into udc-dev
2023-03-22 22:10:11 +00:00
William Loh
e4af1c93e5
Merge "Keep same behavior after initiatingPackageName change"
2023-03-22 22:04:08 +00:00
Reema Bajwa
4e1eda372c
Fix bug in CTS test
...
Test: CTS
Bug: 274804384
Change-Id: I4e848dbe5bc9926f08fb20a452f0ce6ec8d3ffd5
2023-03-22 20:23:54 +00:00
Becca Hughes
0b5eb7691b
Show package name if no label
...
Test: make
Bug: 273753519
Merged-In: I78b47e8c55382ceef90329547231124db2ca27d9
Change-Id: I78b47e8c55382ceef90329547231124db2ca27d9
2023-03-22 20:23:41 +00:00
Jason Hsu
f6d4ab89ef
Merge "Correct the char limit for strings" into udc-dev am: 72237b55f8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22200384
Change-Id: I60b087e91930bcabaa3a8c07d0bd5ca1f77e67e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-22 18:03:43 +00:00
Jason Hsu
72237b55f8
Merge "Correct the char limit for strings" into udc-dev
2023-03-22 17:32:55 +00:00
jasonwshsu
e621a54f0a
Correct the char limit for strings
...
* string: bluetooth_system_sounds_title is too long to fit in one line.
Should allow more char limit to two lines.
Bug: 270086620
Test: flash rom and check UI
Change-Id: I8b0c8ca37fc3b7447da3dba3bca66673b4d05f7a
2023-03-23 01:25:19 +08:00
Becca Hughes
4a16a24460
Merge "Show package name if no label"
2023-03-22 16:53:54 +00:00
Wu Ahan
05f2c3221a
Merge "Use GlifLayout#setDescriptionText in SetupChooseLockGenericFragment" into tm-qpr-dev am: 3a2ef6db2f
am: 0067e9581b
am: 2034c0c395
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22099962
Change-Id: I35e2ec89a87304caf2002c674e0f71ad87ad47a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-22 14:46:00 +00:00
Wu Ahan
2034c0c395
Merge "Use GlifLayout#setDescriptionText in SetupChooseLockGenericFragment" into tm-qpr-dev am: 3a2ef6db2f
am: 0067e9581b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22099962
Change-Id: I19a4ecd726bf1e6b059909fcb274f2d2cc080fb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-22 14:02:36 +00:00
Wu Ahan
0067e9581b
Merge "Use GlifLayout#setDescriptionText in SetupChooseLockGenericFragment" into tm-qpr-dev am: 3a2ef6db2f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22099962
Change-Id: Ibe03950c9d6e02ebd641e93df2cb5cb646dbfb35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-22 13:44:52 +00:00
TreeHugger Robot
f1f6ee9b14
Merge "Fix icons of DND timelapse/event schedule types in Dark Mode" into udc-dev am: a311ae81fc
am: c2b7bce383
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22166492
Change-Id: I025659da2ede844304b34ba44a461fbf889a757a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-22 13:04:25 +00:00
TreeHugger Robot
8f6a04e78e
Merge "Fix icons of DND timelapse/event schedule types in Dark Mode" into udc-dev am: a311ae81fc
am: 810c487324
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22166492
Change-Id: Ic326044595bd9acffd3fa7efcc4dd3c42259cb15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-22 13:02:48 +00:00
TreeHugger Robot
810c487324
Merge "Fix icons of DND timelapse/event schedule types in Dark Mode" into udc-dev am: a311ae81fc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22166492
Change-Id: I4db97fde3b3c365b7c50a5f1e02f56aa1654760b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-22 12:26:50 +00:00
TreeHugger Robot
c2b7bce383
Merge "Fix icons of DND timelapse/event schedule types in Dark Mode" into udc-dev am: a311ae81fc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22166492
Change-Id: Ic249607574653f392927f02024d01544897a6bfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-22 12:26:46 +00:00
TreeHugger Robot
a311ae81fc
Merge "Fix icons of DND timelapse/event schedule types in Dark Mode" into udc-dev
2023-03-22 11:40:57 +00:00
Josh Hou
d20f21c1d0
Merge "[Panlingual] Can't set per-app languages for apps on work profile page" into udc-dev am: b1f9d26174
am: 1163a0400b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22173332
Change-Id: Iafef0ca4b446099abaf876dd0da9f1f58d8f938a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-22 07:29:52 +00:00
Josh Hou
5139a9b98c
Merge "[Panlingual] Can't set per-app languages for apps on work profile page" into udc-dev am: b1f9d26174
am: f8a3717611
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22173332
Change-Id: I39e37e5f705ef0934aa740e3f1bef1ba12fcd58b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-22 07:28:46 +00:00
Josh Hou
1163a0400b
Merge "[Panlingual] Can't set per-app languages for apps on work profile page" into udc-dev am: b1f9d26174
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22173332
Change-Id: I86052de81858b979e555db860ef9f7fe080b976d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-22 05:58:56 +00:00
Josh Hou
f8a3717611
Merge "[Panlingual] Can't set per-app languages for apps on work profile page" into udc-dev am: b1f9d26174
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22173332
Change-Id: I2fbe71e8fec2e2c12ec5086c65ccf730af6b6703
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-22 05:58:21 +00:00
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
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