Commit Graph

68003 Commits

Author SHA1 Message Date
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
Automerger Merge Worker
614a41c3d0 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
Change-Id: I9bf34f9c451a8b1e864ee9a60363c0d81e7e48cd
2020-04-28 14:16:37 +00:00
TreeHugger Robot
6637170b1d Merge "Updates for msg apps that don't use shortcuts" into rvc-dev am: 6f482cef09 am: 4738734887 am: 4bc961c95d
Change-Id: I4b8570b4f4fe62ac0e1753cda956ec06286ea803
2020-04-28 14:16:19 +00:00
TreeHugger Robot
22446ccf4a Merge "Updates for msg apps that don't use shortcuts" into rvc-dev am: 6f482cef09 am: 4738734887 am: d7478b0db4
Change-Id: I5a79813584186bc54de9d5a8f64854a20e7ca6f5
2020-04-28 14:16:18 +00:00
Automerger Merge Worker
8bb8384164 Merge "Merge "Updates for msg apps that don't use shortcuts" into rvc-dev am: 6f482cef09 am: dcba11ba82" into rvc-d1-dev-plus-aosp 2020-04-28 14:08:29 +00:00
TreeHugger Robot
d7478b0db4 Merge "Updates for msg apps that don't use shortcuts" into rvc-dev am: 6f482cef09 am: 4738734887
Change-Id: Iee676688bd868b5bb045bd4da5296c7549ab8860
2020-04-28 14:08:22 +00:00
TreeHugger Robot
5c427c828a Merge "Updates for msg apps that don't use shortcuts" into rvc-dev am: 6f482cef09 am: dcba11ba82
Change-Id: If4766ce87e8786f179898d11f8873ff5bcda39d0
2020-04-28 14:08:22 +00:00
TreeHugger Robot
4bc961c95d Merge "Updates for msg apps that don't use shortcuts" into rvc-dev am: 6f482cef09 am: 4738734887
Change-Id: Ia923da6427ace26e9231bba0e464cf9d0a1f3a77
2020-04-28 14:08:16 +00:00
Bonian Chen
9130c7ea46 Merge "[Settings] Avoid mobile data usage init in WiFi usage" into rvc-dev am: 38b0d3091d am: d0783f22c0 am: 06483a6af1 am: c2a0b2143d am: 1613dbf95c am: f382311cfd
Change-Id: Ic0d917d9793685d3dc3d1c8cb78545f311d343ef
2020-04-28 14:07:59 +00:00
Bonian Chen
1ad13477cb Merge "[Settings] Avoid mobile data usage init in WiFi usage" into rvc-dev am: 38b0d3091d am: 414949593c am: 2dbb480320 am: 44107f42d3 am: 281280afa4
Change-Id: Ia76836c598e6837cab07851e38263be4c3db4f2c
2020-04-28 14:07:49 +00:00
Bonian Chen
68384bdde1 Merge "[Settings] Avoid mobile data usage init in WiFi usage" into rvc-dev am: 38b0d3091d am: d0783f22c0 am: 907949b2eb am: f5612b39da am: 7ec01ecd10
Change-Id: I6c0fb8eee17010ad5b8234cbe7c9dd6ebea1c792
2020-04-28 14:07:34 +00:00
TreeHugger Robot
6ca4817f2e Merge "Fix when search "storage", there are multiple results" into rvc-dev am: f7ee64da6c am: f635ce3685 am: ac9ba09d91
Change-Id: Ie736ef335357ee039a9c44429ac61110079ffcde
2020-04-28 14:07:30 +00:00
TreeHugger Robot
fbb7b19880 Merge "Fix when search "storage", there are multiple results" into rvc-dev am: f7ee64da6c am: 462f4cd695 am: 1676898f76
Change-Id: I006fe0c7b21535cf12f38145d94b958429476fbd
2020-04-28 14:07:17 +00:00
TreeHugger Robot
c2fc5892d0 Merge "Fix when search "storage", there are multiple results" into rvc-dev am: f7ee64da6c am: 462f4cd695 am: 4d26a4e326
Change-Id: I31ee3857c15395399774e723f711afc1cf9dfea9
2020-04-28 14:07:17 +00:00
TreeHugger Robot
dcba11ba82 Merge "Updates for msg apps that don't use shortcuts" into rvc-dev am: 6f482cef09
Change-Id: I90d6f44c1b5af1037422aadae7fae71eabcaa452
2020-04-28 14:02:40 +00:00
TreeHugger Robot
4738734887 Merge "Updates for msg apps that don't use shortcuts" into rvc-dev am: 6f482cef09
Change-Id: I5d739de32339359c28bab9ab6957abf1c287b9e1
2020-04-28 14:02:27 +00:00