Bill Lin
e43497ff54
Merge "2/ Make One handed mode support multiple user switch" into sc-dev am: e3e3fc915a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13849836
Change-Id: I446caec4128640628d205babf4b5306c99a2eb90
2021-04-01 02:37:25 +00:00
Bonian Chen
87e0ee06a6
[automerger skipped] Merge changes from topic "revert-1645152-getSystemService(Class<T>)-KMFSZZGDPU" am: 194af56330
am: a472f53325
am: 5735be835c
-s ours am: 02fc12a796
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1659980
Change-Id: I47d2fa72d72aa0a52194354eb6bc0af23a96f7d7
2021-04-01 02:35:07 +00:00
Bill Lin
e3e3fc915a
Merge "2/ Make One handed mode support multiple user switch" into sc-dev
2021-04-01 02:02:39 +00:00
Bonian Chen
02fc12a796
[automerger skipped] Merge changes from topic "revert-1645152-getSystemService(Class<T>)-KMFSZZGDPU" am: 194af56330
am: a472f53325
am: 5735be835c
-s ours
...
am skip reason: skipped by user bonianchen
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1659980
Change-Id: I2204d4f9d87decdb34160a75b895f143fffc3882
2021-04-01 01:56:32 +00:00
Ahaan Ugale
cccaf43f2a
Merge "Fix passwords settings crash due to null lifecycle owner." into sc-dev am: 3afa988e1e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13988607
Change-Id: Ifc1f436f389586d5c155d7e109521fee9ab902e9
2021-04-01 00:26:27 +00:00
Ahaan Ugale
3afa988e1e
Merge "Fix passwords settings crash due to null lifecycle owner." into sc-dev
2021-03-31 23:42:10 +00:00
TreeHugger Robot
73961cf510
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 46b5695031
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14054530
Change-Id: I6290aaafcbd76c6cb3008b9b2cf27beacb6831ec
2021-03-31 22:41:51 +00:00
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
46b5695031
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-03-31 22:35:24 +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
Bill Yi
29f8151d1e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id2e9d44d1f15a657d7e1651aca6e04d9d3586682
2021-03-31 19:19:40 +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
Bonian Chen
5735be835c
Merge changes from topic "revert-1645152-getSystemService(Class<T>)-KMFSZZGDPU" am: 194af56330
am: a472f53325
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1659980
Change-Id: I6100fa84ad5be8d33bd20d9836ecd432a217fe7a
2021-03-31 15:44:41 +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
Bonian Chen
a472f53325
Merge changes from topic "revert-1645152-getSystemService(Class<T>)-KMFSZZGDPU" am: 194af56330
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1659980
Change-Id: I0330a149d0b686e8acee05a5028f67e1cb7ad3a6
2021-03-31 15:03:38 +00:00
Bonian Chen
194af56330
Merge changes from topic "revert-1645152-getSystemService(Class<T>)-KMFSZZGDPU"
...
* changes:
Revert "[Settings] Support getSystemService(Class<T>)"
Revert "[Settings] Convert to getSystemService(Class<T>)"
2021-03-31 14:30:40 +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
Bill Lin
49ba85dc8a
2/ Make One handed mode support multiple user switch
...
Previously OHM did not support for multile user switch.
We get current user id in settings and get/put settings value
with currentUserId.
Test: manual switch user and check Settings > System > Gesture > One-Handed
Test: make RunSettingsRoboTests -j40
Bug: 182278800
Change-Id: I12dcc7b634ae19375358733357dc95197e81067c
2021-03-31 17:48:23 +08:00
Bonian Chen
2b195b4335
Revert "[Settings] Support getSystemService(Class<T>)"
...
Revert submission 1645152-getSystemService(Class<T>)
Reason for revert: Fix JUnit test failure
Reverted Changes:
I1b4812044:[Settings] Convert to getSystemService(Class<T>)
I278951c24:[Settings] Support getSystemService(Class<T>)
Change-Id: I5ca453c30c39d52e772033820f36ad448aeabe9e
2021-03-31 09:37:03 +00:00
Bonian Chen
d6f54ed90b
Revert "[Settings] Convert to getSystemService(Class<T>)"
...
Revert submission 1645152-getSystemService(Class<T>)
Reason for revert: Fix JUnit test failure
Reverted Changes:
I1b4812044:[Settings] Convert to getSystemService(Class<T>)
I278951c24:[Settings] Support getSystemService(Class<T>)
Change-Id: I864a40f82ba9cb4170900ac0c1d77f781b17341f
2021-03-31 09:37:03 +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
Ahaan Ugale
318f7cc512
Fix passwords settings crash due to null lifecycle owner.
...
A change related to lifecycles was reverted some time ago
(I7e6d2e9e6fd363a3afdd3dbab24e7c3b36e9ed29), which caused this to break.
The crash is only seen if an autofill service sets the new Passwords
Activity attr; currently no services do.
Fix: 184077486
Test: manual - check settings page and see no crash
Test: manual - same with work profile added
Test: make RunSettingsRoboTests
Change-Id: Ie439f37c9e884f9de2b112b348e1bef03adcd077
2021-03-31 03:31:33 +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