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

81567 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marie Matheson
01cff09972 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: I60319debbb9b6e39e581e62ef9b762454a5bccb6
 2021-04-15 10:01:26 +00:00
YUKAI HUNG
4bcdd3123b 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: I7a895aa1011ce79f1e8d7d564ec8758572a2190c
 2021-04-15 10:01:17 +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
7c3775b03d 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: Ic913f3883f6bbd985e6b1f7371ad47c52089d850
 2021-04-15 05:45:52 +00:00
Edgar Wang
9d14071637 Merge "Apply SettingsPreferenceTheme in Settings" into sc-dev 2021-04-15 05:27:22 +00:00
TreeHugger Robot
fdfe60d87e 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: I2871f2febd498e3f71e264327bbe6d911b8d4dd5
 2021-04-15 02:44:40 +00:00
Jason Hsu
240fe7dee7 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: If702b149f2685850a898865f19c75fe9a936cb02
 2021-04-15 02:44:26 +00:00
Peter Wang
ee77615343 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: I9af0712b79fb6c248e091bbadd560fc0f5cb72b5
 2021-04-15 02:44:14 +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
10cd1cd6e6 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: I890e8b75650f31dd0e285615bf40a2fcc91047ff
 2021-04-15 01:24:27 +00:00
Julia Reynolds
4649282033 Only one action bar needed am: 98b8716e0a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14189470

Change-Id: I7330d933c087ee993570b4fd22df5c31182b4a58
 2021-04-15 01:23:10 +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
d843a380f6 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: If7957ff584e3ac15e0360b3307cd4f9104612030
 2021-04-14 19:15:02 +00:00
TreeHugger Robot
813e3c338c [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: Ib288624b5b7318f18fa53f56e5a9c13677609816
 2021-04-14 19:14:49 +00:00
TreeHugger Robot
7593e5b717 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: I62276685b7caed1346f39bd5648a587c0ea4a080
 2021-04-14 19:14:44 +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
f2df938c69 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: I6b0237c99dafb8520eaa92dc7cd621cee7ce0d12
 2021-04-14 18:26:04 +00:00
Dmitri Plotnikov
ffbf5d71c8 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: Ida4310282710b182529e038724a825e5dfd102de
 2021-04-14 18:04:56 +00:00
TreeHugger Robot
3991ebebe2 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: I1f0f0e4776c530a14caec54c905f477c6cef81c2
 2021-04-14 18:04:10 +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
TreeHugger Robot
802222e5b3 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-14 17:16:08 +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
8a30574316 [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: I0ded79d55d2e03a12532ac3bd5eab4853f8b0dfd
 2021-04-14 16:30:08 +00:00
Sally Yuen
5e89a42c2a 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: Id1e92c5cbaae8438d25aefe33ba3d88f9d29cc79
 2021-04-14 16:29:45 +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
3a489538b3 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-14 16:14:39 +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
cd699256dd 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: I247435b1456f0a96584faa8402d44b5c77e1063d
 2021-04-14 15:30:23 +00:00
Lucas Lin
7e80cc534b 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: I00b00a2df8738219c7e7e0163d6cda295c03c260
 2021-04-14 15:30:17 +00:00
TreeHugger Robot
ac971ed06c 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: Ide20b8a92f8b6040b814d5dcdb05fba750d481fe
 2021-04-14 15:28:53 +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
e936ffc555 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie132293526ea7c325059ba78377c90abb373801b
 2021-04-14 14:52: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
Bill Yi
96deb02d6b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I99b303e904c7b218f4dad1812a8ba83939a33f64
 2021-04-14 13:55:36 +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