Goven Liu
dbc337b4c5
Merge "[Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test" into rvc-dev am: 783b0257ad am: 15ff53ecfb am: 4b67490445
...
Change-Id: I035849dc12342937d00c55aa727116bc626322ab
2020-04-01 04:00:58 +00:00
Goven Liu
4b67490445
Merge "[Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test" into rvc-dev am: 783b0257ad am: 15ff53ecfb
...
Change-Id: I4409afa7c65bbf7d6d5ac051b8ebd7e258bedf91
2020-04-01 03:49:40 +00:00
Goven Liu
15ff53ecfb
Merge "[Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test" into rvc-dev am: 783b0257ad
...
Change-Id: I681ff5a91c45eca3d6f80dc61aed8907d08842b5
2020-04-01 03:36:05 +00:00
Goven Liu
783b0257ad
Merge "[Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test" into rvc-dev
2020-04-01 03:16:34 +00:00
Sarah Chin
1a963d5f96
[automerger skipped] Merge "Rename calls to isGlobalModeEnabled" am: b6fd42a06a am: c03048cd27 -s ours am: 902793ffa7 -s ours am: 8f14309c6a -s ours
...
am skip reason: Change-Id If302350cfea7b2cd2cd25906dd1dd6a6d192a5d6 with SHA-1 77dea1beb0
2020-04-01 00:02:14 +00:00
Sarah Chin
8f14309c6a
[automerger skipped] Merge "Rename calls to isGlobalModeEnabled" am: b6fd42a06a am: c03048cd27 -s ours am: 902793ffa7 -s ours
...
am skip reason: Change-Id If302350cfea7b2cd2cd25906dd1dd6a6d192a5d6 with SHA-1 77dea1beb0
2020-03-31 23:40:46 +00:00
Sarah Chin
902793ffa7
[automerger skipped] Merge "Rename calls to isGlobalModeEnabled" am: b6fd42a06a am: c03048cd27 -s ours
...
am skip reason: Change-Id If302350cfea7b2cd2cd25906dd1dd6a6d192a5d6 with SHA-1 77dea1beb0
2020-03-31 23:26:57 +00:00
Sarah Chin
c03048cd27
Merge "Rename calls to isGlobalModeEnabled" am: b6fd42a06a
...
Change-Id: Ibd354d26acab6e5f8195d4f93b302ec9c362d9be
2020-03-31 23:15:07 +00:00
Sarah Chin
b6fd42a06a
Merge "Rename calls to isGlobalModeEnabled"
2020-03-31 23:02:20 +00:00
Brad Ebinger
7f9b393ead
[automerger skipped] Merge changes I06df2928,I70821964 am: 24ddbf5e8c am: 8bc35321d8 -s ours am: 2139c0b50a -s ours am: 41df03ff47 -s ours
...
am skip reason: Change-Id I06df2928116b33fec39aade733401d60e6cde1c1 with SHA-1 60204898ec
2020-03-31 20:53:19 +00:00
Brad Ebinger
2d3a0393d4
[automerger skipped] Add new DialogFragment and Controller for capability discovery opt-in am: f469cac10a am: da1335a9f4 -s ours am: 5ef4a92dd0 -s ours am: 3d3a32d3dd -s ours
...
am skip reason: Change-Id I70821964bc618c3c389c9039cd7f5028e34c7ebb with SHA-1 66c709844a
2020-03-31 20:53:17 +00:00
TreeHugger Robot
a168a5dee5
Merge "Add dnd messages + calls senders image resource" into rvc-dev am: 947cb48303 am: 0d78f267d8 am: 0b06034144
...
Change-Id: I332f65194900d70b1d4c37f0fdc925051c0dd7d3
2020-03-31 20:52:48 +00:00
Automerger Merge Worker
34f9c3d17d
Merge "Merge "Add dnd messages + calls senders image resource" into rvc-dev am: 947cb48303 am: e9c4d17eb2 am: 6c2f6a3e0a am: b7690b92fb" into rvc-qpr-dev-plus-aosp
2020-03-31 20:51:58 +00:00
TreeHugger Robot
3ed02c73ae
Merge "Add dnd messages + calls senders image resource" into rvc-dev am: 947cb48303 am: e9c4d17eb2 am: 6c2f6a3e0a am: b7690b92fb
...
Change-Id: I8f99bfa084fde52a7403d642e262d0f3998d5dd6
2020-03-31 20:51:54 +00:00
TreeHugger Robot
d444d8b9c3
Merge "Disable conversation strip setting." into rvc-dev am: 04d64f470e am: c823a3169b am: d4aa412835
...
Change-Id: I4ebdb50ef493185676773f69a308e9fa03a2557f
2020-03-31 20:51:46 +00:00
TreeHugger Robot
11e999388f
Merge "Disable conversation strip setting." into rvc-dev am: 04d64f470e am: 6e9938cf48 am: 52fec7a9bd am: 85aca25d5d
...
Change-Id: Ia9c2ac172b7e7caa279a6cccde214909084cb946
2020-03-31 20:51:14 +00:00
TreeHugger Robot
43d299ac8a
Merge "Add dnd messages + calls senders image resource" into rvc-dev am: 947cb48303 am: e9c4d17eb2 am: 81df373d42
...
Change-Id: Ie01db13ac5e553776242f04fc96315465a8a06d8
2020-03-31 20:45:38 +00:00
TreeHugger Robot
85f940b564
Merge "Disable conversation strip setting." into rvc-dev am: 04d64f470e am: 6e9938cf48 am: 0035707d32
...
Change-Id: I0690ace142c845067073ddcbfee0c141f99010dc
2020-03-31 20:42:50 +00:00
TreeHugger Robot
b7690b92fb
Merge "Add dnd messages + calls senders image resource" into rvc-dev am: 947cb48303 am: e9c4d17eb2 am: 6c2f6a3e0a
...
Change-Id: Iad3e19db543800dcab83404022b7d3983347a44d
2020-03-31 20:34:10 +00:00
TreeHugger Robot
85aca25d5d
Merge "Disable conversation strip setting." into rvc-dev am: 04d64f470e am: 6e9938cf48 am: 52fec7a9bd
...
Change-Id: Iae0665df16c34a2fb71c02033d4b2462cf66deac
2020-03-31 20:33:00 +00:00
Brad Ebinger
41df03ff47
[automerger skipped] Merge changes I06df2928,I70821964 am: 24ddbf5e8c am: 8bc35321d8 -s ours am: 2139c0b50a -s ours
...
am skip reason: Change-Id I06df2928116b33fec39aade733401d60e6cde1c1 with SHA-1 60204898ec
2020-03-31 20:28:50 +00:00
Brad Ebinger
3d3a32d3dd
[automerger skipped] Add new DialogFragment and Controller for capability discovery opt-in am: f469cac10a am: da1335a9f4 -s ours am: 5ef4a92dd0 -s ours
...
am skip reason: Change-Id I70821964bc618c3c389c9039cd7f5028e34c7ebb with SHA-1 66c709844a
2020-03-31 20:28:49 +00:00
TreeHugger Robot
0b06034144
Merge "Add dnd messages + calls senders image resource" into rvc-dev am: 947cb48303 am: 0d78f267d8
...
Change-Id: I1be31e7940bb9ff43dcca3753a8cc4390371c797
2020-03-31 20:28:02 +00:00
TreeHugger Robot
6c2f6a3e0a
Merge "Add dnd messages + calls senders image resource" into rvc-dev am: 947cb48303 am: e9c4d17eb2
...
Change-Id: Iae17458890d0195b2396f86c4625dae1bd2cfd48
2020-03-31 20:24:25 +00:00
TreeHugger Robot
d4aa412835
Merge "Disable conversation strip setting." into rvc-dev am: 04d64f470e am: c823a3169b
...
Change-Id: I830b29d7328a9d0e0a71e5a208d7c629596b2e60
2020-03-31 20:23:04 +00:00
TreeHugger Robot
81df373d42
Merge "Add dnd messages + calls senders image resource" into rvc-dev am: 947cb48303 am: e9c4d17eb2
...
Change-Id: I12caf300aeefc9a15a97fdbe79598f2bdc538f1c
2020-03-31 20:22:03 +00:00
TreeHugger Robot
3db00ece7a
Merge "Use DEFAULT_LIST contact intent" into rvc-dev am: 07a3b1c6ed am: 249a806fed am: 31e2de7c48
...
Change-Id: I3feae4a366e138821dbf8af58c15f16c5b30f4cf
2020-03-31 20:21:24 +00:00
TreeHugger Robot
0035707d32
Merge "Disable conversation strip setting." into rvc-dev am: 04d64f470e am: 6e9938cf48
...
Change-Id: I9995b090e07d81a3e46be1e9d80e87ab3b098dba
2020-03-31 20:20:53 +00:00
TreeHugger Robot
52fec7a9bd
Merge "Disable conversation strip setting." into rvc-dev am: 04d64f470e am: 6e9938cf48
...
Change-Id: I25b23e9af82055cbba5633ffbd889a3a993390c1
2020-03-31 20:20:45 +00:00
TreeHugger Robot
0e41294b94
Merge "Remove policy transparency for cross-profile calendar setting" into rvc-dev am: d0d3873aa7 am: 8ca191b565 am: 157b568e40
...
Change-Id: Ia8ed3b88e3adf8d94fe3cc16646058d171c18cdd
2020-03-31 20:20:45 +00:00
Brad Ebinger
2139c0b50a
[automerger skipped] Merge changes I06df2928,I70821964 am: 24ddbf5e8c am: 8bc35321d8 -s ours
...
am skip reason: Change-Id I06df2928116b33fec39aade733401d60e6cde1c1 with SHA-1 60204898ec
2020-03-31 20:20:40 +00:00
Brad Ebinger
5ef4a92dd0
[automerger skipped] Add new DialogFragment and Controller for capability discovery opt-in am: f469cac10a am: da1335a9f4 -s ours
...
am skip reason: Change-Id I70821964bc618c3c389c9039cd7f5028e34c7ebb with SHA-1 66c709844a
2020-03-31 20:20:38 +00:00
Bonian Chen
347c9d3b8c
Merge "[Settings] Apply WifiCallingQueryImsState" into rvc-dev am: 54002ca154 am: ddb2495761 am: f8a79db702
...
Change-Id: I8e44055a1a7d6fadbadd7dd127cc10dd367e1284
2020-03-31 20:19:09 +00:00
Bonian Chen
7cd1d72342
Merge "[Settings] Remove internal ImsManager access within MobileNetworkUtils" into rvc-dev am: 311941c7d3 am: 17cd51e9eb am: 8fb70b2510
...
Change-Id: I65ab1981018786aec6994a6eeb8b177cc9433276
2020-03-31 20:19:06 +00:00
TreeHugger Robot
5571ec7ba4
Merge changes Ia96af86c,Ifbe2ac30 into rvc-dev am: 4b45334288 am: 0d76063cc5 am: 8e1929cdc4
...
Change-Id: I874daa38e0f42f998e72c158621f50faf227702b
2020-03-31 20:18:19 +00:00
Kholoud Mohamed
bb22fcf783
Merge "Show all apps that requested cross profile permission" into rvc-dev am: 7fb6f35c3a am: c2b8fd2e85 am: f9f06a2f04
...
Change-Id: I87375662f0a8ba93451e074507289a1fa08d1f58
2020-03-31 20:17:32 +00:00
Robert Luo
35d15a0eb3
Merge "Refine NFC payment wording for "Set default" and "Update" scenarios." into rvc-dev am: c3535eab06 am: f62beedb4f am: aff3082301
...
Change-Id: I72564d61c9ae29d5e683bbf12d6248bad3934d11
2020-03-31 20:17:26 +00:00
Bonian Chen
deef71c6eb
Merge "[Settings] Code Refactor" into rvc-dev am: 268bdc12c6 am: 9dda57cd21 am: a27ebac065
...
Change-Id: Ie648606b8caaf7608f9f67ce1e0853a9f5fdb24b
2020-03-31 20:16:44 +00:00
TreeHugger Robot
bf8810f88d
Merge "Get MediaDevice from devices list" into rvc-dev am: cd329951ba am: 820d35b59a am: d45eb1fc8b
...
Change-Id: I3d2ddd273f171167560ec3b11b19f0c5bc54ddcb
2020-03-31 20:16:24 +00:00
TreeHugger Robot
0d78f267d8
Merge "Add dnd messages + calls senders image resource" into rvc-dev am: 947cb48303
...
Change-Id: Ic5a9b57f6a6809decaab8153c11842860b8d44da
2020-03-31 20:11:05 +00:00
TreeHugger Robot
e9c4d17eb2
Merge "Add dnd messages + calls senders image resource" into rvc-dev am: 947cb48303
...
Change-Id: I1f8a53b6543452481e62c309a1140af3ef8e1899
2020-03-31 20:10:56 +00:00
TreeHugger Robot
c823a3169b
Merge "Disable conversation strip setting." into rvc-dev am: 04d64f470e
...
Change-Id: I32217aa77a2291d6882500dc0484e52528a051d7
2020-03-31 20:10:16 +00:00
TreeHugger Robot
6e9938cf48
Merge "Disable conversation strip setting." into rvc-dev am: 04d64f470e
...
Change-Id: I5e6deeabc8dacb165ee20809a07af2e5b6db78d9
2020-03-31 20:10:11 +00:00
Brad Ebinger
8bc35321d8
Merge changes I06df2928,I70821964 am: 24ddbf5e8c
...
Change-Id: I3aeb0e140fcb3a6c28e1880a6784e7800c368f47
2020-03-31 20:10:07 +00:00
Brad Ebinger
da1335a9f4
Add new DialogFragment and Controller for capability discovery opt-in am: f469cac10a
...
Change-Id: If7f5ed1343a5b13810455bcf7168b8b095db149c
2020-03-31 20:10:05 +00:00
TreeHugger Robot
947cb48303
Merge "Add dnd messages + calls senders image resource" into rvc-dev
2020-03-31 19:40:48 +00:00
Brad Ebinger
24ddbf5e8c
Merge changes I06df2928,I70821964
...
* changes:
Fixes ContactDiscoveryDialogFragmentTest
Add new DialogFragment and Controller for capability discovery opt-in
2020-03-31 19:39:59 +00:00
TreeHugger Robot
04d64f470e
Merge "Disable conversation strip setting." into rvc-dev
2020-03-31 19:21:51 +00:00
TreeHugger Robot
31e2de7c48
Merge "Use DEFAULT_LIST contact intent" into rvc-dev am: 07a3b1c6ed am: 249a806fed
...
Change-Id: Ie1685d04d11e986502b93cc9e61be43df1318c15
2020-03-31 19:14:38 +00:00
TreeHugger Robot
157b568e40
Merge "Remove policy transparency for cross-profile calendar setting" into rvc-dev am: d0d3873aa7 am: 8ca191b565
...
Change-Id: Id6623fe974bf6b13fef9e83711b7c70901f3b4cf
2020-03-31 19:13:45 +00:00
