Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
87,554 Commits 1 Branch 0 Tags
249de94deaf6b7c7b48cf08b5969b3a80c2009b0
Commit Graph

87554 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kevin Chyn
97ebb9431d Merge "Cancel enrollment when back or negative buttons pressed" into sc-dev am: 08b7833120 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14414017

Change-Id: Iff9048ff39cba79ae259cc8ec2d30da7047999ea
 2021-05-03 23:41:45 +00:00
Kevin Chyn
48f033c6d4 Merge "Cancel enrollment when back or negative buttons pressed" into sc-dev am: 08b7833120 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14414017

Change-Id: I04b4855ff03d4c0a09695569daf70dd9d8e7e8bb
 2021-05-03 23:40:03 +00:00
Kevin Chyn
c60fcecf32 Merge "Cancel enrollment when back or negative buttons pressed" into sc-dev am: 08b7833120 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14414017

Change-Id: I8e04d336d84c527560748126ebc3f6fd00f8d20f
 2021-05-03 23:39:45 +00:00
Kevin Chyn
b525754f68 Merge "Cancel enrollment when back or negative buttons pressed" into sc-dev am: 08b7833120 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14414017

Change-Id: I2ef5108a73dafe1cce46ba31318db698e16a53f6
 2021-05-03 23:39:45 +00:00
Kevin Chyn
50dcf7955a Update combined settings summary 
Display strings based on number of enrollments

Bug: 185804815
Test: manual on-device
Change-Id: I47be2a53b37c36b3136cd233001db7cadf123ae9
 2021-05-03 16:15:56 -07:00
Kevin Chyn
a435a5a288 Update credential removal strings 
1) Credential can no longer be removed for separate challenge profiles,
   so strings and supporting logic are also now removed
2) Updates existing strings for credential and fingerprint
3) Adds new strings for face
4) Adds new strings for face + fingerprint

Bug: 185180691
Test: manual on device

Change-Id: I2a850eb6644103e14ef2a670222e500c705a16cd
 2021-05-03 16:15:55 -07:00
Kevin Chyn
08b7833120 Merge "Cancel enrollment when back or negative buttons pressed" into sc-dev 2021-05-03 23:15:03 +00:00
bsears
c87bdd10db Merge "Revert "Fixes 'no ripple effect' issue for screen attention setting"" into sc-dev am: deb2acc9b3 am: 6e1d3aa80d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14410366

Change-Id: I79949eabad0b25ed9e340020486d1b3ed651189d
 2021-05-03 22:46:21 +00:00
bsears
6e1d3aa80d Merge "Revert "Fixes 'no ripple effect' issue for screen attention setting"" into sc-dev am: deb2acc9b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14410366

Change-Id: I5609e99ff6473de06e6bb0496e6ac7e84265b252
 2021-05-03 22:24:46 +00:00
bsears
a0a3b2926d Merge "Revert "Fixes 'no ripple effect' issue for screen attention setting"" into sc-dev am: deb2acc9b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14410366

Change-Id: Iea4057f38107df13c2d5b62719bd1845b7f14540
 2021-05-03 22:22:52 +00:00
bsears
ba1552ce00 Merge "Revert "Fixes 'no ripple effect' issue for screen attention setting"" into sc-dev am: deb2acc9b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14410366

Change-Id: I918e3c01b2abaecc9048c2d3a176ed7bac62b0f8
 2021-05-03 22:22:48 +00:00
bsears
15b21dfed4 Merge "Revert "Fixes 'no ripple effect' issue for screen attention setting"" into sc-dev am: deb2acc9b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14410366

Change-Id: I72f16d31ba81bd7914e8d9c7747dbfccf0c3711e
 2021-05-03 22:22:36 +00:00
sallyyuen
5d567ff19f set enabled state of persist switch when Extra Dim state is changed 
Bug: 186806715
Test: manual,
atest ReduceBrightColorsPersistencePreferenceControllerTest

Change-Id: Icad35cb6bc8ac3a6b8edf518d18898c277cca5e3
 2021-05-03 15:17:00 -07:00
bsears
deb2acc9b3 Merge "Revert "Fixes 'no ripple effect' issue for screen attention setting"" into sc-dev 2021-05-03 22:08:44 +00:00
Kevin Chyn
33ba245149 Cancel enrollment when back or negative buttons pressed 
Fixes: 183671394
Test: Go through enrollment flow and test various buttons
Change-Id: I8d3939de42ecd0a889f0c6d3c94002199285ef8b
 2021-05-03 21:46:25 +00:00
Dmitri Plotnikov
5486742d6e Merge "Replace uses of SystemBatteryConsumer with aggregate BatteryConsumers" into sc-dev am: 501eea7fa2 am: e8694a9805 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14346184

Change-Id: I8a95afbf4249ca4069ceff1dceeb8fb58257a089
 2021-05-03 21:14:34 +00:00
