Automerger Merge Worker
7d1749cb78
Merge "Add string for output switcher transferring error" into rvc-dev am: 8c07f06cd5 am: 9aebc16b6a am: 0d7209e303 am: 8ae78e19a9
...
Change-Id: I5da69404be6bda5c9c462b10d8e7e8ad5019edb0
2020-03-04 01:56:34 +00:00
Automerger Merge Worker
8ae78e19a9
Merge "Add string for output switcher transferring error" into rvc-dev am: 8c07f06cd5 am: 9aebc16b6a am: 0d7209e303
...
Change-Id: Ia3d5e817750c398575c1116072a5b179e00702bf
2020-03-04 01:40:08 +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
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
Automerger Merge Worker
5c3675575d
Merge "Merge "ShortcutPreference Toggle design." into rvc-dev am: 6acde7c21f am: 36a30b38b9 am: 3a059026bc" into rvc-qpr-dev-plus-aosp am: ed6a726216
...
Change-Id: I25d63fcb913f9d506e4ef3890662d54ed8eaf13a
2020-03-03 12:58:33 +00:00
Automerger Merge Worker
ccaacf5e00
Merge "ShortcutPreference Toggle design." into rvc-dev am: 6acde7c21f am: 43d72405b5 am: e358b7ab8c am: 2c2c1b9540
...
Change-Id: I7acde12cd35cbbf2cf5a5d7a5e99c7ae17b600f7
2020-03-03 12:58:25 +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
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
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
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
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
8cf53b4554
[automerger skipped] Merge changes I193805ef,I2e1b9ac5 am: 1ea70d24d5 am: 42b698cdc5 -s ours am: 68eb90cda8 -s ours am: fcaf45ba79 -s ours am: 6ecf807448 -s ours
...
am skip reason: Change-Id I904da749df7074918d205ebd004a173ed109c561 with SHA-1 569f760c12
2020-03-03 11:33:46 +00:00
Automerger Merge Worker
2abdeb80c1
[automerger skipped] Remove reference to PhoneConstant. am: 28c11a8c01 am: c405329ce7 -s ours am: c1ee210aef -s ours am: a79cb95017 -s ours am: fe3216fad9 -s ours
...
am skip reason: Change-Id I2e1b9ac5b9ab051876f1bb26866d055f822bac90 with SHA-1 72e5cecd2a
2020-03-03 11:33:44 +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
db7e504c39
[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: fec1d3f158 -s ours
...
am skip reason: Change-Id Iec0f57b988e1d4fd08bca040abd1bb30b6991507 with SHA-1 051c3ecaa3
2020-03-03 10:30:21 +00:00
Automerger Merge Worker
f3495ff798
[automerger skipped] Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: cf470fab9d am: b5191ad96a am: 79741be4bc -s ours am: 8ad6d65c0a -s ours
...
am skip reason: Change-Id Iec0f57b988e1d4fd08bca040abd1bb30b6991507 with SHA-1 051c3ecaa3
2020-03-03 10:29:59 +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
4c3e56c6ce
[automerger skipped] Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: cf470fab9d am: b5191ad96a am: 2149d18fb1 am: 3a82fc91d9 -s ours
...
am skip reason: Change-Id Iec0f57b988e1d4fd08bca040abd1bb30b6991507 with SHA-1 56e8278498
2020-03-03 10:27:35 +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
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
