Commit Graph

82551 Commits

Author SHA1 Message Date
TreeHugger Robot
eb9360fa97 Merge "Update battery defender tip subtext" into sc-dev am: 2702e5ce80
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788605

Change-Id: Ic1c8dffed05eaf73e7c5d6958701a7b1eec4d8c3
2021-06-02 08:33:11 +00:00
TreeHugger Robot
2702e5ce80 Merge "Update battery defender tip subtext" into sc-dev 2021-06-02 08:25:51 +00:00
Stanley Wang
55ee50d381 Merge "SettingsMainSwitchPreference should display the restricted icon if it is restricted." into sc-dev am: b4b35a8c38
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14758319

Change-Id: I414fa4bc7c652afb52a1a351958497558b373107
2021-06-02 08:23:47 +00:00
TreeHugger Robot
9cc7d4b581 Merge "Remove the face unlock category" into sc-dev am: 3af33cd3fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14732241

Change-Id: I3f0808a55fc768c4605e6b311d5c65217e394833
2021-06-02 08:23:33 +00:00
Stanley Wang
b4b35a8c38 Merge "SettingsMainSwitchPreference should display the restricted icon if it is restricted." into sc-dev 2021-06-02 08:05:57 +00:00
TreeHugger Robot
3af33cd3fc Merge "Remove the face unlock category" into sc-dev 2021-06-02 07:59:42 +00:00
TreeHugger Robot
6907efdb72 Merge "Apply sliding transition to trust agent." into sc-dev am: fffda8de08
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14786716

Change-Id: I55955cecac9a24349642b66e6b3df22d4184ad8c
2021-06-02 06:46:50 +00:00
Menghan Li
884fcfd72d Merge "Fix the link text "Learn more" in the accessibility pages with help links could not convey the link's purpose clearly" into sc-dev am: 58ed6a90fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702759

Change-Id: I8bcf4f0e66af8513618609f83a9bcbb4761a1dde
2021-06-02 06:46:32 +00:00
TreeHugger Robot
fffda8de08 Merge "Apply sliding transition to trust agent." into sc-dev 2021-06-02 06:39:03 +00:00
Menghan Li
58ed6a90fe Merge "Fix the link text "Learn more" in the accessibility pages with help links could not convey the link's purpose clearly" into sc-dev 2021-06-02 06:26:00 +00:00
Wesley.CW Wang
046e7beaef Update battery defender tip subtext
Bug: 189888727
Test: m RunSettingsRoboTests
Change-Id: I5dc3bed3f839b3f62d2e78f0ae16b5465035e1fc
2021-06-02 13:39:07 +08: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
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
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
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
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
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
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
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
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
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
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
Ryan Lin
4abbe80385 Merge "Fix number localization in the strings.xml" into sc-dev 2021-06-01 02:59:06 +00:00
TreeHugger Robot
6aa2b3e6bc Merge "Fix GAR color constrast issue on dialog" into sc-dev am: 6ee9ceab77
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14772168

Change-Id: I03f1df052f2cdbe5cb4521d16ded2a883a06bf0c
2021-06-01 02:34:13 +00:00