Commit Graph

28319 Commits

Author SHA1 Message Date
Tom Hsu
437434f9bc Merge "Add confirmation dialog for system locale change." into udc-dev am: 39129e09d3 am: 358c2d9aaa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21740799

Change-Id: Id6fb6f6b3a7cc3a4a659ff0a8b07e69178917598
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 04:23:45 +00:00
Tom Hsu
358c2d9aaa Merge "Add confirmation dialog for system locale change." into udc-dev am: 39129e09d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21740799

Change-Id: I0e603ed199f26e043502408da66f12c71280309b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 03:47:11 +00:00
Tom Hsu
39129e09d3 Merge "Add confirmation dialog for system locale change." into udc-dev 2023-03-07 03:31:02 +00:00
Marcelo Arteiro
280915b052 Merge "Automated Token Alignment Android/Material" into udc-dev am: b93f186df4 am: a679d68853
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21480745

Change-Id: I9c266b1924594129a6ccdd6d1df147c7ad05672c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 13:42:51 +00:00
Marcelo Arteiro
a679d68853 Merge "Automated Token Alignment Android/Material" into udc-dev am: b93f186df4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21480745

Change-Id: I8c749964c8e185437de1890e6386b4794df48422
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 13:08:50 +00:00
Marcelo Arteiro
22c4def463 Merge "Automated Token Alignment Android/Material" into udc-dev am: b93f186df4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21480745

Change-Id: Id7a102b1515ed4d3d20559743653d35eeb8aba86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 13:08:41 +00:00
Marcelo Arteiro
b93f186df4 Merge "Automated Token Alignment Android/Material" into udc-dev 2023-03-06 12:46:02 +00:00
tom hsu
04eae5cc60 Add confirmation dialog for system locale change.
Bug: b/243511340
Test: atest passed.
Change-Id: I7ef4ed4557a1064d078e49a372f11a573b81058a
2023-03-06 16:01:27 +08:00
YK Hung
8ee200e8b5 Merge "Add a new config for checking BatteryManager show/hide rule" into udc-dev am: edb03e5535 am: 5c37ab9c6d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21784766

Change-Id: Ib093152c9a45fed127a1e7e99ee8cdc6a8a393d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-05 06:03:34 +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
5c37ab9c6d 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: I1801f2db01ee7585a01f71dd879e900def56618d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-05 05:28:03 +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
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
Lucas Dupin
514aeeb058 Merge "Revert "Add discrete contrast UI slider in the setting"" into udc-dev am: f9f6b80efc am: 2aff6c3484
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21733631

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

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

Change-Id: Ic61b01af3ff9207598b3ee43cc4b23765717c888
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 19:44:31 +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
Lucas Dupin
b81af50666 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: I032d15df9b5a4fd62d3fa40f1c8acb0b36cd2105
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 19:21:34 +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
Angela Wang
e49da0f0c6 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: Iea0c6c0116d008cbe33200ef8ecb546e96fb1d11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 18:18:20 +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
YK Hung
04bc21c347 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: Id2d541bd387ae9736c1a74a4605d55286387f5c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 17:44:48 +00:00
YK Hung
f7d5e7b613 Merge "Update incompatible charging string based on UXR suggestion" into udc-dev am: ffd306e63a am: 4759c9447f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21701046

Change-Id: I34df51ffc34a30a0ec519b4d1dc8390cd888b600
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 17:44:24 +00:00
YK Hung
4759c9447f 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: Ic91d53898891a9140f4844e9567fba6c170acd20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 16:59:47 +00:00
Angela Wang
5da8894d9a Merge "Fix duplicated order in notification settings layout" into udc-dev 2023-03-03 08:56:49 +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
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
Diya Bera
2cf85af3d0 Merge "Learn more updated in Fingerprint Settings for side fps" into udc-dev am: 4c3ac9b994 am: 4afe665577
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21611408

