Commit Graph

59999 Commits

Author SHA1 Message Date
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
Bonian Chen
a0b4ca3684 [Settings] Replace isImsRegistered
Replace isImsReigstered() by callback from ImsMmTelManager.

Bug: 140542283
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=SimStatusDialogControllerTest
Merged-In: I904da749df7074918d205ebd004a173ed109c561
Change-Id: I193805ef947636e50bb21d273be15361378d8f8a
2020-03-03 15:11:27 +08:00
tom hsu
28c11a8c01 Remove reference to PhoneConstant.
Create static constant in SimStatusDialogController.

Test: make
Test: m RunSettingsRoboTests
Change-Id: I2e1b9ac5b9ab051876f1bb26866d055f822bac90
Merged-In: I2e1b9ac5b9ab051876f1bb26866d055f822bac90
2020-03-03 15:08:36 +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
Automerger Merge Worker
143d6660b3 Merge "Rename calls to isGlobalModeEnabled" into rvc-dev am: 4d59bce21b am: f8139ef988 am: 44f714fa57 am: 80179c48fd
Change-Id: Iec3284862f269e873e506cf2f54f50b6d6906c85
2020-03-02 19:26:00 +00:00
Automerger Merge Worker
2ec712b0f8 Merge "Rename calls to isGlobalModeEnabled" into rvc-dev am: 4d59bce21b am: a8a09591c2 am: 0738bcd7bb am: a8fc740a68
Change-Id: I3670ccb3f84ca6a44016161bf269e936a49f5b60
2020-03-02 19:23:53 +00: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
Automerger Merge Worker
80179c48fd Merge "Rename calls to isGlobalModeEnabled" into rvc-dev am: 4d59bce21b am: f8139ef988 am: 44f714fa57
Change-Id: Icdf6f72f18b42c009e44faa7f8309dee9b6853b6
2020-03-02 19:07:14 +00:00
Automerger Merge Worker
a8fc740a68 Merge "Rename calls to isGlobalModeEnabled" into rvc-dev am: 4d59bce21b am: a8a09591c2 am: 0738bcd7bb
Change-Id: I87651e45a1c78d06c181bd1077c4a9f71ffb4737
2020-03-02 19:04:42 +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
Automerger Merge Worker
44f714fa57 Merge "Rename calls to isGlobalModeEnabled" into rvc-dev am: 4d59bce21b am: f8139ef988
Change-Id: I16bff6aaee6ba65327ac66b551998059e792b31e
2020-03-02 18:45:01 +00: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
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
0738bcd7bb Merge "Rename calls to isGlobalModeEnabled" into rvc-dev am: 4d59bce21b am: a8a09591c2
Change-Id: I27b634409bf6bebcbdb9cce850b6bca74790b922
2020-03-02 18:41:57 +00: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
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
6379af29ba Merge "Merge "[WifiSettings2] Remove redundant save() call for new configs" into rvc-dev am: 4a76598ba5 am: 300909e22c am: a98440f340" into rvc-qpr-dev-plus-aosp am: 10a9293134
Change-Id: I5962cd48beba16fb0f4a08839a4e24f19e8d29df
2020-03-02 14:44:11 +00:00
Automerger Merge Worker
568cc9e640 Merge "Merge "[WifiSettings2] Remove redundant save() call for new configs" into rvc-dev am: 4a76598ba5 am: 8de6fc23f2" into rvc-d1-dev-plus-aosp am: 1b5264cf5f am: 4927d9d7f3
Change-Id: Ic1d4a0ef0d96cec9d193dd1d989dbf7819bd894b
2020-03-02 14:44:03 +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
10a9293134 Merge "Merge "[WifiSettings2] Remove redundant save() call for new configs" into rvc-dev am: 4a76598ba5 am: 300909e22c am: a98440f340" into rvc-qpr-dev-plus-aosp 2020-03-02 14:32:53 +00:00
Automerger Merge Worker
31469683f6 Merge "[WifiSettings2] Remove redundant save() call for new configs" into rvc-dev am: 4a76598ba5 am: 300909e22c am: a98440f340
Change-Id: I8f0bf84d3aa12338a4297a4c79e44dfe8aaaf282
2020-03-02 14:32:49 +00:00
Automerger Merge Worker
4927d9d7f3 Merge "Merge "[WifiSettings2] Remove redundant save() call for new configs" into rvc-dev am: 4a76598ba5 am: 8de6fc23f2" into rvc-d1-dev-plus-aosp am: 1b5264cf5f
Change-Id: Iaa521b0d0b0679ab227cfa5685565eb68a298898
2020-03-02 14:32:45 +00:00
Automerger Merge Worker
cdfc2b1f4d Merge "[WifiSettings2] Remove redundant save() call for new configs" into rvc-dev am: 4a76598ba5 am: 300909e22c am: 95a522b46f
Change-Id: I2200fd8516a4f8166d28fc29ca3ccb9565c4132e
2020-03-02 14:32:35 +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
1b5264cf5f Merge "Merge "[WifiSettings2] Remove redundant save() call for new configs" into rvc-dev am: 4a76598ba5 am: 8de6fc23f2" into rvc-d1-dev-plus-aosp 2020-03-02 14:21:12 +00:00
Automerger Merge Worker
a98440f340 Merge "[WifiSettings2] Remove redundant save() call for new configs" into rvc-dev am: 4a76598ba5 am: 300909e22c
Change-Id: I4c3acec257871bf056d42fdb7adccd59472a9688
2020-03-02 14:21:08 +00:00
Automerger Merge Worker
a13d2069e0 Merge "[WifiSettings2] Remove redundant save() call for new configs" into rvc-dev am: 4a76598ba5 am: 8de6fc23f2
Change-Id: I90ff92c278d433650c47e41893073237c3cac263
2020-03-02 14:21:05 +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
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
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
Automerger Merge Worker
2b481a5969 Merge "Fix NPE in PanelFragment" am: 06cafcd733 am: 98e3ed4e5d am: 6ad23a342d am: 9b798aa738
Change-Id: Ib814aa115d5fe159726ef676092b88a681d6c45a
2020-03-02 12:26:47 +00:00
Automerger Merge Worker
9b798aa738 Merge "Fix NPE in PanelFragment" am: 06cafcd733 am: 98e3ed4e5d am: 6ad23a342d
Change-Id: I9b7146a9409ead2395d9abee3aba3416158639a6
2020-03-02 12:07:12 +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
b4909b5f21 Merge "Fix the button display problem in Dark theme page" into rvc-dev am: 985b1e8ffb am: 5962711f8f am: 8023599c8d am: 20f76a8e72
Change-Id: I9762058e95c97b20ba6cb4955998b81e7fc011cb
2020-03-02 10:44:49 +00:00
Automerger Merge Worker
3cf34d6fcc Merge "Fix MediaSession.Token#equals()" into rvc-dev am: 18e16e416d am: 143575e128 am: ea0ff4fe06 am: 29d518f316
Change-Id: I03849fd21d845881c2e8c4529b81835c3a15c0af
2020-03-02 10:44:30 +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
20f76a8e72 Merge "Fix the button display problem in Dark theme page" into rvc-dev am: 985b1e8ffb am: 5962711f8f am: 8023599c8d
Change-Id: I268680230559b0b936839ba6e902c08dbf63d7d4
2020-03-02 10:43:53 +00:00
Automerger Merge Worker
d69164c5a7 Merge "Fix the button display problem in Dark theme page" into rvc-dev am: 985b1e8ffb am: 5962711f8f am: 26953558d9 am: eb6d6edadb
Change-Id: I6415793ddc76c9508c18046d80a2e05963740a10
2020-03-02 10:43:50 +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
82782904d6 Merge "Fix MediaSession.Token#equals()" into rvc-dev am: 18e16e416d am: 143575e128 am: 315fb9d172 am: 8e0e86cfb3
Change-Id: I57afc4a65dc2793eb45b6152aec2011600dec359
2020-03-02 10:43:17 +00:00
Automerger Merge Worker
48cc5cab8f Merge "Fix MediaSession.Token#equals()" into rvc-dev am: 18e16e416d am: 572b728a87 am: ae4e86c4db am: 48f99cf65b
Change-Id: Id0bd07840102b959e280844fc214a90c43cd8cfd
2020-03-02 10:42:18 +00:00