Commit Graph

86080 Commits

Author SHA1 Message Date
YUKAI HUNG
0c7474742e Merge "Set default locale in the testing environment to avoid flaky test" into sc-dev am: 3940e5293c am: 4e55c543fa am: 5175e915c9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14782142

Change-Id: Iad932bcb4ccc9f1153fa1e61c019155705fe2e8a
2021-06-01 10:17:58 +00:00
YUKAI HUNG
5175e915c9 Merge "Set default locale in the testing environment to avoid flaky test" into sc-dev am: 3940e5293c am: 4e55c543fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14782142

Change-Id: Iad1c67df730296e4ae747522e304ee1f108551bb
2021-06-01 09:21:32 +00:00
YUKAI HUNG
4e55c543fa Merge "Set default locale in the testing environment to avoid flaky test" into sc-dev am: 3940e5293c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14782142

Change-Id: I56b9c9432c4fb3cfc9170569fb690c71f2b01acd
2021-06-01 08:48:03 +00:00
YUKAI HUNG
3940e5293c Merge "Set default locale in the testing environment to avoid flaky test" into sc-dev 2021-06-01 08:26:24 +00:00
ykhung
7a6bd1e4a4 Set default locale in the testing environment to avoid flaky test
from the error message, looks like some testing environment cannot get the default locale settings to cause it crash. we will et the default locale before testing to avoid such condition.

Bug: 188947451
Test: make SettingsgRoboTests
Change-Id: I6ec9abba41d72c205426df8710eae5b83a841f46
2021-06-01 07:51:15 +00:00
TreeHugger Robot
5fb86d8b6c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 4e684f517b -s ours am: 25f79e3004 -s ours am: 764405d161 -s ours am: 35f2248d6c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14773023

Change-Id: Ifabd30f01ce820a58f618e67c703ef7405ff1d05
2021-06-01 07:27:55 +00:00
TreeHugger Robot
35f2248d6c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 4e684f517b -s ours am: 25f79e3004 -s ours am: 764405d161 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14773023

Change-Id: Ic1d9fc0f3e1f893e637b3e7adf6a288eb2cf2918
2021-06-01 07:03:26 +00:00
TreeHugger Robot
35fd4959f1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 4e684f517b -s ours am: 25f79e3004 -s ours am: 292149d678 -s ours am: 3b43bcda23 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14773023

Change-Id: Ia9c43190af7740ddb82cd27d6b885f0539fada53
2021-06-01 06:54:34 +00:00
TreeHugger Robot
389d71015e Merge "Fix truncated in USB preference" into sc-dev am: 11fa4d3275 am: ca556200dd am: 1ed1a4cd82
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733199

Change-Id: I775af2c309467fc56ba35108a75d9d4a4f701313
2021-06-01 06:54:24 +00:00
TreeHugger Robot
404b10bfba Merge "Fix flickering in USB page" into sc-dev am: f10ecb43d1 am: e0e7d99217 am: 41cc8029f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14732236

Change-Id: I14c905ef96c969f530b63c5f8961b4ae0056f56e
2021-06-01 06:54:03 +00:00
TreeHugger Robot
a38999198c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 14e4be7e93 -s ours am: 2363091424 -s ours am: c7c0c74270 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14773025

Change-Id: I6a5efe6084d888e61c8dace6685bf103b1bca173
2021-06-01 06:53:41 +00:00
TreeHugger Robot
31b761bcb5 Merge "Fix truncated in USB preference" into sc-dev am: 11fa4d3275 am: 9ab0dd4937 am: 8e74766d56
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733199

Change-Id: I492f59c071299531edf8eb6d9d8044e671e240c7
2021-06-01 06:53:25 +00:00
TreeHugger Robot
f788dfbd50 Merge "Fix flickering in USB page" into sc-dev am: f10ecb43d1 am: b76636a072 am: a889fb5938
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14732236

Change-Id: Iffb24aa55fdcd5c7e2ae6586053b232172a2fd09
2021-06-01 06:52:58 +00:00
TreeHugger Robot
cf830f1215 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 14e4be7e93 -s ours am: c0360c4fa3 -s ours am: 1c9e37c0f0 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14773025

