Commit Graph

29355 Commits

Author SHA1 Message Date
changbetty
f4d2771526 [Mainline] Use isActiveSubscriptionId instead of isActiveSubId for mainline
Bug: 147206736
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DisabledSubscriptionControllerTest
      make RunSettingsRoboTests ROBOTEST_FILTER=MobileNetworkSwitchControllerTest
      make RunSettingsRoboTests ROBOTEST_FILTER=SimSelectNotificationTest

Change-Id: If740c2d7ea2c1392d5fe538091ea6e5c4575ad26
2020-01-08 15:48:33 +08:00
Bonian Chen
6b7b92ced5 Merge "[Settings] Refactor AirplaneModeEnabler with test" 2020-01-02 10:19:59 +00:00
TreeHugger Robot
5df80504c3 Merge "Change DEFAULT_CARD_COUNT for settings homepage." 2020-01-02 07:39:24 +00:00
Jason Hsu
bda73ed270 Merge "Accessibility shortcut secondary action - auto hide divider in shortcutPreference" 2020-01-02 07:15:55 +00:00
Menghan Li
d889dec474 Merge "Support accessibility shortcut secondary action (6/n)" 2020-01-02 05:55:12 +00:00
Bonian Chen
717e0765a5 [Settings] Refactor AirplaneModeEnabler with test
Support auto testing

Bug: 147029746
Test: manual
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=AirplaneModeEnablerTest
Change-Id: Ib39ab1881484f65bc5a3834b2828c6ba98198cca
2020-01-02 12:06:00 +08:00
Bonian Chen
3e9fd2490e Merge "[Settings] Refactor AirplaneModeEnabler" 2020-01-02 03:15:51 +00:00
Arc Wang
0a13ae9aea Merge "[Wi-Fi] Support intent extra "wifi_start_connect_ssid" in WifiSettings2" 2020-01-01 01:17:59 +00:00
Stanley Wang
74e42c7d6f Merge "The index implementation for face unlock settings." 2019-12-31 15:11:21 +00:00
TreeHugger Robot
82c437128d Merge "[Wi-Fi] Support intent extra "wifi_enable_next_on_connect" in WifiSettings2" 2019-12-31 11:33:45 +00:00
TreeHugger Robot
7ab84a073a Merge "[Wi-Fi] Show link speed for WifiDialog2 MODE_VIEW" 2019-12-31 11:16:18 +00:00
Stanley Wang
e81d6b7b31 The index implementation for face unlock settings.
- Index the delete face unlock preference and set up face unlock preference.

Fixes: 147031175
Test: manual
Change-Id: Ia984a116947d0c2e6a909f53914d081e25496f87
2019-12-31 18:59:46 +08:00
menghanli
a5d8e12766 Support accessibility shortcut secondary action (6/n)
Implements new edit shortcut dialog selection and save what user
prefered key back for color inversion, color correction, magnifiction,
downlaoded service - LEGACY, INVISIBLE, INTUITIVE case.

Bug: 142530063
Bug: 142531156
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AccessibilityUtilTest
Test: make RunSettingsRoboTests2
Change-Id: I94607db918047ae4082457dd33f17c8675934e2c
2019-12-31 17:42:06 +08:00
Bonian Chen
a72a038bb6 [Settings] Refactor AirplaneModeEnabler
1. Multiple instance of PhoneStateListener is not required.
2. It will be better to monitor radio power state changed instead of service state.

Bug: 147029746
Test: Manual
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=AirplaneModePreferenceControllerTest
Change-Id: I51465904ce2409b6c07c3ba80ea362d208989fbd
2019-12-31 17:02:35 +08:00
Ahmed ElArabawy
8a9ad06570 Merge "Wifi: Fix rototests for wifi tethering" 2019-12-31 08:41:11 +00:00
Ahmed ElArabawy
2632c25f37 Wifi: Fix rototests for wifi tethering
This commit makes fixes to the wifi tethering rototests.
These fixes are done by using the proper encoding for the AP bands.

Bug: 146767071
Test: Run robotest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.wifi
Change-Id: I4ddf6ea9328dabed09bc23d355efa188975316b6
2019-12-30 22:55:17 -08:00
Arc Wang
808070ccbb [Wi-Fi] Show link speed for WifiDialog2 MODE_VIEW
Now there is no WifiDialog2 MODE_VIEW use case since
they are replaced by WifiNetworkDetailsFragment2.

