tim peng
0c9505da84
Merge "No media status is visible in Output Switcher" into rvc-dev am: 5b0913c2b6 am: 4a82a5abb5 am: 1106c19951 am: 774620f543
...
Change-Id: Iaf2f09df206b561dc4478d8f730e27b9944236e7
2020-03-31 09:27:37 +00:00
Robert Luo
6271d783df
Merge "Refine NFC payment wording for "Set default" and "Update" scenarios." into rvc-dev am: c3535eab06 am: c13ecfad98 am: 9fc4bfdcb5
...
Change-Id: I205f7b781f7c2a2ce955d99e82915c25fc6e5b66
2020-03-31 08:34:19 +00:00
Robert Luo
9fc4bfdcb5
Merge "Refine NFC payment wording for "Set default" and "Update" scenarios." into rvc-dev am: c3535eab06 am: c13ecfad98
...
Change-Id: I82be8b4c9c8a2929aac7570c198a2fed2c0eafc1
2020-03-31 08:19:18 +00:00
Robert Luo
c13ecfad98
Merge "Refine NFC payment wording for "Set default" and "Update" scenarios." into rvc-dev am: c3535eab06
...
Change-Id: Ibf6f65fc9659992bb7da934f2f39572b3f108ac2
2020-03-31 08:01:50 +00:00
Robert Luo
c3535eab06
Merge "Refine NFC payment wording for "Set default" and "Update" scenarios." into rvc-dev
2020-03-31 07:42:24 +00:00
Bonian Chen
3c4dffc470
Merge "[Settings] Code Refactor" into rvc-dev am: 268bdc12c6 am: 949ec8a1f0 am: 9e9597f7d8
...
Change-Id: Ibb3fe8013b6de42c2aa2526b6a2e40e3ec3e1a95
2020-03-31 07:15:48 +00:00
Bonian Chen
9e9597f7d8
Merge "[Settings] Code Refactor" into rvc-dev am: 268bdc12c6 am: 949ec8a1f0
...
Change-Id: I3fbf2b0e9a69d08c5926ce05d2bef76d36e6f84f
2020-03-31 07:00:18 +00:00
Bonian Chen
949ec8a1f0
Merge "[Settings] Code Refactor" into rvc-dev am: 268bdc12c6
...
Change-Id: Ib23864723f76e376338604b65171a058cc0df611
2020-03-31 06:39:12 +00:00
Bonian Chen
268bdc12c6
Merge "[Settings] Code Refactor" into rvc-dev
2020-03-31 06:24:15 +00:00
TreeHugger Robot
bebee5c18e
Merge "Get MediaDevice from devices list" into rvc-dev am: cd329951ba am: 46cc33c9a6 am: 210c260ce6
...
Change-Id: Ib374cc0970383c55e61a76fe941a8fbfa8963dc1
2020-03-31 05:15:32 +00:00
TreeHugger Robot
210c260ce6
Merge "Get MediaDevice from devices list" into rvc-dev am: cd329951ba am: 46cc33c9a6
...
Change-Id: Ied6e18f0806b1f32fb3adcec483adc34eb7a23aa
2020-03-31 05:04:21 +00:00
TreeHugger Robot
46cc33c9a6
Merge "Get MediaDevice from devices list" into rvc-dev am: cd329951ba
...
Change-Id: I066c17625736fd8cdaa96068a2bc5accdb5ae3fc
2020-03-31 04:42:59 +00:00
TreeHugger Robot
cd329951ba
Merge "Get MediaDevice from devices list" into rvc-dev
2020-03-31 04:26:31 +00:00
Bonian Chen
21475ae6c6
[Settings] Code Refactor
...
Code refactor in order to support auto testing
Bug: 140542283
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingSettingsForSubTest
Change-Id: I2427732435b59d7359a102e0dd56317ac6a024b4
2020-03-31 03:46:45 +00:00
TreeHugger Robot
ab9a994fcd
Merge "[Wi-Fi] Fix a unit test fail in WifiMasterSwitchPreferenceControllerTest" into rvc-dev am: 477c4fef48 am: 2093f0dee4 am: 1e2a313c5a
...
Change-Id: Idcfa5ac8d980dbf8a8b01b177d58278e665b08e1
2020-03-31 03:13:45 +00:00
TreeHugger Robot
1e2a313c5a
Merge "[Wi-Fi] Fix a unit test fail in WifiMasterSwitchPreferenceControllerTest" into rvc-dev am: 477c4fef48 am: 2093f0dee4
...
Change-Id: I9d0663c100944dcced8ae20d0d38c6ba3364182d
2020-03-31 03:13:38 +00:00
tim peng
f8c57507e2
Merge "No media status is visible in Output Switcher" into rvc-dev am: 5b0913c2b6 am: 4a82a5abb5 am: 2b47660696
...
Change-Id: I441ae31c111143bfd5dea06e2179e1644d86ca52
2020-03-31 03:13:25 +00:00
tim peng
774620f543
Merge "No media status is visible in Output Switcher" into rvc-dev am: 5b0913c2b6 am: 4a82a5abb5 am: 1106c19951
...
Change-Id: Ie11c1cc084213b3196d97ef0eca0f7fa018288a6
2020-03-31 03:13:08 +00:00
TreeHugger Robot
2093f0dee4
Merge "[Wi-Fi] Fix a unit test fail in WifiMasterSwitchPreferenceControllerTest" into rvc-dev am: 477c4fef48
...
Change-Id: Ia47c8ea68d5b5709e1aa82930ea38ab61f0c7222
2020-03-31 02:51:01 +00:00
tim peng
1106c19951
Merge "No media status is visible in Output Switcher" into rvc-dev am: 5b0913c2b6 am: 4a82a5abb5
...
Change-Id: I13e4e901bd2e6a462e2ad7ba29077aa79255d018
2020-03-31 02:45:01 +00:00
tim peng
2b47660696
Merge "No media status is visible in Output Switcher" into rvc-dev am: 5b0913c2b6 am: 4a82a5abb5
...
Change-Id: I3976f109e633f10b6b91b8f756588be561bcb187
2020-03-31 02:44:50 +00:00
TreeHugger Robot
477c4fef48
Merge "[Wi-Fi] Fix a unit test fail in WifiMasterSwitchPreferenceControllerTest" into rvc-dev
2020-03-31 02:34:51 +00:00
tim peng
4a82a5abb5
Merge "No media status is visible in Output Switcher" into rvc-dev am: 5b0913c2b6
...
Change-Id: Ic6c44c4ce05197d113f4f0718640f0abb868793e
2020-03-31 02:24:16 +00:00
tim peng
5b0913c2b6
Merge "No media status is visible in Output Switcher" into rvc-dev
2020-03-31 02:04:48 +00:00
TreeHugger Robot
24848171d3
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4a08ac176f -s ours am: 7f94e44f55 -s ours am: 50699d4595 -s ours am: a383b959ac -s ours
...
am skip reason: subject contains skip directive
Change-Id: I77f95cfea42dcd2572c7d89cbbd24ae2472fffc5
2020-03-31 01:10:24 +00:00
TreeHugger Robot
fe1309d723
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4a08ac176f -s ours am: 7f94e44f55 -s ours am: d87a2cb1f3 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I8369808c740c4be08c8ea250082fb1fdf23e4365
2020-03-31 00:50:51 +00:00
TreeHugger Robot
a383b959ac
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4a08ac176f -s ours am: 7f94e44f55 -s ours am: 50699d4595 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I7a5fd91ca07762f44965e4a2873b92129a8e534a
2020-03-31 00:50:33 +00:00
TreeHugger Robot
50699d4595
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4a08ac176f -s ours am: 7f94e44f55 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I660c2a7e46b4c055e417e955a9e9b99aadca3052
2020-03-31 00:25:29 +00:00
TreeHugger Robot
d87a2cb1f3
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4a08ac176f -s ours am: 7f94e44f55 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I71ff8fa319bb3b19f8c5828412159fc505262aed
2020-03-31 00:25:16 +00:00
TreeHugger Robot
7f94e44f55
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4a08ac176f -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ie75baff25f3026bfdb41b067769e7ffef4123eec
2020-03-31 00:04:51 +00:00
TreeHugger Robot
8c7a574507
Merge "Set face unlock toggle to unchecked when disabled by admin" into rvc-dev am: a2d56af9bd am: ea63b90c3d am: 0c0dc0f64e am: 931ea77cc3
...
Change-Id: Ifb47c6d171397534931b4dea4ae161be0e704beb
2020-03-30 23:45:27 +00:00
TreeHugger Robot
4a08ac176f
Merge "Import translations. DO NOT MERGE" into rvc-dev
2020-03-30 23:39:52 +00:00
TreeHugger Robot
931ea77cc3
Merge "Set face unlock toggle to unchecked when disabled by admin" into rvc-dev am: a2d56af9bd am: ea63b90c3d am: 0c0dc0f64e
...
Change-Id: I18cfc1ccb3d631a90f4917fcb7ee976eee7cc0c3
2020-03-30 23:09:53 +00:00
TreeHugger Robot
0c0dc0f64e
Merge "Set face unlock toggle to unchecked when disabled by admin" into rvc-dev am: a2d56af9bd am: ea63b90c3d
...
Change-Id: Ibba92edec9c66ed27f37ceeb7eb6e891faa28ac2
2020-03-30 22:51:13 +00:00
TreeHugger Robot
599f02eab1
Merge "Set face unlock toggle to unchecked when disabled by admin" into rvc-dev am: a2d56af9bd am: ea63b90c3d am: 4b997ee9fd
...
Change-Id: Icb82bc3fd94d56b94c275ad2bbb80b78b8bbf1dc
2020-03-30 22:13:07 +00:00
TreeHugger Robot
4b997ee9fd
Merge "Set face unlock toggle to unchecked when disabled by admin" into rvc-dev am: a2d56af9bd am: ea63b90c3d
...
Change-Id: Icbbe2f70adac63bf922dd66edb31760ae3efb851
2020-03-30 21:49:07 +00:00
TreeHugger Robot
ea63b90c3d
Merge "Set face unlock toggle to unchecked when disabled by admin" into rvc-dev am: a2d56af9bd
...
Change-Id: I76ca506736ed0d8400ed3e063695e96acd8eff5e
2020-03-30 21:32:06 +00:00
TreeHugger Robot
0ad036bd31
Merge "Don't filter demoted conversation from app subtext" into rvc-dev am: 6f837d10bf am: f61da397fd am: dfdb9d18f8 am: 43919ede30
...
Change-Id: I230ba561a691f74f5b78f8f96593ad8bb3686b69
2020-03-30 21:27:46 +00:00
Julia Reynolds
7b60612e01
Merge "Remove bubble settings from channel pages" into rvc-dev am: 56d45997b3 am: 52b375b242 am: 5c44faa98d am: e7ed0da17a
...
Change-Id: Ib6f6449d83c8166831aea45a4ad772c08d595fec
2020-03-30 21:25:41 +00:00
Julia Reynolds
6271a3e226
Merge "Conversations can't individually bypass dnd" into rvc-dev am: b3f2c0d528 am: 6d30804cec am: 8fcac244ad am: 7368dcdc8c
...
Change-Id: I592a20b0148374bbfb94cee8fa92b3d55771a32d
2020-03-30 21:23:23 +00:00
TreeHugger Robot
a2d56af9bd
Merge "Set face unlock toggle to unchecked when disabled by admin" into rvc-dev
2020-03-30 21:07:15 +00:00
TreeHugger Robot
1b29a5a2ba
Merge "Don't filter demoted conversation from app subtext" into rvc-dev am: 6f837d10bf am: f61da397fd am: 8b94c0e4a3
...
Change-Id: Id082b3e1822fbffb6be9373f5da0c1ff8b25cfa3
2020-03-30 20:51:24 +00:00
Julia Reynolds
2db927cb79
Merge "Remove bubble settings from channel pages" into rvc-dev am: 56d45997b3 am: 52b375b242 am: fdf32b618c
...
Change-Id: I6856e49fcff85168115621da46ad66c38bc43bb8
2020-03-30 20:51:20 +00:00
TreeHugger Robot
43919ede30
Merge "Don't filter demoted conversation from app subtext" into rvc-dev am: 6f837d10bf am: f61da397fd am: dfdb9d18f8
...
Change-Id: I72d53cad79daaaa17e3e66e576574c20edcf6b57
2020-03-30 20:51:16 +00:00
Julia Reynolds
41874f9f73
Merge "Conversations can't individually bypass dnd" into rvc-dev am: b3f2c0d528 am: 6d30804cec am: 639b6f89ea
...
Change-Id: I77c60b21d864ffb1dfac182a244895c9b59774fa
2020-03-30 20:51:15 +00:00
Julia Reynolds
e7ed0da17a
Merge "Remove bubble settings from channel pages" into rvc-dev am: 56d45997b3 am: 52b375b242 am: 5c44faa98d
...
Change-Id: I178c73fcd8924adaf0528878f558e6a3509419a1
2020-03-30 20:51:11 +00:00
Julia Reynolds
7368dcdc8c
Merge "Conversations can't individually bypass dnd" into rvc-dev am: b3f2c0d528 am: 6d30804cec am: 8fcac244ad
...
Change-Id: I5205d2bbc8dfa6c28a5dc927de9e8c4a32db487d
2020-03-30 20:51:03 +00:00
TreeHugger Robot
dfdb9d18f8
Merge "Don't filter demoted conversation from app subtext" into rvc-dev am: 6f837d10bf am: f61da397fd
...
Change-Id: Ib59231d29edd5747afdf73053c837d796c2e0922
2020-03-30 20:39:11 +00:00
Julia Reynolds
5c44faa98d
Merge "Remove bubble settings from channel pages" into rvc-dev am: 56d45997b3 am: 52b375b242
...
Change-Id: I233bcf4e9ba089718534186437472db15b6c87ba
2020-03-30 20:39:06 +00:00
TreeHugger Robot
8b94c0e4a3
Merge "Don't filter demoted conversation from app subtext" into rvc-dev am: 6f837d10bf am: f61da397fd
...
Change-Id: Ia96c24f21d404c3d043047aa68bc465f779a1114
2020-03-30 20:39:04 +00:00
