Commit Graph

59815 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
1104b5e6b9 Merge "Fix for User edit info dialog during rotation" am: c6603dfda8 am: 7cda6b423a am: 454dbfd402
Change-Id: Ib10b10fe8b1199c07bb780fec12be9fa74566e60
2020-03-02 10:33:48 +00:00
Automerger Merge Worker
26953558d9 Merge "Fix the button display problem in Dark theme page" into rvc-dev am: 985b1e8ffb am: 5962711f8f
Change-Id: I622b1f56afd574bf3d280299da9cd3c253798c2a
2020-03-02 10:28:39 +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
86513a62cb Merge "Fix the button display problem in Dark theme page" into rvc-dev am: 985b1e8ffb am: 3248e62e0d
Change-Id: I2ad0df1265c331a9bde63e8db069395f11a42b1e
2020-03-02 10:27:17 +00:00
Automerger Merge Worker
315fb9d172 Merge "Fix MediaSession.Token#equals()" into rvc-dev am: 18e16e416d am: 143575e128
Change-Id: Iee2a8a55feea913e0e76bb9057bbcd89fc35e892
2020-03-02 10:26:24 +00:00
Automerger Merge Worker
ae4e86c4db Merge "Fix MediaSession.Token#equals()" into rvc-dev am: 18e16e416d am: 572b728a87
Change-Id: Iec0bc80c3f2bb4a974a394b5cf4dc2ecfadc918f
2020-03-02 10:21:18 +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
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
572b728a87 Merge "Fix MediaSession.Token#equals()" into rvc-dev am: 18e16e416d
Change-Id: I12e169a2271b1c9f10b258bf720f23eeeaf968d4
2020-03-02 10:12:02 +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
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
Jaewan Kim
18e16e416d Merge "Fix MediaSession.Token#equals()" into rvc-dev 2020-03-02 06:28:20 +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
Automerger Merge Worker
f3226a5b25 Merge "[Settings] Remove unused string for erease eSIM" into rvc-dev am: 1f0c0b18e4 am: 4e9ab8a65b
Change-Id: Id0edd2b8f72503b92a04fe68135b61012120e42e
2020-03-02 05:14:52 +00:00
Automerger Merge Worker
afdfab09f5 Merge "[Settings] Remove unused string for erease eSIM" into rvc-dev am: 1f0c0b18e4 am: 3ea368bc36
Change-Id: I3f032e01f758caf48a711e432343783cf697af05
2020-03-02 05:14:41 +00:00
Automerger Merge Worker
4e9ab8a65b Merge "[Settings] Remove unused string for erease eSIM" into rvc-dev am: 1f0c0b18e4
Change-Id: Id3af44eb9beea5a612e69c25fda4dd26fa22e5c6
2020-03-02 05:04:50 +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
7dc09bd0ed Merge "Merge "Append status to title for the disconnected Bluetooth device" into rvc-dev am: d09ecc3e96 am: 2563b5f61d" into rvc-d1-dev-plus-aosp 2020-03-02 01:49:41 +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
275f21d3e7 Merge "Append status to title for the disconnected Bluetooth device" into rvc-dev am: d09ecc3e96 am: 2563b5f61d
Change-Id: Ic23a9891a8f667e48c41b0f188a25d5afd4a396e
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
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
4f211b3faa Merge "Only show graphics driver option when the apk is available." into rvc-dev am: f302ee2aff am: bd7f968a1c
Change-Id: I42faf67d50e8a6ba35e7f8fa7202b08845b69063
2020-03-01 05:04:00 +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