Change-Id: I1cbb2153f1783fb0c3d696dc402164177d9b1b68
2021-06-01 06:52:26 +00:00
TreeHugger Robot
764405d161 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 4e684f517b -s ours am: 25f79e3004 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14773023

Change-Id: I9e6a1fdba9908eed4b078dcccbc123ace50edeeb
2021-06-01 06:44:19 +00:00
TreeHugger Robot
3b43bcda23 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 4e684f517b -s ours am: 25f79e3004 -s ours am: 292149d678 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14773023

Change-Id: Ib0e71ef1eee4e08fbbd8e778deeae4867e57a7dd
2021-06-01 06:44:19 +00:00
TreeHugger Robot
292149d678 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 4e684f517b -s ours am: 25f79e3004 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14773023

Change-Id: I17d3833df1ceff5b81052160ea9c7b80d24b2320
2021-06-01 06:36:23 +00:00
TreeHugger Robot
1ed1a4cd82 Merge "Fix truncated in USB preference" into sc-dev am: 11fa4d3275 am: ca556200dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733199

Change-Id: Ia38c1b60a550ec4242fda1b3a5e102bd2ab2f55b
2021-06-01 06:32:17 +00:00
TreeHugger Robot
41cc8029f6 Merge "Fix flickering in USB page" into sc-dev am: f10ecb43d1 am: e0e7d99217
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14732236

Change-Id: I1ee4596c709a74239098b0d416504a1aa349018e
2021-06-01 06:32:09 +00:00
TreeHugger Robot
c7c0c74270 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 14e4be7e93 -s ours am: 2363091424 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14773025

Change-Id: Ie9e6877ecbfeb2a92c47f7effb9570e125ffd384
2021-06-01 06:31:58 +00:00
TreeHugger Robot
8e74766d56 Merge "Fix truncated in USB preference" into sc-dev am: 11fa4d3275 am: 9ab0dd4937
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733199

Change-Id: I9870347d0aae7f7e62e209ed594238878a4235d4
2021-06-01 06:30:02 +00:00
TreeHugger Robot
a889fb5938 Merge "Fix flickering in USB page" into sc-dev am: f10ecb43d1 am: b76636a072
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14732236

Change-Id: I2baab0034cef0b9a101992f069b47f90563d3747
2021-06-01 06:29:41 +00:00
TreeHugger Robot
1c9e37c0f0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 14e4be7e93 -s ours am: c0360c4fa3 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14773025

Change-Id: I1e01e2269b48fd4cf851a2a23d168d3655956932
2021-06-01 06:28:55 +00:00
TreeHugger Robot
25f79e3004 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 4e684f517b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14773023

Change-Id: I3d00e68607de7e1021ed513ab3010fc3d373b471
2021-06-01 06:17:45 +00:00
TreeHugger Robot
9ab0dd4937 Merge "Fix truncated in USB preference" into sc-dev am: 11fa4d3275
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733199

Change-Id: I28237ca1c6442cdf9a16e7cbbaf1fd8dc17144c9
2021-06-01 06:09:24 +00:00
TreeHugger Robot
b76636a072 Merge "Fix flickering in USB page" into sc-dev am: f10ecb43d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14732236

Change-Id: Ia7cfe000daeabc4d5ec0bbae86d68bea23f40968
2021-06-01 06:08:39 +00:00
TreeHugger Robot
c0360c4fa3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 14e4be7e93 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14773025

Change-Id: I62b7759ad43e2d6ce89a97f5e5b3008a6f91a989
2021-06-01 06:08:03 +00:00
Edgar Wang
17476d3d78 Remove divider in Storage page am: bc55541ed9 am: 2b45c63759 am: d234543ffb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14758070

Change-Id: I4b50547014facd32ce1ed7640689b95d53476530
2021-06-01 06:06:17 +00:00
TreeHugger Robot
ca556200dd Merge "Fix truncated in USB preference" into sc-dev am: 11fa4d3275
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733199

Change-Id: I233c7b93226b74843701e00257f78bd506d2af1d
2021-06-01 06:05:56 +00:00
TreeHugger Robot
e0e7d99217 Merge "Fix flickering in USB page" into sc-dev am: f10ecb43d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14732236

