Hugh Chen
04052e23d7
Merge "Revert "Fix bluetooth settings will broadcast to anywhere when some cases"" into sc-dev am: cf2dc5107b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14056750
Change-Id: I3bc893768abbf7905fed16945a9c24cf42bdf671
2021-04-01 06:12:54 +00:00
Hugh Chen
cf2dc5107b
Merge "Revert "Fix bluetooth settings will broadcast to anywhere when some cases"" into sc-dev
2021-04-01 05:40:21 +00:00
Yanting Yang
e177746d0c
Merge "Add positive button into regulatory info dialog" into sc-dev am: 123422c99c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14048549
Change-Id: Ib535b28fcfd0a7d2678e871d0306a93a846296ba
2021-04-01 04:17:17 +00:00
Yanting Yang
123422c99c
Merge "Add positive button into regulatory info dialog" into sc-dev
2021-04-01 03:54:27 +00:00
Wesley.CW Wang
055fd69bb4
Update battery settings relative strings (2/3) am: e9cfef7ace
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14048547
Change-Id: Ief4426d55b698e7f896f77e88c4c8526aee45282
2021-04-01 03:38:55 +00:00
Bill Lin
e07f4fa4f7
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: I1e1c67501fa97ffae04c59a672c1e258de074381
2021-04-01 02:38:13 +00:00
Bonian Chen
26d235c109
[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: I8c72522dc11b42cc8df8fcebaae3f15c873140ad
2021-04-01 02:36:20 +00:00
Hugh Chen
802cb176d0
Revert "Fix bluetooth settings will broadcast to anywhere when some cases"
...
This reverts commit 9d00364da4 .
Reason for revert: This fix have a regression, for not blocking b/183344112 revert it.
Change-Id: Ic4366b51e07b43c8d64d2e145563d8a30cb0fc60
2021-04-01 02:24:51 +00:00
Wesley.CW Wang
e9cfef7ace
Update battery settings relative strings (2/3)
...
Bug: 183689347
Test: make
Change-Id: I11524a8bf6d929faa4e5f51581600b12916e3c46
2021-04-01 02:10:54 +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
a4da5dfd17
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: I05076e6539f2945c8d0ea6f18e91e108774cc28f
2021-04-01 00:27:50 +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
6e8f43e1dd
[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: Id5f7a0e4a7a1329fa41e3e63a6a91f89865fc53e
2021-03-31 22:42:34 +00:00
TreeHugger Robot
69ed67f7dd
[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: Ifc91a52eba6bf2827c21fd9ff9c022493f36bb8e
2021-03-31 22:41:33 +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
99a4ea666e
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: I4c95c8c4ef734676d4cdba2d423a7de08d252bb0
2021-03-31 22:13:18 +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
0db9eae659
Update battery progress bar am: fdfda5e589
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14045496
Change-Id: I6f1018104620870138928d90185e1f495e8ed727
2021-03-31 17:31:27 +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
34cb0130f3
Fix error in PowerMenuSettingsControllerTest am: 512419a454
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14051305
Change-Id: Ia622ce34c84dd82b82558424055eb52438bc7487
2021-03-31 15:43:07 +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
f2f934a6da
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: I6141e09568e1a4b94ffaff401bf402996abe9d7f
2021-03-31 13:01:21 +00:00
Arc Wang
53f73de3d9
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: I3b757ffa1979f39dec32ae7fea5beba4ed73ba0e
2021-03-31 13:00:50 +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
0a3f268cf8
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: I23e3df9ef9a2fc7f3e1830c870b2986db3ddac00
2021-03-31 11:02:08 +00:00
Alex Johnston
a05759cb7d
Merge "Remove hardcoded URL string" into sc-dev
2021-03-31 10:35:51 +00:00
Yanting Yang
acbd60285f
Add positive button into regulatory info dialog
...
Based on UX decision to add the positive button into regulatory info
dialog to exit.
Bug: 180558322
Test: visual
Change-Id: I0939ec11d140b5df6d4104042cc376b5c07f12e4
2021-03-31 18:00:29 +08: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
db5f21228c
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: I884ff4189416d1c313aad75e8adea7bf1d5c0c4d
2021-03-31 08:38:02 +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
ba7e033977
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: I105bdb7bd731473c8668a56833b463047cc238a7
2021-03-31 03:39:57 +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
19fd698779
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: I03168e7fbd0a9a112d38f8d631e14a3eac2f3fe6
2021-03-30 20:32:03 +00:00
Fan Zhang
b6599ebede
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: If5a56f4cae6288aab31e0334a1604eff781f2137
2021-03-30 20:29:43 +00:00
Jay Aliomer
91b4a58111
Merge "Notification history UI buff" into sc-dev
2021-03-30 20:29:33 +00:00