Automerger Merge Worker
eb31d86af9
Merge "Add string for output switcher transferring error" into rvc-dev am: 8c07f06cd5 am: 9aebc16b6a
...
Change-Id: I131d6f9021fe9840b9617af4dfe5d6265371831e
2020-03-04 01:26:42 +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
ed6a726216
Merge "Merge "ShortcutPreference Toggle design." into rvc-dev am: 6acde7c21f am: 36a30b38b9 am: 3a059026bc" into rvc-qpr-dev-plus-aosp
2020-03-03 12:42:18 +00:00
Automerger Merge Worker
860971a028
Merge "ShortcutPreference Toggle design." into rvc-dev am: 6acde7c21f am: 36a30b38b9 am: 3a059026bc
...
Change-Id: I6b9b3f0705d0f479da006ecca58f12b086c60310
2020-03-03 12:42:14 +00:00
Automerger Merge Worker
2c2c1b9540
Merge "ShortcutPreference Toggle design." into rvc-dev am: 6acde7c21f am: 43d72405b5 am: e358b7ab8c
...
Change-Id: I104dab937a60a4f2b9cf03deeee9bd6a204765af
2020-03-03 12:42:11 +00:00
Automerger Merge Worker
9c00d5db7b
Merge "ShortcutPreference Toggle design." into rvc-dev am: 6acde7c21f am: 36a30b38b9 am: 3cee900a20
...
Change-Id: I70979fafb82a2986ebc582723c6d79c5e0a524b0
2020-03-03 12:42:01 +00:00
Automerger Merge Worker
3a059026bc
Merge "ShortcutPreference Toggle design." into rvc-dev am: 6acde7c21f am: 36a30b38b9
...
Change-Id: Icfd47c2e0d5dfcb04347167fb31c4cbda59a7bf1
2020-03-03 12:25:31 +00: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
6ecf807448
[automerger skipped] Merge changes I193805ef,I2e1b9ac5 am: 1ea70d24d5 am: 42b698cdc5 -s ours am: 68eb90cda8 -s ours am: fcaf45ba79 -s ours
...
am skip reason: Change-Id I904da749df7074918d205ebd004a173ed109c561 with SHA-1 569f760c12
2020-03-03 11:18:47 +00:00
Automerger Merge Worker
fe3216fad9
[automerger skipped] Remove reference to PhoneConstant. am: 28c11a8c01 am: c405329ce7 -s ours am: c1ee210aef -s ours am: a79cb95017 -s ours
...
am skip reason: Change-Id I2e1b9ac5b9ab051876f1bb26866d055f822bac90 with SHA-1 72e5cecd2a
2020-03-03 11:18:45 +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
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
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
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
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
Automerger Merge Worker
fec1d3f158
[automerger skipped] Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: cf470fab9d am: 4c435922e5 -s ours am: a43cd13dad -s ours
...
am skip reason: Change-Id Iec0f57b988e1d4fd08bca040abd1bb30b6991507 with SHA-1 051c3ecaa3
2020-03-03 10:18:30 +00:00
Automerger Merge Worker
8ad6d65c0a
[automerger skipped] Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: cf470fab9d am: b5191ad96a am: 79741be4bc -s ours
...
am skip reason: Change-Id Iec0f57b988e1d4fd08bca040abd1bb30b6991507 with SHA-1 051c3ecaa3
2020-03-03 10:17:47 +00:00
Automerger Merge Worker
3a82fc91d9
Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: cf470fab9d am: b5191ad96a am: 2149d18fb1
...
Change-Id: I939122590d84a1b95a7c7247e289d14bb4a935a1
2020-03-03 10:17:08 +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
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
2149d18fb1
Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: cf470fab9d am: b5191ad96a
...
Change-Id: I110603e8a64b7dea0bf49728f7fb3df460598207
2020-03-03 10:02:56 +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
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
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
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