Change-Id: I103292554e98ea2fd5a3fdd3f09f644bbf19ad80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 20:28:01 +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
27e77d4f8c 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: I4bcb7c7d27561d4ec2272392bd37a812a1011e2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 19:31:47 +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
ykhung
03442225a3 Update incompatible charging string based on UXR suggestion
Bug: 246960554
Test: atest
Change-Id: I19ed65d17a538bf6c3c95a121d699e4a1a8ca7b1
2023-03-03 00:50:59 +08:00
Vincent Wang
71945b2919 Merge "Fix Incorrect lottie status on the beginning of enrolling UDFPS" into udc-dev am: 98819227f1 am: baa851a640
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21692082

Change-Id: I1ff4b3ef6dbc5db91d942c034a60f1b7a42dec27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 14:01:49 +00:00
Vincent Wang
baa851a640 Merge "Fix Incorrect lottie status on the beginning of enrolling UDFPS" into udc-dev am: 98819227f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21692082

Change-Id: I303f5583775ddb7fa038c4b8e6ae339090f4929c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 13:28:37 +00:00
Vincent Wang
ce2ee1bbc4 Merge "Fix Incorrect lottie status on the beginning of enrolling UDFPS" into udc-dev am: 98819227f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21692082

Change-Id: I71e7e93d282e248523cb70a091482c7e9b29df99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 13:28:02 +00:00
Vincent Wang
3ff1939b59 Fix Incorrect lottie status on the beginning of enrolling UDFPS
Bug: b/271209610
Test: 1. adb root
      2. adb shell setprop sys.fflag.override.settings_biometrics2_enrollment true
      3. Excute fingerprint enroll process & check the state of enroll progress is
         correct
Change-Id: I3cac369e9dcf939a09dce11a7b9e96952bceeee8
2023-03-02 07:24:43 +00:00
Angela Wang
813dced67c Merge "Updates Flash Notifications string resources" into udc-dev am: 926352a668 am: 83ee88fcac
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21648107

Change-Id: Ic9ded050f113a7d7bd75049d8cb33a7f99a9b0e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 02:50:43 +00:00
Angela Wang
83ee88fcac Merge "Updates Flash Notifications string resources" into udc-dev am: 926352a668
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21648107

Change-Id: Ie0d224b76ff6d0d530eca46d65d225d35216c4ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 02:20:46 +00:00
Angela Wang
10320b9112 Merge "Updates Flash Notifications string resources" into udc-dev am: 926352a668
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21648107

Change-Id: If266445d844a0e182c747c37f382598d7f38a4e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 02:18:04 +00:00
Angela Wang
926352a668 Merge "Updates Flash Notifications string resources" into udc-dev 2023-03-02 01:56:08 +00:00
Angela Wang
35db5e8d3d Updates Flash Notifications string resources
A few formatting changes that are needed to align with Android Accessibility UX patterns.

Bug: 270418490
Test: checks the changes manually
Change-Id: Ia5bd9fa1b8c9c32f9d430f54788e995816c2ee52
2023-03-02 01:55:30 +00:00
Bill Yi
dbb44f6df5 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-03-01 19:59:34 +00:00
Bill Yi
b25ac20f23 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-03-01 18:12:33 +00:00
Andreas Miko
9d61cc28cc Merge "Add setting to disable PIN animation and password" into udc-dev am: 8b71dc930d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21591508

Change-Id: Ibb99c65c9d999fcc655790b36a380e7778ab56e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 13:09:37 +00:00
Steve Elliott
23cf83b75a Merge "Update unseen notif filtering settings string" into tm-qpr-dev am: caf6347d11 am: 97ee8a8414 am: f6955e43d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21464051

Change-Id: I89aa70fe8d23e528fc87b5add38b43c7abb3bf6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 13:06:51 +00:00
Steve Elliott
2e82d0baf8 Merge "Update unseen notif filtering settings string" into tm-qpr-dev am: caf6347d11 am: 97ee8a8414 am: f6955e43d7 am: 8af89d5d21
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21464051

Change-Id: Ib55853f9be40a61ab629cb07cb902cb687db4b14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 12:55:01 +00:00