TreeHugger Robot
dd086d3adf
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: I87041f7a1bf91a98b118ec019374d86e151d8b4e
2021-06-02 06:49:32 +00:00
Menghan Li
0ca1bae38b
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: I7612ccb19b46b21db60099e915185af4e7547b80
2021-06-02 06:49:01 +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 Wang
e723abc4e7
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: Ie955fe86da7369d1102c396b9e23e3a4154727db
2021-06-02 03:58:48 +00:00
Les Lee
4ecb16a2ea
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: Id42c5c3590e5102498f2b6134ec8e0b3ec81f5e4
2021-06-02 03:50:43 +00:00
Wesley Wang
a5681d343b
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: I298d171903bd69e50ed1a39c3c2a2ac63c60a1d5
2021-06-02 03:49:34 +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
99a6b6b020
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: I7e93432a4b29ebe2fd750f697157f12eb453bd92
2021-06-02 02:38:30 +00:00
TreeHugger Robot
e1c77b9138
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: Id920e431b057448583ab7cddaadb101f499c7814
2021-06-02 02:38:26 +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
f069fded0b
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: I41817776f86eacecd8eb7d764025f3f537ad7940
2021-06-02 00:12:48 +00:00
Abel Tesfaye
0dbbd148d5
Merge "Update smart auto rotate string" into sc-dev
2021-06-01 23:44:12 +00:00
TreeHugger Robot
d1de4ca26a
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: Ie5c83d512114974ce406add1f327c8da0a102562
2021-06-01 20:24:31 +00:00
Bill Yi
ce462b4a54
[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: I2888cdc33b36e98b312f94b789f0f312128c4b13
2021-06-01 20:24:00 +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
df67f293c7
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: I5d6c4cedc1a86267736e523359632142bbb72a7e
2021-06-01 08:45:13 +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
390269ec5a
[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: Ic469bd8e8af07ba8cd997cd4d13fdf3827bd58ab
2021-06-01 06:41:28 +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
e30ce7010e
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: Ie9d2459157f302091dbd19af1bcf247aa108d063
2021-06-01 06:05:44 +00:00
TreeHugger Robot
61098fb7cc
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: I52e474faeead01b49adee16af4c5675d8a8ebfac
2021-06-01 06:05:39 +00:00
TreeHugger Robot
e384b5a95c
[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: I4f74c97af380eb8fac4f57e8a3632e513c98743f
2021-06-01 06:05:08 +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
a5e5b8f862
Remove divider in Storage page am: bc55541ed9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14758070
Change-Id: I2ffe06b35ab2fbdca49b60cb90f931c4f717dc5a
2021-06-01 05:29:39 +00:00
Ryan Lin
54307435ed
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: I739f181985da1448bfe1a828f07fd770aa86364a
2021-06-01 03:21:20 +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
d689dba4dc
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: Ia8c414fee27a975ab759abbeb275285696612414
2021-06-01 02:34:12 +00:00
Zoey Chen
1c7a377218
Merge "[ProviderModel] Use category to separate physical SIM and e-SIM" into sc-dev am: c968a80ff6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14732243
Change-Id: Iea49056a49bbec4bd4cdce7a05b383d4990d6d17
2021-06-01 02:33:58 +00:00
TreeHugger Robot
6ee9ceab77
Merge "Fix GAR color constrast issue on dialog" into sc-dev
2021-06-01 02:26:56 +00:00
Zoey Chen
c968a80ff6
Merge "[ProviderModel] Use category to separate physical SIM and e-SIM" into sc-dev
2021-06-01 02:16:08 +00:00
Bill Yi
d6083ff654
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9566689e45
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14776217
Change-Id: I9f800fb813ba4d3a3ff7565e7039e197d5bb5f60
2021-05-31 18:32:50 +00:00
Bill Yi
9566689e45
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I781d054bd16827689f348586de92df1ce981c9c3
2021-05-31 10:03:49 -07:00
Zoey Chen
71fada3af8
[ProviderModel] Use category to separate physical SIM and e-SIM
...
Mock from UX: https://screenshot.googleplex.com/4kscwJvoQE7vwF3.png
Implementation UI: https://screenshot.googleplex.com/AEeVzLi364KiPGa.png
Bug: 187071119
Test: atest NetworkProviderSimListControllerTest
Test: atest NetworkProviderSimsCategoryControllerTest
Test: atest NetworkProviderDownloadedSimListControllerTest
Test: atest NetworkProviderDownloadedSimsCategoryControllerTest
Change-Id: Ia84bebe6ea431cdbae19f3e4b840f7cd56dc2d6f
2021-05-31 23:59:37 +08:00
TreeHugger Robot
d77f37112c
Merge "Reduce flickers when launching Storage Settings" into sc-dev am: 0462ffaffc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716098
Change-Id: I26f9501714975bb7225eaf228df2fdb89c96ceae
2021-05-31 14:33:17 +00:00