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

28289 Commits

Author SHA1 Message Date
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
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
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
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
ecc9213a45 Merge "Hide "additional info" when active dream does not support." into tm-qpr-dev am: 6b6c68fd94 am: d8f61dc2a3 am: 8ba70d32e2 am: b319e78682 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21452841

Change-Id: I1349f0bc03740f277f2d7ab8e4a38fc9c1929fc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 12:34:23 +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
Darrell Shi
987f62322b 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: I46e98a31a803cfeb4f48fd50a3df0f1d34e3a3e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 12:14:18 +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
Bill Yi
7ef6dedd46 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-03-01 00:49:32 +00:00
Julia Reynolds
114cb4df2d Merge "Make string the same across screens" into udc-dev am: 510cb8f22e am: 6a5a753fb2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21654119

Change-Id: Ia59a9edbe2e641cf689224cf334d47ccefc2e754
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 00:21: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
9e364dcebf 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
Change-Id: I587b993ef5515a075442e82ebafae88bebdffc20
 2023-02-28 10:30:28 +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
Bill Yi
b6cd183ace Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ibcc1d864ee6aef75df0553b013d32fa58fa8fc29
 2023-02-27 09:37:37 -08: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
Bill Yi
edd5fab7d9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Icad8ced0ed4661bd61aa6b55f8cccb92b43af268
 2023-02-27 04:24:24 -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
Becca Hughes
d9ce857fd5 Merge "Update strings based on UX/product feedback" 2023-02-24 19:45:33 +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
c6166bc07d 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: Ib0c1ebd27bc65db95fccae3a67514b7687d662b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 13:31:35 +00:00