Commit Graph

30801 Commits

Author SHA1 Message Date
Automerger Merge Worker
221357cef9 Merge "Refresh summary when update state of preference" into rvc-dev am: bde2d44bb1 am: 8d7579e6b1
Change-Id: I2b94c6c407738096d1d3657c9012abbe5135d833
2020-03-09 04:28:32 +00:00
Automerger Merge Worker
008e13ad7e Merge "Add setBackgroundColor() in VideoPreference" into rvc-dev am: 7d6011be10 am: 0e05847f2b am: c2395edf5e am: 49d43c3cd0
Change-Id: I52b4575baa1ccf726af64e76575b05f434ab9ef0
2020-03-09 04:28:26 +00:00
Automerger Merge Worker
d4970a9df1 Merge "Refresh summary when update state of preference" into rvc-dev am: bde2d44bb1
Change-Id: I035e835ec5565100464fe1b14108b49cedca7546
2020-03-09 04:13:27 +00:00
TreeHugger Robot
bde2d44bb1 Merge "Refresh summary when update state of preference" into rvc-dev 2020-03-09 04:01:11 +00:00
Automerger Merge Worker
0e05847f2b Merge "Add setBackgroundColor() in VideoPreference" into rvc-dev am: 7d6011be10
Change-Id: Ia4f3155fd2820da536e1f9822ca181ab625d36d7
2020-03-09 03:45:29 +00:00
TreeHugger Robot
7d6011be10 Merge "Add setBackgroundColor() in VideoPreference" into rvc-dev 2020-03-09 03:29:30 +00:00
Arc Wang
ced9c346a5 [Wi-Fi] Remove redundant code
Should not setSummary in ConnectedWifiEntryPreference because
WifiEntryPreference updates summary by WifiEntry#getSummary

Bug: 150911380
Test: manual
      See captive portal Wi-Fi summary 'Sign in to network'
      before logging in.
Change-Id: Ibc47623d66b9d2844c0ca827081f205f0bab89e7
2020-03-09 10:47:58 +08:00
Automerger Merge Worker
c4e1408a30 Merge "[Wi-Fi] Control Wi-Fi Hotspot Settings using onClick instead of onSwitchToggled" into rvc-dev am: 29063e3779 am: ff11b08361 am: 241f426e36 am: dcbe174ab5
Change-Id: I3a449473066ae36f13cae1f36f9a2ace98836f83
2020-03-07 23:18:44 +00:00
Automerger Merge Worker
95e7500990 Merge "Update enrollment with API update" into rvc-dev am: be753c3543 am: b7f10b9012 am: 7c04e2f1ae am: b1f6e93a23
Change-Id: I3afd81544b454285ce7fb5e1e18a84b605151986
2020-03-07 23:10:16 +00:00
Automerger Merge Worker
ff11b08361 Merge "[Wi-Fi] Control Wi-Fi Hotspot Settings using onClick instead of onSwitchToggled" into rvc-dev am: 29063e3779
Change-Id: Idfdbf2f0c4684d5fa7934937a39be401a139362a
2020-03-07 17:37:49 +00:00
TreeHugger Robot
29063e3779 Merge "[Wi-Fi] Control Wi-Fi Hotspot Settings using onClick instead of onSwitchToggled" into rvc-dev 2020-03-07 17:16:05 +00:00
Automerger Merge Worker
b7f10b9012 Merge "Update enrollment with API update" into rvc-dev am: be753c3543
Change-Id: If7503971a68c00057e6256ae32f032edc8b61a2d
2020-03-06 22:45:48 +00:00
Kevin Chyn
be753c3543 Merge "Update enrollment with API update" into rvc-dev 2020-03-06 22:43:57 +00:00
Automerger Merge Worker
054b853b2d Merge "[Wi-Fi] Implement ConnectedWifiEntryPreference to show gear icon" into rvc-dev am: 858cf42516 am: e47d1cae4f am: 3806ccd234 am: 3ffbb869c5
Change-Id: I3e050f140686bfab641ae41f2a85c3f557b5060e
2020-03-06 22:32:37 +00:00
Automerger Merge Worker
e47d1cae4f Merge "[Wi-Fi] Implement ConnectedWifiEntryPreference to show gear icon" into rvc-dev am: 858cf42516
Change-Id: If8394b1d01bd07daeb6d53988a0844467b5fb336
2020-03-06 21:46:58 +00:00
Quang Luong
858cf42516 Merge "[Wi-Fi] Implement ConnectedWifiEntryPreference to show gear icon" into rvc-dev 2020-03-06 21:36:30 +00:00
Automerger Merge Worker
d559621435 Merge "Log errors on history load" into rvc-dev am: d27d2b375e am: f77db13ff8 am: caa1efc234 am: c880f69196
Change-Id: I26428d09f5558f061b466f97b8c2ff7c1e6fbde3
2020-03-06 21:23:47 +00:00
Automerger Merge Worker
caa1efc234 Merge "Log errors on history load" into rvc-dev am: d27d2b375e am: f77db13ff8
Change-Id: Ib9cb1bd80156aa0e06888849c0f382d9b795b637
2020-03-06 20:51:50 +00:00
Automerger Merge Worker
045a1c53b0 Merge "Log errors on history load" into rvc-dev am: d27d2b375e
Change-Id: I6d67f30948567491a777c505b18084e383d4fa4b
2020-03-06 20:35:26 +00:00
Julia Reynolds
78b1848509 Log errors on history load
Test: manual
Bug: 150336474
Change-Id: I10e0e5ab9d51d88b67678be0f7040c360dcbcbe4
2020-03-06 10:05:30 -05:00
Arc Wang
f5e9927668 [Wi-Fi] Implement ConnectedWifiEntryPreference to show gear icon
click the gear icon will always switch to Wi-Fi detail screen.

