Edgar Wang
23fcf20a12
Merge "Apply SettingsPreferenceTheme in Settings" into sc-dev am: 9d14071637
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14182152
Change-Id: I444d59bff4c2316de7321f3f3103e98ffec1bf6c
2021-04-15 05:27:58 +00:00
Edgar Wang
9d14071637
Merge "Apply SettingsPreferenceTheme in Settings" into sc-dev
2021-04-15 05:27:22 +00:00
TreeHugger Robot
5695ab418c
Merge "Cleanup Storage Settings" into sc-dev am: fce594ad7f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14182146
Change-Id: Ia76082f3af2fd8dcddafd21b53fabb83634a57fc
2021-04-15 02:50:34 +00:00
Jason Hsu
8eb4a3d3da
Merge "Add icon for "Extra dim"" into sc-dev am: 3909ddb789
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14187045
Change-Id: Iac1fbf2e69ee55bb84cc6379c6d06fdd74b0fbf1
2021-04-15 02:50:17 +00:00
Peter Wang
90f24a470d
Merge "Change DSDS dialog confirm text from "Continue" to "Yes"" into sc-dev am: 1812aabcec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14187494
Change-Id: I1e8558f071e3221bde982224ab8b6062a62ebf05
2021-04-15 02:49:28 +00:00
TreeHugger Robot
fce594ad7f
Merge "Cleanup Storage Settings" into sc-dev
2021-04-15 02:28:35 +00:00
Jason Hsu
3909ddb789
Merge "Add icon for "Extra dim"" into sc-dev
2021-04-15 02:12:41 +00:00
Peter Wang
1812aabcec
Merge "Change DSDS dialog confirm text from "Continue" to "Yes"" into sc-dev
2021-04-15 01:49:12 +00:00
YUKAI HUNG
c4f0c1285d
Merge "Load application icon and label for UID battery consumer type" into sc-dev am: a73e40cb74
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14185087
Change-Id: I94f9efb739302e5697c14c0f16997521ab475a51
2021-04-15 01:30:03 +00:00
Julia Reynolds
dc1dd5dc48
Only one action bar needed am: 98b8716e0a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14189470
Change-Id: I2554900f36f37e3adaac8ed4368db5e163c18d48
2021-04-15 01:28:33 +00:00
YUKAI HUNG
a73e40cb74
Merge "Load application icon and label for UID battery consumer type" into sc-dev
2021-04-15 01:04:00 +00:00
Peter Wang
6e61073864
Change DSDS dialog confirm text from "Continue" to "Yes"
...
Bug: 131169645
Bug: 184769109
Test: N/A
Change-Id: Ide709c83459ec955739daa0f23167aa72a5665a9
2021-04-14 13:43:26 -07:00
Julia Reynolds
98b8716e0a
Only one action bar needed
...
And it's provided by the Activity.
Test: notification history does not crash
Bug: 184695659
Change-Id: I5a4c882c42b894601306826006152684bb499b51
2021-04-14 16:16:36 -04:00
Julia Reynolds
5d99e1c19a
Merge "Restyle notif history to beter match shade" into sc-dev am: a12666a3ad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14188053
Change-Id: I6bffe927373a766624a6f6bd16813b6efe4c77f4
2021-04-14 19:17:23 +00:00
TreeHugger Robot
748e873747
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0ba20b96bb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14187886
Change-Id: Ia27bba06bfe4706e58fd0f61271d57a4873af04b
2021-04-14 19:16:46 +00:00
TreeHugger Robot
fa6b2b18a4
Merge "Toggle Power + Volume chord with long press power to assist setting" into sc-dev am: d41c4d3c8c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14172389
Change-Id: I4374fbfa335cebdc34082a2217db9c30f7090757
2021-04-14 19:16:35 +00:00
Julia Reynolds
a12666a3ad
Merge "Restyle notif history to beter match shade" into sc-dev
2021-04-14 19:06:33 +00:00
TreeHugger Robot
0ba20b96bb
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-04-14 18:52:41 +00:00
TreeHugger Robot
d41c4d3c8c
Merge "Toggle Power + Volume chord with long press power to assist setting" into sc-dev
2021-04-14 18:49:31 +00:00
Kevin Chyn
e791667b57
Merge "Revert "Set ConfirmDeviceCredentialActivity non-external in FRP"" into sc-dev am: a328111013
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14172320
Change-Id: Ia8b353d645a2a7411269d1a0afc9e56f28be6270
2021-04-14 18:33:15 +00:00
Dmitri Plotnikov
aea5d6a2b0
Merge "Remove references to POWER_COMPONENT_USAGE and TIME_COMPONENT_USAGE" into sc-dev am: 3ac49f0a9b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14078240
Change-Id: Ifd020e750c4b46612ef0d8ea9b8d4e1e28acf82d
2021-04-14 18:10:04 +00:00
TreeHugger Robot
26bbbed015
Merge "Replace the hidden API to public API or other alternatives" into sc-dev am: 5467d0f7aa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14173731
Change-Id: Ie31812cb645b6ce9b41660d7705a6d40bbb7aea0
2021-04-14 18:09:29 +00:00
Kevin Chyn
a328111013
Merge "Revert "Set ConfirmDeviceCredentialActivity non-external in FRP"" into sc-dev
2021-04-14 17:56:14 +00:00
Dmitri Plotnikov
3ac49f0a9b
Merge "Remove references to POWER_COMPONENT_USAGE and TIME_COMPONENT_USAGE" into sc-dev
2021-04-14 17:50:25 +00:00
TreeHugger Robot
5467d0f7aa
Merge "Replace the hidden API to public API or other alternatives" into sc-dev
2021-04-14 17:47:41 +00:00
Jernej Virag
f74f1dbbc0
Toggle Power + Volume chord with long press power to assist setting
...
Power + Volume chord setting should be toggled together with LPP setting. The LPP setting still remains the source of truth with Power + Volume chord being dependant on it.
Bug: 179673796
Bug: 185205501
Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.gestures.*"
Flash image on actual device and manually test toggling.
Change-Id: Ie19ae55db7c6c07533ea6347e0a4e1e4505423e2
2021-04-14 17:03:46 +00:00
Julia Reynolds
9a238e5124
Restyle notif history to beter match shade
...
Test: manual
Fixes: 184695659
Fixes: 183949048
Fixes: 184695652
Fixes: 185271315
Change-Id: I79a937d7d64e6bdf0014ce3f939e6e96690556b9
2021-04-14 12:28:16 -04:00
ykhung
59da7ab7b1
Load application icon and label for UID battery consumer type
...
Bug: 185187669
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: Idb77a1bd48f7f4b66b86ff12c166a204d17bd9ec
2021-04-14 16:16:33 +00:00
TreeHugger Robot
36055c1597
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 42f8180428
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14187486
Change-Id: I5aa880357183ff0f5ac70da7c6f2c3533458c66b
2021-04-14 16:16:05 +00:00
Sally Yuen
aeaa13af9e
Merge "Call ColorDisplayManager for Extra Dim/RBC state" into sc-dev am: 182c812b1b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14172316
Change-Id: Ib5e32da597c1a780bd905d1ade6a9bd66ae4056e
2021-04-14 16:15:41 +00:00
TreeHugger Robot
42f8180428
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-04-14 16:08:36 +00:00
Sally Yuen
182c812b1b
Merge "Call ColorDisplayManager for Extra Dim/RBC state" into sc-dev
2021-04-14 16:05:59 +00:00
YUKAI HUNG
f96d931b7c
Merge "Avoid load icon and label in the background for periodic job" into sc-dev am: ec91ea48a3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14182162
Change-Id: I73eba78c00a101115a0bcedfe1559b720a9c0e9b
2021-04-14 15:35:36 +00:00
Lucas Lin
00332cab6f
Merge "Remove the usage of hidden API and fix the test" into sc-dev am: e231dc2b6f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14185085
Change-Id: Ia282cd218112a4afd5772d35dc06bbb135a3b1ac
2021-04-14 15:35:32 +00:00
TreeHugger Robot
9d8e5a616c
Merge "Prevent failed dynamic index" into sc-dev am: 0c2eb1b553
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14185090
Change-Id: I20bf4b660595eb48fdeecada8cae5fc46b86db44
2021-04-14 15:34:32 +00:00
YUKAI HUNG
ec91ea48a3
Merge "Avoid load icon and label in the background for periodic job" into sc-dev
2021-04-14 15:26:47 +00:00
Bill Yi
b8dbcb2082
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I285fa2be7828ca1f329faafccb33bdb1c4410e17
2021-04-14 15:22:18 +00:00
Lucas Lin
e231dc2b6f
Merge "Remove the usage of hidden API and fix the test" into sc-dev
2021-04-14 15:11:49 +00:00
TreeHugger Robot
0c2eb1b553
Merge "Prevent failed dynamic index" into sc-dev
2021-04-14 14:58:51 +00:00
Bill Yi
8b1265cf4d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib0863a79472b02f7ce86920d780454f6c6f9350e
2021-04-14 14:23:01 +00:00
Arc Wang
192fd24f26
Cleanup Storage Settings
...
Bug: 183078080
Test: make
make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.deviceinfo
make RunSettingsRoboTests
ROBOTEST_FILTER=com.android.settings.deviceinfo.storage
atest com.android.settings.deviceinfo
atest com.android.settings.deviceinfo.storage
Change-Id: I901f5f7999ea94dafb72a2517a11e2ff1fd51b42
2021-04-14 21:37:46 +08:00
jasonwshsu
75528bf56b
Add icon for "Extra dim"
...
* foreground icon: 18 * 18
* background icon: 32 * 32 with color Google Gray 700
Fix: 184081577
Fix: 170973645
Test: manual test
Change-Id: I40b0e69109284df83cabc88ce77af3399a77153a
2021-04-14 13:09:02 +00:00
TreeHugger Robot
072ec47b38
Merge "Prevent HTML Injection on the Device Admin request screen" into sc-dev am: ede5041dd6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167793
Change-Id: If762c9bc68cd47c6a4858385fe932812e721043c
2021-04-14 12:47:20 +00:00
TreeHugger Robot
ede5041dd6
Merge "Prevent HTML Injection on the Device Admin request screen" into sc-dev
2021-04-14 12:15:19 +00:00
lucaslin
09bbb51d29
Replace the hidden API to public API or other alternatives
...
Some of connectivity related files are going to be a part of
mainline module, so the external callers cannot call its hidden
API.
Replace the hidden API to public API or other alternatives from
the callers side.
Bug: 182859030
Test: 1. Remove "framework-connectivity.impl"
2. atest SettingsUnitTests:InternetUpdaterTest
3. atest SettingsUnitTests:ProviderModelSliceHelperTest
4. atest SettingsUnitTests:MobileNetworkUtilsTest
5. make RunSettingsRoboTests \
ROBOTEST_FILTER=AppDataUsagePreferenceControllerTest
6. make RunSettingsRoboTests \
ROBOTEST_FILTER=TetherPreferenceControllerTest
7. make RunSettingsRoboTests \
ROBOTEST_FILTER=WifiDetailPreferenceController2Test
8. make RunSettingsRoboTests \
ROBOTEST_FILTER=ContextualWifiSliceTest
Change-Id: Idd1ca57d8f2790070e9c401936c5af2a05bcfe9d
2021-04-14 11:36:54 +00:00
Yanting Yang
f43c018442
Merge "Use sentence case for display section subheaders" into sc-dev am: 2cfa6e5f39
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14182156
Change-Id: Ic4cefbf2ce4dcc292f0cfb5eb71a74687bb3701c
2021-04-14 10:56:11 +00:00
Yanting Yang
2cfa6e5f39
Merge "Use sentence case for display section subheaders" into sc-dev
2021-04-14 10:47:09 +00:00
Tsung-Mao Fang
5ec0410e5b
Prevent failed dynamic index
...
In the original design, if a controller in page initializes
failed, then it will impact all the dynamic index mechanism.
In this change, we will only skip controllers in a specfic page.
All other pages which controllers initialize correctly should work
proerly.
Test: See correct dynamic result
Bug: 185325344
Change-Id: I4f959a23635739e1064318ccdddd6d97016dac23
2021-04-14 18:42:46 +08:00
Tiffany Nguyen
54f957aad2
Merge "Revert "Update BatterySettingsFeatureProvider to an activity-friendly interface."" into sc-dev am: f9acbaf425
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14185089
Change-Id: I20cda250c6b5b44b6901c93a04a65607bfc05ca3
2021-04-14 10:13:28 +00:00
Tiffany Nguyen
828ca94277
Merge "Update BatterySettingsFeatureProvider to an activity-friendly interface." into sc-dev am: ceb78586ee
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14172319
Change-Id: I5f1808d0c01d85aec24f0295d351ae3f098d5ee8
2021-04-14 10:13:22 +00:00