PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
122,922 Commits 1 Branch 0 Tags
74375351cb1558865e01f3311ee48910d35e1650
Commit Graph

122922 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kweku Adams
97252eed2d Merge "Use string notifications_disabled instead of off" into udc-dev am: 83c04b32d1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22938598

Change-Id: I89c3e6121bbb4083d1f6c49ce4819bf495ce1ecc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 16:14:31 +00:00
ykhung
09c1a4a850 Support incompatible charger state in the Settings main page 
https://screenshot.googleplex.com/9af4YCnCCjKHCFY

Bug: 271775549
Test: make test RunSettingsRoboTests
Change-Id: I6562e1b48a85ceceb20389ed87e55e0093040be2
 2023-05-02 00:04:01 +08:00
Kweku Adams
83c04b32d1 Merge "Use string notifications_disabled instead of off" into udc-dev 2023-05-01 15:37:22 +00:00
Florian Mayer
3b97ebd313 Merge "Fix typo in MemtagHelper" into udc-dev am: d7bbff0041 am: 3be6f32c42 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22931417

Change-Id: Ibe979ce519a989a6121adf21a8723f712539c504
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 11:46:25 +00:00
Florian Mayer
6fe9a4850b Merge "Fix typo in MemtagHelper" into udc-dev am: d7bbff0041 am: 6dd4f9a4ec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22931417

Change-Id: I7bb16d6032f3904dba39ed87fccde24c1cadeec3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 11:41:53 +00:00
Florian Mayer
6dd4f9a4ec Merge "Fix typo in MemtagHelper" into udc-dev am: d7bbff0041 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22931417

Change-Id: I7d000eba56ef08dfbe53fb3417b00dc5d7bdd3dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 11:03:01 +00:00
Florian Mayer
3be6f32c42 Merge "Fix typo in MemtagHelper" into udc-dev am: d7bbff0041 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22931417

Change-Id: Ia7cef08103ad0faaedbcb26051757d3ef93b4e1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 10:58:56 +00:00
Florian Mayer
d7bbff0041 Merge "Fix typo in MemtagHelper" into udc-dev 2023-05-01 10:26:47 +00:00
Florian Mayer
411d78c06c Fix typo in MemtagHelper 
Bug: 280034968
Change-Id: I5977925399342cd79f0bed2dd4af0e21c0c20102
 2023-05-01 10:25:04 +00:00
ykhung
f193d7bde7 Fix legacy failed tests to avoid block presubmit am: a0f3f421dd am: 3684f9770e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948657

Change-Id: I60bb7184eb58e5604f4d38904345ddad9b6cbbe7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-30 09:03:36 +00:00
ykhung
22bfa101c5 Fix legacy failed tests to avoid block presubmit am: a0f3f421dd am: 343284fe3f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948657

Change-Id: I82f634709288f4832bac0623bc5f08ca0ecfa3f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-30 08:59:37 +00:00
ykhung
343284fe3f Fix legacy failed tests to avoid block presubmit am: a0f3f421dd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948657

Change-Id: I9a28921a13578106840c73fbd21bcff23855ac21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-30 08:18:06 +00:00
ykhung
3684f9770e Fix legacy failed tests to avoid block presubmit am: a0f3f421dd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948657

Change-Id: I217958f3629dd99d09b6d1a9796ceebada84dce2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-30 08:13:57 +00:00
ykhung
a0f3f421dd Fix legacy failed tests to avoid block presubmit 
Root cause: the `Robolectric.setupActivity(Activity.class)` is removed from the system, which will always return the null `Context`

Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.*
Change-Id: Ib52bc715508332bcb4bdcac56ecc414aa43f1419
 2023-04-30 00:33:57 +00:00
