Commit Graph

59358 Commits

Author SHA1 Message Date
Automerger Merge Worker
20f0980dfb Merge "Fix exception when filtering the APPs which can CHANGE_WIFI_STATE" into rvc-dev am: d3946b5479 am: a2027e5960 am: f0004bf1dc
Change-Id: I74e149079c43d7c205363ab57add997138e201f0
2020-03-04 11:41:23 +00:00
Automerger Merge Worker
f0004bf1dc Merge "Fix exception when filtering the APPs which can CHANGE_WIFI_STATE" into rvc-dev am: d3946b5479 am: a2027e5960
Change-Id: Ib3ef974d9da0476b9c97c69ce6c063215a33ea16
2020-03-04 11:15:26 +00:00
Automerger Merge Worker
a2027e5960 Merge "Fix exception when filtering the APPs which can CHANGE_WIFI_STATE" into rvc-dev am: d3946b5479
Change-Id: I84cb4504ee074d0ab9bbc4bc2d46f3fa8d2afb02
2020-03-04 10:59:52 +00:00
TreeHugger Robot
d3946b5479 Merge "Fix exception when filtering the APPs which can CHANGE_WIFI_STATE" into rvc-dev 2020-03-04 10:40:39 +00:00
Arc Wang
d5bdbdb345 Fix exception when filtering the APPs which can CHANGE_WIFI_STATE
When filtering AppEntry, only allow the extraInfo type of WifiSettingsState.

Bug: 148486719
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AppStateChangeWifiStateBridgeTest
Change-Id: I486e88629aec8cfecf6174de8987d37394043743
2020-03-04 16:09:41 +08:00
Automerger Merge Worker
7c59f85d84 Merge "Fix double scroller of App info page" into rvc-dev am: 0ab87cce3d am: 85b274b6c9 am: cf6bc20c70
Change-Id: Ic3b3fc21c1ad2694bb21067d43ba1da533a6bb24
2020-03-04 07:44:45 +00:00
Automerger Merge Worker
cf6bc20c70 Merge "Fix double scroller of App info page" into rvc-dev am: 0ab87cce3d am: 85b274b6c9
Change-Id: I0f4a089a31374ccea3fbf8f7b9ffcf1eed50fa1f
2020-03-04 07:25:29 +00:00
Automerger Merge Worker
85b274b6c9 Merge "Fix double scroller of App info page" into rvc-dev am: 0ab87cce3d
Change-Id: I43a6edf20ab7fdaa5323d6b955e3f5408423629e
2020-03-04 07:04:18 +00:00
Yanting Yang
0ab87cce3d Merge "Fix double scroller of App info page" into rvc-dev 2020-03-04 06:51:19 +00:00
Automerger Merge Worker
85321037af Merge "Add dynamic group panel" into rvc-dev am: 9a1701b42f am: 5c5c13e2a9 am: 56f95e94ad
Change-Id: If0c3f08fca6ce78f94a60ded9ff5d28b471427e1
2020-03-04 03:12:30 +00:00
Automerger Merge Worker
2b9a685801 Merge "Add slice regist key for dynamic group" into rvc-dev am: 9904275968 am: 01d9e35c58 am: 06ab772ba4
Change-Id: I27831fecf246135f2134621926285152ec664500
2020-03-04 03:12:28 +00:00
Automerger Merge Worker
92d19c19a6 Merge "Add slice for dynamic grouping in output switcher" into rvc-dev am: 09ff25cdf9 am: bc0d38d1be am: 513096cded
Change-Id: I2728bbfeba057aed033e8cb0d8b6f5695a205ca8
2020-03-04 03:12:26 +00:00
Automerger Merge Worker
4954088094 [automerger skipped] [Wi-Fi] Ignore incorrect user certificates am: 9e46a0bc93 -s ours am: d6f421d593 -s ours am: b012406ee6 -s ours am: b0ed691dd8 -s ours
am skip reason: Change-Id Iab35ac975933abc54fda83b99a2109d53d6722d4 with SHA-1 9730b5aa86 is in history

