TreeHugger Robot
c988d01854
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: bb799e3144 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14054531
Change-Id: If069d4ee4022266cc20152875c64a4c67a805003
2021-03-31 22:40:25 +00:00
TreeHugger Robot
bb799e3144
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-03-31 22:25:34 +00:00
Yu-Han Yang
34980d9314
Merge "Update Location Settings footer when MLS changes" into sc-dev am: 844347bd27
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14036910
Change-Id: Ic9628e6bf86146912db634a00edb749cc63058be
2021-03-31 22:12:37 +00:00
Yu-Han Yang
844347bd27
Merge "Update Location Settings footer when MLS changes" into sc-dev
2021-03-31 21:38:29 +00:00
Yu-Han Yang
4b2e6f76ff
Update Location Settings footer when MLS changes
...
Also changed strings:
- from "Manage location permissions" to "App location permissions"
- from "Location Services" to "manage location services"
Bug: 180533061
Test: on device
Change-Id: I135430674b9363ea7caaa44f6e9baed96b6ec3cf
2021-03-31 13:15:36 -07:00
Bill Yi
5d5f583dc8
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I178674550fc86cf77ac47ee88e36a0903bb2caff
2021-03-31 19:52:15 +00:00
Wesley.CW Wang
f97a5e8fc1
Update battery progress bar am: fdfda5e589
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14045496
Change-Id: I008cdd00eb1c607c61cacd7aab037426dd83de1d
2021-03-31 17:31:30 +00:00
Wesley.CW Wang
fdfda5e589
Update battery progress bar
...
- Setup state text to bottom text view
- Remove battery state icon
Screenshot: https://screenshot.googleplex.com/At9tAVDgnoQBtNS.png
Bug: 177407113
Test: make RunSettingsRoboTests
Change-Id: I86cfe83982da70b8fc49386f388c1a068295e205
2021-03-31 17:04:24 +00:00
Jernej Virag
3340db9ef0
Fix error in PowerMenuSettingsControllerTest am: 512419a454
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14051305
Change-Id: If708b4979129e426158151bb665354724f54586c
2021-03-31 15:43:54 +00:00
Jernej Virag
512419a454
Fix error in PowerMenuSettingsControllerTest
...
"allUnavailable" should actually mean long press on power menu unavailable as well.
Bug: 184138823
Test: make RunSettingsRoboTests
Change-Id: Idee6b0a665941d5840166331f76e571e2539bd2e
2021-03-31 13:53:27 +00:00
Arc Wang
a5acc0ca12
Merge "Fix the issue of the repo upload hooking checker" into sc-dev am: de4494dea4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14029459
Change-Id: I7f027eaf9a076931222a81eee40d91e42b5cacc9
2021-03-31 12:53:56 +00:00
Arc Wang
9d5b4688e2
Merge "Fix com.android.settings.deviceinfo.storage.StorageEntryTest" into sc-dev am: aed1bba60a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14029456
Change-Id: I3a382089a60bc5c036d7e5d2fee85ddff03de68f
2021-03-31 12:53:38 +00:00
Arc Wang
de4494dea4
Merge "Fix the issue of the repo upload hooking checker" into sc-dev
2021-03-31 12:36:59 +00:00
Arc Wang
aed1bba60a
Merge "Fix com.android.settings.deviceinfo.storage.StorageEntryTest" into sc-dev
2021-03-31 12:36:46 +00:00
Alex Johnston
90119bca81
Merge "Remove hardcoded URL string" into sc-dev am: a05759cb7d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14033950
Change-Id: I033baaa50a01bdc0090beade4a51e285f9451477
2021-03-31 11:04:01 +00:00
Alex Johnston
a05759cb7d
Merge "Remove hardcoded URL string" into sc-dev
2021-03-31 10:35:51 +00:00
Alex Johnston
56519258ef
Remove hardcoded URL string
...
* Details on URLs in the credential management
app preference should be translatable.
* Remove hardcoded text and introduce strings.
Manual testing
* Download TestDPC and select 'Request to
manage credentials'.
* Select allow.
* Go to Settings Credential management app
preference and verify URL strings are displayed
correctly.
Bug: 170627997
Test: manual testing
Change-Id: Iadff0c136064dabc3f77e30b46356126d657397f
2021-03-31 10:17:36 +01:00
Yanting Yang
9916f07f3e
Merge "Make work profile sounds section as its own entry" into sc-dev am: 6ef0b34a32
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13887089
Change-Id: I819769ce85ccdb316600df7da4c55552a2be6982
2021-03-31 08:37:28 +00:00
Yanting Yang
6ef0b34a32
Merge "Make work profile sounds section as its own entry" into sc-dev
2021-03-31 08:08:41 +00:00
Arc Wang
f593c065e2
Fix the issue of the repo upload hooking checker
...
Fixes: 184103893
Test: repo upload test
Change-Id: Iae7637f11ff443ddd591bb93eac199243edc9d37
2021-03-31 05:56:12 +00:00
Mill Chen
a1490d26c4
Merge "Add an error dialog in FingerprintEnrollFindSensor" into sc-dev am: 3525843554
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14029861
Change-Id: Ib399d432aa4cf8c18aad79a0779e5026c262865f
2021-03-31 03:39:50 +00:00
Mill Chen
3525843554
Merge "Add an error dialog in FingerprintEnrollFindSensor" into sc-dev
2021-03-31 03:11:10 +00:00
Arc Wang
a1fb47beb8
Fix com.android.settings.deviceinfo.storage.StorageEntryTest
...
StorageEntry#isStub() is unused and not built in apk.
Remove the method to fix test fail.
Bug: 184045592
Test: atest com.android.settings.deviceinfo.storage
Change-Id: I89d73c45111918c2ff01174d6fbb47f8c59f6968
2021-03-31 10:05:09 +08:00
Jay Aliomer
d83e663013
Merge "Notification history UI buff" into sc-dev am: 91b4a58111
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14037274
Change-Id: If2bd8f413961c6c43fcdd3fe6f64ffe0569704ec
2021-03-30 20:32:30 +00:00
Fan Zhang
030ff66672
Merge "More settings button add test" into sc-dev am: 2d58e29ad9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14017673
Change-Id: I787577510551a8ac6ce7b7cfddff7ca4c7e45802
2021-03-30 20:30:21 +00:00
Jay Aliomer
91b4a58111
Merge "Notification history UI buff" into sc-dev
2021-03-30 20:29:33 +00:00
Fan Zhang
2d58e29ad9
Merge "More settings button add test" into sc-dev
2021-03-30 19:41:33 +00:00
Jay Aliomer
5d10dbc732
Notification history UI buff
...
Fixes: 182155974
Test: visual test
Change-Id: I028381407504b3cf390987a6fa11c041fddf6198
2021-03-30 14:49:57 -04:00
Joshua Mccloskey
24a0a5daeb
Merge "Added fingerprint strings" into sc-dev am: b904e94fcd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13998808
Change-Id: Iec9df2dae13af4f6f6a4a719290530be5eb2043c
2021-03-30 17:10:28 +00:00
Yu-Han Yang
6b7ae6b75e
Merge "Untab Location Settings and tab Location Services" into sc-dev am: 60ddf8d7d4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13985188
Change-Id: Icd9ff01202d4fd4135b79f03eb5df5a9c1cc04b1
2021-03-30 17:10:11 +00:00
Yu-Han Yang
d822c05cdf
Merge "Update links to Scanning Settings" into sc-dev am: 8d07eeb590
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13991364
Change-Id: I00757cd497f322a174468f10edae756d9840ba6a
2021-03-30 17:10:04 +00:00
Shireesha Bongarala
2043d31130
More settings button add test
...
Bug: 179063896
Test: make RunSettingsRoboTests -j40 ROBOTEST_FILTER=MoreSettingsPreferenceControllerTest
Change-Id: I99079165d32074ac0812bd62a146a9d238738fbc
2021-03-30 17:09:57 +00:00
Joshua Mccloskey
b904e94fcd
Merge "Added fingerprint strings" into sc-dev
2021-03-30 16:53:51 +00:00
Yu-Han Yang
60ddf8d7d4
Merge "Untab Location Settings and tab Location Services" into sc-dev
2021-03-30 16:48:38 +00:00
Yu-Han Yang
8d07eeb590
Merge "Update links to Scanning Settings" into sc-dev
2021-03-30 16:47:18 +00:00
Peter Kalauskas
439a60643c
Merge "Fix NPE in UserSettingsTest" into sc-dev am: 383ae7f025
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14019935
Change-Id: I3813fa74f48c043d9d539e8b9997e1a2a1edb40f
2021-03-30 15:19:39 +00:00
Alex Johnston
2f8d178435
Merge "RequestManageCredentials support RTL languages" into sc-dev am: 099a144869
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14018678
Change-Id: Id19b8324a3d5154697d90599a0d56def215b9448
2021-03-30 15:18:07 +00:00
Peter Kalauskas
383ae7f025
Merge "Fix NPE in UserSettingsTest" into sc-dev
2021-03-30 15:01:16 +00:00
Alex Johnston
099a144869
Merge "RequestManageCredentials support RTL languages" into sc-dev
2021-03-30 14:52:49 +00:00
Yanting Yang
e14a3a3022
Make work profile sounds section as its own entry
...
Also rephrase the strings by request.
Bug: 174964721
Test: manual
Change-Id: I760249cd48832f2739ab7ca33706cd11dd34a6b5
2021-03-30 22:37:01 +08:00
Julia Reynolds
b3b92c996c
Merge "Fix some 'clear recent issues'" into sc-dev am: 05c30a3f53
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14019938
Change-Id: Id5244f754140fdd68097407798363a62caec3087
2021-03-30 14:21:49 +00:00
Mill Chen
4606a292ac
Add an error dialog in FingerprintEnrollFindSensor
...
When a device stands for a while during the fingerprint enrollment, the
fingerprint icon will disappear without any warning message. This
change is trying to show a dialog to inform users.
Fixes: 180633056
Test: visual verified
1) Settings -> Security -> Fingerprint
2) Navigate to "Touch & hold the fingerprint icon" page
3) Let device stand for a while and see if there's a dialog shown
Change-Id: I69c8fb73f2a7406e4a379396e2624fb523e162a8
2021-03-30 21:49:11 +08:00
Julia Reynolds
05c30a3f53
Merge "Fix some 'clear recent issues'" into sc-dev
2021-03-30 13:41:58 +00:00
Arc Wang
2be3195f5e
Merge "Set icon for 'Free up space'" into sc-dev am: 495c51e3ac
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14008237
Change-Id: Iad479cdc536f879a9dcd46d2c4b9a068263009c6
2021-03-30 12:38:04 +00:00
Arc Wang
495c51e3ac
Merge "Set icon for 'Free up space'" into sc-dev
2021-03-30 12:26:57 +00:00
Almaz Mingaleev
edd4dea232
resolve merge conflicts of 7d9233302f to sc-dev am: dea929aa06
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14032726
Change-Id: I3ce506516ee7e9f6ff4581705e4c150d10faa26b
2021-03-30 11:58:28 +00:00
Sunny Shao
9798dc06fe
Merge "Fix the "Add link" permanent disabled problem" into sc-dev am: 9bd9d299f0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14008226
Change-Id: Ifde95d1793692e83cfff5cef45d20047d5d1a149
2021-03-30 11:58:24 +00:00
Weng Su
2c8e759692
Merge "Fix the WifiTether test case failed" into sc-dev am: 9b86942fec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14029853
Change-Id: I312a83e3f07dd28658b744a73d51675d2486c115
2021-03-30 11:58:19 +00:00
Weng Su
045b3eba93
Merge "[Provider Model] Move the Internet unavailable Wi-Fi down" into sc-dev am: 4e341b780a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13990616
Change-Id: I5845d9691397f86ade3e69279d8e9c33a6f53b99
2021-03-30 11:57:01 +00:00
Almaz Mingaleev
dea929aa06
resolve merge conflicts of 7d9233302f to sc-dev
...
Change-Id: I7f6b7b035cc9c37a168e97ddeac5c8de9d5910de
2021-03-30 11:43:33 +00:00