Treehugger Robot
e6b237fffe [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: a1c21ec6d0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib1bc692d73d057033d1b4cdb416eb34bac1047ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 08:50:27 +00:00
Bill Yi
f7324a1365 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4aaf3c69d2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8be64b19a279edb0aa52b532b20d081c932dd47f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 08:50:11 +00:00
Treehugger Robot
295768313b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 7d651cba2a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I734f3b888752df5bcde845c58df99c54c4121c13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 08:50:08 +00:00
Bill Yi
ace4cd9f14 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af0651b602 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5bf0721434528ffbb0ea0a93f16f5b6aa61234d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 08:50:02 +00:00
Treehugger Robot
06daae87ea [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 987cc7259b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I442c0552627cc95dff567f00023e9acd842b8a2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 08:49:33 +00:00
Bill Yi
75f8c5d4ef [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 75997c0291 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id0acbfd620aa09081d9bf0db20723d25c41fde33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 08:49:08 +00:00
Treehugger Robot
a1c21ec6d0 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-04-29 07:57:31 +00:00
Treehugger Robot
7d651cba2a Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-04-29 07:57:31 +00:00
Treehugger Robot
987cc7259b Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-04-29 07:57:31 +00:00
Chaohui Wang
ca615997ea Use string notifications_disabled instead of off 
notifications_disabled was changed to off in
Change: I5f84d09f223efd478461ded93aeac82bf7b128d8

And reverted from off to notifications_disabled in
Change: Iaad301c5513478fb95e40987ea3ccb4f923d71fa

This usage is branched from AppNotificationPreferenceController.java,
and missed in revert.

Bug: 272603842
Test: Visual
Test: Unit test
Change-Id: I5b8466134c1342e10de7a2ead8c52931e0c19377
 2023-04-29 15:42:09 +08:00
Grace Cheng
ec1bd37db0 Prevent NPE on deleting fingerprint in Settings 
Gate all Settings FingerprintUnlockCategory logic on isSfps() check to prevent NPE

Fixes: 279866500
Test: Enroll 2+ fingerprints on a non-sfps device, delete fingerprint,
observe no crash

Change-Id: I040d498426e0f8efb789875eedeb7bcf44436149
 2023-04-29 05:19:41 +00:00
Treehugger Robot
0eb1227f1a Merge "Add developer option switch to set ANGLE as the default system driver" into udc-dev am: 24666c9737 am: 4671972bea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22542821

Change-Id: I0141cab3b834ca660b13cf7b606c7a62573ee1c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 04:42:01 +00:00
Treehugger Robot
fabaacd2e6 Merge "Add developer option switch to set ANGLE as the default system driver" into udc-dev am: 24666c9737 am: c1a32a5a7f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22542821

Change-Id: I07065ad6b618a9bbeac0d41d48eb5e8898a783d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 04:36:25 +00:00
Treehugger Robot
c1a32a5a7f Merge "Add developer option switch to set ANGLE as the default system driver" into udc-dev am: 24666c9737 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22542821

Change-Id: I553d2a4be15286ec59f6fb38b188f4878c0e0c76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 03:57:09 +00:00
Treehugger Robot
4671972bea Merge "Add developer option switch to set ANGLE as the default system driver" into udc-dev am: 24666c9737 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22542821

Change-Id: Ica664646426196d5a88072594eb1a6d04b37ed97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 03:52:58 +00:00
Treehugger Robot
24666c9737 Merge "Add developer option switch to set ANGLE as the default system driver" into udc-dev 2023-04-29 03:21:56 +00:00
Treehugger Robot
bb24cf231d Merge "Set minHeight for remote lockscreen validation checkbox" into udc-dev am: c72b766263 am: 76894e50f9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22869576

Change-Id: Ic1382f4002183d71d45365f07c7ee9700b744d84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 02:14:25 +00:00
Treehugger Robot
3be8f5f3a3 Merge "Set minHeight for remote lockscreen validation checkbox" into udc-dev am: c72b766263 am: e31a768cf5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22869576

Change-Id: I9ba8763ae78ee0d5ef5fc5ac74dd88780aeb4069
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 02:09:58 +00:00
Treehugger Robot
e31a768cf5 Merge "Set minHeight for remote lockscreen validation checkbox" into udc-dev am: c72b766263 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22869576

Change-Id: Id3f95abd142fba8eecd361d8b13bd2bd4db1c28d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 01:32:34 +00:00
Treehugger Robot
76894e50f9 Merge "Set minHeight for remote lockscreen validation checkbox" into udc-dev am: c72b766263 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22869576

Change-Id: Ic623ebc6f6f1dfca6e2e4c8744700e296abd270c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 01:27:13 +00:00
Treehugger Robot
c72b766263 Merge "Set minHeight for remote lockscreen validation checkbox" into udc-dev 2023-04-29 01:03:35 +00:00
Treehugger Robot
968de7c4a1 Merge "Fixes broken Settings test." into udc-dev am: 01c585ed27 am: 9a09103aaa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932419

Change-Id: I2658b778f6b67719d1c2b7e0480c5b0b105394bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 00:08:27 +00:00
Treehugger Robot
46895b026b Merge "Fixes broken Settings test." into udc-dev am: 01c585ed27 am: 550e33b9cd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932419

Change-Id: I51b35a417b63e17126fc55ed5cb3d2b3bf68ea8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 00:04:23 +00:00
Treehugger Robot
550e33b9cd Merge "Fixes broken Settings test." into udc-dev am: 01c585ed27 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932419

Change-Id: I2b0bf456f6f494de4f626f93320a0bef8051b6ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 23:26:13 +00:00
Treehugger Robot
9a09103aaa Merge "Fixes broken Settings test." into udc-dev am: 01c585ed27 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932419

Change-Id: I57eb532cd21eb2e28b0d58deae5c9adaef597bcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 23:22:14 +00:00
Treehugger Robot
01c585ed27 Merge "Fixes broken Settings test." into udc-dev 2023-04-28 22:37:57 +00:00
Julia Tuttle
dd9bc876dc Merge "Fix a couple compiler warnings in Settings" into udc-dev am: 7b3df1c080 am: 6fb097c08c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897913

Change-Id: I17b2390a8119feb22ed5290708720d41898bcad5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 19:18:14 +00:00
Julia Tuttle
a8e8345a8c Merge "Optimize imports in AppNotificationSettings" into udc-dev am: ec12caadda am: b34c993a13 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897912

Change-Id: Ia92f1d9a2c35eb03c06d787b153bbb93774e57d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 19:14:29 +00:00
Austin Delgado
b8fc7e5bc2 Merge "Hide enrollment options that don't match requested biometric strength" into udc-dev am: 9b94905c63 am: f5d8437078 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22646172

Change-Id: I34e2f839ec6505bccc11f03db6c69988de8674ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 19:14:09 +00:00
TreeHugger Robot
99a75b24ee Merge "SettingsRoboTests: fix device state rotation related tests" into udc-dev am: 6e524f6244 am: 00259adc51 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22930697

Change-Id: If64d6ee2186bb42b775159ddd3dd29bf03b5cf42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 19:11:19 +00:00
Julia Tuttle
6fb097c08c Merge "Fix a couple compiler warnings in Settings" into udc-dev am: 7b3df1c080 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897913

Change-Id: I26c3cc54bb1a899aae3f0e773368352573106d9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 19:08:13 +00:00
Bill Yi
1b4f6059dc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 547484f797 -s ours am: 4174b548cf -s ours am: a4eb2b9a37 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I48fb227343cfa9ba42b3c774a8db61a3a9fe646a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 19:07:43 +00:00
Julia Tuttle
775d61dc4e Merge "Fix a couple compiler warnings in Settings" into udc-dev am: 7b3df1c080 am: e0adef90bb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897913

Change-Id: Id1cd6525e13254f4c738bfb1e6cec6f2cea6cc53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 18:49:16 +00:00
Julia Tuttle
472a2024ad Merge "Optimize imports in AppNotificationSettings" into udc-dev am: ec12caadda am: 7e3355382b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897912

Change-Id: I372d19fcd0ef394904a04e0514299139f7aa8c11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 18:47:59 +00:00
Austin Delgado
ce3118d414 Merge "Hide enrollment options that don't match requested biometric strength" into udc-dev am: 9b94905c63 am: ff7ae4123b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22646172

Change-Id: I07b2d29814748641ed512b3cefddd3f4b914d959
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 18:47:51 +00:00
Julia Tuttle
e0adef90bb Merge "Fix a couple compiler warnings in Settings" into udc-dev am: 7b3df1c080 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897913

Change-Id: I618fd16ea06ed6cbe5a9556d16d56af5baefd4bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 18:47:03 +00:00