Commit Graph

62902 Commits

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

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

Change-Id: I94265a2af1e69f1257c93fb05222c79037840156
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
Bonian Chen
f8a79db702 Merge "[Settings] Apply WifiCallingQueryImsState" into rvc-dev am: 54002ca154 am: ddb2495761
Change-Id: Ie71e4b59dab47d9a2298647bd8ba446298c177c5
2020-03-31 19:13:04 +00:00
Bonian Chen
8fb70b2510 Merge "[Settings] Remove internal ImsManager access within MobileNetworkUtils" into rvc-dev am: 311941c7d3 am: 17cd51e9eb
Change-Id: Ia0b142b307083bc2b184bfe8fa1965370b39e4be
2020-03-31 19:13:02 +00:00
TreeHugger Robot
8e1929cdc4 Merge changes Ia96af86c,Ifbe2ac30 into rvc-dev am: 4b45334288 am: 0d76063cc5
Change-Id: I61aa64518000747bf384017ceeee45c5df1f93a5
2020-03-31 19:12:15 +00:00
Kholoud Mohamed
f9f06a2f04 Merge "Show all apps that requested cross profile permission" into rvc-dev am: 7fb6f35c3a am: c2b8fd2e85
Change-Id: I7a1b4daf8fe0e3ac40c9fac0bd5d739ba4ba1528
2020-03-31 19:11:54 +00:00
Robert Luo
aff3082301 Merge "Refine NFC payment wording for "Set default" and "Update" scenarios." into rvc-dev am: c3535eab06 am: f62beedb4f
Change-Id: I0192a74a3c2246a0206c70a4b01eb13462d9eeba
2020-03-31 19:11:07 +00:00
Bonian Chen
a27ebac065 Merge "[Settings] Code Refactor" into rvc-dev am: 268bdc12c6 am: 9dda57cd21
Change-Id: Id714807d7fb24d5b42dc2e80ec095c4120fabd3f
2020-03-31 19:09:59 +00:00
TreeHugger Robot
d45eb1fc8b Merge "Get MediaDevice from devices list" into rvc-dev am: cd329951ba am: 820d35b59a
Change-Id: Ie38c2af54bc8f15def8defa9e30a2c4176dae53c
2020-03-31 19:08:56 +00:00
TreeHugger Robot
8d3c31162c Merge "[Wi-Fi] Fix a unit test fail in WifiMasterSwitchPreferenceControllerTest" into rvc-dev am: 477c4fef48 am: 58920061b1 am: 9ecc677cc0
Change-Id: I4427dfd02759d19c7436b5c6179fce9cb0a9b7ec
2020-03-31 19:03:44 +00:00
tim peng
6826502ec2 Merge "No media status is visible in Output Switcher" into rvc-dev am: 5b0913c2b6 am: 5c81b237cd am: 21978e8269
Change-Id: Id9562bf9d8e139a2a84121d670d13b0b0a3d97c4
2020-03-31 19:02:17 +00:00
TreeHugger Robot
59190565d5 Merge "Use DEFAULT_LIST contact intent" into rvc-dev am: 07a3b1c6ed am: e15d04acf1 am: 7bf3fbd41c am: 5d9c3f0052
Change-Id: I7fcd23929e71dcd48ce79db20a77cd62a1966c5e
2020-03-31 18:47:40 +00:00
TreeHugger Robot
1c9cd8dc19 Merge "Remove policy transparency for cross-profile calendar setting" into rvc-dev am: d0d3873aa7 am: c5507e6665 am: 2ed94f615d am: 55c90fc1c5
Change-Id: Ic4e677276a9672e22cf0235e5910161fa9d6d892
2020-03-31 18:47:29 +00:00
TreeHugger Robot
9ecc677cc0 Merge "[Wi-Fi] Fix a unit test fail in WifiMasterSwitchPreferenceControllerTest" into rvc-dev am: 477c4fef48 am: 58920061b1
Change-Id: Ia1a79e26bccb1a62bc31754396878738ba1cb781
2020-03-31 18:45:57 +00:00
tim peng
21978e8269 Merge "No media status is visible in Output Switcher" into rvc-dev am: 5b0913c2b6 am: 5c81b237cd
Change-Id: I03ed2ce730eadd35f90a553bc3504e0e3ac219ae
2020-03-31 18:44:16 +00:00
TreeHugger Robot
7198fb6279 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4a08ac176f -s ours am: 7c4f2d2cc8 -s ours am: 8f7429dda4 -s ours
am skip reason: subject contains skip directive

Change-Id: I7fd50f02c148c392829115abefb50f36a5e9f3e5
2020-03-31 18:37:10 +00:00
TreeHugger Robot
d573871bef Merge "Set face unlock toggle to unchecked when disabled by admin" into rvc-dev am: a2d56af9bd am: ee96c179b4 am: e01e07fab7
Change-Id: I0290c04ffbd08c97bbf11fecc476d5da819c7da7
2020-03-31 18:36:26 +00:00
TreeHugger Robot
c13c970577 Merge "Don't filter demoted conversation from app subtext" into rvc-dev am: 6f837d10bf am: 21cd235d70 am: 1cb8ff7871
Change-Id: I334dd327088ad33ea58371342e633069041d1df5
2020-03-31 18:36:10 +00:00
TreeHugger Robot
8f7429dda4 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4a08ac176f -s ours am: 7c4f2d2cc8 -s ours
am skip reason: subject contains skip directive

Change-Id: I5750cc3ea6772ceb5a384af9c15c096f4e5c24e4
2020-03-31 18:35:53 +00:00
Julia Reynolds
ab35560e45 Merge "Remove bubble settings from channel pages" into rvc-dev am: 56d45997b3 am: 17ee537e91 am: 6192f73159
Change-Id: I69b767b439d5d4f52fa7669454d74ca8ac852407
2020-03-31 18:35:44 +00:00
Julia Reynolds
481b77d60f Merge "Conversations can't individually bypass dnd" into rvc-dev am: b3f2c0d528 am: 1dc6ae3d5f am: 7ce567b66d
Change-Id: I028ec08f8fbc07ba596547588d22417c8694f28e
2020-03-31 18:35:02 +00:00
TreeHugger Robot
e01e07fab7 Merge "Set face unlock toggle to unchecked when disabled by admin" into rvc-dev am: a2d56af9bd am: ee96c179b4
Change-Id: I4eba351b1c24893a835615b9c85b32289234927a
2020-03-31 18:34:51 +00:00
Julia Reynolds
515907b14e Merge "Fix some history a11y issues" into rvc-dev am: 2f77fd08e9 am: 77e6a449b0 am: 6a13fb955a
Change-Id: Ic4757adccd18811e975783231ff70b22ce7cea4e
2020-03-31 18:34:02 +00:00
TreeHugger Robot
1cb8ff7871 Merge "Don't filter demoted conversation from app subtext" into rvc-dev am: 6f837d10bf am: 21cd235d70
Change-Id: I0ef4f6c16446653199ed25c780064a6a510ac73a
2020-03-31 18:33:56 +00:00