PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
81,423 Commits 1 Branch 0 Tags
b98aded5459ff8c5ec02d588f69aa6350eb0e37c
Commit Graph

81423 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
b98aded545 Merge "Hide Wireless Emergency Alerts on unsupported devices" into sc-dev am: 089c56520d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167803

Change-Id: I35e9173bad46236a273f891849b9c8a2643fe8e5
 2021-04-15 10:01:59 +00:00
Marie Matheson
a8e83d3d39 Merge "Make host type in ChangeScreenLockPreferenceController more generic." into sc-dev am: bcf3fc6272 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14186646

Change-Id: I2986ade9c4b3352ad761ef73e8e092e63d12d0b9
 2021-04-15 10:01:48 +00:00
YUKAI HUNG
d969786f3d Merge "Add cache mechanism to improve icon and label loading performance" into sc-dev am: 98ad383e5b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14187767

Change-Id: I1b1cba1674371315dac5d50453b3c21775d577ac
 2021-04-15 10:01:17 +00:00
TreeHugger Robot
089c56520d Merge "Hide Wireless Emergency Alerts on unsupported devices" into sc-dev 2021-04-15 08:49:36 +00:00
Marie Matheson
bcf3fc6272 Merge "Make host type in ChangeScreenLockPreferenceController more generic." into sc-dev 2021-04-15 08:44:09 +00:00
YUKAI HUNG
98ad383e5b Merge "Add cache mechanism to improve icon and label loading performance" into sc-dev 2021-04-15 08:40:26 +00:00
Edgar Wang
1604be36b9 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: Ibf74e7ed0f944aabe741710bfe6fb72d574292ef
 2021-04-15 05:45:43 +00:00
Edgar Wang
9d14071637 Merge "Apply SettingsPreferenceTheme in Settings" into sc-dev 2021-04-15 05:27:22 +00:00
TreeHugger Robot
9ee731fe33 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: I4f8b3228c95c269b5bab8573eb8511e4f12f978e
 2021-04-15 02:45:23 +00:00
Jason Hsu
96504ef833 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: Ib9cf8e004d980c35f3d4803e9bc0cd4643859f04
 2021-04-15 02:44:53 +00:00
Peter Wang
4c28b2ba74 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: I03dce2775a5c1b3c5de73ec2040b5d3a16dfe172
 2021-04-15 02:44:47 +00:00
TreeHugger Robot
fce594ad7f Merge "Cleanup Storage Settings" into sc-dev 2021-04-15 02:28:35 +00:00
ykhung
b2674eb5be Add cache mechanism to improve icon and label loading performance 
Bug: 185207505
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: I73dba5e40783f9ef4cfc0c4c33ea56b12754535d
 2021-04-15 02:20:14 +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
3aced587fc 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: Ie0fae06e41e8ef8c146184f67c104fb077207e54
 2021-04-15 01:24:21 +00:00
Julia Reynolds
ecf6eea0aa Only one action bar needed am: 98b8716e0a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14189470

Change-Id: I594d1fc25c9cbb14a0ac8f3b102bbd822795464b
 2021-04-15 01:23:16 +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
16901e04d5 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: I575f84d7e04b474f06582ec0d76ffa6ca9e894df
 2021-04-14 19:14:35 +00:00
TreeHugger Robot
ba3248da9e [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: I4c712119fe2b673471381199d097f1cb3e655287
 2021-04-14 19:14:06 +00:00
TreeHugger Robot
227c95f268 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: I5445a69a9ba9c2900e326baab584422dbaf93d76
 2021-04-14 19:14:01 +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
aa38c2958a 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: I453063a1ff1eb8d388a45d128f1026695eb53aa9
 2021-04-14 18:27:13 +00:00
Dmitri Plotnikov
52cebc3828 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: I04130b69577670a15b864277d5121b7e81ffbea5
 2021-04-14 18:05:20 +00:00
TreeHugger Robot
0f612a9465 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: I1a48e00f90bb79a15d133458e8bc5318b41d46da
 2021-04-14 18:04:58 +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
TreeHugger Robot
366d86df52 [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: Ie24fca9c6e2c11c10519ef7dec53a9b4de721c8b
 2021-04-14 16:32:38 +00:00
Sally Yuen
ae9eaebda9 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: Ifd7b37f7c93273894e5226593eac656726e0972d
 2021-04-14 16:32:16 +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
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
b26a94f4c6 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: Ib796b631105dfd34da539197ce5b0243075fcc95
 2021-04-14 15:30:18 +00:00
Lucas Lin
8119cde953 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: I88911babfba4a94fac075b93b43534f6b0b758ab
 2021-04-14 15:30:11 +00:00
TreeHugger Robot
35cdddc010 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: I614d526e1dc3ffedd5c1d4f87a4f3fc3a9f31d78
 2021-04-14 15:29:51 +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
Marie Matheson
35fd9edd1b Make host type in ChangeScreenLockPreferenceController more generic. 
Bug:181764105
Test: Tested Manually - no change in behaviour, correct metric type is
used.

Change-Id: Id03f8c53b3208001d4d9e43392218b381b7d1916
 2021-04-14 12:57:56 +00:00