Change-Id: I14427e2b6ab9682e97600f164e246aa2e3a12593
2020-03-04 03:12:19 +00:00
Automerger Merge Worker
a3f11009b6 Merge "[Wi-Fi] Apply WifiEntry onUpdate to support refresh WiFi detail page for OpenRoaming feature." into rvc-dev am: e64fb77bc8 am: 55fa845f1e am: e8100bb129
Change-Id: Iedd273ba66dc84ea3af2ffc3aa262a3d0120948c
2020-03-04 03:12:12 +00:00
Automerger Merge Worker
56f95e94ad Merge "Add dynamic group panel" into rvc-dev am: 9a1701b42f am: 5c5c13e2a9
Change-Id: I712581f8efa089e8c4703ccd5ac8e04f3232a1b2
2020-03-04 02:59:42 +00:00
Automerger Merge Worker
06ab772ba4 Merge "Add slice regist key for dynamic group" into rvc-dev am: 9904275968 am: 01d9e35c58
Change-Id: Iab904472b6ef52f3dac3977f39ae8d37ef2a9a18
2020-03-04 02:59:41 +00:00
Automerger Merge Worker
513096cded Merge "Add slice for dynamic grouping in output switcher" into rvc-dev am: 09ff25cdf9 am: bc0d38d1be
Change-Id: I52a1a99ed95b21c8b10c35619f2dcccf2fd689af
2020-03-04 02:59:39 +00:00
Automerger Merge Worker
b0ed691dd8 [automerger skipped] [Wi-Fi] Ignore incorrect user certificates am: 9e46a0bc93 -s ours am: d6f421d593 -s ours am: b012406ee6 -s ours
am skip reason: Change-Id Iab35ac975933abc54fda83b99a2109d53d6722d4 with SHA-1 9730b5aa86 is in history

Change-Id: I64f07280dec52a1b5e93123d2d9d93be6493554f
2020-03-04 02:59:34 +00:00
Automerger Merge Worker
e8100bb129 Merge "[Wi-Fi] Apply WifiEntry onUpdate to support refresh WiFi detail page for OpenRoaming feature." into rvc-dev am: e64fb77bc8 am: 55fa845f1e
Change-Id: I4266ccaab8c2efd8a3b8f36ab72f394686fb71f5
2020-03-04 02:59:30 +00:00
Automerger Merge Worker
ed46a7d526 Merge changes I3b1d1c4e,I11bdad27 into rvc-dev am: 5dbf99de82 am: 7d7ddddcda am: cec1f09aaa
Change-Id: If21fed883602541ab3566a1ba9b70f2d92032976
2020-03-04 02:45:35 +00:00
Automerger Merge Worker
5c5c13e2a9 Merge "Add dynamic group panel" into rvc-dev am: 9a1701b42f
Change-Id: I2455802d495dc2331b72fe7de02f5de4dbae289f
2020-03-04 02:38:57 +00:00
Automerger Merge Worker
01d9e35c58 Merge "Add slice regist key for dynamic group" into rvc-dev am: 9904275968
Change-Id: I4cb461f0395e948cc5b0ccf24474978984c4d50d
2020-03-04 02:38:55 +00:00
Automerger Merge Worker
bc0d38d1be Merge "Add slice for dynamic grouping in output switcher" into rvc-dev am: 09ff25cdf9
Change-Id: Id1ca213df71e06a33d89b7d1e510b75b74ace8c6
2020-03-04 02:38:54 +00:00
Automerger Merge Worker
b012406ee6 [automerger skipped] [Wi-Fi] Ignore incorrect user certificates am: 9e46a0bc93 -s ours am: d6f421d593 -s ours
am skip reason: Change-Id Iab35ac975933abc54fda83b99a2109d53d6722d4 with SHA-1 9730b5aa86 is in history

