Commit Graph

81731 Commits

Author SHA1 Message Date
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
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
Shireesha Bongarala
2c5c048482 Hide Wireless Emergency Alerts on unsupported devices
Bug: 175158310
Test: make Settings -j40
Change-Id: I455613a8b80d828e0e068977fb1446c0a7a4f85d
2021-04-14 12:37:34 +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
Edgar Wang
817a167416 Apply SettingsPreferenceTheme in Settings
- Set all of preference style inherit from SettingsPreferenceTheme
- Apply to Theme.Settings and Theme.Settings.Home
- Fix robotest failed in ScreenTimeoutSettingsTest

Bug: 185206291
Test: manual & robotest
Change-Id: I855d003b10348569903855fcbf235bc00265658b
2021-04-14 16:36:14 +08:00
Weng Su
087d10a7bc Fix Wi-Fi tips disappeared issue in airplane mode
- The Wi-Fi state will not be called back in the airplane mode, need to
call onWifiStateChanged() to update the initial state of the UI.

- Screenshot:
  https://screenshot.googleplex.com/8XJXAGTS5FetGQi

Bug: 173179150
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiSettingsTest

Change-Id: I6d9eae26d6def3bff942f8b01e2ddb453327a7de
2021-04-14 16:32:35 +08: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
004807c861 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: I2d80da7275f0068693b3638471b9bc2fa156dfe0
2021-04-14 07:33:44 +00:00
Kevin Chyn
d7b6b3d54e Revert "Set ConfirmDeviceCredentialActivity non-external in FRP"
This reverts commit ba5e25e3b1.

Reason for revert: b/183706857
Bug: b/171950236

Change-Id: Icdd1c76ed650539520a2ebf8ece078f17cdf9deb
2021-04-14 07:24:16 +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
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
Ryan Lin
406f5f0a1d 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: I9a695904309e9c8f997a33f1cd39503053dba84e
2021-04-14 06:31:52 +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
Syaoran Kuo
f4aca12619 Adds new test for notification.
1. Add notification test.
2. Add shareUserId into manifest file.

Test: atest
com.android.settings.notification.AppNotificationComponentTest
Bug: 184814161

Change-Id: I38b7a854e8c8e0777fb7be3a518b7ed9d0f0a7a6
2021-04-14 05:35:38 +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
TreeHugger Robot
fe59de27ea 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: I7d6730b861c100d3888bc86c453bc48591547c9b
2021-04-14 04:02:13 +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
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
c759242125 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: I9a57e18d457d5ae5b7159932c4bbd6ff820a1334
2021-04-14 03:42:12 +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
f9a3ef46e4 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: I23179e6b98fd6beae829d6fde68f10f9bfcecda8
2021-04-14 02:32:22 +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
Tsung-Mao Fang
b6b63bec6c Update OWNER file for TTS subfolder
Change-Id: If0efd5051bc8ddcaa406746d4eb4e4a03d9023b7
Test: N/A
Fix: 185232773
2021-04-14 01:29:15 +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
5b33bfac18 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: I634c611bf1287784fdec48a2257e3236565bc40b
2021-04-13 23:49:35 +00:00
Dmitri Plotnikov
26db6e5f8e Merge "Adjust for changing BatteryUsageStats constructor" into sc-dev 2021-04-13 23:44:29 +00:00
TreeHugger Robot
8f5f0b3c02 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: Ib3bd4f3a331265fd5661cb175518a0aee08b22d5
2021-04-13 22:40:09 +00:00
Dmitri Plotnikov
470839a3b7 Remove references to POWER_COMPONENT_USAGE and TIME_COMPONENT_USAGE
Bug: 184397335
Test: enable fake data, rebuild and restart Settings/Battery
Change-Id: I1a5825a0e324c7884fc900e7cea9f38a9153253c
2021-04-13 15:39:26 -07:00
TreeHugger Robot
ea4ab07b63 Merge "Update getOwnersForDomain usage to SortedSet" into sc-dev 2021-04-13 21:54:12 +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