Commit Graph

59873 Commits

Author SHA1 Message Date
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
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 is in history

Change-Id: I76d49519f5fbc03b808fb9d4d1e0066eac78dabf
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 is in history

Change-Id: I99e0e6160bd49bf07e280f30b35e6e3d5357a457
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 is in history

Change-Id: I05032fb277c7da998c8f5ef7f12aefb06b86cc1c
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 is in history

Change-Id: I5c879a4397f97cbb3a34a22d3134a2e1b2e439c2
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 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
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 is in history

Change-Id: Ib656716e0ee243c633ab9a7b7ffd43d8c4659728
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 is in history

Change-Id: If8f75b81c1cedeeb37cadf736cdbaa20cbc57fea
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 is in history

Change-Id: I45dcf389f982ccf1ae1490ea5e3f38d8d7249aaa
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 is in history

Change-Id: I5002bf7518dcee2ec32066818ecac1bd3d68c7b4
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 is in history

Change-Id: Iec929aaea43c5a24cc4a310de03d34f3fd7a9ae9
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 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
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
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