Commit Graph

59295 Commits

Author SHA1 Message Date
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
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
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
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
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
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
f8139ef988 Merge "Rename calls to isGlobalModeEnabled" into rvc-dev am: 4d59bce21b
Change-Id: Id1ca1fe5b1949e68006c6c4fe7c0f2c9c4a888fb
2020-03-02 18:41:16 +00:00
Sarah Chin
4d59bce21b Merge "Rename calls to isGlobalModeEnabled" into rvc-dev 2020-03-02 18:11:23 +00:00
Arc Wang
9e46a0bc93 [Wi-Fi] Ignore incorrect user certificates
These incorrect user certificates displayed when users
editing a Wi-Fi network of WPA3-Enterprise in 192bit.

Bug: 149763958
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigControllerTest
Change-Id: Idcbc80aa3e945f83ba6b77ebf9ef443398ef8e3c
Merged-In: Iab35ac975933abc54fda83b99a2109d53d6722d4
2020-03-02 22:28:46 +08:00
Automerger Merge Worker
300909e22c Merge "[WifiSettings2] Remove redundant save() call for new configs" into rvc-dev am: 4a76598ba5
Change-Id: I36d2ba74ca0e28c8bc696ca2a9d09f59f045f3f8
2020-03-02 14:08:33 +00:00
TreeHugger Robot
4a76598ba5 Merge "[WifiSettings2] Remove redundant save() call for new configs" into rvc-dev 2020-03-02 13:56:51 +00:00
Alex Johnston
051c3ecaa3 Add policy transparency dialog to 'Remove work profile'
* In New COPE mode, no explanation was being shown to the
  user as to why the work profile cannot be removed.
* This CL adds a policy transparency dialog when the
  'Remove work profile' preference is selected.
* This was done by modifying AccountRestrictionHelper to
  set the preference to disabled by admin if the device is
  in New COPE mode and the base restriction
  DISALLOW_REMOVE_MANAGED_PROFILE is enforced.

Bug: 149391073
Test: Manual testing
Change-Id: Iec0f57b988e1d4fd08bca040abd1bb30b6991507
Merged-In: Iec0f57b988e1d4fd08bca040abd1bb30b6991507
(cherry picked from commit 56e8278498)
2020-03-02 12:05:22 +00:00
Automerger Merge Worker
5962711f8f Merge "Fix the button display problem in Dark theme page" into rvc-dev am: 985b1e8ffb
Change-Id: I5c7a85ba47eb9f069341946957cedbcf084457f0
2020-03-02 10:13:13 +00:00
Automerger Merge Worker
143575e128 Merge "Fix MediaSession.Token#equals()" into rvc-dev am: 18e16e416d
Change-Id: Ic4fd81e813044d707d1e3067ed6047c03a67b98c
2020-03-02 10:11:55 +00:00
TreeHugger Robot
985b1e8ffb Merge "Fix the button display problem in Dark theme page" into rvc-dev 2020-03-02 07:42:19 +00:00
Jaewan Kim
18e16e416d Merge "Fix MediaSession.Token#equals()" into rvc-dev 2020-03-02 06:28:20 +00:00
Automerger Merge Worker
3ea368bc36 Merge "[Settings] Remove unused string for erease eSIM" into rvc-dev am: 1f0c0b18e4
Change-Id: I5ca697af3382e26d3d5e981e972aba269cdad131
2020-03-02 05:04:44 +00:00
Bonian Chen
1f0c0b18e4 Merge "[Settings] Remove unused string for erease eSIM" into rvc-dev 2020-03-02 04:51:05 +00:00
Sunny Shao
1de4c009ea Fix the button display problem in Dark theme page
- Dark theme is disabled when Battery save is on.
- Let dark theme page not be searchable when Battery save is on.

Fixes: 150443799
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.display.darkmode
Change-Id: I2674499dd64333825765f70ed1f31dcb83e1b895
2020-03-02 11:59:28 +08:00
Automerger Merge Worker
6b0088679f Merge "Append status to title for the disconnected Bluetooth device" into rvc-dev am: d09ecc3e96
Change-Id: I3cccfeaa5e5e5b1e448764a50e503ba02e094f27
2020-03-02 01:38:51 +00:00
tim peng
d09ecc3e96 Merge "Append status to title for the disconnected Bluetooth device" into rvc-dev 2020-03-02 01:25:09 +00:00
Jaewan Kim
9f9ac53fe6 Fix MediaSession.Token#equals()
This also fixes the Activity#setMediaController() which previously
ignored because the MediaSessionService failed to find session set to
the foreground activity.

Bug: 149006225
Test: Run MediaActivityTest in CtsMediaTestCases
Change-Id: I18d3097f7b20275a20b1de789be6884f843668ae
2020-03-02 02:46:44 +09:00
Automerger Merge Worker
2534b7ddf8 Merge "Only show graphics driver option when the apk is available." into rvc-dev am: f302ee2aff
Change-Id: I8ddf41253e9e5b1b2acd3793d1671b18e6074a0f
2020-03-01 04:53:09 +00:00
TreeHugger Robot
f302ee2aff Merge "Only show graphics driver option when the apk is available." into rvc-dev 2020-03-01 04:42:02 +00:00
Automerger Merge Worker
c3ab634078 Merge "Change volume panel title from "Volume" to "Sound"" into rvc-dev am: 3248376473
Change-Id: Ic92989a2d2a096c06d59039b6359e869855edf84
2020-03-01 03:34:09 +00:00
tim peng
3248376473 Merge "Change volume panel title from "Volume" to "Sound"" into rvc-dev 2020-03-01 03:22:29 +00:00
Bonian Chen
1b8174689d [Settings] Remove unused string for erease eSIM
Remove strings added by ag/6804404 which are no longer required by b/132114333.

Bug: 133790033
Test: build pass
Change-Id: I3ce375efd04164cf93cff2c89436e222df14bfeb
2020-03-01 01:19:44 +00:00
Automerger Merge Worker
90551d0a85 Merge "Fix notification history crash & layout" into rvc-dev am: 9229504fe2
Change-Id: Iea24224c2f7137619e7faf123914cb360283da05
2020-02-29 05:38:56 +00:00
TreeHugger Robot
9229504fe2 Merge "Fix notification history crash & layout" into rvc-dev 2020-02-29 05:23:07 +00:00
Julia Reynolds
291ee404c2 Fix notification history crash & layout
- Fix occasional crash on device boot
- No more overlapping text

Test: manual
Fixes: 150326599
Fixes: 149767075
Change-Id: I3032a2913f2ca4ce57af596c180faa819e4c9363
2020-02-28 16:16:44 -05:00