Dmitri Plotnikov
e8694a9805 Merge "Replace uses of SystemBatteryConsumer with aggregate BatteryConsumers" into sc-dev am: 501eea7fa2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14346184

Change-Id: I68267eeef46b765aaf6feb7fa9d1b12b1642e730
 2021-05-03 20:49:25 +00:00
Dmitri Plotnikov
bff1a83ba3 Merge "Replace uses of SystemBatteryConsumer with aggregate BatteryConsumers" into sc-dev am: 501eea7fa2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14346184

Change-Id: Ie466616a4ac81ac74ef2c3dffbe3ba1b82e458a4
 2021-05-03 20:48:05 +00:00
Dmitri Plotnikov
aa2809177d Merge "Replace uses of SystemBatteryConsumer with aggregate BatteryConsumers" into sc-dev am: 501eea7fa2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14346184

Change-Id: If4d7a7d6733cfb1886f561e7fcfb8f518ff58f4c
 2021-05-03 20:47:41 +00:00
Dmitri Plotnikov
6acbd70713 Merge "Replace uses of SystemBatteryConsumer with aggregate BatteryConsumers" into sc-dev am: 501eea7fa2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14346184

Change-Id: I7d9bad0c94e6f5a85bf37ddf81114a1f10df01c0
 2021-05-03 20:47:15 +00:00
Dmitri Plotnikov
501eea7fa2 Merge "Replace uses of SystemBatteryConsumer with aggregate BatteryConsumers" into sc-dev 2021-05-03 20:40:25 +00:00
Trevor David Black
7c5484bc60 Update Android Settings for the latest Extra App Info design 
Bug: b/185793841
Test: Settings -> Apps -> APP -> Extra App Info
Change-Id: I2067f7d5d773e2fd9c817504dda262fb5fd7e033
 2021-05-03 19:05:15 +00:00
TreeHugger Robot
318f637086 Merge "Storage Settings Apps category shows image/video/audio APPs" into sc-dev am: 8d1fd73e89 am: 6885fa717e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14186629

Change-Id: I52a2687edcdbd654d51af76fb0504b57b23ead55
 2021-05-03 18:48:00 +00:00
TreeHugger Robot
6885fa717e Merge "Storage Settings Apps category shows image/video/audio APPs" into sc-dev am: 8d1fd73e89 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14186629

Change-Id: I470015fafa57a2b046d43050369b0984f85fe1b7
 2021-05-03 18:34:49 +00:00
TreeHugger Robot
33baa05d95 Merge "Storage Settings Apps category shows image/video/audio APPs" into sc-dev am: 8d1fd73e89 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14186629

Change-Id: I4cf006558fda517dd7db111ee09e84cf17f7454d
 2021-05-03 18:33:47 +00:00
TreeHugger Robot
de0c3bd921 Merge "Storage Settings Apps category shows image/video/audio APPs" into sc-dev am: 8d1fd73e89 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14186629

Change-Id: I091cd10bd4d201db57bcb4fe97b3d92f691294e0
 2021-05-03 18:33:23 +00:00
TreeHugger Robot
e0e26649fb Merge "Storage Settings Apps category shows image/video/audio APPs" into sc-dev am: 8d1fd73e89 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14186629

Change-Id: I20b35ee33b1f1459a367d2d09cc06e597fa13454
 2021-05-03 18:33:15 +00:00
Edgar Wang
b0bfbe7fc5 Remove Advanced item in Language & input Settings. 
Fix: 186608859
Test: manual
Change-Id: I1dfa0aabaf6a9f2ba924cbf2bd190fc6b3e2741c
 2021-05-04 02:19:48 +08:00
TreeHugger Robot
8d1fd73e89 Merge "Storage Settings Apps category shows image/video/audio APPs" into sc-dev 2021-05-03 18:11:03 +00:00
TreeHugger Robot
9a5030b795 Merge "Update apps icon in Sound > Media page to correct size." into sc-dev am: 80daf4fc49 am: 19fb79491f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14410003

Change-Id: I2cbe51ae2946a9b34bd92c64091408251667bc0c
 2021-05-03 18:02:46 +00:00
Dmitri Plotnikov
6417493b29 Replace uses of SystemBatteryConsumer with aggregate BatteryConsumers 
Bug: 186006876
Test: make RunSettingsRoboTests
Test: make RunSettingsGoogleRoboTests
Change-Id: I2e240aa15c87b4b9dcbe993b4b0b1111285ec3ff
 2021-05-03 11:01:36 -07:00
bsears
30e9ba1e52 Revert "Fixes 'no ripple effect' issue for screen attention setting" 
This reverts commit 20d1da2b62.

Reason for revert: Based on bisection, this is the likely root cause of b/186904496

Bug: 186904496
Change-Id: I0eaa026b52610d7ef4543c32791531971e68f8e6
 2021-05-03 17:59:11 +00:00
TreeHugger Robot
19fb79491f Merge "Update apps icon in Sound > Media page to correct size." into sc-dev am: 80daf4fc49 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14410003

