Les Lee
e56e94b7a4
Merge "wifi: Use new API for data usage function" into sc-dev am: 5246f75bda
am: 371ffdc357
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14786726
Change-Id: I72ee9557359a1cf1fe391451f4efdacf3555eb2a
2021-06-02 04:27:56 +00:00
Wesley Wang
a121362d05
Merge "Update battery error layout" into sc-dev am: 431e77d429
am: 5abef61536
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14758085
Change-Id: Ic958c7ce28233770135ddd6ab1177bc96fd9acb3
2021-06-02 04:26:45 +00:00
Les Lee
371ffdc357
Merge "wifi: Use new API for data usage function" into sc-dev am: 5246f75bda
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14786726
Change-Id: If484e7e529af0041a49c4aa98f693d654669567c
2021-06-02 04:01:13 +00:00
Wesley Wang
5abef61536
Merge "Update battery error layout" into sc-dev am: 431e77d429
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14758085
Change-Id: I072d3160d86825416d32c1ae24740fb2019b3cc7
2021-06-02 03:59:07 +00:00
Les Lee
5246f75bda
Merge "wifi: Use new API for data usage function" into sc-dev
2021-06-02 03:37:54 +00:00
Wesley Wang
431e77d429
Merge "Update battery error layout" into sc-dev
2021-06-02 03:37:28 +00:00
TreeHugger Robot
52c8b8c1e1
Merge "Remove all dividers in privacy page" into sc-dev am: 2076ebf2f7
am: d501c2d369
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14786727
Change-Id: I7cfff0b5606fb7839ac04bdcebbfd2d7c4f6bbeb
2021-06-02 03:04:44 +00:00
TreeHugger Robot
baed387430
Merge "Fix biometric content overlap with top/bottom bars" into sc-dev am: 9a839db046
am: 46857865b4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14752842
Change-Id: I1840a9b215baa9d69da485f70163e4ef38a62fc1
2021-06-02 03:04:28 +00:00
TreeHugger Robot
d501c2d369
Merge "Remove all dividers in privacy page" into sc-dev am: 2076ebf2f7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14786727
Change-Id: I1a9fb624109bc2af4bcd60cb173d63b601576c7e
2021-06-02 02:36:16 +00:00
TreeHugger Robot
46857865b4
Merge "Fix biometric content overlap with top/bottom bars" into sc-dev am: 9a839db046
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14752842
Change-Id: I1a69824d9b40d667f184d6583540d1fc455d16b3
2021-06-02 02:35:58 +00:00
TreeHugger Robot
2076ebf2f7
Merge "Remove all dividers in privacy page" into sc-dev
2021-06-02 02:28:47 +00:00
TreeHugger Robot
9a839db046
Merge "Fix biometric content overlap with top/bottom bars" into sc-dev
2021-06-02 02:17:48 +00:00
Curtis Belmonte
af149b11fc
Fix biometric content overlap with top/bottom bars
...
Sets a solid background for the status and footer bar shown on each of
the biometric enroll introduction screens, to prevent the content from
showing through.
Test: Manually tested face and fingerprint enrollment
Fixes: 189075189
Change-Id: I1a41dc911c5ac7ded94e33b25a9c0e990e93ba3f
2021-06-01 18:11:12 -07:00
Abel Tesfaye
cc3813b6b9
Merge "Update smart auto rotate string" into sc-dev am: 0dbbd148d5
am: 9d6d8b30cf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14504138
Change-Id: I41fb2839504f8ce4b199a8d4a8a3fc2a401ca660
2021-06-02 00:37:04 +00:00
Abel Tesfaye
9d6d8b30cf
Merge "Update smart auto rotate string" into sc-dev am: 0dbbd148d5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14504138
Change-Id: I4c910660e6afca2b1d13f65bcccaf495684dc4d7
2021-06-02 00:09:40 +00:00
Abel Tesfaye
0dbbd148d5
Merge "Update smart auto rotate string" into sc-dev
2021-06-01 23:44:12 +00:00
Bill Yi
fae0532b29
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6c2d3450ae
-s ours am: b14070608e
-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: I214a8946dd68abaf56e340109179de3211576ed5
2021-06-01 20:57:13 +00:00
TreeHugger Robot
282050ce95
Merge "Further refactoring on ActionDisabledByAdminDialog classes." into sc-dev am: 9e1e5ddb72
am: 1744af0d97
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14700128
Change-Id: I906084f1bd9b507ab4b9e24afb9eeec96f96a430
2021-06-01 20:44:14 +00:00
Bill Yi
c20f5f692f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6c2d3450ae
-s ours am: 2d4bb6b826
-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: I8c81408e644daa3805ed2e22776fef2e5b1c5c51
2021-06-01 20:44:02 +00:00
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
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
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