PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
80,718 Commits 1 Branch 0 Tags
aeaa13af9e078f8b2714cfb09ab82a4718a08fa0
Commit Graph

80718 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
5ad687f487 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: I2a4919a500a57e29689472401bb2f7e9938004a5
 2021-04-14 08:01:33 +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
Jack He
2e22dcc7f2 Merge "BT: Use DeviceConfig for Bluetooth GD toggle" am: 6de2953232 am: ee25171aa1 am: 130f27d48f am: ab38192a1f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1661159

Change-Id: I1963bc9f049ab66cd3c3150d110c3596c4c83bdb
 2021-04-14 07:40:23 +00:00
Jack He
ab38192a1f Merge "BT: Use DeviceConfig for Bluetooth GD toggle" am: 6de2953232 am: ee25171aa1 am: 130f27d48f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1661159

Change-Id: Ic39e10b36eff5b009886d7a321575f63ef15ba5c
 2021-04-14 06:55:36 +00:00
Ryan Lin
a339d2796f Merge "Show the illustration with the given button mode" into sc-dev am: 0e35a6fe07 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167785

Change-Id: I029e585c949308feeb510f5c81b3ab39d668e771
 2021-04-14 06:36:00 +00:00
Yanting Yang
fa16844eb1 Use sentence case for display section subheaders 
Fixes: 184957718
Test: visual
Change-Id: Iba3cdda216d7bf4db4b124886b326a052117f6f4
 2021-04-14 06:34:58 +00:00
Jack He
130f27d48f Merge "BT: Use DeviceConfig for Bluetooth GD toggle" am: 6de2953232 am: ee25171aa1 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1661159

Change-Id: I690e850a6b67125a35e999a4faf86a3454140d3f
 2021-04-14 06:07:23 +00:00
Ryan Lin
0e35a6fe07 Merge "Show the illustration with the given button mode" into sc-dev 2021-04-14 05:50:49 +00:00
Jack He
ee25171aa1 Merge "BT: Use DeviceConfig for Bluetooth GD toggle" am: 6de2953232 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1661159

Change-Id: Ib4b7dbbc490cbb74954531fbf17b440074cb4447
 2021-04-14 05:23:30 +00:00
Tiffany Nguyen
f2e33df51c Update BatterySettingsFeatureProvider to an activity-friendly interface. 
Test: no impl
Bug: 181827718
Change-Id: I006c7c253df516981240d49fd2590fa68dabb9f2
 2021-04-14 04:50:10 +00:00
Jack He
6de2953232 Merge "BT: Use DeviceConfig for Bluetooth GD toggle" 2021-04-14 04:44:02 +00:00
Jeremy Goldman
eecc97a339 Add additional strings to differentiate between single and multiple 
insecure vpns

Although in english, the strings can be "N not secure", in other
languages translators have requested that we add "VPN" or "VPNs" after
the number for extra clarity. Thus, we split the string into two
depending on whether there is just one or more than one insecure VPN.

Bug: 184167494
Test: atest -c SettingsUnitTests
Change-Id: I93f0cbec5f22ffcac70ddc2ecf640729eef29c04
 2021-04-14 11:52:38 +08:00
TreeHugger Robot
606862ec21 Merge "Add 50% opacity if detect there is no device image yet" into sc-dev am: c9cbe8a572 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14140159

Change-Id: I440ca51636090382a5d682b5217d7010471219a8
 2021-04-14 03:48:53 +00:00
YUKAI HUNG
fabbc13d3a Merge "Export loadNameAndIcon() method out for BatteryDiffEntry reusing." into sc-dev am: 9c68e56389 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14173736

Change-Id: I930aadceac30e84d4563aa7e63d92aa47b2bf71c
 2021-04-14 03:48:30 +00:00
TreeHugger Robot
c9cbe8a572 Merge "Add 50% opacity if detect there is no device image yet" into sc-dev 2021-04-14 03:44:16 +00:00
YUKAI HUNG
9c68e56389 Merge "Export loadNameAndIcon() method out for BatteryDiffEntry reusing." into sc-dev 2021-04-14 03:07:33 +00:00
YUKAI HUNG
eb3e1282d2 Merge "Load application icon and label from package manager if available" into sc-dev am: 8d8877b6db 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167798

Change-Id: Ia510ea9e9af9549bd46ac54e8ee3271909a89472
 2021-04-14 02:37:17 +00:00
YUKAI HUNG
8d8877b6db Merge "Load application icon and label from package manager if available" into sc-dev 2021-04-14 01:58:37 +00:00
sallyyuen
fefb447526 Call ColorDisplayManager for Extra Dim/RBC state 
- Move junit test into unit test folder
- Settings resources ids are different from the junit test ids
so we need to find the correct resource id
- ColorDisplayManager will not update in time before the controller
is checked, and it can't be mocked since it's a final class
Bug: 170970675
Test: manual, atest ReduceBrightColorsPreferenceControllerTest

Change-Id: I57bfdd8294c5b6e147b4e11ae97b6b56f6121343
 2021-04-13 17:42:25 -07:00
Dmitri Plotnikov
6af2e84cd3 Merge "Adjust for changing BatteryUsageStats constructor" into sc-dev am: 26db6e5f8e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14162520

Change-Id: I1a200e6e9d517b93479d6b009b36c594a4fc607a
 2021-04-13 23:53:57 +00:00
Dmitri Plotnikov
26db6e5f8e Merge "Adjust for changing BatteryUsageStats constructor" into sc-dev 2021-04-13 23:44:29 +00:00
TreeHugger Robot
f79708058a Merge "Update getOwnersForDomain usage to SortedSet" into sc-dev am: ea4ab07b63 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14173190

Change-Id: I1d67d76e203fa81960bb170f2d1bfb19f56b31f2
 2021-04-13 22:27:36 +00:00
TreeHugger Robot
ea4ab07b63 Merge "Update getOwnersForDomain usage to SortedSet" into sc-dev 2021-04-13 21:54:12 +00:00
Sally Yuen
17cc9ffd93 Merge "Add a banner for RBC/Extra Dim" into sc-dev am: 12166e5bb1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14165431

Change-Id: I3b39af9acf487e2372421ddef808d3e6deb93379
 2021-04-13 21:42:51 +00:00
Jack He
8cc23bd2fe BT: Use DeviceConfig for Bluetooth GD toggle 
Bug: 184235563
Test: make and toggle GD settings, unit test
Change-Id: I643339f80a82950b1b1ffcf60830f93a955e6666
 2021-04-13 20:31:38 +00:00
ykhung
8483ea48b9 Export loadNameAndIcon() method out for BatteryDiffEntry reusing. 
Bug: 185187669
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: Iedb37546f6f08751174d977d962aec44539f2fb8
 2021-04-14 01:01:48 +08:00
Sally Yuen
12166e5bb1 Merge "Add a banner for RBC/Extra Dim" into sc-dev 2021-04-13 16:18:57 +00:00
Winson
3cb64ab6ad Update getOwnersForDomain usage to SortedSet 
From API feedback, the return type of this method was updated.
Migrating was fairly simple.

Bug: 184891031

Test: manual, launch settings screen on device

Change-Id: Ic159093b5d3f592de0b3533cf26bf0c878e06a30
 2021-04-13 08:40:14 -07:00
ykhung
db88c994b4 Load application icon and label from package manager if available 
Bug: 185187669
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: Id612f0f1db51d538abb41fc711b9350d9a147cb8
 2021-04-13 23:12:12 +08:00