Should think about removing MODE_VIEW in the future,
however, we should let it work before phase out it.

Bug: 146407136
Test: build
Change-Id: I7cd470c74cea846046975b8c65fd2604702cc136
2019-12-31 14:54:31 +08:00
jasonwshsu
a2cf6a1313 Accessibility shortcut secondary action - auto hide divider in shortcutPreference
- Hide divider when settings view is gone.

Bug: 142530063
Test: manual
Change-Id: I07c9aa628c4e300d1fd21fe5b87c18ff1c294e17
2019-12-31 12:12:49 +08:00
Stanley Wang
ae89ecf8d0 Merge "Remove the unused slices." 2019-12-31 02:04:59 +00:00
Stanley Wang
9fd20149c9 Merge "Index wi-fi preferences." 2019-12-31 02:04:24 +00:00
TreeHugger Robot
d515ed7ba2 Merge "Update BrandedAccountPreferenceController" 2019-12-30 14:10:25 +00:00
Stanley Wang
0577751718 Index wi-fi preferences.
- Add xml file to index "Saved network" and "Wifi data usage"
preferences.
- Disable the "Saved network" if the access points is empty.
- Disable the "Wifi data usage" if there is no wifi radio.

Fixes: 146823365
Test: manual
Change-Id: I049d0463fd58f186dae1d5f54dcc914f52031da7
2019-12-30 19:50:18 +08:00
Stanley Wang
5ce5349167 Remove the unused slices.
Remove the DataUsageSlice, DeviceInfoSlice and EmergencyInfoSlice.

Fixes: 146994847
Test: robotest
Change-Id: Ic840e9cc93e99b3c0a34eb6536401db34c98eca8
2019-12-30 19:04:49 +08:00
Arc Wang
e8e0e5d81b Merge "[Wi-Fi] Hide the Advanced Option after expanding the advanced option fields." 2019-12-30 10:44:32 +00:00
Sunny Shao
12cef91760 Update BrandedAccountPreferenceController
Use the updateState to decide the preference display due to the displayPreference
could not be called while user press BACK key then the upper page gone and bottom
page reshow.

Fixes: 146989749
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.deviceinfo
Change-Id: I00b08b59c533ed0832ed07e6231138dd88084517
2019-12-30 18:13:37 +08:00
Bonian Chen
739ae785ff Merge "[Settings] Code refactor" 2019-12-30 08:20:39 +00:00
Automerger Merge Worker
6d56b7373a Merge "[Settings] Correct spelling in source code" am: 22c5c7d4a4 am: 42a1f866e4 am: 08b42adf46
Change-Id: I83915ffc8745cf102573e9dc7a762236ed57d696
2019-12-30 07:54:57 +00:00
Automerger Merge Worker
08b42adf46 Merge "[Settings] Correct spelling in source code" am: 22c5c7d4a4 am: 42a1f866e4
Change-Id: Iac65c4fb8ded870857207c316946535f4ec87a5f
2019-12-30 07:35:49 +00:00
Bonian Chen
22c5c7d4a4 Merge "[Settings] Correct spelling in source code" 2019-12-30 07:18:59 +00:00
Stanley Wang
849853c468 Merge "The dynamic index implementation for time zone preferences." 2019-12-30 06:47:38 +00:00
Quang Luong
942af81d73 Merge "[Wi-Fi] Sync Connect button UI with WifiEntry connected state" 2019-12-30 06:02:23 +00:00
Automerger Merge Worker
066d3f693d Merge "Changed reference of telecom.Log to util.Log" am: f9d06dc434 am: 2bffc2754a am: c30575610c
Change-Id: I50d8ae9c889ae4764ffc8dcc7b8e714563b41bcd
2019-12-30 05:11:37 +00:00
Automerger Merge Worker
c30575610c Merge "Changed reference of telecom.Log to util.Log" am: f9d06dc434 am: 2bffc2754a
Change-Id: Ic36bfe8db4edba2a80353a9d4fa66027e5d92364
2019-12-30 04:59:08 +00:00
govenliu
91d6dfc455 [Wi-Fi] Hide the Advanced Option after expanding the advanced option fields.
To align with other advanced option behaviors in other Settings items, hide the Advanced Option button after the hidden advanced options are show, which also solve the a11y issue.

