Bill Yi
383a5aa78e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c73e6bf08d
-s ours am: d7caf65594
-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: I3cca1e97f6b597ccf9a817d2ab2cde36316a2986
2021-05-04 03:12:34 +00:00
TreeHugger Robot
0151b0a8f0
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: I4687f1f0e5dc8b25da3ce2d20dc742cb93bd2784
2021-05-04 03:12:30 +00:00
TreeHugger Robot
0b99020b5a
[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: I5898481edfb03e8b7b3745b702206e487a13ba8a
2021-05-04 03:11:58 +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
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
8d0376c98c
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-05-04 02:53:01 +00:00
TreeHugger Robot
dbe3c72bb6
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: Ibbdbf407b847dce578035104fbf5fda83cbd8312
2021-05-04 02:48:46 +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
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
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
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
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
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
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
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
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
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
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
YUKAI HUNG
29cc5c19a0
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: I352c4afd0f36b251eb35d3a330bce98e81141551
2021-05-03 12:43:00 +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
9d46a4fec6
Merge "Move Magnification Mode Settings to the main page" into sc-dev am: 194015b774
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14327003
Change-Id: I227793e9d91307a221ec6e307ced5acfd4321e8f
2021-05-03 11:34:32 +00:00
Ryan Lin
194015b774
Merge "Move Magnification Mode Settings to the main page" into sc-dev
2021-05-03 11:28:02 +00:00
Menghan Li
484782bc2e
Merge "[Material Next] Update accessibility tool footer style" into sc-dev am: da60d4e842
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14260604
Change-Id: Ia0eeba70077a8d12507e99355b6d3ecbaf1368a4
2021-05-03 11:26:16 +00:00
Menghan Li
da60d4e842
Merge "[Material Next] Update accessibility tool footer style" into sc-dev
2021-05-03 11:13:28 +00:00
ykhung
0c7e50cb43
Add new field for data interpolation usage
...
reference the decription in cl/371645876
Bug: 184807417
Test: make SettingsRoboTests
Change-Id: I944399dc205cad9b96fe22e82e4c651b4ccc4e37
2021-05-03 18:31:27 +08:00
Menghan Li
cc938176bd
Merge "Hide the accessibility location preference when gesture navigation mode enabled." into sc-dev am: c7ddea6aa8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14408665
Change-Id: Ice1328a20c1c769f5ec0fbf0e55c51a9961ac5b4
2021-05-03 10:27:24 +00:00
Menghan Li
c7ddea6aa8
Merge "Hide the accessibility location preference when gesture navigation mode enabled." into sc-dev
2021-05-03 10:21:58 +00:00
Menghan Li
055eed3d94
Merge "[Material Next] Audio adjustment customized seekbar" into sc-dev am: 8270d175b8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409958
Change-Id: Ib468520dfd7c8f8957d24ce8e24393acf7dc40fe
2021-05-03 10:21:52 +00:00
TreeHugger Robot
cdceaf3602
Merge "Revert "Refine battery help message layout"" into sc-dev am: c3dc96ebc3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409960
Change-Id: Ica83b61c65571466e2f8e444568e3b0d73c9aae4
2021-05-03 10:21:39 +00:00
Menghan Li
8270d175b8
Merge "[Material Next] Audio adjustment customized seekbar" into sc-dev
2021-05-03 10:21:29 +00:00