Bill Yi
b0ee01b3ab
[automerger skipped] Import translations. DO NOT MERGE am: f6f96f8a85
-s ours am: 90cce123e5
-s ours am: 935ff6a18a
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Ie466022993d60576aa4371dc96240cd2d44eac61
2020-04-19 08:48:38 +00:00
Bill Yi
935ff6a18a
[automerger skipped] Import translations. DO NOT MERGE am: f6f96f8a85
-s ours am: 90cce123e5
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I2ca017ad434243993b9ac12f0b3be09789374b69
2020-04-19 08:22:40 +00:00
Bill Yi
90cce123e5
[automerger skipped] Import translations. DO NOT MERGE am: f6f96f8a85
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I3e5cce528fa6eccc7e7de29516b96e54cfddddb1
2020-04-19 08:05:02 +00:00
Bill Yi
f6f96f8a85
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: Ia460d84145b5e6f1ff7a4fb93ad34510ed1a6800
2020-04-18 22:28:22 -07:00
Julia Reynolds
c1235654ef
Update configure notifications screen am: f43cf08634
am: b84e194474
...
Change-Id: Iceef427af06d9faa17737801fb5ab0274716fcc4
2020-04-17 21:19:13 +00:00
Julia Reynolds
b84e194474
Update configure notifications screen am: f43cf08634
...
Change-Id: Idc63949ef2f2ecaaae7891a01d6eb48cbf830eaa
2020-04-17 20:58:04 +00:00
Julia Reynolds
f43cf08634
Update configure notifications screen
...
Test: atest
Bug: 153150072
Change-Id: I99ebe2cad5036a154c40bce54dbd6ddbd23c2323
2020-04-17 12:47:06 -04:00
TreeHugger Robot
9e72486b90
Merge "Fix incorrect app count displayed under special app access" into rvc-dev am: 87883c7634
am: e1e61d67b0
...
Change-Id: I21a71cd24ff61441392ab30a2253bf87a1e8a2ac
2020-04-17 10:40:10 +00:00
TreeHugger Robot
e1e61d67b0
Merge "Fix incorrect app count displayed under special app access" into rvc-dev am: 87883c7634
...
Change-Id: Ie8fa7609ffaf252d012cdbf54d758ed20f5e06e9
2020-04-17 10:18:53 +00:00
TreeHugger Robot
87883c7634
Merge "Fix incorrect app count displayed under special app access" into rvc-dev
2020-04-17 10:07:21 +00:00
Yanting Yang
7cfd82900c
Merge "Do not generate copyable slices for Settings Search" into rvc-dev am: 674e2c23a3
am: e611ebfb33
...
Change-Id: Iec93b0c7624a143328f229bb88a95eea48af96ee
2020-04-17 09:47:01 +00:00
Yanting Yang
e611ebfb33
Merge "Do not generate copyable slices for Settings Search" into rvc-dev am: 674e2c23a3
...
Change-Id: I23093ff82e7a4b5e51570653d1dfa015f09da675
2020-04-17 09:26:42 +00:00
Yanting Yang
674e2c23a3
Merge "Do not generate copyable slices for Settings Search" into rvc-dev
2020-04-17 09:06:28 +00:00
Yanting Yang
b6c30a2c31
Do not generate copyable slices for Settings Search
...
Copyable slices is to provide user a quickly sub-text copying way on
Settings Search. Since we plan to remove all sub-text from Settings
Search, the copying feature is no longer available.
Therefore, we don't need to generate copyable slices in Settings
anymore.
Impact search result:
Build number, Phone number, Hardware version, Serial number and IMEI
Bug: 143118037
Test: visual and robotests
Change-Id: I81474aed994678c42d73cc59e169573880de1378
2020-04-17 13:25:22 +08:00
Tom Hsu
857d656932
Merge "Fix failures on com.android.settings.network.ApnEditorTest" into rvc-dev am: 7c84dc9959
am: a733ead043
...
Change-Id: I6cc2492adeb4ed057f23c1d8e94209c6f6d897bf
2020-04-17 04:44:38 +00:00
Tom Hsu
a733ead043
Merge "Fix failures on com.android.settings.network.ApnEditorTest" into rvc-dev am: 7c84dc9959
...
Change-Id: Ifd84da0751b08efa551bcde8a3d7a2c21b2e4f20
2020-04-17 04:22:28 +00:00
Tom Hsu
7c84dc9959
Merge "Fix failures on com.android.settings.network.ApnEditorTest" into rvc-dev
2020-04-17 04:01:10 +00:00
Zhen Zhang
1963474117
Merge "[Settings] Fix crashes caused by null bluetooth adapter and ethernet manager" into rvc-dev am: 7e3e5dfa06
am: 987a70e750
...
Change-Id: I48653122c49815b166b0e3cd3f3db8ce0ff2b05e
2020-04-17 03:22:58 +00:00
Zhen Zhang
987a70e750
Merge "[Settings] Fix crashes caused by null bluetooth adapter and ethernet manager" into rvc-dev am: 7e3e5dfa06
...
Change-Id: If882edbe92b6efa5407be82528664b80f20d3e3f
2020-04-17 03:05:22 +00:00
Zhen Zhang
7e3e5dfa06
Merge "[Settings] Fix crashes caused by null bluetooth adapter and ethernet manager" into rvc-dev
2020-04-17 02:56:50 +00:00
Edgar Wang
23b5b359a0
Merge "Remove duplicated search index data of "Live Caption"" into rvc-dev am: 2b01f9ba7d
am: 27c1b456a5
...
Change-Id: Idc8b2c8b62d0f66783c286e526fce434d1581442
2020-04-17 02:36:11 +00:00
Edgar Wang
27c1b456a5
Merge "Remove duplicated search index data of "Live Caption"" into rvc-dev am: 2b01f9ba7d
...
Change-Id: I48970cfd18aef705790b20a6af6e5e9a08a1bc1a
2020-04-17 02:13:30 +00:00
Edgar Wang
2b01f9ba7d
Merge "Remove duplicated search index data of "Live Caption"" into rvc-dev
2020-04-17 01:53:00 +00:00
Weilun Du
f8757b7112
[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
(cherry picked from commit 08e95d0db0
)
2020-04-16 16:56:28 -07:00
Eugene Susla
d088583349
Merge "Implement auto revoke user whitelist intent handler" into rvc-dev am: ff8b793427
am: 1184cec4a2
...
Change-Id: I34a643bf08482d3bbbdc8e97f24377082593dd2f
2020-04-16 23:28:19 +00:00
Eugene Susla
1184cec4a2
Merge "Implement auto revoke user whitelist intent handler" into rvc-dev am: ff8b793427
...
Change-Id: Ifc857fe8d776d8353d8787a9ce0521f7495a821e
2020-04-16 23:12:00 +00:00
Eugene Susla
ff8b793427
Merge "Implement auto revoke user whitelist intent handler" into rvc-dev
2020-04-16 22:52:45 +00:00
tom hsu
969a6a613c
Fix failures on com.android.settings.network.ApnEditorTest
...
Bug: 152376182
Test: make RunSettingsRoboTests
Change-Id: Ib718a4ed0163e07be748857a0dc7b2af92036c3f
2020-04-17 03:45:40 +08:00
TreeHugger Robot
58b434ad02
Merge "Fallback to AOSP emergency info if the original intent is broken" into rvc-dev am: afbf9e60c0
am: 8f39c1380c
...
Change-Id: I0b32dd33d9713759978b16effc55bbe2e197fff6
2020-04-16 16:29:56 +00:00
TreeHugger Robot
8f39c1380c
Merge "Fallback to AOSP emergency info if the original intent is broken" into rvc-dev am: afbf9e60c0
...
Change-Id: I921ee0886440878a8ec0c231cb511019148be8f5
2020-04-16 16:16:16 +00:00
TreeHugger Robot
afbf9e60c0
Merge "Fallback to AOSP emergency info if the original intent is broken" into rvc-dev
2020-04-16 16:01:43 +00:00
Julia Reynolds
34c66fd94e
Merge "Launch subscreens with the correct user" into rvc-dev am: 0c99ecaec1
am: f1801907d8
...
Change-Id: I8ec8602c1e8753ce03d4c6acc75dcdf58be8c24e
2020-04-16 14:26:36 +00:00
Julia Reynolds
f1801907d8
Merge "Launch subscreens with the correct user" into rvc-dev am: 0c99ecaec1
...
Change-Id: I40f34bf9f15c76ad1474a8d6096d47027d37b13a
2020-04-16 14:12:27 +00:00
Julia Reynolds
0c99ecaec1
Merge "Launch subscreens with the correct user" into rvc-dev
2020-04-16 13:57:50 +00:00
Sunny Shao
d63c5ebff5
Fix incorrect app count displayed under special app access
...
- This special app Google Play services will change its hasLauncherEntry
value after receiving the MSG_LOAD_LAUNCHER.
- Update the summary while SpecialAppAccessPreferenceController is
receiving the onLauncherInfoChanged callback.
Fixes: 150480524
Test: manual test
Change-Id: I26b99fce54606644ee5603b4ca4730267c0f7ce5
2020-04-16 21:38:03 +08:00
TreeHugger Robot
53d317a4d0
Merge "Support another new intent for mainline module intent" into rvc-dev am: 158bbe17f3
am: 8142527b35
...
Change-Id: I4d28d4e61aa47db8c4b6e172069605b283a50585
2020-04-16 11:31:59 +00:00
TreeHugger Robot
8142527b35
Merge "Support another new intent for mainline module intent" into rvc-dev am: 158bbe17f3
...
Change-Id: Ibeb68b99a9c40bc61edc9706d596809d0c11e4f0
2020-04-16 11:15:44 +00:00
TreeHugger Robot
158bbe17f3
Merge "Support another new intent for mainline module intent" into rvc-dev
2020-04-16 11:03:19 +00:00
Tsung-Mao Fang
54150c9942
Support another new intent for mainline module intent
...
Mainline module team would like to create a new intent to support v2 UX.
In Settings side, if we found system supports this intent,
then we should navigate user to new place.
Test: Run robo test
Fix: 151189987
Change-Id: If4b437236b70c83a1f29a5c3d9e322178c8a6ec6
2020-04-16 17:35:38 +08:00
Tsung-Mao Fang
b3bb7a0237
Fallback to AOSP emergency info if the original intent is broken
...
If the variant of emergency info is broken, we should try to show
AOSP emergency info instead.
Test: Rebuilt rom and see the Ui. Run robo test
Fix: 154114259
Change-Id: I5bc3f6cbf9102a7b7299c3edf718a58101effbf8
2020-04-16 17:23:52 +08:00
Menghan Li
26a36e81b0
Merge "Refines animation for caption preferences tutorial" into rvc-dev am: 5970337d26
am: 4ee3e3b983
...
Change-Id: Ie699bf850c661445e5c773f34359826b21d7f855
2020-04-16 06:52:59 +00:00
tim peng
2bd8c71b27
Merge "Incorrect panel layout after rotation" into rvc-dev am: ea3a83e288
am: 4d97cc4e8e
...
Change-Id: Id359b3065edeb9aed8bf0c1f4f01b6f7c553c095
2020-04-16 06:52:52 +00:00
Menghan Li
4ee3e3b983
Merge "Refines animation for caption preferences tutorial" into rvc-dev am: 5970337d26
...
Change-Id: Ic53a132347c296c936bd498c543fab7afce51a2c
2020-04-16 06:37:21 +00:00
tim peng
4d97cc4e8e
Merge "Incorrect panel layout after rotation" into rvc-dev am: ea3a83e288
...
Change-Id: Ia96f690a596633fab838eac2c5be99eec92508fc
2020-04-16 06:37:06 +00:00
Menghan Li
5970337d26
Merge "Refines animation for caption preferences tutorial" into rvc-dev
2020-04-16 06:25:03 +00:00
tim peng
ea3a83e288
Merge "Incorrect panel layout after rotation" into rvc-dev
2020-04-16 06:10:15 +00:00
Eugene Susla
596662c52e
Implement auto revoke user whitelist intent handler
...
Bug: 153607914
Test: presubmit
Change-Id: I22288d0a963fd03e38841a9f66c342f6eb283149
2020-04-15 15:04:11 -07:00
Julia Reynolds
e3cb4f094e
Launch subscreens with the correct user
...
Test: atest
Fixes: 153556621
Change-Id: I5f3f0f408dc8e50db1762b1ce93f7748ea6332b0
2020-04-15 17:36:11 -04:00
TreeHugger Robot
9ade4f4cb4
Merge "Update flows for notification history" into rvc-dev am: 79a38a733f
am: 10052a54ab
...
Change-Id: Ia93b4fa2b891a50ea8b59941fa5eefe4f0da0164
2020-04-15 18:12:01 +00:00
Calvin Pan
4c877e1495
Merge "Add missing NR network mode in setPreferenceValueAndSummary" into rvc-dev am: 0758056d04
am: 106c2d210d
...
Change-Id: I3ed59308b803bf841eb3ab049fac823ce33b93eb
2020-04-15 17:50:31 +00:00