Automerger Merge Worker
ec9c799dcc
Merge "[Wi-Fi] Apply WifiEntry onUpdate to support refresh WiFi detail page for OpenRoaming feature." into rvc-dev am: e64fb77bc8 am: 55fa845f1e
...
Change-Id: If0e7aad1904e70cf550bcb8143d22962086ed65c
2020-03-04 02:59:21 +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
Automerger Merge Worker
ad3edcf79c
Merge changes I3b1d1c4e,I11bdad27 into rvc-dev am: 5dbf99de82 am: 7d7ddddcda
...
Change-Id: I07b6bd9ff2ab5ee82c116c83a2d4f1ea8fe69f27
2020-03-04 02:32:59 +00:00
Automerger Merge Worker
99cb10c954
Merge changes I3b1d1c4e,I11bdad27 into rvc-dev am: 5dbf99de82 am: b3ff936644
...
Change-Id: I5638d4c12907aea63a9f61b0c0dc3cea4d8115a0
2020-03-04 02:32:42 +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
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
0b924d6cad
Merge "Add string for output switcher transferring error" into rvc-dev am: 8c07f06cd5 am: 61c7581322
...
Change-Id: I58d050e865f53aef709be9b27d3865e3307b8729
2020-03-04 01:26:45 +00:00
Automerger Merge Worker
0d7209e303
Merge "Add string for output switcher transferring error" into rvc-dev am: 8c07f06cd5 am: 9aebc16b6a
...
Change-Id: I34ef1774e79d6b280d34fb2298f316c15ea1480e
2020-03-04 01:26:24 +00:00
Automerger Merge Worker
61c7581322
Merge "Add string for output switcher transferring error" into rvc-dev am: 8c07f06cd5
...
Change-Id: I65ba4dcd05836f14b94da7811fc37ba92521efaf
2020-03-04 01:13:19 +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
Automerger Merge Worker
e358b7ab8c
Merge "ShortcutPreference Toggle design." into rvc-dev am: 6acde7c21f am: 43d72405b5
...
Change-Id: Icff2d3010afe04f74eb1639360324400a4add3ed
2020-03-03 12:25:31 +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
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
fcaf45ba79
[automerger skipped] Merge changes I193805ef,I2e1b9ac5 am: 1ea70d24d5 am: 42b698cdc5 -s ours am: 68eb90cda8 -s ours
...
am skip reason: Change-Id I904da749df7074918d205ebd004a173ed109c561 with SHA-1 569f760c12 is in history
Change-Id: Ib60019f859877fb46eed2c77d114a08fede3dad9
2020-03-03 11:05:42 +00:00
Automerger Merge Worker
a79cb95017
[automerger skipped] Remove reference to PhoneConstant. am: 28c11a8c01 am: c405329ce7 -s ours am: c1ee210aef -s ours
...
am skip reason: Change-Id I2e1b9ac5b9ab051876f1bb26866d055f822bac90 with SHA-1 72e5cecd2a is in history
Change-Id: I0d58b4bb5baef39bc9b05dca64e432483d132d6f
2020-03-03 11:05:40 +00:00
Automerger Merge Worker
68eb90cda8
[automerger skipped] Merge changes I193805ef,I2e1b9ac5 am: 1ea70d24d5 am: 42b698cdc5 -s ours
...
am skip reason: Change-Id I904da749df7074918d205ebd004a173ed109c561 with SHA-1 569f760c12 is in history
Change-Id: I23fc0161148e4c7f30b017a41fd04749f7d239d3
2020-03-03 10:49:36 +00:00
Automerger Merge Worker
c1ee210aef
[automerger skipped] Remove reference to PhoneConstant. am: 28c11a8c01 am: c405329ce7 -s ours
...
am skip reason: Change-Id I2e1b9ac5b9ab051876f1bb26866d055f822bac90 with SHA-1 72e5cecd2a is in history
Change-Id: I1e9547363f67b8bb1b79cb25961054b7efc5c4fa
2020-03-03 10:49:35 +00:00
Automerger Merge Worker
42b698cdc5
Merge changes I193805ef,I2e1b9ac5 am: 1ea70d24d5
...
Change-Id: I237ff4ef41d3dfb3fd74f74e0c252898d19962e5
2020-03-03 10:27:48 +00:00
Automerger Merge Worker
c405329ce7
Remove reference to PhoneConstant. am: 28c11a8c01
...
Change-Id: I635f49570f67f88cca0f937bb3aac3361f9a926a
2020-03-03 10:27:47 +00:00
Treehugger Robot
1ea70d24d5
Merge changes I193805ef,I2e1b9ac5
...
* changes:
[Settings] Replace isImsRegistered
Remove reference to PhoneConstant.
2020-03-03 10:15:27 +00:00
Automerger Merge Worker
a43cd13dad
[automerger skipped] Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: cf470fab9d am: 4c435922e5 -s ours
...
am skip reason: Change-Id Iec0f57b988e1d4fd08bca040abd1bb30b6991507 with SHA-1 051c3ecaa3 is in history
Change-Id: Ibb84fd8864ff09ccc924039f4c6a3d8c7028d4f8
2020-03-03 10:04:14 +00: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
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
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
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
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