Change-Id: I7d38220054f0caf0ca4d0dc4c78a8d971d37fa44
2021-06-01 06:05:27 +00:00
TreeHugger Robot
2363091424 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 14e4be7e93 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14773025

Change-Id: I1e70e5e1dd1c40bcb5ef8fc0a8c78f2fade876b9
2021-06-01 06:04:50 +00:00
Edgar Wang
d234543ffb Remove divider in Storage page am: bc55541ed9 am: 2b45c63759
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14758070

Change-Id: Ife521d662b5ae77e57c5935494928f0115aa3325
2021-06-01 05:56:35 +00:00
TreeHugger Robot
f646e9467f Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-06-01 05:55:53 +00:00
TreeHugger Robot
4e684f517b Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-06-01 05:55:43 +00:00
TreeHugger Robot
d13a19e017 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-06-01 05:48:23 +00:00
TreeHugger Robot
11fa4d3275 Merge "Fix truncated in USB preference" into sc-dev 2021-06-01 05:44:48 +00:00
TreeHugger Robot
f10ecb43d1 Merge "Fix flickering in USB page" into sc-dev 2021-06-01 05:44:35 +00:00
Edgar Wang
98802f77ce Remove divider in Storage page am: bc55541ed9 am: 5c1949dcba am: 23e2638610
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14758070

Change-Id: I75c87376bb7daeb0ae5ebe57b07d135727ddc6f4
2021-06-01 05:44:26 +00:00
TreeHugger Robot
d7aaca982c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: ab3d8c4c74 -s ours am: 0425585748 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14773026

Change-Id: Iee276abae4e2b4d8a38655cbbc314a3a8fd03d58
2021-06-01 05:44:13 +00:00
TreeHugger Robot
fb32d6e577 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 9cc8517bfa -s ours am: 7f51103d3f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14773577

Change-Id: Iab69a7e9f7b45697deb62a65cc2f50cfa603707a
2021-06-01 05:44:06 +00:00
TreeHugger Robot
14e4be7e93 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-01 05:43:52 +00:00
Edgar Wang
23e2638610 Remove divider in Storage page am: bc55541ed9 am: 5c1949dcba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14758070

Change-Id: Ie22a42c2b1bb7d15c6ca31df40ac493ba9ac3bef
2021-06-01 05:43:17 +00:00
TreeHugger Robot
0425585748 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: ab3d8c4c74 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14773026

Change-Id: I7ea85f83536ab4f80fe8527c5381ee20c835bd34
2021-06-01 05:41:57 +00:00
TreeHugger Robot
7f51103d3f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 9cc8517bfa -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14773577

Change-Id: I878fa2af9bafc4c1595cbad3515a218e2f5296d9
2021-06-01 05:41:37 +00:00
Edgar Wang
5c1949dcba Remove divider in Storage page am: bc55541ed9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14758070

Change-Id: I77a1390fa436ad5ac132c4733c69406e996cefb9
2021-06-01 05:32:19 +00:00
Edgar Wang
2b45c63759 Remove divider in Storage page am: bc55541ed9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14758070

Change-Id: I8b0c4f85ebd413d2637948b1e081ad9552d200c4
2021-06-01 05:26:17 +00:00
TreeHugger Robot
ab3d8c4c74 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-06-01 05:22:50 +00:00
TreeHugger Robot
9cc8517bfa Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-06-01 05:18:59 +00:00
Ryan Lin
33de30c3ee Merge "Fix number localization in the strings.xml" into sc-dev am: 4abbe80385 am: 719a8879f3 am: 6171d56e72
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14673570

Change-Id: I812e46766ab19f420398f159ad22593f1034ccb4
2021-06-01 04:10:53 +00:00
Ryan Lin
3075efea8e Merge "Fix number localization in the strings.xml" into sc-dev am: 4abbe80385 am: 8a6272e933 am: 30f93b4e49
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14673570

Change-Id: Ia3a554697cad200c0a1940345c6e59d05317737b
2021-06-01 04:10:38 +00:00