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

81405 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
TreeHugger Robot
0466e8f7e2 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: I6c6c6494cacd338b437f6547c18f8876da1059ef
 2021-04-14 12:42:45 +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
426cc7c766 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: I00d9ee7e328be8fcb2e5cdf24840c805451523f3
 2021-04-14 11:11:31 +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
4ff4d5fbf9 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: If76848321bb890c188c544549f40dc2ee08b888f
 2021-04-14 10:08:45 +00:00
Tiffany Nguyen
0062910698 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: I0112492f8cccde3c1531bc9f65f6812befd06c8a
 2021-04-14 10:08:37 +00:00
Tiffany Nguyen
f9acbaf425 Merge "Revert "Update BatterySettingsFeatureProvider to an activity-friendly interface."" into sc-dev 2021-04-14 09:59:41 +00:00
Tiffany Nguyen
b33d03b741 Revert "Update BatterySettingsFeatureProvider to an activity-friendly interface." 
This reverts commit f2e33df51c.

Reason for revert: reverting to include multiple repos (learning something new every day!)

Change-Id: I0909a17f82d18233b20200edcb6011d6fad81fa6
 2021-04-14 09:58:26 +00:00
Tiffany Nguyen
ceb78586ee Merge "Update BatterySettingsFeatureProvider to an activity-friendly interface." into sc-dev 2021-04-14 09:19:45 +00:00
lucaslin
4400038635 Remove the usage of hidden API and fix the test 
- Network class will be inside mainline module, so the external
callers cannot call its hidden API. Remove the usage of hidden
API.
- The orignal test looks wrong because it shouldn't set the data
of intent, it should set the extra of intent instead. (Refer to
the design of ConnectivityService.java) Fix the test and remove
the @Ignore annotation.
- Add 2 new tests to cover the case of receiving unexpected network.

Bug: 182859030
Bug: 183920404
Test: 1. Remove "framework-connectivity.impl"
      2. make RunSettingsRoboTests \
         ROBOTEST_FILTER=WifiNoInternetDialogTest
Change-Id: Ie48a1651629ad9c067728f667cdd91f2f0bccd07
 2021-04-14 09:07:54 +00:00
ykhung
a711199d8c Avoid load icon and label in the background for periodic job 
In the original design, BatteyEntry will load icon and label in the
background thread and cache them into memory, but we don't need such
information in the periodic fetching job. Add a method to disable it to
improve the performance and memory footprint.

Bug: 185207505
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: Iba759256e94159fce243ff4d700a8adf9e92f82c
 2021-04-14 09:05:34 +00:00
Jeremy Goldman
58aae308e5 Merge "Add additional strings to differentiate between single and multiple insecure vpns" into sc-dev am: 21eaa6d568 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14182147

Change-Id: If2ba19c72a2d6a3b07afd3315d1daab4ef7ef266
 2021-04-14 08:37:42 +00:00
Tsung-Mao Fang
0bf3c98b2f Prevent HTML Injection on the Device Admin request screen 
The root issue is that CharSequence is an interface.
String implements that interface, however, Spanned class
too which is a rich text format that can store HTML code.

The solution is enforce to use String type which won't include
any HTML function.

Test: Rebuilt apk and see the string without HTML style.
Bug: 179042963
Change-Id: I53b460b12da918e022d2f2934f114d205dbaadb0
 2021-04-14 15:51:37 +08:00
Jeremy Goldman
21eaa6d568 Merge "Add additional strings to differentiate between single and multiple insecure vpns" into sc-dev 2021-04-14 07:49:18 +00:00