Change-Id: I9b319237feb46c080fdfebc8d0ca4106b52834fc
2020-03-04 02:38:45 +00:00
Automerger Merge Worker
55fa845f1e Merge "[Wi-Fi] Apply WifiEntry onUpdate to support refresh WiFi detail page for OpenRoaming feature." into rvc-dev am: e64fb77bc8
Change-Id: I84001a5c44becfe7d8590e8097dbf99f6aed2eb9
2020-03-04 02:38:35 +00:00
tim peng
9a1701b42f Merge "Add dynamic group panel" into rvc-dev 2020-03-04 02:35:35 +00:00
tim peng
9904275968 Merge "Add slice regist key for dynamic group" into rvc-dev 2020-03-04 02:35:35 +00:00
tim peng
09ff25cdf9 Merge "Add slice for dynamic grouping in output switcher" into rvc-dev 2020-03-04 02:35:35 +00:00
Automerger Merge Worker
cec1f09aaa Merge changes I3b1d1c4e,I11bdad27 into rvc-dev am: 5dbf99de82 am: 7d7ddddcda
Change-Id: Ia8b5455a7856747dda56a94dea22c0f6a1d38eec
2020-03-04 02:32:59 +00:00
Automerger Merge Worker
d6f421d593 [automerger skipped] [Wi-Fi] Ignore incorrect user certificates am: 9e46a0bc93 -s ours
am skip reason: Change-Id Iab35ac975933abc54fda83b99a2109d53d6722d4 with SHA-1 9730b5aa86 is in history

Change-Id: Ia2bbed0f22a29e50bc6d4523bf5ec4b75ee1a981
2020-03-04 02:32:26 +00:00
Arc Wang
e64fb77bc8 Merge "[Wi-Fi] Apply WifiEntry onUpdate to support refresh WiFi detail page for OpenRoaming feature." into rvc-dev 2020-03-04 02:25:38 +00:00
Automerger Merge Worker
7d7ddddcda Merge changes I3b1d1c4e,I11bdad27 into rvc-dev am: 5dbf99de82
Change-Id: I925eec066c43a8befeef41d40cad7ecfb2b6fb86
2020-03-04 02:04:18 +00:00
Zhen Zhang
5dbf99de82 Merge changes I3b1d1c4e,I11bdad27 into rvc-dev
* changes:
  Let tether preference controllers extend TogglePreferenceController
  Make tether option preferences listen to own SharedPreferences change
2020-03-04 01:53:07 +00:00
Automerger Merge Worker
9ad579bfe6 Merge "Add string for output switcher transferring error" into rvc-dev am: 8c07f06cd5 am: 9aebc16b6a am: eb31d86af9
Change-Id: I2cb340913046145917130697dcf188fa372c0e86
2020-03-04 01:40:49 +00:00
Automerger Merge Worker
eb31d86af9 Merge "Add string for output switcher transferring error" into rvc-dev am: 8c07f06cd5 am: 9aebc16b6a
Change-Id: I131d6f9021fe9840b9617af4dfe5d6265371831e
2020-03-04 01:26:42 +00:00
Automerger Merge Worker
9aebc16b6a Merge "Add string for output switcher transferring error" into rvc-dev am: 8c07f06cd5
Change-Id: Iac9a8770e495bcb01a8fc87436af66378f2c2b1f
2020-03-04 01:13:07 +00:00
tim peng
8c07f06cd5 Merge "Add string for output switcher transferring error" into rvc-dev 2020-03-04 00:55:01 +00:00
Zhen Zhang
abb734920d Let tether preference controllers extend TogglePreferenceController
Refactored USBTether, BluetoothTether and WifiTetherDisable preference
controllers to extend TogglePreferenceControllers, since they are all
SwitchPreference.

Bug: 150634051
Test: UsbTetherPreferenceControllerTest,
BluetoothTetherPreferenceControllerTest,
WifiTetherDisablePreferenceControllerTest,
CodeInspectionTest

