Commit Graph

86127 Commits

Author SHA1 Message Date
Bonian Chen
2519bec539 Merge "[Settings] Connected carrier should not be forbidden ones" 2021-06-02 05:12:40 +00:00
Wesley Wang
f29e4d6fdb Merge "Update battery settings string" into sc-dev am: e678e2da06 am: f5404dc0bf am: f760e06d47
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788594

Change-Id: I86187ef77e2045a45497bb6900239125e13eb75e
2021-06-02 04:47:59 +00:00
Les Lee
67fa425454 Merge "wifi: Use new API for data usage function" into sc-dev am: 5246f75bda am: 371ffdc357 am: e56e94b7a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14786726

Change-Id: I14f79f84f729dd24e16d92a6fa16440080215f0e
2021-06-02 04:47:38 +00:00
Wesley Wang
67ea125039 Merge "Update battery error layout" into sc-dev am: 431e77d429 am: 5abef61536 am: a121362d05
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14758085

Change-Id: I2955c75d8744bf73fe217c1b1341e7795b4051d0
2021-06-02 04:45:58 +00:00
Wesley Wang
f760e06d47 Merge "Update battery settings string" into sc-dev am: e678e2da06 am: f5404dc0bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788594

Change-Id: Id90be7765d5fd01fe2c16a5f86061cc51f982492
2021-06-02 04:28:11 +00:00
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
Wesley Wang
f5404dc0bf Merge "Update battery settings string" into sc-dev am: e678e2da06
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788594

Change-Id: I073e69dc3e8908a419dc564f1a6b9128d6c96f2d
2021-06-02 04:01:41 +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
Wesley Wang
e678e2da06 Merge "Update battery settings string" into sc-dev 2021-06-02 03:41: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
f1f2e371fd Merge "Remove all dividers in privacy page" into sc-dev am: 2076ebf2f7 am: d501c2d369 am: 52c8b8c1e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14786727

Change-Id: I4fbcfb7b144b91e6193e60ba341f5824505f2501
2021-06-02 03:30:33 +00:00
TreeHugger Robot
9b69294dd5 Merge "Fix biometric content overlap with top/bottom bars" into sc-dev am: 9a839db046 am: 46857865b4 am: baed387430
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14752842

Change-Id: I599c29389a9497c3dfd8c8f12e46e5b26e5dc9b5
2021-06-02 03:26:53 +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
c375003361 Merge "Update smart auto rotate string" into sc-dev am: 0dbbd148d5 am: 9d6d8b30cf am: cc3813b6b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14504138

Change-Id: If207eece1568d12b23fdadf438c13e6fab013c8a
2021-06-02 00:58:10 +00: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
7e1272825e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6c2d3450ae -s ours am: b14070608e -s ours am: fae0532b29 -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: I2e2a46501887d7aa61cbf36de4982bc312526b56
2021-06-01 21:17:57 +00:00
TreeHugger Robot
7233b95761 Merge "Further refactoring on ActionDisabledByAdminDialog classes." into sc-dev am: 9e1e5ddb72 am: 1744af0d97 am: 282050ce95
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14700128

Change-Id: Ic30fef16736f22437770a8365cf4d8c50ef39fdb
2021-06-01 21:06:04 +00:00
Bill Yi
79d7a92961 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6c2d3450ae -s ours am: 2d4bb6b826 -s ours am: c20f5f692f -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: I63442868972ef95c2968b7df63fef7c39504ce8e
2021-06-01 21:05:46 +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
Bonian Chen
696c9b7335 [Settings] Connected carrier should not be forbidden ones
Manual network selection UI tried to display connected carrier as
initial list prior to the initial response from network scan.
However, the detection of connected carrier could be incorrect.

Before having an architectural change for this part, adding a piece of
code to avoid from displaying carriers which should be avoided.

Bug: 165158590
Test: local
Change-Id: If9c0804c706dd77a1c690555b245425dfeaf1fa9
2021-06-01 22:48:17 +08: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
dc4d844908 Merge "Set default locale in the testing environment to avoid flaky test" into sc-dev am: 3940e5293c am: 669ea3072b am: 1e7cb74bf5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14782142

Change-Id: Ib27b950d1d035b2462b627e1664535c0ca29d54b
2021-06-01 10:18:06 +00:00
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
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