Mady Mellor
a27918494f
Add list of selected/excluded convos to bubble settings
...
* Some changes to extend AppConversationListPrefController
* When a user removes something from the selected or
excluded list that resets the channel setting
Bug: 148619540
Test: make -j40 RunSettingsRoboTests ROBOTEST_FILTER="Bubble"
Change-Id: I7a9ed7b70208dbdefca6c3c09d34d55c65f06408
2020-04-28 13:18:56 -07:00
Julia Reynolds
1a2e7ad52f
Fix some icons on conversation screen
...
Test: manual
Fixes: 154930822
Change-Id: Ic480203f494eaccd743a7c77895596174f52539b
2020-04-28 19:07:08 +00:00
Brad Ebinger
e6fae38169
Fix NPE if CarrierConfigManager is not available
...
Fixes: 155147094
Test: Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.network.telephony
Change-Id: Iecf3e385a88d18c7578eb520449f4042324e21f5
2020-04-28 11:27:27 -07:00
Beverly
e3cf68feb5
Update strings to be more translation friendly am: dcc79e9942 am: 0d644b34ed am: e792b84f57 am: 1f3cc80103 am: fdb8693a8a am: 1aadec59ea
...
Change-Id: I905a5f12da15d8c8b4ce01cfb04defa0081d17fa
2020-04-28 18:12:41 +00:00
Beverly
7eadfcf8de
Update strings to be more translation friendly am: dcc79e9942 am: f32362f03a am: e6f80c2626 am: 0dccdc11b6 am: ebd15ce93a
...
Change-Id: I91d83a41c7d0601b4c6e52e9e90f652aa7a92c60
2020-04-28 18:12:24 +00:00
Beverly
d9f5622380
Update strings to be more translation friendly am: dcc79e9942 am: 0d644b34ed am: 2c3e295e2f am: 7b79d4bb08 am: 5ed8cf12e8
...
Change-Id: I0b28770394b45a3e5eaf93249be92968430c3023
2020-04-28 18:12:07 +00:00
Beverly
1aadec59ea
Update strings to be more translation friendly am: dcc79e9942 am: 0d644b34ed am: e792b84f57 am: 1f3cc80103 am: fdb8693a8a
...
Change-Id: I11b6bea32a88530bdcdaa99aac4c7d5da0fed793
2020-04-28 17:58:59 +00:00
Beverly
ebd15ce93a
Update strings to be more translation friendly am: dcc79e9942 am: f32362f03a am: e6f80c2626 am: 0dccdc11b6
...
Change-Id: I7ea70ae3da2070e01830288f2cd72dd2ade78b96
2020-04-28 17:58:37 +00:00
Beverly
5ed8cf12e8
Update strings to be more translation friendly am: dcc79e9942 am: 0d644b34ed am: 2c3e295e2f am: 7b79d4bb08
...
Change-Id: I7e1ef371eaed8840429d468be51adb16c2d0b88a
2020-04-28 17:58:03 +00:00
Beverly
fdb8693a8a
Update strings to be more translation friendly am: dcc79e9942 am: 0d644b34ed am: e792b84f57 am: 1f3cc80103
...
Change-Id: I007195dc0f9b746265a2f150af93c8979533699a
2020-04-28 17:51:28 +00:00
Beverly
0dccdc11b6
Update strings to be more translation friendly am: dcc79e9942 am: f32362f03a am: e6f80c2626
...
Change-Id: Ia88d14a388104804618c905d62faea09e3f8c64e
2020-04-28 17:29:49 +00:00
Beverly
1f3cc80103
Update strings to be more translation friendly am: dcc79e9942 am: 0d644b34ed am: e792b84f57
...
Change-Id: I7138ed95b98c566c6fa026a8bef1a9fe07dc424c
2020-04-28 17:29:44 +00:00
Beverly
7b79d4bb08
Update strings to be more translation friendly am: dcc79e9942 am: 0d644b34ed am: 2c3e295e2f
...
Change-Id: Ide9faeb6a1c9bbb883923b79efdfc84ed18283bc
2020-04-28 17:29:30 +00:00
Beverly
e6f80c2626
Update strings to be more translation friendly am: dcc79e9942 am: f32362f03a
...
Change-Id: Id2f6cb93b5d5c3e00c795c78aaa6a093390b51b4
2020-04-28 17:17:08 +00:00
Beverly
2c3e295e2f
Update strings to be more translation friendly am: dcc79e9942 am: 0d644b34ed
...
Change-Id: I4954569d276c25c4e14bd6031d11d0209abcb384
2020-04-28 17:16:38 +00:00
Beverly
e792b84f57
Update strings to be more translation friendly am: dcc79e9942 am: 0d644b34ed
...
Change-Id: I9ab4817ac8029df1bb25f1238046145613c3a798
2020-04-28 17:16:34 +00:00
Beverly
f32362f03a
Update strings to be more translation friendly am: dcc79e9942
...
Change-Id: Ic9de15791cf1298605683eb42c25ee4a0901b613
2020-04-28 16:50:46 +00:00
Beverly
0d644b34ed
Update strings to be more translation friendly am: dcc79e9942
...
Change-Id: Ic545a4151940b97dc705d1f7bb8f252e108c9d1b
2020-04-28 16:49:37 +00:00
TreeHugger Robot
cf1263713b
Merge "[Wi-Fi] Show Wi-Fi editor for authentication failures" into rvc-dev am: 4eeb99d63e am: 46f68f51e6 am: 24e88c6666 am: 6a320d3856 am: 73d0f7fb6f am: c6217f86e9
...
Change-Id: I04ceaab881ccdcdb95c3fa0a021c24fcf4443d37
2020-04-28 15:46:43 +00:00
TreeHugger Robot
86dff6fbb1
Merge "[Wi-Fi] Show Wi-Fi editor for authentication failures" into rvc-dev am: 4eeb99d63e am: 47b56d7152 am: 305663b436 am: 3628ac675a am: 75979c20f9
...
Change-Id: I8ba0059c75c57f54708934c04916cad5b65d39d3
2020-04-28 15:46:31 +00:00
TreeHugger Robot
00322513b7
Merge "[Wi-Fi] Show Wi-Fi editor for authentication failures" into rvc-dev am: 4eeb99d63e am: 46f68f51e6 am: 6b3c8a4169 am: 6dcc97e72d am: 9a9b0b5e18
...
Change-Id: Ib6d19f9f0bdc7ee957ac82ae86361daa7a54bb57
2020-04-28 15:46:07 +00:00
TreeHugger Robot
c6217f86e9
Merge "[Wi-Fi] Show Wi-Fi editor for authentication failures" into rvc-dev am: 4eeb99d63e am: 46f68f51e6 am: 24e88c6666 am: 6a320d3856 am: 73d0f7fb6f
...
Change-Id: I997f8534b10cf1600b395ec61d2a551c00b30556
2020-04-28 15:30:18 +00:00
TreeHugger Robot
73d0f7fb6f
Merge "[Wi-Fi] Show Wi-Fi editor for authentication failures" into rvc-dev am: 4eeb99d63e am: 46f68f51e6 am: 24e88c6666 am: 6a320d3856
...
Change-Id: Ib502c137a80c4407888a5f70e12d724585ec481c
2020-04-28 15:29:48 +00:00
TreeHugger Robot
75979c20f9
Merge "[Wi-Fi] Show Wi-Fi editor for authentication failures" into rvc-dev am: 4eeb99d63e am: 47b56d7152 am: 305663b436 am: 3628ac675a
...
Change-Id: I96f2fbcfa4755918c091c34b37f9e9d7b88fc250
2020-04-28 15:29:33 +00:00
TreeHugger Robot
9a9b0b5e18
Merge "[Wi-Fi] Show Wi-Fi editor for authentication failures" into rvc-dev am: 4eeb99d63e am: 46f68f51e6 am: 6b3c8a4169 am: 6dcc97e72d
...
Change-Id: I84359aed0aa5915e35081d082cceea5014bc4ade
2020-04-28 15:29:13 +00:00
TreeHugger Robot
6a320d3856
Merge "[Wi-Fi] Show Wi-Fi editor for authentication failures" into rvc-dev am: 4eeb99d63e am: 46f68f51e6 am: 24e88c6666
...
Change-Id: Icccabc819c1ab4ca1b0effa98234b128632b4fbc
2020-04-28 15:08:31 +00:00
TreeHugger Robot
3628ac675a
Merge "[Wi-Fi] Show Wi-Fi editor for authentication failures" into rvc-dev am: 4eeb99d63e am: 47b56d7152 am: 305663b436
...
Change-Id: Idc724fe340a16bafc06e09075abbfa7df62be265
2020-04-28 15:08:20 +00:00
TreeHugger Robot
6dcc97e72d
Merge "[Wi-Fi] Show Wi-Fi editor for authentication failures" into rvc-dev am: 4eeb99d63e am: 46f68f51e6 am: 6b3c8a4169
...
Change-Id: I9cfbd0aae537fb5804c719de44ad91ce555effc8
2020-04-28 15:08:06 +00:00
Paul Chang
6950a8056e
Fix - Bug report handler settings is not shown when it is launched by a work profile app.
...
BUG: 155045928
Test: Bug report handler settings can be shown when it is launched by a work profile app
Change-Id: I1e9b5e81aac4b0bf646d4ac1cf84afd64df1df67
2020-04-28 23:02:57 +08:00
TreeHugger Robot
305663b436
Merge "[Wi-Fi] Show Wi-Fi editor for authentication failures" into rvc-dev am: 4eeb99d63e am: 47b56d7152
...
Change-Id: I2609354dc855493301734a2004c21e989594f974
2020-04-28 14:55:29 +00:00
TreeHugger Robot
24e88c6666
Merge "[Wi-Fi] Show Wi-Fi editor for authentication failures" into rvc-dev am: 4eeb99d63e am: 46f68f51e6
...
Change-Id: I900e7fe4f3b3d0ec4ef7f91a85bb66912bca5f81
2020-04-28 14:55:28 +00:00
TreeHugger Robot
6b3c8a4169
Merge "[Wi-Fi] Show Wi-Fi editor for authentication failures" into rvc-dev am: 4eeb99d63e am: 46f68f51e6
...
Change-Id: I6e114287d6495105022e498293000b8fbacda13d
2020-04-28 14:54:57 +00:00
Beverly
dcc79e9942
Update strings to be more translation friendly
...
Use different strings for "None" based on the context of the string.
Some languages may require different gendered grammar depending on its
context.
Also update contacts summary string to include plurals (1 vs many).
Test: make RunSettingsRoboTests7
Bug: 154898476
Fixes: 154944295
Change-Id: If9949d75de573042389a19df3d4c5d15c6cbeb25
2020-04-28 14:53:08 +00:00
TreeHugger Robot
b1d1262c08
Merge "Updates for msg apps that don't use shortcuts" into rvc-dev am: 6f482cef09 am: 4738734887 am: d7478b0db4 am: 22446ccf4a am: 1e348937e2 am: e84a8753b7
...
Change-Id: If7baf0cc6d808fb4b3d02d85d91ee6b0468c1dc7
2020-04-28 14:38:36 +00:00
TreeHugger Robot
1467a92771
Merge "Fix when search "storage", there are multiple results" into rvc-dev am: f7ee64da6c am: 462f4cd695 am: 1676898f76 am: fbb7b19880 am: 2d8c3431dc am: ca73914f05
...
Change-Id: Iee375c0e1ddac1f1346ca679419bf54e718ba534
2020-04-28 14:38:13 +00:00
Automerger Merge Worker
9d4b7599ee
Merge "Merge "Updates for msg apps that don't use shortcuts" into rvc-dev am: 6f482cef09 am: dcba11ba82" into rvc-d1-dev-plus-aosp am: 8bb8384164 am: 614a41c3d0 am: 628c8fcb96
...
Change-Id: I5d3afe6fd17ea867a56e598c7c260a4981398f47
2020-04-28 14:37:37 +00:00
TreeHugger Robot
b6a92b08e3
Merge "Updates for msg apps that don't use shortcuts" into rvc-dev am: 6f482cef09 am: 4738734887 am: 4bc961c95d am: 6637170b1d am: d49493a1f8
...
Change-Id: I69dac104290b6092b162627d46eda0b3eb29f935
2020-04-28 14:37:26 +00:00
TreeHugger Robot
63ee31fbd3
Merge "Fix when search "storage", there are multiple results" into rvc-dev am: f7ee64da6c am: f635ce3685 am: ac9ba09d91 am: 6ca4817f2e am: 6932fc002f
...
Change-Id: I70e31e0b409ba38523e0a3141c6fae794110ecb5
2020-04-28 14:37:11 +00:00
TreeHugger Robot
aa7dbdf635
Merge "Fix when search "storage", there are multiple results" into rvc-dev am: f7ee64da6c am: 462f4cd695 am: 4d26a4e326 am: c2fc5892d0 am: dcfafabdf0
...
Change-Id: I14123dad922980f68cba25bc2cba7cafa7053a4c
2020-04-28 14:37:06 +00:00
TreeHugger Robot
47b56d7152
Merge "[Wi-Fi] Show Wi-Fi editor for authentication failures" into rvc-dev am: 4eeb99d63e
...
Change-Id: I4a63e84c417fd31e87b0b4cae0a957b13e9b79c5
2020-04-28 14:36:28 +00:00
TreeHugger Robot
46f68f51e6
Merge "[Wi-Fi] Show Wi-Fi editor for authentication failures" into rvc-dev am: 4eeb99d63e
...
Change-Id: Iaa49b317fbe48f2641b0d3a75be9596ead8bcc7b
2020-04-28 14:36:23 +00:00
TreeHugger Robot
e84a8753b7
Merge "Updates for msg apps that don't use shortcuts" into rvc-dev am: 6f482cef09 am: 4738734887 am: d7478b0db4 am: 22446ccf4a am: 1e348937e2
...
Change-Id: I00c842f9ba688877cc427a738b5cd78e60764915
2020-04-28 14:22:44 +00:00
TreeHugger Robot
ca73914f05
Merge "Fix when search "storage", there are multiple results" into rvc-dev am: f7ee64da6c am: 462f4cd695 am: 1676898f76 am: fbb7b19880 am: 2d8c3431dc
...
Change-Id: Id232811d09639a5569418949ebb3b191563f1377
2020-04-28 14:21:53 +00:00
Automerger Merge Worker
628c8fcb96
Merge "Merge "Updates for msg apps that don't use shortcuts" into rvc-dev am: 6f482cef09 am: dcba11ba82" into rvc-d1-dev-plus-aosp am: 8bb8384164 am: 614a41c3d0
...
Change-Id: Iae839b3252947f53ceaaa06f1404762a0b7f4819
2020-04-28 14:21:21 +00:00
TreeHugger Robot
4eeb99d63e
Merge "[Wi-Fi] Show Wi-Fi editor for authentication failures" into rvc-dev
2020-04-28 14:21:14 +00:00
TreeHugger Robot
d49493a1f8
Merge "Updates for msg apps that don't use shortcuts" into rvc-dev am: 6f482cef09 am: 4738734887 am: 4bc961c95d am: 6637170b1d
...
Change-Id: Ie7bdb43e3e3fa4919b7e8286bdda57077ae49156
2020-04-28 14:20:50 +00:00
TreeHugger Robot
1e348937e2
Merge "Updates for msg apps that don't use shortcuts" into rvc-dev am: 6f482cef09 am: 4738734887 am: d7478b0db4 am: 22446ccf4a
...
Change-Id: I8b7375e4ed5eff94f70f6f404da0a85f4da187ce
2020-04-28 14:20:46 +00:00
TreeHugger Robot
2d8c3431dc
Merge "Fix when search "storage", there are multiple results" into rvc-dev am: f7ee64da6c am: 462f4cd695 am: 1676898f76 am: fbb7b19880
...
Change-Id: I4e8598a5ccd70774f1bdaf7d58703102108734a0
2020-04-28 14:20:12 +00:00
TreeHugger Robot
6932fc002f
Merge "Fix when search "storage", there are multiple results" into rvc-dev am: f7ee64da6c am: f635ce3685 am: ac9ba09d91 am: 6ca4817f2e
...
Change-Id: I76c50993c1a347d5c535ea8f7eb47d29af544298
2020-04-28 14:19:48 +00:00
TreeHugger Robot
dcfafabdf0
Merge "Fix when search "storage", there are multiple results" into rvc-dev am: f7ee64da6c am: 462f4cd695 am: 4d26a4e326 am: c2fc5892d0
...
Change-Id: I346d0ffc3ecf5310107f1756243a0daa4a3b701c
2020-04-28 14:19:41 +00:00
