PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
120,427 Commits 1 Branch 0 Tags
24131b83e76be1079812e069ee498a8c5f85835f
Commit Graph

120427 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
218310af06 Merge "Fix settings crash" into udc-dev am: 20c5853744 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21650756

Change-Id: I89c5d6dc687e2929cedd0e6a47461a91287d1776
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-28 23:53:57 +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
20c5853744 Merge "Fix settings crash" into udc-dev 2023-02-28 23:02:06 +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
Avinash Vadlamudi
2838dde36e Merge "[Auto Pin Confirmation]: Save the autoPinConfirmOptionSetManually field state" into udc-dev am: 019ce4c02c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21611347

Change-Id: Ida2ec570ce03146046925733a6971e5ca6a70b23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-28 21:42:11 +00:00
TreeHugger Robot
333d957462 Merge "Refine FingerprintEnrollmentActivity" into udc-dev am: 7e9d6e7d22 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21584900

Change-Id: I54985ba7d58ada0a2f14604599221e6e609d9e02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-28 20:48:07 +00:00
Chaohui Wang
68e47490d6 Merge "Disable the middle pages during development" into udc-dev am: e34d95d68e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21469909

Change-Id: Id4602df190b9ce51ad688635772662b27f673289
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-28 19:47:17 +00:00
Avinash Vadlamudi
019ce4c02c Merge "[Auto Pin Confirmation]: Save the autoPinConfirmOptionSetManually field state" into udc-dev 2023-02-28 15:10:27 +00:00
TreeHugger Robot
7e9d6e7d22 Merge "Refine FingerprintEnrollmentActivity" into udc-dev 2023-02-28 12:58:53 +00:00
Avinash Vadlamudi
7da92e9295 [Auto Pin Confirmation]: Save the autoPinConfirmOptionSetManually field state 
- Save and restore the autoPinConfirmOptionSetManually field during activity restart (because of orientation change)
- This helps to retain the state of the auto confirm unlock checkbox  during an orientation change during set PIN stage.

Bug: 268592440
Test: Manual Test
Test: atest ChooseLockPasswordTest
Change-Id: I48ce9080b6007fb4e3a5ca5013d6c21ed4ba664f
 2023-02-28 11:54:16 +00:00
