Commit Graph

83059 Commits

Author SHA1 Message Date
Bill Yi
b14070608e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6c2d3450ae -s ours
am skip reason: subject contains skip directive

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

Change-Id: I79e32c48bc3d8d240b073b73b4026f07f3589a55
2021-06-01 20:34:57 +00:00
TreeHugger Robot
1744af0d97 Merge "Further refactoring on ActionDisabledByAdminDialog classes." into sc-dev am: 9e1e5ddb72
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14700128

Change-Id: Id99262a605c0318b07a1844ed5e42ae02e1159f5
2021-06-01 20:24:48 +00:00
Bill Yi
2d4bb6b826 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6c2d3450ae -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5dbb84851ab90bc57dbad3924e8d4bd4b4f6aa66
2021-06-01 20:23:51 +00:00
TreeHugger Robot
9e1e5ddb72 Merge "Further refactoring on ActionDisabledByAdminDialog classes." into sc-dev 2021-06-01 20:13:24 +00:00
Bill Yi
6c2d3450ae Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I702c7c5cd90121f321dc9598d28be96dc27bfd3a
2021-06-01 09:16:36 -07:00
Wesley.CW Wang
adf36b5014 Update battery settings string
- Update App info battery usage entry subtext
 - Update battery settings battery usage title
 - Update battery error card text

Bug: 187612897
Bug: 189785077
Bug: 178197718
Test: make RunSettingsRoboTests
Change-Id: I101d56ab21abe0554964d5a4f1f7aceeacffb588
2021-06-01 22:20:04 +08:00
Wesley.CW Wang
645e28e31b Update battery error layout
- Update font
 - Add importantForAccessibility to make whole layout selectable
 Screenshot: https://screenshot.googleplex.com/9nJxzD47xeaB6ea.png

Bug: 187612897
Test: make RunSettingsRoboTests
Change-Id: I15bbee6780d8e2c0a01995c6dbb91b933abda274
2021-06-01 19:09:03 +08:00
lesl
5012cef58f wifi: Use new API for data usage function
For mobile, a old API: buildTemplateMobileAll doesn't includes the
merged wifi network, call the new API: buildTemplateCarrierMetered
to replace the old one.

PS: Not only usage functionality but also apply to network policy
control since the default policy is changing to use
new API: buildTemplateCarrier now.

Test: make RunSettingsRoboTests ROBOTEST_FILTER=SettingsDumpServiceTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageLibTest
Test: Manual Test, modify the mobile usage warming and limit bytes and
      check the data via adb shell dumpsys netpolicy

Bug: 176396812
Merged-In: I6fbec14e7be4dc4b5c2fd3659a801521c81b233c
Change-Id: I6fbec14e7be4dc4b5c2fd3659a801521c81b233c
2021-06-01 10:34:10 +00:00
Tsung-Mao Fang
833462baa3 Remove all dividers in privacy page
Based on ux rules, remove the dividers for Android S.

Test: See the screen
Fix: 183174009
Change-Id: I7850c37387ccc18964f2c491ec696307f3ad9d4e
2021-06-01 18:20:38 +08:00
YUKAI HUNG
1e7cb74bf5 Merge "Set default locale in the testing environment to avoid flaky test" into sc-dev am: 3940e5293c am: 669ea3072b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14782142

Change-Id: Iea781f364e88897bb2b139940a93d29a97793fcd
2021-06-01 09:22:36 +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
669ea3072b 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: Ie1210215d9641d857eccd40e34af480eeefd6f1f
2021-06-01 08:41:36 +00:00
Yi-Ling Chuang
e7c769fe02 Apply sliding transition to trust agent.
- Also rename the extra of page transition.
- Remove useless code while starting activity from fragment.

Bug: 187542491
Test: robotest and manually went through trust agent flow.
Change-Id: I55419f23db7fa77281039e642bde5558c17dce0f
2021-06-01 16:39:13 +08: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
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
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
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
4e684f517b Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-06-01 05:55:43 +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
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
6171d56e72 Merge "Fix number localization in the strings.xml" into sc-dev am: 4abbe80385 am: 719a8879f3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14673570

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

Change-Id: Ic1217177e7d900e328234cf3744498527aed0a4e
2021-06-01 03:47:16 +00:00
Ryan Lin
719a8879f3 Merge "Fix number localization in the strings.xml" into sc-dev am: 4abbe80385
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14673570

Change-Id: Ie6d411e4f1a98b4aa1b5e8f35b713891579925b0
2021-06-01 03:24:21 +00:00
Ryan Lin
8a6272e933 Merge "Fix number localization in the strings.xml" into sc-dev am: 4abbe80385
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14673570

Change-Id: Ie71443e570322eda388a9903d059767c73ad59cb
2021-06-01 03:21:10 +00:00
Edgar Wang
bc55541ed9 Remove divider in Storage page
Fixes: 189389989
Test: manual
Change-Id: I92212620a5dd93b855d6e76d6401d5fd3969e4a6
2021-06-01 03:10:04 +00:00