Commit Graph

120611 Commits

Author SHA1 Message Date
YK Hung
79e26c3228 Merge "Update the incompatible banner tip icon based on UX refinement" into udc-dev am: ba9bd128c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21784767

Change-Id: Ib274c132a34a5399d6426dab5acfdb352f9e16d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-05 05:48:33 +00:00
YK Hung
e784c520f3 Merge "Add a new config for checking BatteryManager show/hide rule" into udc-dev am: edb03e5535
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21784766

Change-Id: I519a2533bc1916741cd89f8d0cc9dc4b1d933f47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-05 05:28:04 +00:00
YK Hung
ba9bd128c7 Merge "Update the incompatible banner tip icon based on UX refinement" into udc-dev 2023-03-05 05:17:32 +00:00
YK Hung
edb03e5535 Merge "Add a new config for checking BatteryManager show/hide rule" into udc-dev 2023-03-05 05:12:27 +00:00
ykhung
ecb91b7d36 Update the incompatible banner tip icon based on UX refinement
Bug: 246960554
Test: presubmit & manual
Change-Id: I5fab570e1a8947d70a7923338c4e74caa67bcd2e
2023-03-05 11:30:19 +08:00
ykhung
3ae46cd6ec Add a new config for checking BatteryManager show/hide rule
Bug: 271387663
Test: presubmit
Change-Id: If24b5e6de630afe972ad7ff7af866cb587db0a56
2023-03-05 10:54:01 +08:00
Wenhui Yang
ad26c2873b [automerger skipped] Merge "[DO NOT MERGE] Fix tablet verify pin wording" into tm-qpr-dev am: 1fc651aee7 am: ee77d819f9 -s ours am: 87dca7b54e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie97acfcf00275f997d5c51f74d85511096e30f4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-04 07:33:18 +00:00
Wenhui Yang
c1d0064a70 [automerger skipped] [DO NOT MERGE] Fix tablet verify pin wording am: 07ca5b7e4e am: 59090cbb65 -s ours am: 9c3060dea8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5e808296d92c9c3e3132ccb646e754b7e9873aeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-04 07:29:35 +00:00
Wenhui Yang
87dca7b54e [automerger skipped] Merge "[DO NOT MERGE] Fix tablet verify pin wording" into tm-qpr-dev am: 1fc651aee7 am: ee77d819f9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ide9d559a8cb50d90b637b2f56008f7f47b58d393
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-04 06:30:03 +00:00
Wenhui Yang
9c3060dea8 [automerger skipped] [DO NOT MERGE] Fix tablet verify pin wording am: 07ca5b7e4e am: 59090cbb65 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6f155805d208da88c68df632023ee0c681d9e49a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-04 06:29:54 +00:00
Wenhui Yang
ee77d819f9 Merge "[DO NOT MERGE] Fix tablet verify pin wording" into tm-qpr-dev am: 1fc651aee7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21631222

Change-Id: I418f39b4328603ddd96a5d0a4cc1ed347ac70aa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 19:37:08 +00:00
Wenhui Yang
59090cbb65 [DO NOT MERGE] Fix tablet verify pin wording am: 07ca5b7e4e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21631222

Change-Id: I4222ff4118ab7e6da39cf777f676104092ac96b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 19:37:00 +00:00
Lucas Dupin
2aff6c3484 Merge "Revert "Add discrete contrast UI slider in the setting"" into udc-dev am: f9f6b80efc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21733631

Change-Id: I2a42a67681613992474c86cbf2e7744a67bf7a08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 19:27:27 +00:00
SongFerng Wang
df1ed13f98 [automerger skipped] Merge "[Settings] Customizable resource for hiding 3G preferred network type" into tm-qpr-dev am: 2b3cbffffd am: d427c0d2d1 -s ours am: 8153d6c491 -s ours
am skip reason: Merged-In I8092372372cb334b5ac1956b869d194b9fcd0523 with SHA-1 a9717482a7 is already in history

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

Change-Id: Ia35941823a7904b4dae2d86dc07a4d7f40f03789
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 19:25:25 +00:00
YK Hung
78be1d4dee Merge "Hide BatteryManagerPreference if there is no adaptive charging" into udc-dev am: 4f98350ba3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21736487

Change-Id: Ied630d92f743dc431e27dad52f47505615ddead8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 19:23:26 +00:00
Angela Wang
6d6652eeec Merge "Fix duplicated order in notification settings layout" into udc-dev am: 5da8894d9a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578804

Change-Id: Ica3ac8f7ec7416baad3f10edbdb95f4c18085cab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 19:20:06 +00:00
YK Hung
60ccbd9056 Merge "Update the battery saver scheduler string" into udc-dev am: 8efe31900c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21701047

