Commit Graph

11385 Commits

Author SHA1 Message Date
Automerger Merge Worker
7bb65a19dc Merge "[Settings] Code Refactor of MobileNetworkPreferenceController" am: 52dd9f5abf am: 10ff4f4ab6
Change-Id: I380cb41a50e1dfc1edf9aca30c6dac14e33740d5
2020-03-13 12:24:48 +00:00
Automerger Merge Worker
fa889d4fec Merge "[Settings] Refactor DisabledSubscriptionController" am: 0972a6dd94 am: 7ecae6dd06
Change-Id: I7a64297cc60f20d560e811636c4d2678366282c1
2020-03-13 12:24:42 +00:00
Bonian Chen
52dd9f5abf Merge "[Settings] Code Refactor of MobileNetworkPreferenceController" 2020-03-13 12:05:36 +00:00
Bonian Chen
0972a6dd94 Merge "[Settings] Refactor DisabledSubscriptionController" 2020-03-13 11:52:53 +00:00
Automerger Merge Worker
e628466fc2 Merge "[Settings] Refactor CarrierPreferenceController" am: 985352d172 am: a0d1887a98
Change-Id: I449647f069d2e356fd6fa7ed06e655e2c0ad9eb9
2020-03-13 10:48:10 +00:00
Automerger Merge Worker
0587fe1ced Merge "[Settings] Refactor Telephony PreferenceController" am: 1b00c00f79 am: 6865bece3c
Change-Id: I9f0f6f0f404b35f05ac1b101b7a3e71bae6517c0
2020-03-13 10:48:05 +00:00
Bonian Chen
985352d172 Merge "[Settings] Refactor CarrierPreferenceController" 2020-03-13 10:12:29 +00:00
Bonian Chen
1b00c00f79 Merge "[Settings] Refactor Telephony PreferenceController" 2020-03-13 10:11:54 +00:00
TreeHugger Robot
6d8e0fed61 Merge "Fix tests" into rvc-dev 2020-03-13 09:27:16 +00:00
Bonian Chen
0971feaeda [Settings] Code Refactor of MobileNetworkPreferenceController
Code Refactor of MobileNetworkPreferenceController

Bug: 150567855
Test: make
Change-Id: If5de2d0841e2f8705d2e202b6e6a7e53dc1a4897
2020-03-13 15:58:09 +08:00
Edgar Wang
3b47408016 Refine remove locale warning dialog string
- If the first language is not selected, just remove the body copy
  else warning user the locale will change to another language.

Fixes: 140723349
Test: manual & robotest
Change-Id: I9fec17ae85889f2864c3f3cae744f7181e6f9b2c
2020-03-13 12:49:21 +08:00
Edgar Wang
ad30345078 Merge "Remove ignore test case" into rvc-dev 2020-03-13 04:45:59 +00:00
TreeHugger Robot
89a6fafa33 Merge "Use values-night to control the dark mode background color" into rvc-dev 2020-03-13 03:13:27 +00:00
Julia Reynolds
49f40ee77b Fix tests
Fixing one of them by removing an unneeded setting

Test: RunSettingsRoboTests2
Fixes: 151279674
Change-Id: If2b513ba7b4bf8ec5183e2a9457caab3d3e06dc4
2020-03-12 17:27:35 -04:00
Zhen Zhang
0ad0a50538 Merge "Log some actions for changing wifi hotspot config" into rvc-dev 2020-03-12 19:47:42 +00:00
Alex Johnston
341f995971 DPC can be uninstalled in personal profile in New COPE
* For an organization-owned device, the DPC should be able to
  be uninstalled in the personal profile. Previously, the
  observed behaviour was that the uninstall button in the App
  Info Screen was being greyed out.
* This was because the previous logic did not allow for
  uninstalling any app which has a profile owner or device
  owner on *any* user.
* This CL updates this logic, such that, for non-system apps
  uninstalling is blocked only if the app has a profile owner
  or device owner for the current calling user.

Bug: 149381804
Test: Manual testing
      atest com.android.settings.applications.appinfo.AppButtonsPreferenceControllerTest
Change-Id: Ifaf03daa41724dbbd869c7e1371a77cc39d15ac7
2020-03-12 13:38:19 +00:00
Bonian Chen
332de69f8e [Settings] Refactor CarrierPreferenceController
Refactor CarrierPreferenceController

Bug: 150352656
Test: make
Change-Id: I8b125eb501cdbf63cbfa84d72d78e44a655bf9a5
2020-03-12 20:53:10 +08:00
Bonian Chen
b7891e879f [Settings] Refactor Telephony PreferenceController
Refactor TelephonyBasePreferenceController and TelephonyTogglePreferenceController

Bug: 150352656
Test: make
Change-Id: I3d52054fd9fbc5597db6266686d155a12d5a88d6
2020-03-12 20:43:54 +08:00
Bonian Chen
29c1be284b [Settings] Refactor DisabledSubscriptionController
Refactor DisabledSubscriptionController

