Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
120,627 Commits 1 Branch 0 Tags
e43a9c0dc4b3546ea46f84a498b165101debab68
Commit Graph

28265 Commits

Author SHA1 Message Date
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
b93f186df4 Merge "Automated Token Alignment Android/Material" into udc-dev 2023-03-06 12:46:02 +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
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
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
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
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
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
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
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
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
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
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
b25ac20f23 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-03-01 18:12:33 +00:00
Andreas Miko
0d883efab0 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: I6653e57561da90f6cb4b39ce2095755d1bdb1105
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 12:52:15 +00:00
Steve Elliott
8af89d5d21 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: I00befad0d6bf0dbf5f99828bafde3fc91a775d43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 12:48:26 +00:00
Andreas Miko
8b71dc930d Merge "Add setting to disable PIN animation and password" into udc-dev 2023-03-01 12:46:04 +00:00
Darrell Shi
b319e78682 Merge "Hide "additional info" when active dream does not support." into tm-qpr-dev am: 6b6c68fd94 am: d8f61dc2a3 am: 8ba70d32e2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21452841

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

Change-Id: I36e13e98689832aed10256e708e28082b6d00f74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 12:14:18 +00:00
Darrell Shi
8ba70d32e2 Merge "Hide "additional info" when active dream does not support." into tm-qpr-dev am: 6b6c68fd94 am: d8f61dc2a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21452841

Change-Id: I097729dd0420387e67d8aa7eba9642c4834330d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 12:12:28 +00:00
Diya Bera
5faf4eeb8e Learn more updated in Fingerprint Settings for side fps 
Test: Manual - Go to Fingerprint Settings and check the string
Bug: 258338293
Change-Id: Ia22fcd1289bec85642993b22fe3cb3ebaf647cbd
 2023-03-01 01:13:03 +00:00
Julia Reynolds
24131b83e7 Merge "Make string the same across screens" into udc-dev am: 510cb8f22e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21654119

Change-Id: I836dfcee1df32aa69f6f2ce8948136920e06ca04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-28 23:54:26 +00:00
Julia Reynolds
510cb8f22e Merge "Make string the same across screens" into udc-dev 2023-02-28 23:30:15 +00:00
Julia Reynolds
e75dfc6f05 Make string the same across screens 
Test: view notification settings
Fixes: 245912213
Change-Id: Ifb1966a2102afa38ed00bb81e08bbd1b92123a55
 2023-02-28 17:10:24 -05:00
Steve Elliott
97ee8a8414 Merge "Update unseen notif filtering settings string" into tm-qpr-dev am: caf6347d11 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21464051

Change-Id: Ia7757a15bc4d4796fc7d573cc59b488453527038
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-28 12:48:22 +00:00
Darrell Shi
d8f61dc2a3 Merge "Hide "additional info" when active dream does not support." into tm-qpr-dev am: 6b6c68fd94 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21452841

Change-Id: I404de08142653608ff054be43c70d4323b063861
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-28 12:38:18 +00:00
Andreas Miko
387b788b19 Add setting to disable PIN animation and password 
Test: Unit - atest SettingsRoboTests
Test: Manual - Set PIN lock and enabled/disabled the setting to observe animation change during PIN entry
Bug: b/204799468
Merged-In: I587b993ef5515a075442e82ebafae88bebdffc20
Change-Id: I587b993ef5515a075442e82ebafae88bebdffc20
 2023-02-28 10:29:58 +00:00
Steve Elliott
caf6347d11 Merge "Update unseen notif filtering settings string" into tm-qpr-dev 2023-02-27 17:01:42 +00:00
Bill Yi
85eeec4806 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9ed9da3f47690f600214f944d0783e948f856782
 2023-02-27 04:26:22 -08:00
TreeHugger Robot
76a930705b Merge "Update strings based on UX/product feedback" into udc-dev am: 887a733ebb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21579175

Change-Id: I09e1f7cbc722ef59e5cacf3c354f3a7de289d1ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-25 01:50:40 +00:00
Becca Hughes
b52fb4ce0b Update strings based on UX/product feedback 
Update settings strings for cred man based
on feedback.

Test: make
Bug: 264939770
Change-Id: I1e89e99ef11cd1fb64750709e331e1f059d2eeaf
(cherry picked from commit 0172ff6942)
Merged-In: I1e89e99ef11cd1fb64750709e331e1f059d2eeaf
 2023-02-24 19:50:50 +00:00
Darrell Shi
6b6c68fd94 Merge "Hide "additional info" when active dream does not support." into tm-qpr-dev 2023-02-24 16:10:13 +00:00
Zaiyue Xue
1ee1cc368f Merge "Fix b/265387286: The total percentage of all apps is not 100%" into udc-dev am: ae0d935dcc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21502689

Change-Id: I7c47d61fd6cf6f1662dc77e7bf744b71f393a7be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 13:31:44 +00:00
Zaiyue Xue
ae0d935dcc Merge "Fix b/265387286: The total percentage of all apps is not 100%" into udc-dev 2023-02-24 12:55:21 +00:00
Vincent Wang
35ec32bb18 Merge "Refactor FingerprintEnrollEnrolling to fragment" into udc-dev am: d17704196f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578805

Change-Id: I0017be373d3a5003913fd9d9fa86c2c8ced16c98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 12:19:09 +00:00
Vincent Wang
d17704196f Merge "Refactor FingerprintEnrollEnrolling to fragment" into udc-dev 2023-02-24 11:42:26 +00:00
Zaiyue Xue
6d939b34dc Fix b/265387286: The total percentage of all apps is not 100% 
Bug: 265387286
Fix: 265387286
Test: manual
Change-Id: I654f8211a45c818f9a2d4867ac679e72c9ce6eb1
 2023-02-24 19:19:28 +08:00
Vincent Wang
882b49c8fb Refactor FingerprintEnrollEnrolling to fragment 
Bug: b/260957933
Test: NA
Change-Id: I281ec7a7373f6863e2e6f8f20bbbb01fa01e009a
 2023-02-24 08:43:17 +00:00
TreeHugger Robot
76baf341d2 Merge "Clarify string for translation" into udc-dev am: 6d3a9b40d4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21534693

Change-Id: Ia72afbbe0cdc696dc42e84e199374bf2ef993cf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 07:30:34 +00:00
Angela Wang
2b4830720c Fix duplicated order in notification settings layout 
There has 2 preferences with android:order="18" in the xml. Reorders all the preferences to remove the duplication.

Bug: 270638515
Test: manual test
Change-Id: I275effcd0e8a9c304dc045e17086fdb688be96b7
 2023-02-24 07:15:29 +00:00