Chaohui Wang
e34d95d68e Merge "Disable the middle pages during development" into udc-dev 2023-02-28 11:43:05 +00:00
TreeHugger Robot
1b34eb83ea [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 8e002f962e -s ours am: 488d3adb81 -s ours am: de10018301 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6595604d4cf74c2165f6e7ca36c50759d77b936e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-28 01:19:46 +00:00
Bill Yi
6b8e4c701b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a2cbc7ea7c -s ours am: 934826d8d3 -s ours am: 0f86c524c8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6e1df9f9045f9d617c48f3f2638f0b8c1da3fb61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-28 01:19:43 +00:00
TreeHugger Robot
37d176a317 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 3f75c80642 -s ours am: 62a6197006 -s ours am: 98e097b2e6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I68550569875b440d78ae9f9b24732853ef90d531
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-28 01:19:38 +00:00
Bill Yi
c693b4db1b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c253ffe61a -s ours am: 47d7d69611 -s ours am: 49c2652453 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ica4924bc54b24e0ca29937fea69c3bf0aa3ac709
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-28 01:19:28 +00:00
Bill Yi
c9832aa578 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 99b4d024d1 -s ours am: 5d6536ce44 -s ours am: 8f600b3932 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I49251020739d114e47b402a513ef23955b4038b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-28 01:19:01 +00:00
TreeHugger Robot
de10018301 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 8e002f962e -s ours am: 488d3adb81 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If39365a1964c49b7ee609fe0f88f6b5dce6bc9f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-28 00:40:01 +00:00
Bill Yi
0f86c524c8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a2cbc7ea7c -s ours am: 934826d8d3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4c75ab1453ac6d2491881c6981ff5d6ca393f12a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-28 00:39:55 +00:00
TreeHugger Robot
98e097b2e6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 3f75c80642 -s ours am: 62a6197006 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I94fb8806123683ab43a3f75fdeefda6a191b75c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-28 00:39:40 +00:00
Bill Yi
49c2652453 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c253ffe61a -s ours am: 47d7d69611 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id472fd8a72cf62a383942953901c18e13570dc9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-28 00:39:27 +00:00
Bill Yi
8f600b3932 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 99b4d024d1 -s ours am: 5d6536ce44 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I43d982ef1c633b0fb592a81b3cd49c55cc20862c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-28 00:39:11 +00:00
TreeHugger Robot
488d3adb81 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 8e002f962e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id7f81ddfe5f308de358950a5eba75a2852f29f38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-28 00:06:37 +00:00
Bill Yi
934826d8d3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a2cbc7ea7c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4c800f6e4828b492ee35ba09492fac1f388f3fae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-28 00:06:33 +00:00
TreeHugger Robot
62a6197006 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 3f75c80642 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib76fbcdf3c4c9a282bcb659941d0ea465d1ea675
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-28 00:06:29 +00:00
Bill Yi
47d7d69611 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c253ffe61a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib27e69a8c83f8a538a387a3b95d137d68841d739
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-28 00:06:17 +00:00
Bill Yi
5d6536ce44 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 99b4d024d1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8aea0e66f39df752b06ba85adc5201a8bd1ebf8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-28 00:05:41 +00:00
TreeHugger Robot
8e002f962e Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2023-02-27 23:59:16 +00:00
TreeHugger Robot
3f75c80642 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2023-02-27 23:59:16 +00:00
Julia Reynolds
57a42d2a93 Fix settings crash 
Test: post notification with an action with a null title, view
notification widget
Fixes: 250836823

Change-Id: I56707c628b3fcc7d6823e4b3736dd26e3d98dfa7
 2023-02-27 16:24:21 -05:00
William Leshner
f5364571a3 Merge "Restrict screen saver settings searches to enabled users." into udc-dev am: 01dfbcc297 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21486654

Change-Id: I5e938be27d0995589fd25f565b103c31ac6f2268
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-27 17:57:33 +00:00
William Leshner
01dfbcc297 Merge "Restrict screen saver settings searches to enabled users." into udc-dev 2023-02-27 17:30:48 +00:00
Bill Yi
a2cbc7ea7c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I15d98108201d7c114ffd7e30f3141af4e8fc0497
 2023-02-26 20:37:26 -08:00
Bill Yi
c253ffe61a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic10f43fb3b99fbf09a56366b4d0e0fd864741d05
 2023-02-26 20:36:20 -08:00
Bill Yi
99b4d024d1 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I48f351db5e5fb38e3ea5f197f7648c805d21c487
 2023-02-26 20:34:24 -08:00
Milton Wu
94b421b253 Refine FingerprintEnrollmentActivity 
1. Fix backstacks after enrolling finish
2. Support skipFindSensor and skipIntro

Bug: 260957939
Test: Manually test it on different sensor devices
Change-Id: I4061e29999a47bf4859d6562ad82330fb0f6f620
 2023-02-25 08:08:31 +00:00
Weng Su
07618e1cec Merge "Refer to the last Hotspot password when generating the password" into udc-dev am: d078d1f00a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21534044

Change-Id: Ie8f4eaeeab908a913b85d0d1a0b97c848248d89e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-25 02:58:57 +00:00
Weng Su
d078d1f00a Merge "Refer to the last Hotspot password when generating the password" into udc-dev 2023-02-25 02:33:55 +00: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
Henri Chataing
2f83720dab Merge "Nfc: Rename system properties in Nfc settings" am: fa88ad84be am: 1325de7875 am: 5bb48d9250 am: c2c408f3b4 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2452247

Change-Id: I7ac6eadaf67b235c67f9b1c4b037e7f725ef8644
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-25 01:47:40 +00:00
TreeHugger Robot
887a733ebb Merge "Update strings based on UX/product feedback" into udc-dev 2023-02-25 01:05:32 +00:00
Henri Chataing
c2c408f3b4 Merge "Nfc: Rename system properties in Nfc settings" am: fa88ad84be am: 1325de7875 am: 5bb48d9250 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2452247

Change-Id: I4edc194d398c13b80df97c682c7494fb1962a64b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-25 01:02:19 +00:00
Henri Chataing
5bb48d9250 Merge "Nfc: Rename system properties in Nfc settings" am: fa88ad84be am: 1325de7875 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2452247

Change-Id: Ia03c857e442f801d7fb042dda4c186aeb1dce1e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 23:54:34 +00:00
Will Leshner
ca1379f0b3 Restrict screen saver settings searches to enabled users. 
If a user can't enable screen saver, they shouldn't be able to
accidentally find screen saver related settings in Settings.

Bug: 260276394
Test: atest ScreenSaverPreferenceControllerTest
Test: manually by settings up a second user on a device that supports
screen saver, switching to that user, and making sure that searches for
"screen saver" don't accidentally reveal settings that can't be
accessed.

Change-Id: If2f465b2acb548455f0868507cf47217ea1a626f
 2023-02-24 15:36:48 -08:00
Henri Chataing
1325de7875 Merge "Nfc: Rename system properties in Nfc settings" am: fa88ad84be 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2452247

Change-Id: Ibbe1f8ed19c421b32f24675734eeb233b61e5468
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 23:02:43 +00:00
TreeHugger Robot
ade18c1ffe Merge "Allow Magnification Settings launch from outside of AccessibilitySettings" into udc-dev am: 3a445a3ea1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21489373

Change-Id: I639c4bab90359dd33d557b05acd1d43556c7a184
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 19:55:37 +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
Henri Chataing
fa88ad84be Merge "Nfc: Rename system properties in Nfc settings" 2023-02-24 18:57:25 +00:00
TreeHugger Robot
3a445a3ea1 Merge "Allow Magnification Settings launch from outside of AccessibilitySettings" into udc-dev 2023-02-24 18:54:44 +00:00
TreeHugger Robot
fa2b0ef4ae Merge "Fix b/270656372 unit test failure." into udc-dev am: f9ef8e39f5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578803

Change-Id: I285a39d07df9cf76fac6ebb4de1a6e1909771030
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 13:32:50 +00:00