Bill Yi
20e0cbec41
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I3d6289030419addc1ccd223de40be5e1bc422df8
2020-03-31 20:55:13 -07:00
Automerger Merge Worker
0295e02499
Merge "Merge "[Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test" into rvc-dev am: 783b0257ad am: 336834b17e" into rvc-d1-dev-plus-aosp
2020-04-01 03:49:43 +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
d0bc27f31e
Merge "[Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test" into rvc-dev am: 783b0257ad am: 336834b17e
...
Change-Id: Id059dbb0a8fc61d225f2efff917cba62dd3822d3
2020-04-01 03:49:40 +00:00
Goven Liu
ea63069e93
Merge "[Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test" into rvc-dev am: 783b0257ad am: 15ff53ecfb
...
Change-Id: I9c8ede2f1ddf8e3f763caf0d68f2a7a586db20ab
2020-04-01 03:49:28 +00:00
Goven Liu
336834b17e
Merge "[Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test" into rvc-dev am: 783b0257ad
...
Change-Id: I4d369739d3d83771f220cacb1846338056367969
2020-04-01 03:36:29 +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
Bill Yi
5f16525806
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: Ie47208d5573659f3bdcc57c8d9933a2245625669
2020-03-31 20:12:42 -07:00
Bonian Chen
39ff4e4495
[Settings] Code Refactor
...
1. Code refactor for android.telephony.ims.ImsManager.
2. Remove unused methods
Bug: 140542283
Test: build pass
Change-Id: I187789a8a553a2c073b3591807dfebfafba6bc14
2020-04-01 10:58:27 +08:00
Weilun Du
08e95d0db0
[Settings] Fix crashes caused by null bluetooth adapter and ethernet
...
manager
Emulator system image doesn't support bluetooth and ethernet manager
yet.
BUG: 150408099
Signed-off-by: Weilun Du <wdu@google.com >
Change-Id: Iab4f7b962f01755fe7d84956f9b54374f1e17408
2020-04-01 02:39:28 +00:00
Malcolm Chen
0b2b2b50d7
Update string of showing conflict between 5G and DSDS.
...
Bug: 152786064
Test: manual
Change-Id: I3ab8dc326caff5b7480c17b9a8004ed91a8b0578
2020-03-31 17:19:16 -07:00
Sarah Chin
f338218348
[automerger skipped] Merge "Rename calls to isGlobalModeEnabled" am: b6fd42a06a am: c03048cd27 -s ours am: 902793ffa7 -s ours am: 8f14309c6a -s ours am: 1a963d5f96 -s ours
...
am skip reason: Change-Id If302350cfea7b2cd2cd25906dd1dd6a6d192a5d6 with SHA-1 77dea1beb0
2020-04-01 00:03:14 +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
05733f933e
[automerger skipped] Merge changes I06df2928,I70821964 am: 24ddbf5e8c am: 8bc35321d8 -s ours am: 2139c0b50a -s ours am: 41df03ff47 -s ours am: 7f9b393ead -s ours
...
am skip reason: Change-Id I06df2928116b33fec39aade733401d60e6cde1c1 with SHA-1 60204898ec
2020-03-31 21:53:56 +00:00
Brad Ebinger
74e520cbf7
[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: 2d3a0393d4 -s ours
...
am skip reason: Change-Id I70821964bc618c3c389c9039cd7f5028e34c7ebb with SHA-1 66c709844a
2020-03-31 21:53:54 +00:00
TreeHugger Robot
6554b8ab18
Merge "Add dnd messages + calls senders image resource" into rvc-dev am: 947cb48303 am: 0d78f267d8 am: 0b06034144 am: a168a5dee5
...
Change-Id: Ic45286b6b04419ede03fb8eb01533d7fb41ddac1
2020-03-31 21:53:32 +00:00
Automerger Merge Worker
3cce9c0a98
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 am: 34f9c3d17d
...
Change-Id: I98ca16e89738bc1567286e6fcb99b239fd9fb7a0
2020-03-31 21:53:12 +00:00
TreeHugger Robot
6afd1ed7ef
Merge "Disable conversation strip setting." into rvc-dev am: 04d64f470e am: c823a3169b am: d4aa412835 am: d444d8b9c3
...
Change-Id: I29e84a1a773ecc25c3ee4625280a5cf75b7888f3
2020-03-31 21:52:47 +00:00
TreeHugger Robot
5588945d08
Merge "Disable conversation strip setting." into rvc-dev am: 04d64f470e am: 6e9938cf48 am: 52fec7a9bd am: 85aca25d5d am: 11e999388f
...
Change-Id: I63c16a176c04205bec8d378ce525f889af03ab4f
2020-03-31 21:52:13 +00:00
TreeHugger Robot
5f7375b546
Merge "Add dnd messages + calls senders image resource" into rvc-dev am: 947cb48303 am: e9c4d17eb2 am: 81df373d42 am: 43d299ac8a
...
Change-Id: I0ef739ea2386854001b719b1e2cf5e8cc43f4241
2020-03-31 21:49:12 +00:00
TreeHugger Robot
53c6bfffae
Merge "Disable conversation strip setting." into rvc-dev am: 04d64f470e am: 6e9938cf48 am: 0035707d32 am: 85f940b564
...
Change-Id: Ia73d18279f72e0eaefe73f0053549a4287a68ffa
2020-03-31 21:48:17 +00:00
TreeHugger Robot
a009444967
Merge "Use DEFAULT_LIST contact intent" into rvc-dev am: 07a3b1c6ed am: 249a806fed am: 31e2de7c48 am: 3db00ece7a
...
Change-Id: I2f00a5772e34b1de151acd03037a721b0599aa94
2020-03-31 21:11:53 +00:00
TreeHugger Robot
86301ad6d8
Merge "Remove policy transparency for cross-profile calendar setting" into rvc-dev am: d0d3873aa7 am: 8ca191b565 am: 157b568e40 am: 0e41294b94
...
Change-Id: I400d717d7c8d224f2824ebf1044f2f7c7b94b5dc
2020-03-31 21:08:54 +00:00
Bonian Chen
65ee2e06b5
Merge "[Settings] Apply WifiCallingQueryImsState" into rvc-dev am: 54002ca154 am: ddb2495761 am: f8a79db702 am: 347c9d3b8c
...
Change-Id: Ibc62c6dc824f9371ec3309d29c2da718591c1ce9
2020-03-31 21:02:56 +00:00
Bonian Chen
c71452a0e4
Merge "[Settings] Remove internal ImsManager access within MobileNetworkUtils" into rvc-dev am: 311941c7d3 am: 17cd51e9eb am: 8fb70b2510 am: 7cd1d72342
...
Change-Id: I469414dde5986df2e4a5f7cf5ba296998c6a0db4
2020-03-31 21:02:54 +00:00
TreeHugger Robot
853d3f31e9
Merge changes Ia96af86c,Ifbe2ac30 into rvc-dev am: 4b45334288 am: 0d76063cc5 am: 8e1929cdc4 am: 5571ec7ba4
...
Change-Id: Ia7575fcff74fad69df54a352443fae5fa036b89a
2020-03-31 20:58:43 +00:00
Kholoud Mohamed
493723aec0
Merge "Show all apps that requested cross profile permission" into rvc-dev am: 7fb6f35c3a am: c2b8fd2e85 am: f9f06a2f04 am: bb22fcf783
...
Change-Id: I93b41228f5b5fb87696e2eb9c4b2aba5f0d1456e
2020-03-31 20:58:10 +00:00
Robert Luo
a573f1c472
Merge "Refine NFC payment wording for "Set default" and "Update" scenarios." into rvc-dev am: c3535eab06 am: f62beedb4f am: aff3082301 am: 35d15a0eb3
...
Change-Id: I07f9fd2eea6d45faf27c17ac937f5b82d3d6f890
2020-03-31 20:57:30 +00:00
Bonian Chen
c806ddb119
Merge "[Settings] Code Refactor" into rvc-dev am: 268bdc12c6 am: 9dda57cd21 am: a27ebac065 am: deef71c6eb
...
Change-Id: I122d1a98fd291bfd87e128d8df70c45f7f332de6
2020-03-31 20:56:29 +00:00
TreeHugger Robot
e1f616bda3
Merge "Get MediaDevice from devices list" into rvc-dev am: cd329951ba am: 820d35b59a am: d45eb1fc8b am: bf8810f88d
...
Change-Id: Ica48444e23aacdd9b9299e7e13137351d14d028f
2020-03-31 20:55:36 +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