Bug: 150352656
Test: make
Change-Id: I6d31247d77c8fb515b9ba1b1ead33102f0e9e12f
2020-03-12 20:17:17 +08:00
hughchen
728d63c014 Use values-night to control the dark mode background color
Bug: 149974597
Test: make -j42 RunSettingsRoboTests
Change-Id: Ia10f7bab0ec7781db8b4b4dbdf359bb8a87672cc
2020-03-12 19:47:44 +08:00
Automerger Merge Worker
31f9002e3b Merge "[Settings] Code refactor" am: a7a9863a52 am: a99bfeadf9
Change-Id: I16b8f6d6e48c7f1f8f6ef6e76b6eaf73269b2da0
2020-03-12 11:31:43 +00:00
Edgar Wang
651edc5c44 Remove ignore test case
Fixes: 147865441
Test: RunSettingsRoboTests ROBOTEST_FILTER=AssistFlashScreenPreferenceControllerTest
      RunSettingsRoboTests ROBOTEST_FILTER=DefaultAssistPreferenceControllerTest
      RunSettingsRoboTests ROBOTEST_FILTER=DefaultAutofillPickerTest
      RunSettingsRoboTests ROBOTEST_FILTER=StyleSuggestionActivityTest
Change-Id: I46f2d4b1dc38047bea3b287f11dcc71b7aed6c87
2020-03-12 19:21:36 +08:00
shafik
143ec3ec2b Update ManageExternalStorageDetailsTest setUidMode
We previously changed ManageExternalStorageDetails to use
AppOpsManager#setUidMode instead of AppOpsManager#setMode, but forgot to
update the relevant unittest. This CL changes that unittest.

Test: make RunSettingsRoboTests ROBOTEST_FILTER=ManageExternalStorageDetailsTest
Fix: 150914062
Change-Id: I2cfe7e7a19f2422474d11fb946089a6847b36b12
2020-03-12 09:43:55 +00:00
Bonian Chen
bfc8714e1f [Settings] Code refactor
Code refactor.

Bug: 150352656
Test: make
Change-Id: I9efd75849ff6972ebddbba767868ad0d0ea0ffda
2020-03-12 16:31:06 +08:00
Tim Peng
dd39f44344 Handle ransferring state in output switcher
-Add subtitle on Slice item for transferring and failed case
-Add test cases

Bug: 150903460
Test: make -j50 RunSettingsRoboTests
Change-Id: I45fee20194dc6c9ec86ca88158393dfda455d0c0
2020-03-12 16:29:30 +08:00
Zhen Zhang
63c7c202d7 Log some actions for changing wifi hotspot config
Log following actions:
- wifi hotspot name changed
- wifi hotspot password changed

Added tests for logging actions in each controller's test.

Bug: 151113705
Test: WifiTetherSSIDPrefereceControllerTest;
WifiTetherPasswordPreferenceControllerTest;
CodeInspectionTest

Change-Id: I84b1cd8449e575a6ee1ad8868e7791dc601e726f
2020-03-12 01:06:46 -07:00
Calvin Pan
59f5eb638e Merge "Hide the 5G opiton when 5G has been disallowed" into rvc-dev 2020-03-12 06:25:11 +00:00
Menghan Li
873b50a46a Merge "Update R acessibility assets and strings (2/n)" into rvc-dev 2020-03-12 05:37:32 +00:00
TreeHugger Robot
40613ef30c Merge "Fix DevelopmentSettingsDashboardFragmentTest" into rvc-dev 2020-03-12 04:35:32 +00:00
TreeHugger Robot
a7bd169814 Merge "Fix WifiTetherSettingsTest" into rvc-dev 2020-03-12 02:54:35 +00:00
Lucas Dupin
249d80ec7b Blur developer setting
New dev-option for enabling and disabling blurs, on devices that support
it.

Bug: 149792636
Test: manual
Test: atest EnableBlursPreferenceControllerTest
Change-Id: I26b4739a7b811c461557316a9247f6a9c397048a
2020-03-11 18:17:46 -07:00
Yi-Ling Chuang
b8eb466dd1 Fix WifiTetherSettingsTest
Bug: 151201888
Test: run WifiTetherSettingsTest successfully
Change-Id: I80df83f3dc720c80734ec083c33bab5c56c52796
2020-03-11 19:33:09 +08:00
Yi-Ling Chuang
f46fd991fa Fix DevelopmentSettingsDashboardFragmentTest
Fixes: 151206654
Bug: 150907639
Test: robotests
Change-Id: I36a1dacc7fe2ccd3b724a9aa135447db97fa3d41
2020-03-11 19:16:35 +08:00
Yi-Ling Chuang
542f76a51e Fix TetherSettingsTest
Fixes: 151204777
Test: run TetherSettingsTest
Change-Id: Ic510aac7fc7f9af095e78473bc191a4e903dcaba
2020-03-11 18:18:36 +08:00
menghanli
19cf6ddff8 Update R acessibility assets and strings (2/n)
- Temporary-use template summary by shortcut state

