Bill Yi
596a2fa503
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe0e09fdb4
-s ours am: d92ec7a9cc
-s ours am: 7c02bd8602
-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: I59fbd374d03734752abc3cc33f3a57dc89f362e2
2021-05-04 03:58:53 +00:00
Bill Yi
7c02bd8602
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe0e09fdb4
-s ours am: d92ec7a9cc
-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: Iff211e71f9a26cb742c28177b99b7f64938adf8c
2021-05-04 03:29:50 +00:00
Bill Yi
d20d239449
[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: I6e0039972a8e58f096697fb8a6eef0cbcd6e9ea4
2021-05-04 03:12:30 +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
7b6e2f264c
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: I59cff2c2f331386ea7dd2cbb19aec50e4762a589
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
91f4c0489c
[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: I257385e291a15ac7fb294054826f69c4374c26bb
2021-05-04 02:57:49 +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
7cc907da20
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: I1df9196b3df5621361327123f7e9a8b24f22519a
2021-05-04 02:49: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
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
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
08b7833120
Merge "Cancel enrollment when back or negative buttons pressed" into sc-dev
2021-05-03 23:15:03 +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
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
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
501eea7fa2
Merge "Replace uses of SystemBatteryConsumer with aggregate BatteryConsumers" into sc-dev
2021-05-03 20:40:25 +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
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
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
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
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
ffbea30a18
Merge "RefreshRatePrefCtr: Correct the check of peak refresh rate" into sc-dev
2021-05-03 14:59:47 +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
001dcc9e93
Merge "Remove reserved icon space for Safety > Wireless emergency alerts" into sc-dev
2021-05-03 13:37:55 +00:00
YUKAI HUNG
c8f64c7cf4
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: I1779e4685b7578772f9939908c1900d15ff098c3
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
bd365fdc7d
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: I99c3100057cb3365c0f4ffdd64d1ebd7afcf1670
2021-05-03 11:28:55 +00:00
Menghan Li
cbc7db6025
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: Ic3ba3b9c0e770b7b28fc248c2cc278159c57bae1
2021-05-03 11:28:47 +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
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
2542a2bc1f
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: I1945245762ce9dcd5fda439de9a3d977a9606eda
2021-05-03 10:23:11 +00:00
Menghan Li
d8cc22319b
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: I798bff56ddbaac832c4056b168964fff1bb54e6a
2021-05-03 10:23:07 +00:00
TreeHugger Robot
c8c1aa8b32
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: Ic5fe3e0db7cb50e3ab3e6263f6622506cdef3e19
2021-05-03 10:23:04 +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
8270d175b8
Merge "[Material Next] Audio adjustment customized seekbar" into sc-dev
2021-05-03 10:21:29 +00:00
TreeHugger Robot
c3dc96ebc3
Merge "Revert "Refine battery help message layout"" into sc-dev
2021-05-03 10:07:11 +00:00
Edgar Wang
37c15a371c
Remove reserved icon space for Safety > Wireless emergency alerts
...
- remove iconSpaceReserved = true
Bug: 186609856
Test: visual
Change-Id: Ib6145e94e7a4f199b17e2e7f3b4c180b60e98900
2021-05-03 17:50:24 +08:00
Mill Chen
df9e1df4a8
Increasing the character limit am: b4a9916adf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14408673
Change-Id: I381f4636925de1695290f62c812825ccad8773ac
2021-05-03 09:09:49 +00:00
Mill Chen
a51dd978ee
Revert "Refine battery help message layout"
...
This reverts commit 2369167d63
.
Reason for revert: break Settings checking style
Bug: 187023021
Change-Id: I4bb0f93e5d2a545af5e6004dfe24c7e87738036c
2021-05-03 09:06:08 +00:00