Commit Graph

82282 Commits

Author SHA1 Message Date
TreeHugger Robot
d38e7e2568 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: I3aa67149060a4715c5b7535017fe8d7c2be3f60b
2021-06-03 06:45:10 +00:00
Stanley Wang
090c1db54b 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: I58e5b740f9f0d09081b6fcbaba6285988bdedece
2021-06-03 06:44:50 +00:00
TreeHugger Robot
3da51e2fa1 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: Idb13354016ee0ad9598f62fffd6370e8da55d513
2021-06-03 06:41:46 +00:00
TreeHugger Robot
5ec95d91ec 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: Ibf7dc474c7340e636be1626cfd51f3d5847cd1a6
2021-06-03 06:41:40 +00:00
Menghan Li
7f352f0030 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: I6d9b4b991b1a4b4158254eb6b36286d3638a7ee2
2021-06-03 06:41:34 +00:00
Wesley Wang
d2d83c7bdd 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: Id3bcdd00f6cfe30454bd53a070e9793031aaf321
2021-06-03 06:41:28 +00:00
Les Lee
9d89f8fc86 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: Ifa114d809aab701ec16a5c72e8ae9a3e3d5528b8
2021-06-03 06:41:18 +00:00
Wesley Wang
80bb5b005e 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: I6dbeed62f155f116039dd8194bc827b50c4b4d5b
2021-06-03 06:33:15 +00:00
TreeHugger Robot
975ddf380c 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: Ibeae45225b86bf44efe777cbea31c8325886e46a
2021-06-03 06:33:09 +00:00
TreeHugger Robot
fb0cacb30f 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: Ie8efe236e01704370a77a86f4501b21e6789bb3f
2021-06-03 06:33:02 +00:00
Abel Tesfaye
8b9c1ce735 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: Iea6cdbdc543b4c7a6f3c0b2907a6cd2c3045d764
2021-06-03 06:32:56 +00:00
TreeHugger Robot
8eb8bfec86 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: I35927c0b212ab83aa4c49bd082c6c0d5fdcf3cf9
2021-06-03 06:32:47 +00:00
TreeHugger Robot
2702e5ce80 Merge "Update battery defender tip subtext" into sc-dev 2021-06-02 08:25:51 +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
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
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
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
0dbbd148d5 Merge "Update smart auto rotate string" into sc-dev 2021-06-01 23:44:12 +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
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
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
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
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
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
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
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
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
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
Edgar Wang
bc55541ed9 Remove divider in Storage page
Fixes: 189389989
Test: manual
Change-Id: I92212620a5dd93b855d6e76d6401d5fd3969e4a6
2021-06-01 03:10:04 +00:00