Change-Id: I2d97cdafd8be61c476de376594478bd673f1cb78
 2021-05-03 17:41:48 +00:00
TreeHugger Robot
07427eeeb3 Merge "Update apps icon in Sound > Media page to correct size." into sc-dev am: 80daf4fc49 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14410003

Change-Id: I9ccc52d929394c2cdb680ded515a1639c96826c9
 2021-05-03 17:40:32 +00:00
TreeHugger Robot
c4d465aec9 Merge "Update apps icon in Sound > Media page to correct size." into sc-dev am: 80daf4fc49 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14410003

Change-Id: I33150790e40a107eff5324a9ba815e7986d70922
 2021-05-03 17:40:32 +00:00
TreeHugger Robot
9777b6c023 Merge "Update apps icon in Sound > Media page to correct size." into sc-dev am: 80daf4fc49 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14410003

Change-Id: Ib2f36425c198d6d872b2920cffa0d6aa605c98ff
 2021-05-03 17:39:55 +00:00
TreeHugger Robot
80daf4fc49 Merge "Update apps icon in Sound > Media page to correct size." into sc-dev 2021-05-03 17:20:33 +00:00
Edgar Wang
da4d4b2e3b Update apps icon in Sound > Media page to correct size. 
- MediaSwitchPreference should inherit AppSwitchPreference

Fix: 186609222
Test: visual
Change-Id: I18a8c42a9eab9601acc792117928a121a3c4b436
 2021-05-04 00:08:59 +08:00
Yichi Chen
5a2a17fe2a Merge "RefreshRatePrefCtr: Correct the check of peak refresh rate" into sc-dev am: ffbea30a18 am: d54f8c82a8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352150

Change-Id: Ia8c327ff75e8ffea6a3d756b021289b38b147255
 2021-05-03 15:47:48 +00:00
Yichi Chen
d54f8c82a8 Merge "RefreshRatePrefCtr: Correct the check of peak refresh rate" into sc-dev am: ffbea30a18 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352150

Change-Id: I09f1b01f37510e01ea7696a45da6d9fc70f014b6
 2021-05-03 15:33:59 +00:00
Yichi Chen
c89beaf70f Merge "RefreshRatePrefCtr: Correct the check of peak refresh rate" into sc-dev am: ffbea30a18 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352150

Change-Id: I675b330d964dedc4d1660cb695318bf9bbf51375
 2021-05-03 15:32:25 +00:00
Yichi Chen
a835ecfe40 Merge "RefreshRatePrefCtr: Correct the check of peak refresh rate" into sc-dev am: ffbea30a18 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352150

Change-Id: I042502664d9b1a9dc88563b4572b4c54a8c9c981
 2021-05-03 15:32:14 +00:00
Yichi Chen
97efa6eed4 Merge "RefreshRatePrefCtr: Correct the check of peak refresh rate" into sc-dev am: ffbea30a18 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352150

Change-Id: I6724beea6fdbca073ddb4466abab91da90aeff86
 2021-05-03 15:32:09 +00:00
Yichi Chen
ffbea30a18 Merge "RefreshRatePrefCtr: Correct the check of peak refresh rate" into sc-dev 2021-05-03 14:59:47 +00:00
TreeHugger Robot
f6e1d83d60 Merge "Remove reserved icon space for Safety > Wireless emergency alerts" into sc-dev am: 001dcc9e93 am: 41118f5575 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409961

Change-Id: Ic929fbeb3f0f5e53f85b46e23eb2bb1bf762f78a
 2021-05-03 14:20:39 +00:00
TreeHugger Robot
41118f5575 Merge "Remove reserved icon space for Safety > Wireless emergency alerts" into sc-dev am: 001dcc9e93 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409961

Change-Id: I457e36b76bfe7c82fb3676ae36862eda677401c6
 2021-05-03 14:05:49 +00:00
TreeHugger Robot
38c31c7b4f Merge "Remove reserved icon space for Safety > Wireless emergency alerts" into sc-dev am: 001dcc9e93 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409961

Change-Id: Ieed21afd3445231702475a97fddc2083c67e55c8
 2021-05-03 14:04:05 +00:00
TreeHugger Robot
92d2b8fb62 Merge "Remove reserved icon space for Safety > Wireless emergency alerts" into sc-dev am: 001dcc9e93 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409961

Change-Id: I86f19c504a88113a780237eb427618479a3a0868
 2021-05-03 14:01:09 +00:00
TreeHugger Robot
21f81feb86 Merge "Remove reserved icon space for Safety > Wireless emergency alerts" into sc-dev am: 001dcc9e93 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409961

Change-Id: I874e9c98a7ea1dda231c1bc0aee01a0033ffd8ec
 2021-05-03 14:01:02 +00:00
TreeHugger Robot
001dcc9e93 Merge "Remove reserved icon space for Safety > Wireless emergency alerts" into sc-dev 2021-05-03 13:37:55 +00:00