Bug: 146908469
Test: Add test case getVisibility_whenAdvancedOptionClicked_shouldBeGone
to verify View is Gone.
Change-Id: I11b2f9b250a7d50d32b8c05207498f4cf14feb41
2019-12-30 12:48:29 +08:00
Stanley Wang
f0cd9742b5 The dynamic index implementation for time zone preferences.
Disable the region settings page if auto time zone is enabled.

Fixes: 146849126
Test: manual
Change-Id: Icce1e5aca14539d6c9149e05a3321429bd337f17
2019-12-30 12:46:32 +08:00
Lee Chou
f9d06dc434 Merge "Changed reference of telecom.Log to util.Log" 2019-12-30 04:36:18 +00:00
Bonian Chen
f980a2985a [Settings] Code refactor
Code refactor.

Bug: 146985715
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=AirplaneModePreferenceControllerTest
Change-Id: I3ecc85f0f4ae1a0164a88bf811fe4c865d517d03
2019-12-30 11:24:58 +08:00
TreeHugger Robot
5900c5a6ac Merge "Use flag to confirm whether callback should unregister" 2019-12-30 02:39:03 +00:00
Bonian Chen
b14af41430 [Settings] Correct spelling in source code
Rename mSubsciptionsMonitor into mSubscriptionMonitor.

Test: build pass
Change-Id: Ib0444c61fbe4238f743bf83f6ff96656be433c9d
2019-12-30 10:27:57 +08:00
Arc Wang
b0e9d44478 [Wi-Fi] Support intent extra "wifi_start_connect_ssid" in WifiSettings2
This is a similar code merge of ag/575560 & ag/2588374

Bug: 143328194
Test: manual
      Connect to a Wi-Fi network with wrong network.
      Click the fail notification and launch Wi-Fi picker.
      Check if the editor shows the specified Wi-Fi network.

Change-Id: I5bc8cd0ea51e7baf3d6d2d6d522a3973b74ef930
2019-12-27 14:11:36 +00:00
Arc Wang
46721efd99 [Wi-Fi] Support intent extra "wifi_enable_next_on_connect" in WifiSettings2
This is a similar code merge of ag/489459.

Bug: 143328194
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiSettings2Test
Change-Id: I666b3293f00aa1822a6fdcc3760ae19d27019597
2019-12-27 14:10:24 +00:00
TreeHugger Robot
19747ba32a Merge "[Wi-Fi] Apply WifiDialog2 in WifiSetings2" 2019-12-27 09:18:57 +00:00
Lee Chou
1c5f319f3c Changed reference of telecom.Log to util.Log
Bug: 146912511
Test: make and test manually
Change-Id: Ibc077c71c6181cf7724279fd73e4370aaf8fefa1
2019-12-27 17:12:18 +08:00
TreeHugger Robot
fb54889efc Merge "[Wi-Fi] Replace AccessPoint with WifiEntry for WifiDialog2" 2019-12-27 08:47:36 +00:00
TreeHugger Robot
b897eb8551 Merge "[Wi-Fi] Branch WifiDialog files for WifiTracker2 development" 2019-12-27 07:42:52 +00:00
TreeHugger Robot
08bd74c59c Merge "Finish bluetooth detail fragment if device is BOND_NONE" 2019-12-27 03:03:49 +00:00
Automerger Merge Worker
cd46f2df4f Merge "[Settings] Replace getSimCount() API" am: b0bddfec15 am: 92f25fadd2
Change-Id: I709109c86262dcc6886ccd2dbccf84fbc7188650
2019-12-27 02:58:25 +00:00
Bonian Chen
b0bddfec15 Merge "[Settings] Replace getSimCount() API" 2019-12-27 02:45:42 +00:00
Menghan Li
7cbba20eec Merge "Fix CodeInspectionTest for CaptionPropertiesFragment" 2019-12-27 02:32:13 +00:00
TreeHugger Robot
e780606358 Merge "[DPP R2] Update ACTION_PROCESS_WIFI_EASY_CONNECT_URI intent" 2019-12-26 19:19:54 +00:00