Jeremy Goldman
1e9202eae6
Merge "If the CarrierConfigManager is still null, return that the preference is not available." into sc-dev am: d6913243a1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409956
Change-Id: I4197e96219e6daa7ea23bd3094f63b024c9b4fb5
2021-05-04 09:49:07 +00:00
Jeremy Goldman
d6913243a1
Merge "If the CarrierConfigManager is still null, return that the preference is not available." into sc-dev
2021-05-04 09:30:04 +00:00
Jeremy Goldman
050f7a7657
If the CarrierConfigManager is still null, return that the preference is
...
not available.
Test: atest -c VideoCallingPreferenceControllerTest
Bug: 186594185
Change-Id: I4650d9f77f6a4a0cb84d6e20f02e4ab1d1841131
2021-05-04 15:05:53 +08:00
Menghan Li
bd4fccc87c
Merge "[Material Next] Typography for font style" into sc-dev am: 4ec4cf32f1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409968
Change-Id: I1c2fb1cc1b1d24528aea640d12b598f0bdeaf137
2021-05-04 06:48:57 +00:00
Menghan Li
4ec4cf32f1
Merge "[Material Next] Typography for font style" into sc-dev
2021-05-04 06:22:58 +00:00
YUKAI HUNG
f4693a716b
Merge "Rename variables and refine the format style from ag/14346184" into sc-dev am: 37d6d0835c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419441
Change-Id: I7613752fdefe17cf5e0b4fdf129cb3e031da1760
2021-05-04 06:14:54 +00:00
YUKAI HUNG
37d6d0835c
Merge "Rename variables and refine the format style from ag/14346184" into sc-dev
2021-05-04 05:59:52 +00:00
ykhung
973212adf7
Rename variables and refine the format style from ag/14346184
...
Bug: 14346184
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: Ie87f2dba2b87781ed5071adbc6f8a2aa45d1fd53
2021-05-04 11:59:07 +08:00
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
menghanli
39229a6aea
[Material Next] Typography for font style
...
Set fontFamily with Typography config which follows the rule for font
and supported font family changing in “Style & Wallpaper”.
Bug: 186065669
Test: Manual testing
Change-Id: I8b94a7e643fa72e91519209cbad2e3d65b6c6749
2021-05-04 11:34:00 +08: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