Change-Id: I1520ec312f75534c46927e126eb025a9fe9cda51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 19:04:14 +00:00
Lucas Dupin
f9f6b80efc Merge "Revert "Add discrete contrast UI slider in the setting"" into udc-dev 2023-03-03 18:45:22 +00:00
Wenhui Yang
1fc651aee7 Merge "[DO NOT MERGE] Fix tablet verify pin wording" into tm-qpr-dev 2023-03-03 18:07:50 +00:00
SongFerng Wang
8153d6c491 [automerger skipped] Merge "[Settings] Customizable resource for hiding 3G preferred network type" into tm-qpr-dev am: 2b3cbffffd am: d427c0d2d1 -s ours
am skip reason: Merged-In I8092372372cb334b5ac1956b869d194b9fcd0523 with SHA-1 a9717482a7 is already in history

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

Change-Id: Ie4cbe406a891d0471517c34aa06d69815f8a5a6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 17:57:27 +00:00
YK Hung
f95af758eb Merge "Update incompatible charging string based on UXR suggestion" into udc-dev am: ffd306e63a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21701046

Change-Id: Ice09e7200bbc0bff6fba713be8b38ea1fbb072b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 17:44:51 +00:00
TreeHugger Robot
88bcec84d8 Merge "Fix checkcolor_hook error" into udc-dev am: 4b4b0cf83b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21692788

Change-Id: I10124f01d59d9515f1c230efea1dc2f6dc7d0e94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 17:32:30 +00:00
SongFerng Wang
d427c0d2d1 Merge "[Settings] Customizable resource for hiding 3G preferred network type" into tm-qpr-dev am: 2b3cbffffd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21551540

Change-Id: I30a31add9ce0d6c8493edf162b57d80b03e4ef5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 17:15:07 +00:00
Diya Bera
69b0c4fe50 [automerger skipped] Merge "Learn more updated in Fingerprint Settings for side fps" into tm-qpr-dev am: 47cedbde0a am: f3012c6497 -s ours am: 7cb164d0c1 -s ours
am skip reason: Merged-In Ia22fcd1289bec85642993b22fe3cb3ebaf647cbd with SHA-1 5faf4eeb8e is already in history

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

Change-Id: I88b75092fa5fe59affcfb43b953a9ccf6d61535d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 17:12:25 +00:00
YK Hung
4f98350ba3 Merge "Hide BatteryManagerPreference if there is no adaptive charging" into udc-dev 2023-03-03 12:04:29 +00:00
ykhung
82d5103f07 Hide BatteryManagerPreference if there is no adaptive charging
Fix: 271387663
Test: presubmit
Change-Id: I12c511f17f23b21f6a584d86e854683fba037047
2023-03-03 17:46:27 +08:00
Angela Wang
5da8894d9a Merge "Fix duplicated order in notification settings layout" into udc-dev 2023-03-03 08:56:49 +00:00
SongFerng Wang
2b3cbffffd Merge "[Settings] Customizable resource for hiding 3G preferred network type" into tm-qpr-dev 2023-03-03 07:42:51 +00:00
YK Hung
8efe31900c Merge "Update the battery saver scheduler string" into udc-dev 2023-03-03 05:42:08 +00:00
ykhung
b25a824f50 Update the battery saver scheduler string
Fix: 266030870
Test: presubmit
Change-Id: I271f02b6a6044ba39d23e9ad1eb1decebe4eec85
2023-03-03 12:16:29 +08:00
YK Hung
ffd306e63a Merge "Update incompatible charging string based on UXR suggestion" into udc-dev 2023-03-03 03:34:16 +00:00
Diya Bera
cd9bfa0c8b [automerger skipped] Merge "Removed subtext from side fps enrollment flow" into tm-qpr-dev am: 97f99f5d30 am: afa29d5cb8 -s ours am: 63c145445b -s ours
am skip reason: Merged-In Iba4c13e8083ecb92f8033882af9147f14071e726 with SHA-1 7fa342fadb is already in history

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

Change-Id: Id571f7c562a5ea1c2c9a627f6dbc1576fbff4b03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 02:18:04 +00:00
Chris Li
01fa5fa6aa Update EmbeddingAspectRatio to the latest am: 81ee016a6e am: 32d271dfb3 am: aabd2ee494
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21673464

Change-Id: Ia2f0149bf4bc0231c86198cc870e63cd8d413603
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 02:00:42 +00:00
TreeHugger Robot
4b4b0cf83b Merge "Fix checkcolor_hook error" into udc-dev 2023-03-03 01:52:59 +00:00
Diya Bera
7cb164d0c1 [automerger skipped] Merge "Learn more updated in Fingerprint Settings for side fps" into tm-qpr-dev am: 47cedbde0a am: f3012c6497 -s ours
am skip reason: Merged-In Ia22fcd1289bec85642993b22fe3cb3ebaf647cbd with SHA-1 5faf4eeb8e is already in history

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