Bug: 150911380
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ConnectedWifiEntryPreferenceTest
Change-Id: I640d180ae5684ffaa9b2adec7b1be401b2bfd89d
2020-03-06 19:27:08 +08:00
Automerger Merge Worker
b4e56a9f35 Merge "Require authorization before turning off eSIM security feature" into rvc-dev am: f3ce231d17
Change-Id: Ie89044a623e320ef2b790a8f89e271988de0531a
2020-03-06 10:24:41 +00:00
Automerger Merge Worker
abbb4ee257 Merge "Update edit shortcut dialog measurements and assets." into rvc-dev am: b6ab224ddb
Change-Id: I71aa23a4d507d3266e096cec04c22a706ba2eb0a
2020-03-06 10:24:09 +00:00
Automerger Merge Worker
545d58d702 Merge "Add getSessionName() API for group name in worker" into rvc-dev am: 2d15cecf54
Change-Id: I8e638569fd4567519f1b2072a3b77aeff74568a9
2020-03-06 10:23:55 +00:00
menghanli
5d7083a103 ShortcutPreference Toggle design (2/n)
- Removes edit shortcut disable condition.
- Shows "off" if user removes all items in edit dialog.
- Restores last time what user chosen options when show edit dialog.

Bug: 148989269
Test: Manually test
Change-Id: I105abda782999d38c92e3de9811e2fd378869e73
2020-03-06 18:02:53 +08:00
Automerger Merge Worker
cda373cfac Merge "Require authorization before turning off eSIM security feature" into rvc-dev am: f3ce231d17 am: 7e89b41219 am: 6713550398 am: 5d67642062
Change-Id: Id1c46c334864a869f26370b7cd1732dce7c1b267
2020-03-06 09:44:34 +00:00
Automerger Merge Worker
6713550398 Merge "Require authorization before turning off eSIM security feature" into rvc-dev am: f3ce231d17 am: 7e89b41219
Change-Id: Id273c8a1bc1bbf51b8fb475eb03e7d19447e1c02
2020-03-06 09:11:22 +00:00
Automerger Merge Worker
512cc0fc8d Merge "Update edit shortcut dialog measurements and assets." into rvc-dev am: b6ab224ddb am: 696d25adf0 am: 5b97ecf287 am: 223199e10c
Change-Id: I0050be30c56fb5218d474f307d44545b452a49a6
2020-03-06 09:11:03 +00:00
Bonian Chen
3fef55d53b Remove reference of Phoneconstants for SUBSCRIPTION_KEY
- use SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX instead of it

