Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
81,552 Commits 1 Branch 0 Tags
ee776153438b0017c41e78cd76c23bb1ddd9e708
Commit Graph

81552 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
TreeHugger Robot
0b6960cf0f 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: I79fe181ce0ad5807bb877b74c4cbacc66d5227ef
 2021-04-14 12:42:02 +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
62e5f40669 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: Id58cc24b2a11e378a46a14459ccab71762ffcfe0
 2021-04-14 11:10:56 +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
e7066b40c2 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: I7d063062eaf8bd59f76cf47d71c0fffbcdbbd913
 2021-04-14 10:04:12 +00:00
Tiffany Nguyen
a558bbd69b 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: I766b057af4dc4e7e15b9b9d9d2b9653a2ab71ce6
 2021-04-14 10:04:04 +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