Change-Id: Ieed83b86abaedc2c6f49bc859ee3c51dde81763e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 01:37:20 +00:00
Diya Bera
63c145445b [automerger skipped] Merge "Removed subtext from side fps enrollment flow" into tm-qpr-dev am: 97f99f5d30 am: afa29d5cb8 -s ours
am skip reason: Merged-In Iba4c13e8083ecb92f8033882af9147f14071e726 with SHA-1 7fa342fadb is already in history

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

Change-Id: Ia1f47a216186d1819d70dfaa89af04a6e3341edc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 01:37:05 +00:00
Diya Bera
f3012c6497 Merge "Learn more updated in Fingerprint Settings for side fps" into tm-qpr-dev am: 47cedbde0a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21593025

Change-Id: Ic8b8eea0c25961ccc05b3d344161e1a194104b3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 01:26:01 +00:00
Diya Bera
afa29d5cb8 Merge "Removed subtext from side fps enrollment flow" into tm-qpr-dev am: 97f99f5d30
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21613842

Change-Id: Ia2a62797dd783366a5d2df4494a25d748fac7995
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 01:24:11 +00:00
Chris Li
aabd2ee494 Update EmbeddingAspectRatio to the latest am: 81ee016a6e am: 32d271dfb3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21673464

Change-Id: I59f466f5c34469e77455ef7332cd14237ac4162c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 01:20:54 +00:00
Phil Weaver
64c23fc5cf Revert "Add discrete contrast UI slider in the setting"
This reverts commit fd3911ba29.

Reason for revert: Setting will be re-landed in developer settings. Not currently aligned with other accessibility features.

Change-Id: If896d87b0bd6d5e74422c1919e60d8717d28a1d0
2023-03-03 00:53:07 +00:00
Wenhui Yang
07ca5b7e4e [DO NOT MERGE] Fix tablet verify pin wording
Test: Manual - Reset tablet without removing accounts, observe the texts
displayed correctly for tablet. Expanded related for devices.
Fixes: 267539281
Fixes: 270516438

Change-Id: If2ad3692b9fb2c8a374d8e988aac76a7254b8cd6
2023-03-03 00:10:18 +00:00
Diya Bera
47cedbde0a Merge "Learn more updated in Fingerprint Settings for side fps" into tm-qpr-dev 2023-03-02 22:21:12 +00:00
Diya Bera
97f99f5d30 Merge "Removed subtext from side fps enrollment flow" into tm-qpr-dev 2023-03-02 21:22:46 +00:00
Chris Li
32d271dfb3 Update EmbeddingAspectRatio to the latest am: 81ee016a6e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21673464

Change-Id: I45ffde90d1b91b709b6e00622a789722c7cd750f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 20:46:57 +00:00
Diya Bera
4afe665577 Merge "Learn more updated in Fingerprint Settings for side fps" into udc-dev am: 4c3ac9b994
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21611408

Change-Id: Ic344db9a90e1266de105ebcc4c7ad9bc8f7f4ff0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 19:31:52 +00:00
Diya Bera
961b32ca28 Learn more updated in Fingerprint Settings for side fps
Test: Manual - Go to Fingerprint Settings and check the string
Bug: 258338293
Change-Id: Ia22fcd1289bec85642993b22fe3cb3ebaf647cbd
Merged-in: Ia22fcd1289bec85642993b22fe3cb3ebaf647cbd
2023-03-02 19:09:34 +00:00
Diya Bera
4c3ac9b994 Merge "Learn more updated in Fingerprint Settings for side fps" into udc-dev 2023-03-02 19:09:23 +00:00
Diya Bera
327eaf16fb Removed subtext from side fps enrollment flow
Test: Manual (Try to enroll your fingerprint in a side fps device, and
observe that there is no subtext in landscape mode)
Bug: 267271891

Change-Id: Iba4c13e8083ecb92f8033882af9147f14071e726
Merged-in: Iba4c13e8083ecb92f8033882af9147f14071e726
2023-03-02 18:42:02 +00:00
Diya Bera
a2c16a2643 Merge "Removed subtext from side fps enrollment flow" into udc-dev am: 36e41dc985
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21673465

Change-Id: I7202f15c530fe3c7f5ae94d011b12d83717db2d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 17:27:04 +00:00
Diya Bera
36e41dc985 Merge "Removed subtext from side fps enrollment flow" into udc-dev 2023-03-02 17:16:31 +00:00