Bug: 148837311
Test: Manual test
Change-Id: Ia720b8f3f317bb1874d6758ebc4fbf4145d0c217
2020-03-11 17:21:27 +08:00
Arc Wang
b8fb854e98 Merge "[Wi-Fi] Add STA+AP information in Hotspot & tethering footer" into rvc-dev 2020-03-11 04:00:49 +00:00
TreeHugger Robot
6aa40f6ea7 Merge "Revert "Ignore some failed tests."" into rvc-dev 2020-03-11 03:16:49 +00:00
Yi-Ling Chuang
ef4550c504 Revert "Ignore some failed tests."
This reverts commit db4fd2b1c3.

Reason for revert: Test failures are fixed.

Fixes: 150914017
Change-Id: I561816d51427f1141aae42128659b42cc25221dd
2020-03-11 03:16:33 +00:00
TreeHugger Robot
7c2979c340 Merge "[Wi-Fi] Use startActivityForResult instead of startActivity to launch google help page" into rvc-dev 2020-03-10 12:12:46 +00:00
calvinpan
75867d8f63 Hide the 5G opiton when 5G has been disallowed
1. Create PreferenceEntriesBuilder for 5G entry. In the past, the
preferred network type entries was based on CarrierConfigManger value
but 5G option is based on allowed netowork type and device access
family, so include 4G and 5G logic in PreferenceEntriesBuilder.

2. If user selected item not in preferred network option, settings will
auto selected on the first item. For example, if user selected on 5G and
device disallowed 5G(5G option will be hide), so settings will selected
on first item(4G).

Bug: 149721842
Test: EnabledNetworkModePreferenceControllerTest

Change-Id: Ic447a137f9db4cf1a0048a8e58487c29b402bb48
2020-03-10 10:23:43 +00:00
Arc Wang
005fe6951c [Wi-Fi] Add STA+AP information in Hotspot & tethering footer
Use WifiManager#isStaApConcurrencySupported() to check if a
device supports STA+AP and shows the footer information.

Bug: 121328949
Test: make RunSettingsRoboTests ROBOTEST_FILTER=TetherSettingsTest
      make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherFooterPreferenceControllerTest
Change-Id: I3446abb5cc9cdf76da8d17f5de31bd65715c165c
2020-03-10 18:15:13 +08:00
govenliu
6794ce8233 [Wi-Fi] Use startActivityForResult instead of startActivity to launch google help page
The startActivity API can not launch the help page.
Change to use startActivityForResult to launch.

Bug: 143784389
Test: Add learnMore_launchesHelp_shouldStartActivityForResult unit test to check if startActivityForResult be called.
Change-Id: Ia3ef82f94d4c8feb71131b44be26df74d6259805
2020-03-10 14:28:34 +08:00
Tim Peng
b4c4c362c5 Add entry point at output switcher to do group operation
-Entry point is available only when there are more than 1 connected device
-Add group Slice item when it is available
-Add intent filter in manifest
-Add test case

Bug: 146813761
Test: make -j42 RunSettingsRoboTests
Change-Id: If398b7a31219fd1910503d96fe7593622528c792
2020-03-10 13:44:09 +08:00
tim peng
af4d55e7dd Merge "Adjust layout for Slice InputRange" into rvc-dev 2020-03-10 03:04:26 +00:00
Tim Peng
db7d61d0a2 Adjust layout for Slice InputRange
-Make title to slider aligned
-Add test cases

Bug: 147462114
Test: make -j50 RunSettingsRoboTests
Change-Id: Ib1d076f77eae75e4f861a80873117b6254729fe5
2020-03-09 21:50:58 +08:00
tim peng
9607eb334b Merge "Update rule to display output switcher Slice" into rvc-dev 2020-03-09 13:42:53 +00:00
TreeHugger Robot
5d6c309d65 Merge "Fix WirelessDebuggingEnablerTest failures." into rvc-dev 2020-03-09 13:09:31 +00:00
TreeHugger Robot
e547a87055 Merge "Show paired devices on Bluetooth device slice card" into rvc-dev 2020-03-09 12:19:08 +00:00
Automerger Merge Worker
586b2786ac Merge "Fix PlatformCompatDashboardTest." am: 805f137935 am: 976f7bfe78
Change-Id: I800672519f7dd70b20645d3c9348f32e8d5ce648
2020-03-09 11:17:46 +00:00
Anna Trostanetski
805f137935 Merge "Fix PlatformCompatDashboardTest." 2020-03-09 10:53:02 +00:00