Commit Graph

30483 Commits

Author SHA1 Message Date
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
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
b3ff936644 Merge changes I3b1d1c4e,I11bdad27 into rvc-dev am: 5dbf99de82
Change-Id: I8fc697e7682b9da3243b2050820d1b0ba59efebb
2020-03-04 02:04:23 +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
Rahul Sabnis
3e0f661f11 Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."
Revert submission 10303287-revert-10253996-bt-a2dp-no-null-FQRXACWPIA

Reason for revert: Fixing breakage
Reverted Changes:
I4d9f2f819:Revert "Make sure calls to BluetoothA2dp APIs pass...
I771ca0d57:Revert "Need to now pass in active device instead ...
I76529c7a1:Revert "Pass in active device to all BluetoothA2dp...
I297bda68d:Revert "Require user pass in a non-null BluetoothD...
I525327959:Revert "Pass in active device to all BluetoothA2dp...
I1d8660b11:Revert "Pass in active device to all BluetoothA2dp...

Bug: 147287141
Test: robotests
Merged-In: I5aecfa4b5a8e371b914573ddd080acb98078bfca
Change-Id: I5aecfa4b5a8e371b914573ddd080acb98078bfca
2020-03-03 16:21:49 -08:00
Julia Reynolds
5879a2c8b4 Use contrasted color icons
Test: manual in dark mode
Fixes: 150411005
Change-Id: I850cf89fce79131f57f9e390225be91ad6cf3274
2020-03-03 16:18:19 -05: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
Alex Johnston
f2c7cbc92b Update AccountRestrictionHelper in master
* In New COPE mode, no explanation was being shown to the
  user as to why the work profile cannot be removed.
* This CL updates AccountRestrictionHelper in master to
  be the same as AccountRestrictionHelper in rvc-dev.

Bug: 149391073
Test: Manual testing
Change-Id: I479e0778e8e426b49d5d9e6e2ee3e6bd44b430e4
2020-03-03 14:16:28 +00:00
Automerger Merge Worker
c22840f7ec Merge "ShortcutPreference Toggle design." into rvc-dev am: 6acde7c21f am: 36a30b38b9 am: 3cee900a20 am: 9c00d5db7b
Change-Id: If0a32e40551cb39287b248ff481d8f60bc1e3610
2020-03-03 12:58:18 +00:00
Automerger Merge Worker
3cee900a20 Merge "ShortcutPreference Toggle design." into rvc-dev am: 6acde7c21f am: 36a30b38b9
Change-Id: Ic87db00a6c97157d65b3b4d5b8138e73bbf40a62
2020-03-03 12:25:25 +00:00
Automerger Merge Worker
43d72405b5 Merge "ShortcutPreference Toggle design." into rvc-dev am: 6acde7c21f
Change-Id: Icfa72b48ab61fc16fbfaa63aaa39ffa359523d08
2020-03-03 12:12:32 +00:00
TreeHugger Robot
6acde7c21f Merge "ShortcutPreference Toggle design." into rvc-dev 2020-03-03 12:01:57 +00:00
hughchen
507218b577 Add setBackgroundColor() in VideoPreference
- Add setBackgroundColor() to allow changed background
  color of VideoPreference.
- Add test case.