Change-Id: I3b1d1c4e678c65ced8dd506a87c3c43ed300d64f
2020-03-03 11:28:18 -08:00
Yanting Yang
0bc52c307e Fix double scroller of App info page
App info page has enabled the FastScroll for recycler view to provide a
vertical scroll bar.

In tabbed screen, the default scroller will be shown and then occurred
overlap problem with FastScroller.

Hide the default scroller to fix this double scroller problem.

Fixes: 150285712
Test: visual
Change-Id: I26390a0497d820e3a07e8df247a4bc03b5ff23d9
2020-03-03 22:48:05 +08:00
Automerger Merge Worker
3a059026bc Merge "ShortcutPreference Toggle design." into rvc-dev am: 6acde7c21f am: 36a30b38b9
Change-Id: Icfd47c2e0d5dfcb04347167fb31c4cbda59a7bf1
2020-03-03 12:25:31 +00:00
Automerger Merge Worker
36a30b38b9 Merge "ShortcutPreference Toggle design." into rvc-dev am: 6acde7c21f
Change-Id: I865472594bd8c37b1fda311e99276238fb15d2ac
2020-03-03 12:12:23 +00:00
TreeHugger Robot
6acde7c21f Merge "ShortcutPreference Toggle design." into rvc-dev 2020-03-03 12:01:57 +00:00
Automerger Merge Worker
2149d18fb1 Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: cf470fab9d am: b5191ad96a
Change-Id: I110603e8a64b7dea0bf49728f7fb3df460598207
2020-03-03 10:02:56 +00:00
Automerger Merge Worker
b5191ad96a Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: cf470fab9d
Change-Id: I6d12c929d4fd1c763b6a49d4cfe7b82da5075e5d
2020-03-03 09:52:01 +00:00
Alex Johnston
cf470fab9d Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev 2020-03-03 09:39:28 +00:00
menghanli
919e555a51 ShortcutPreference Toggle design.
- For target SDK < 30 app show as preference item to trigger shortcut on/off.
- For target SDK >= 30 app show two item: the left one can edit shortcut and the right one be a on/off trigger button.

The design is reference from WIFI setting which has similar comportment.

Bug: 148989269
Test: Test result in Buganizer.

Change-Id: I815206d9e885c01bf3e6445820176aed4a743323
2020-03-03 17:31:27 +08:00
govenliu
a22a457750 [Wi-Fi] Apply WifiEntry onUpdate to support refresh WiFi detail page for OpenRoaming feature.
Issue: The preference UIs status didn't chage dynamically.
Solution: update the preference UI status when onUpdated is called.

Bug: 146669261
Test: 1.manually mofidy framework to test.
      2.The getAvailabilityStatus() already tested in
      WifiSubscriptionDetailPreferenceController2Test.
Change-Id: I51b5e67df7998d7d3e9ede9ead7aa49ad574c7a3
2020-03-03 17:26:46 +08:00
Tim Peng
f7395c4ac8 Add string for output switcher transferring error
Bug: 150652687
Test: manual
Change-Id: I907a978bd46129c330b29e7b90ae9d0afe82ae6f
2020-03-03 11:09:42 +08:00
Zhen Zhang
084875a104 Make tether option preferences listen to own SharedPreferences change
The SharedPreferences value could be changed by other classes. This can
help make UI consistent with shared preferences value.

Bug: 148968321
Test: UsbTetherPreferenceControllerTest;
BluetoothTetherPreferenceControllerTest;
WifiTetherDisablePreferenceControllerTest;
CodeInspectionTest.

Change-Id: I11bdad2729e88c07ea1f046d9e95a6a63b398931
2020-03-02 10:56:27 -08:00
Automerger Merge Worker
6757a04c18 Merge "Rename calls to isGlobalModeEnabled" into rvc-dev am: 4d59bce21b am: f8139ef988
Change-Id: Ifed88b1a48216086db69e47922ec43d565077324
2020-03-02 18:44:44 +00:00