Test: make
Test: m RunSettingsRoboTests
Merged-In: Ic635b11c995077ebf1e143d9562b100d7730fe52
Change-Id: I42cbf1074af3b325ebb37281efd505954a2ca25c
2020-03-06 09:07:24 +00:00
Lee Chou
f3ce231d17 Merge "Require authorization before turning off eSIM security feature" into rvc-dev 2020-03-06 08:45:09 +00:00
Automerger Merge Worker
5b97ecf287 Merge "Update edit shortcut dialog measurements and assets." into rvc-dev am: b6ab224ddb am: 696d25adf0
Change-Id: I120d9b2135ed0c6d65461dde644d5a55559c85d4
2020-03-06 08:45:07 +00:00
Automerger Merge Worker
748027f9c9 Merge "Add getSessionName() API for group name in worker" into rvc-dev am: 2d15cecf54 am: 32080a92e8 am: 5cd16c76ab am: cb2c8f3cdc
Change-Id: I5bb873d8793e647b16b0c440820ab0771fcadfbb
2020-03-06 08:40:19 +00:00
Menghan Li
b6ab224ddb Merge "Update edit shortcut dialog measurements and assets." into rvc-dev 2020-03-06 08:01:59 +00:00
Automerger Merge Worker
5cd16c76ab Merge "Add getSessionName() API for group name in worker" into rvc-dev am: 2d15cecf54 am: 32080a92e8
Change-Id: I8693afc41c9f0eac5bf9d08158d0b6b32a06d01f
2020-03-06 07:24:45 +00:00
tim peng
2d15cecf54 Merge "Add getSessionName() API for group name in worker" into rvc-dev 2020-03-06 06:56:30 +00:00
Automerger Merge Worker
58193c352d Merge "[Telephony Setting] Enable the Settings test case" into rvc-dev am: 997a458e76 am: e7fd1cbc4e am: 1cf856987b am: 702e5bb44f am: d5daf57e66
Change-Id: I9598432d18cb9c3520433c9e568e888ee6758a3c
2020-03-06 04:25:59 +00:00
Automerger Merge Worker
d5daf57e66 Merge "[Telephony Setting] Enable the Settings test case" into rvc-dev am: 997a458e76 am: e7fd1cbc4e am: 1cf856987b am: 702e5bb44f
Change-Id: I1c796271534f824bd68617917beafefd2ed1055d
2020-03-06 04:11:11 +00:00
Automerger Merge Worker
ac742b040a Merge "[Telephony Setting] Enable the Settings test case" into rvc-dev am: 997a458e76 am: e7fd1cbc4e
Change-Id: I43264354b76900c510e2a49d1f702b8440cb7e30
2020-03-06 03:39:01 +00:00
SongFerngWang
000ddb3194 PreferredNetworkModePreferenceController's summary no 5G item
Bug: 150839189
Test: Summary show 5G items
Change-Id: I5fa42e48b8c073b4c4933b32417c2cbeada09a40
Merged-In: I5fa42e48b8c073b4c4933b32417c2cbeada09a40
2020-03-06 11:37:58 +08:00
Automerger Merge Worker
081c161005 Merge "[Telephony Setting] Enable the Settings test case" into rvc-dev am: 997a458e76
Change-Id: Ie0b97fe0fa7d8da3ad105a44f1686bac23eba775
2020-03-06 03:20:17 +00:00
Betty Chang
997a458e76 Merge "[Telephony Setting] Enable the Settings test case" into rvc-dev 2020-03-06 03:01:32 +00:00
Kevin Chyn
260a77f39d Update enrollment with API update
Bug: 150499348
Fixes: 150823201

Test: Builds
Test: CtsVerifier
Change-Id: Ic02b43447d1baaaa611e265498c8790d8812a12d
2020-03-05 16:39:39 -08:00
Zhen Zhang
1745955f35 Refresh summary when update state of preference
TogglePreferenceController won't call refresh summary for
SwitchPreference. Need to call it explicitly in updateState to update
the subtext.

Bug: 150885013
Test: Manually test
Change-Id: I0dafd78d867fc0c66906ee9a2daa7692bb15224b
2020-03-05 14:10:37 -08:00
Automerger Merge Worker
90a99332e7 Merge "Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."" into rvc-dev am: 54edae5e54
Change-Id: Id8ea47aadc2d443bd8ac77cca1f7fc4ba4f63eca
2020-03-05 19:33:47 +00:00
TreeHugger Robot
54edae5e54 Merge "Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."" into rvc-dev 2020-03-05 19:15:30 +00:00
Automerger Merge Worker
65930df1e2 Merge "Use contrasted color icons" into rvc-dev am: 64fff70aa5 am: ef5570fd64 am: 6993251d18 am: 4a2b5a89ec
Change-Id: I1e84d81031793a994d6ed019908b2695636fbb34
2020-03-05 17:46:46 +00:00
Automerger Merge Worker
fbc8b3727a PreferredNetworkModePreferenceController's summary no 5G item am: 8598dccce1 am: f82f82a582 am: ffe0b05d59 am: 5487890d1c
Change-Id: I1760d29d33fd41a44a1c93d30301b717cb78acb9
2020-03-05 17:46:18 +00:00
Automerger Merge Worker
ffe0b05d59 PreferredNetworkModePreferenceController's summary no 5G item am: 8598dccce1 am: f82f82a582
Change-Id: I2874831cdf21c3b0d51625bbf388b747af694a26
2020-03-05 17:16:38 +00:00
Automerger Merge Worker
ef5570fd64 Merge "Use contrasted color icons" into rvc-dev am: 64fff70aa5
Change-Id: I99c8ee2ce6a6cb2a33ba9566bc2429183e6ed44d
2020-03-05 17:05:04 +00:00
Julia Reynolds
64fff70aa5 Merge "Use contrasted color icons" into rvc-dev 2020-03-05 17:02:15 +00:00