Bug: 149974597
Test: make -j42 RunSettingsRoboTests
Change-Id: I14f849d54657dc0ccbd599c393de6f430e9352d4
2020-03-03 18:33:18 +08:00
Automerger Merge Worker
79741be4bc Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: cf470fab9d am: b5191ad96a
Change-Id: If3cfa6a75e1db2b7685385f60a7b3a0287a2836b
2020-03-03 10:03:02 +00:00
Automerger Merge Worker
4c435922e5 Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: cf470fab9d
Change-Id: I5145177f1e9c982af790b0f7aa95ceaf84161c39
2020-03-03 09:52:20 +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
Automerger Merge Worker
a68ee602fb Merge "Rename calls to isGlobalModeEnabled" into rvc-dev am: 4d59bce21b am: f8139ef988 am: 6757a04c18 am: 185fa23d45
Change-Id: I0f65598bef92ab99f76b7cadccf10da18b6a7557
2020-03-02 19:19:52 +00: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
185fa23d45 Merge "Rename calls to isGlobalModeEnabled" into rvc-dev am: 4d59bce21b am: f8139ef988 am: 6757a04c18
Change-Id: I0ae6120f94718f90efb5e48ab1ffd77ddc56d327
2020-03-02 18:56:13 +00:00
Rahul Sabnis
c3684ebd22 Merge "Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."" 2020-03-02 18:43:47 +00:00
Automerger Merge Worker
a8a09591c2 Merge "Rename calls to isGlobalModeEnabled" into rvc-dev am: 4d59bce21b
Change-Id: Idd1c67a5e20a373ea23c3b414236171692f6b64e
2020-03-02 18:41:15 +00:00
Sarah Chin
4d59bce21b Merge "Rename calls to isGlobalModeEnabled" into rvc-dev 2020-03-02 18:11:23 +00:00
Automerger Merge Worker
8bb5205146 Merge "[WifiSettings2] Remove redundant save() call for new configs" into rvc-dev am: 4a76598ba5 am: 300909e22c am: 95a522b46f am: cdfc2b1f4d
Change-Id: Ia5826850ac3f665d9888aa2beabedbb63ac203aa
2020-03-02 14:43:54 +00:00
Automerger Merge Worker
95a522b46f Merge "[WifiSettings2] Remove redundant save() call for new configs" into rvc-dev am: 4a76598ba5 am: 300909e22c
Change-Id: Id3ecdebf02151d7c46b6bf5e2e3ded924881bb26
2020-03-02 14:20:58 +00:00
Automerger Merge Worker
8de6fc23f2 Merge "[WifiSettings2] Remove redundant save() call for new configs" into rvc-dev am: 4a76598ba5
Change-Id: Idddc73ccfd806168f29b7bb30459686740cd7b60
2020-03-02 14:08:35 +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
Automerger Merge Worker
e77673594d Merge "Fix NPE in PanelFragment" am: 06cafcd733 am: 98e3ed4e5d am: 6ad23a342d am: 9b798aa738 am: 2b481a5969
Change-Id: Ic082a4f9aa65114eec606edb77c3c7bb8e2be8e8
2020-03-02 12:35:57 +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
6ad23a342d Merge "Fix NPE in PanelFragment" am: 06cafcd733 am: 98e3ed4e5d
Change-Id: I710a54c16476313e83bf8ee9c12c0712a184c65c
2020-03-02 11:52:50 +00:00
Automerger Merge Worker
98e3ed4e5d Merge "Fix NPE in PanelFragment" am: 06cafcd733
Change-Id: Ia08ab086c610de141b4cadd2ae097b596351e46e
2020-03-02 11:37:36 +00:00
Treehugger Robot
06cafcd733 Merge "Fix NPE in PanelFragment" 2020-03-02 11:21:05 +00:00
Automerger Merge Worker
b272edb4a1 Merge "Fix for User edit info dialog during rotation" am: c6603dfda8 am: 7cda6b423a am: 454dbfd402 am: 1104b5e6b9 am: 33ae9e0ed1
Change-Id: If9bae6eb1c9f924a63d41f7310f0377c4681ce41
2020-03-02 10:44:17 +00:00
Automerger Merge Worker
f21c44abe8 Merge "Fix the button display problem in Dark theme page" into rvc-dev am: 985b1e8ffb am: 3248e62e0d am: 86513a62cb am: ef73a232b4
Change-Id: I20070f776f50c91c17bc9db81b75e0e4cc8c7a5e
2020-03-02 10:43:27 +00:00
Automerger Merge Worker
454dbfd402 Merge "Fix for User edit info dialog during rotation" am: c6603dfda8 am: 7cda6b423a
Change-Id: Ia6a3ca26dd3b2fdfce8df0cb21b24927fcb07bcb
2020-03-02 10:27:50 +00:00
Automerger Merge Worker
3248e62e0d Merge "Fix the button display problem in Dark theme page" into rvc-dev am: 985b1e8ffb
Change-Id: I339fc21bfa9ecf76e5f0088127bad900df3bb76f
2020-03-02 10:12:45 +00:00
Automerger Merge Worker
7cda6b423a Merge "Fix for User edit info dialog during rotation" am: c6603dfda8
Change-Id: I4f5a29975aed084e1080387d6eb4500121c23ee0
2020-03-02 10:11:44 +00:00
Treehugger Robot
c6603dfda8 Merge "Fix for User edit info dialog during rotation" 2020-03-02 07:45:36 +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
Lee Chou
ee81a02109 Require authorization before turning off eSIM security feature
eSIM has a feature that requires an auth check before deletion, this
adds a security check before allowing the security feature to be turned
off.

TogglePreferenceController was changed to BasePreferenceController to
separate updating the state from UI press and updating from code.

Bug: 150568010
Test: mp settingsg and manual testing
Change-Id: I9e74e173720dce7b25d2d8a1e9004862cdb5e2e0
2020-03-02 05:23:49 +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
000c7401e9 Merge "Append status to title for the disconnected Bluetooth device" into rvc-dev am: d09ecc3e96 am: 6b0088679f am: 9845b9f08d am: 401c586bc5
Change-Id: I9c77f53016d2c22ecafc324f5164801303b4f2f9
2020-03-02 02:19:34 +00:00
Automerger Merge Worker
9845b9f08d Merge "Append status to title for the disconnected Bluetooth device" into rvc-dev am: d09ecc3e96 am: 6b0088679f
Change-Id: I739b9860174ae08584b0d4c941a9d2976653ec56
2020-03-02 01:49:37 +00:00
Automerger Merge Worker
2563b5f61d Merge "Append status to title for the disconnected Bluetooth device" into rvc-dev am: d09ecc3e96
Change-Id: Ifd4be196c59b940bc4888effce73aaf28e50afb8
2020-03-02 01:39:04 +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
Automerger Merge Worker
10b861e5c9 Merge "Only show graphics driver option when the apk is available." into rvc-dev am: f302ee2aff am: 2534b7ddf8 am: d543081a23 am: db0b266c7b
Change-Id: Ie5e63e32376caad84904ec5442ca90ac09e50b4b
2020-03-01 05:24:06 +00:00
Automerger Merge Worker
d543081a23 Merge "Only show graphics driver option when the apk is available." into rvc-dev am: f302ee2aff am: 2534b7ddf8
Change-Id: I2b335e3ce004f77b9b2670d63c856a016e4e8c2d
2020-03-01 05:03:49 +00:00
Automerger Merge Worker
bd7f968a1c Merge "Only show graphics driver option when the apk is available." into rvc-dev am: f302ee2aff
Change-Id: Iabc6caa61f028cb2a2f5b36a595cc1e6da6c8ec8
2020-03-01 04:53:23 +00:00