Commit Graph

81569 Commits

Author SHA1 Message Date
TreeHugger Robot
05c45b3d92 Merge "Fix unable to send file via OPP" into sc-dev am: 5ef4fa037e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14327016

Change-Id: I53daf92598dee05723e6a90648e4f2c313bf5669
2021-05-04 03:06:16 +00:00
Bill Yi
d7caf65594 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c73e6bf08d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I74281b47b6a940823398d23bed07af691eb63595
2021-05-04 03:04:45 +00:00
TreeHugger Robot
c420aaa025 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 8d0376c98c -s ours am: 55c94745be -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idead8ef4d08e822ebf0b5b3afa2fe8c0f9044547
2021-05-04 03:04:34 +00:00
TreeHugger Robot
a8f18c44a3 Merge "Remove Advanced item in Language & input Settings." into sc-dev am: f2ec0fbf83 am: c91fbcefad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14410006

Change-Id: Ib75c7cd4e4b532d945bdd68f7aae56e3100da9e6
2021-05-04 03:04:13 +00:00
Bill Yi
d92ec7a9cc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe0e09fdb4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I296cef365d0327f63938594f3f2e306a7e4d3e7b
2021-05-04 03:04:05 +00:00
TreeHugger Robot
5ef4fa037e Merge "Fix unable to send file via OPP" into sc-dev 2021-05-04 03:00:23 +00:00
TreeHugger Robot
55c94745be [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 8d0376c98c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I528c118d1df463ffc486640e8e52f7e94ce294e7
2021-05-04 02:59:32 +00:00
TreeHugger Robot
8d0376c98c Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-05-04 02:53:01 +00:00
TreeHugger Robot
c91fbcefad Merge "Remove Advanced item in Language & input Settings." into sc-dev am: f2ec0fbf83
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14410006

Change-Id: I568670dafad961353b783b9cae80b5da2c4b18b9
2021-05-04 02:51:03 +00:00
Edgar Wang
609d900f4d Remove the Summary of Backup in System Settings
Fix: 182357397
Test: manual and robotest
Change-Id: Ic6b08cfd23947af82fd1e9075dd5f698168127ac
2021-05-04 02:28:13 +00:00
TreeHugger Robot
f2ec0fbf83 Merge "Remove Advanced item in Language & input Settings." into sc-dev 2021-05-04 01:39:38 +00:00
Yi Jiang
18c97b595f Fixes 'no ripple effect' issue for screen attention setting
Preferences shouldn't be initialized at onAttach() because the settings
style hasn't been loaded yet. This change defers the preferences
initialization so that they comply with the settings style.

The change ag/14114425 is reverted due to b/186904496. This change
includes a fix for that issue.

Test: manually
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=com.android.settings.display
Bug: 183909540
Bug: 186904496

Change-Id: I317ce251f4d11e62c6592ee587c2919da4d45db3
2021-05-03 18:02:59 -07:00
Bill Yi
ad14295e59 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I4edba2d5bfab846fed936c170b758a26ef6cfc83
2021-05-04 00:21:24 +00:00
Bill Yi
fe0e09fdb4 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I08b788ccb14010924b696e28eba8bcc600a5be5b
2021-05-04 00:10:14 +00:00
Bill Yi
c73e6bf08d Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I2ca2d581603839530c4ed567babd3ee82442234e
2021-05-04 00:04:12 +00:00
Kevin Chyn
dce9141d20 Merge "Cancel enrollment when back or negative buttons pressed" into sc-dev am: 08b7833120 am: 97ebb9431d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14414017

Change-Id: Iea94dc1a1ac24acb1d2b74c6f897acf22ba2bc0d
2021-05-03 23:55:43 +00:00
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
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
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
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
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
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
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
001dcc9e93 Merge "Remove reserved icon space for Safety > Wireless emergency alerts" into sc-dev 2021-05-03 13:37:55 +00:00
YUKAI HUNG
899c8cbac0 Merge "Add new field for data interpolation usage" into sc-dev am: f988790908 am: b6213e31cd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409677

Change-Id: Ia9c309657b18eb8213f2380b3304f2554e999601
2021-05-03 12:58:21 +00:00
YUKAI HUNG
b6213e31cd Merge "Add new field for data interpolation usage" into sc-dev am: f988790908
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409677

Change-Id: I47db94b6d66163cdc8871ad42af32f3dc8e525de
2021-05-03 12:44:42 +00:00
YUKAI HUNG
f988790908 Merge "Add new field for data interpolation usage" into sc-dev 2021-05-03 12:26:24 +00:00
Arc Wang
4cd89bb082 Storage Settings Apps category shows image/video/audio APPs
There is AOSP built in file browser for image/video/audio
file category, all APPs except games should be included in
Apps category.

- Shows image/video/audio APPs in APPs category.
- Count Image/Video/Audio APPs storage size to Apps storage size.
- Remove APP size & cache size for Images/Videos/Audios category.

Bug: 170918505
Test: atest StorageAsyncLoaderTest.java
Change-Id: I07e0a3a66a13f36b9e0cbde289d8ba90df4ae295
2021-05-03 20:17:58 +08:00
Ryan Lin
3757065866 Merge "Move Magnification Mode Settings to the main page" into sc-dev am: 194015b774 am: 46c74bb532
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14327003

Change-Id: I5cd2206d5a0a5130f16d62798058e2e8e62d0dc9
2021-05-03 11:46:31 +00:00