Commit Graph

109869 Commits

Author SHA1 Message Date
Chaohui Wang
bb5b51e44c Clean up unused string resource sync_plug
This one is added by commit 43c697854c,
but not find any usage.

Bug: 234570979
Test: make Settings
Change-Id: I3941efb0e5e93ceaa5f0fb2ffe96567992d673fb
2022-06-01 18:43:10 +08:00
Rhed Jao
d6804cbff5 Merge "[Settings] Passing correct user id to getAppOpPermissionPackages" 2022-06-01 09:45:06 +00:00
Chaohui Wang
777595cc82 Merge "Fix flicker in Dark theme" into tm-dev am: 71fe20ea8b am: f1487a7661 am: cb66a7b88a am: d0392c974c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18659336

Change-Id: If6766659a1141fb8619775775f2054bd3ad218c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 03:54:54 +00:00
Chaohui Wang
bcf3a5768e Merge "Fix flicker in Dark theme" into tm-dev am: 71fe20ea8b am: 596644171b am: f519eb1c05 am: 2e167ee500
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18659336

Change-Id: I53e6614e4ab0cd3df6ac317bdad307676a96a876
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 03:54:31 +00:00
Chaohui Wang
ef0aa0e3e1 Merge "Fix flicker in Dark theme" into tm-dev am: 71fe20ea8b am: 596644171b am: f34bac0ee6 am: 7cebd7959d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18659336

Change-Id: I5c4b0f57b65e322ba4f717eeb462f04ce6d99857
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 03:53:23 +00:00
Chaohui Wang
d0392c974c Merge "Fix flicker in Dark theme" into tm-dev am: 71fe20ea8b am: f1487a7661 am: cb66a7b88a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18659336

Change-Id: I6dc9cf6427b05c93c4538581a5e6adb7ba7a6d3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 03:30:15 +00:00
Chaohui Wang
2e167ee500 Merge "Fix flicker in Dark theme" into tm-dev am: 71fe20ea8b am: 596644171b am: f519eb1c05
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18659336

Change-Id: I167453310c055e64e19a5a7065c3473e5d5a05ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 03:29:42 +00:00
Chaohui Wang
7cebd7959d Merge "Fix flicker in Dark theme" into tm-dev am: 71fe20ea8b am: 596644171b am: f34bac0ee6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18659336

Change-Id: I2d90540595b155fd0299725334c6179c6dc2d2ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 03:29:13 +00:00
Chaohui Wang
cb66a7b88a Merge "Fix flicker in Dark theme" into tm-dev am: 71fe20ea8b am: f1487a7661
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18659336

Change-Id: Ib9c41d951f5e3e4330a1cb616dc2f6ffdccfae8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 03:07:02 +00:00
Chaohui Wang
f519eb1c05 Merge "Fix flicker in Dark theme" into tm-dev am: 71fe20ea8b am: 596644171b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18659336

Change-Id: Ia5dbd8fa8e67fce3b8d20f6cedbb983e65650650
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 03:06:41 +00:00
Chaohui Wang
f34bac0ee6 Merge "Fix flicker in Dark theme" into tm-dev am: 71fe20ea8b am: 596644171b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18659336

Change-Id: I70b1572efb652df90ddaaa633e34cc8fad0e543b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 03:06:41 +00:00
Chaohui Wang
2416be0c66 Merge "Fix flicker in Dark theme" into tm-dev am: 71fe20ea8b am: 57e99642e6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18659336

Change-Id: Ib8c22696072a50a8c7926a5625e49f0a967574f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 03:06:21 +00:00
Chaohui Wang
596644171b Merge "Fix flicker in Dark theme" into tm-dev am: 71fe20ea8b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18659336

Change-Id: I9c4aed2bb375a2b8b7836a139b1b01f64d235dce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 02:51:43 +00:00
Chaohui Wang
57e99642e6 Merge "Fix flicker in Dark theme" into tm-dev am: 71fe20ea8b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18659336

Change-Id: I111f39e1f41413f3ab5e73e51bda2694c7aebbc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 02:50:46 +00:00
Chaohui Wang
f1487a7661 Merge "Fix flicker in Dark theme" into tm-dev am: 71fe20ea8b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18659336

Change-Id: I649d3486aa2228af4d68dc1a80b414fe36510c80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 02:50:22 +00:00
Chaohui Wang
71fe20ea8b Merge "Fix flicker in Dark theme" into tm-dev 2022-06-01 02:35:51 +00:00
TreeHugger Robot
25be25a8e6 Merge "Update biometrics OWNERS" into tm-d1-dev am: 715ffb6f0e am: ecfb8ca300 am: 79e5384a84
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18641304

Change-Id: I28c6790d98d7cee5681e50d321d3d34387d9680d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 23:35:22 +00:00
TreeHugger Robot
dfcef8896f Merge "Update biometrics OWNERS" into tm-d1-dev am: 715ffb6f0e am: 28b3a9a7ae am: ace4d8944c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18641304

Change-Id: Ib3413537b6b069964e134f3825b235a0df3ff391
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 23:33:24 +00:00
TreeHugger Robot
79e5384a84 Merge "Update biometrics OWNERS" into tm-d1-dev am: 715ffb6f0e am: ecfb8ca300
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18641304

Change-Id: I048bca44c0b3750cc666e46d2775013e492d5e98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 23:08:10 +00:00
TreeHugger Robot
ace4d8944c Merge "Update biometrics OWNERS" into tm-d1-dev am: 715ffb6f0e am: 28b3a9a7ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18641304

Change-Id: I016d7fefa06a535a5edff5670a7c847fa86abacd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 23:07:57 +00:00
TreeHugger Robot
28b3a9a7ae Merge "Update biometrics OWNERS" into tm-d1-dev am: 715ffb6f0e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18641304

Change-Id: I9e12101cb0fd246ec5dde24754f298173a1fda80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 22:54:33 +00:00
TreeHugger Robot
ecfb8ca300 Merge "Update biometrics OWNERS" into tm-d1-dev am: 715ffb6f0e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18641304

Change-Id: Ifa8ecedac0cd5918c06a29327685dd3cf5ad8b0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 22:54:28 +00:00
TreeHugger Robot
715ffb6f0e Merge "Update biometrics OWNERS" into tm-d1-dev 2022-05-31 22:34:46 +00:00
Lin Yuan
1e71471b2c Merge "Fix: policy enforcement for location wifi scanning" 2022-05-31 13:42:13 +00:00
Amith Yamasani
b0d56f0ee3 Use Uri.toString() instead of Uri.toSafeString() am: 1b27c91a7b am: b9e7df683f am: 2294b09650 am: 19fd2f197a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18646683

Change-Id: Ia6b14989102c1ba7c4588cec8555c2cbbb6c0454
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 13:19:15 +00:00
Amith Yamasani
5f3b714afa Use Uri.toString() instead of Uri.toSafeString() am: 1b27c91a7b am: 390236115a am: 6cbe791c94 am: 860c9cf331
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18646683

Change-Id: Ief1a4987d1cefe4b20e5a3c38d6e8bd682a9e663
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 13:19:06 +00:00
Amith Yamasani
bdf5299053 Use Uri.toString() instead of Uri.toSafeString() am: 1b27c91a7b am: 390236115a am: 6a4d79541a am: bb2e561062
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18646683

Change-Id: I97a5f101e2d5d1f311c5e2fb47893aeb972f918a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 13:18:47 +00:00
Amith Yamasani
19fd2f197a Use Uri.toString() instead of Uri.toSafeString() am: 1b27c91a7b am: b9e7df683f am: 2294b09650
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18646683

Change-Id: I1ca776798e91d0834e475abd7ade5e1513d57b1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 13:01:14 +00:00
Amith Yamasani
860c9cf331 Use Uri.toString() instead of Uri.toSafeString() am: 1b27c91a7b am: 390236115a am: 6cbe791c94
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18646683

Change-Id: Ied7da083634089348e9a2664d588f4dee534b276
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 13:00:57 +00:00
Amith Yamasani
bb2e561062 Use Uri.toString() instead of Uri.toSafeString() am: 1b27c91a7b am: 390236115a am: 6a4d79541a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18646683

Change-Id: I23449db027d5c663cb3dfe7a76211e0e92f87d1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 13:00:44 +00:00
Amith Yamasani
2294b09650 Use Uri.toString() instead of Uri.toSafeString() am: 1b27c91a7b am: b9e7df683f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18646683

Change-Id: I535eda21a8445deb256a145170ae42ae1a3115ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 12:40:10 +00:00
Amith Yamasani
6cbe791c94 Use Uri.toString() instead of Uri.toSafeString() am: 1b27c91a7b am: 390236115a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18646683

Change-Id: I31e002c94128935ef811033da62b831299925df9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 12:40:00 +00:00
Amith Yamasani
6a4d79541a Use Uri.toString() instead of Uri.toSafeString() am: 1b27c91a7b am: 390236115a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18646683

Change-Id: If31bb0c8c6927bd7eb7f0898d9afdf84af6b6bf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 12:39:59 +00:00
Amith Yamasani
d29969dc59 Use Uri.toString() instead of Uri.toSafeString() am: 1b27c91a7b am: faa28109f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18646683

Change-Id: I670440d0d88c3deac0e080b1d78408d5ba3b25cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 12:39:30 +00:00
Amith Yamasani
390236115a Use Uri.toString() instead of Uri.toSafeString() am: 1b27c91a7b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18646683

Change-Id: I69c616bb66f0a440e654fe8c324bd222d1b3e612
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 12:25:01 +00:00
Amith Yamasani
faa28109f2 Use Uri.toString() instead of Uri.toSafeString() am: 1b27c91a7b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18646683

Change-Id: I451b1cddcedf6a2f5daa95d3a1426e7f6ea56a2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 12:24:06 +00:00
Amith Yamasani
b9e7df683f Use Uri.toString() instead of Uri.toSafeString() am: 1b27c91a7b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18646683

Change-Id: I169d16a6dbb7cec8a82386ebd7f482845d2f0836
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 12:23:43 +00:00
Chaohui Wang
9f6eaf8624 Fix flicker in Dark theme
Currently, when schedule sets to "Turns on at bedtime", the footer will
show a slid up animation when entering the page, this is because the
"Start time" & "End time" preferences are hidden in onResume().

This is because these 2 preferences always return AVAILABLE in
getAvailabilityStatus(), and manually update visibility in
refreshSummary(), which is called each time updateState() is called.

Usually the controller not set the visibility explicitly, but return
CONDITIONALLY_UNAVAILABLE in getAvailabilityStatus() when they want to
hide the preference.

Because getAvailabilityStatus() is called in onCreate(), by using this,
we can fix the flicker.

Fix: 234399017
Test: visual & robo test
Change-Id: I4cb7dd95d2985bd1ca4c8cb30aaebdc21a5415f8
2022-05-31 19:03:54 +08:00
menghanli
99030d8382 Polish reset display size and text dialog content am: 51a056ec32 am: c17018fdbf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18659331

Change-Id: Ic09f49855014f2755a6b1ab5ed78b9bcd67b7d6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 08:24:30 +00:00
menghanli
c17018fdbf Polish reset display size and text dialog content am: 51a056ec32
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18659331

Change-Id: I08cd1e9467a0713b41a6d86b45e46cce6c571258
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 07:39:23 +00:00
Amith Yamasani
1b27c91a7b Use Uri.toString() instead of Uri.toSafeString()
Uri.toSafeString strips out paths and shouldn't be used
for situations other than logging.

Bug: 232694281
Test: PtsPowerTestCases
Change-Id: Iec835b738c3e928e922bd6a14573106f2ce4f526
2022-05-30 23:22:25 -07:00
Zoey Chen
1b58b29a41 [automerger skipped] Merge "[LeAudio] Remove the QrCamera and decorateView in Settings" am: 31011d591f am: bd8c589390 -s ours am: 95c15f1f0b -s ours am: ad2bdc8fef -s ours am: 99b85ef683 -s ours
am skip reason: Merged-In Ibc29f0e90af28e14a11164fa8940920745545c7e with SHA-1 bf99e37329 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2107987

Change-Id: Ib74419430b66930630a0057080f36d8116782ec6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 05:29:02 +00:00
Zoey Chen
99b85ef683 [automerger skipped] Merge "[LeAudio] Remove the QrCamera and decorateView in Settings" am: 31011d591f am: bd8c589390 -s ours am: 95c15f1f0b -s ours am: ad2bdc8fef -s ours
am skip reason: Merged-In Ibc29f0e90af28e14a11164fa8940920745545c7e with SHA-1 bf99e37329 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2107987

Change-Id: Ie3d10be0e38199945c2edc85a31dd7e585df06de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 04:51:05 +00:00
Zoey Chen
ad2bdc8fef [automerger skipped] Merge "[LeAudio] Remove the QrCamera and decorateView in Settings" am: 31011d591f am: bd8c589390 -s ours am: 95c15f1f0b -s ours
am skip reason: Merged-In Ibc29f0e90af28e14a11164fa8940920745545c7e with SHA-1 bf99e37329 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2107987

Change-Id: I3696416d7a05fc2cd6d7c3d3fe4018131388f5ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 04:37:04 +00:00
Zoey Chen
95c15f1f0b [automerger skipped] Merge "[LeAudio] Remove the QrCamera and decorateView in Settings" am: 31011d591f am: bd8c589390 -s ours
am skip reason: Merged-In Ibc29f0e90af28e14a11164fa8940920745545c7e with SHA-1 bf99e37329 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2107987

Change-Id: I25e081bb87845b2b286326eaad7f53573eb9e441
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 04:22:36 +00:00
Zoey Chen
bd8c589390 Merge "[LeAudio] Remove the QrCamera and decorateView in Settings" am: 31011d591f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2107987

Change-Id: Iee27c40089c612cd2e9ac80a4fa218d707fffd0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 03:57:00 +00:00
Zoey Chen
31011d591f Merge "[LeAudio] Remove the QrCamera and decorateView in Settings" 2022-05-31 03:27:51 +00:00
menghanli
51a056ec32 Polish reset display size and text dialog content
Use "tablet" for tablet devices; use "phone" for default

Bug: 233985662
Test: Manual testing
Change-Id: I24e54315414502dc61efb733bbf697783b1de87a
2022-05-30 23:54:09 +00:00
Rhed Jao
bd2bcd5cca [Settings] Passing correct user id to getAppOpPermissionPackages
A new user id parameter is added to the
IPackageManager#getAppOpPermissionPackages API. Update the new api
usage to the Settings application.

Bug: 229684723
Test: atest SettingsUnitTests
Test: m -j RunSettingsRoboTests \
      ROBOTEST_FILTER="AlarmsAndRemindersDetailsTest|
            AlarmsAndRemindersDetailPreferenceControllerTest"
Change-Id: I8c90f0a57426c669478367004571cca5dfb05cb6
2022-05-30 14:55:50 +08:00
Automerger Merge Worker
ddf0a2ffc6 Merge "Merge "Enable hyphenation on most of preference." into tm-dev am: 610538e10b am: 7e712ef660" into tm-d1-dev-plus-aosp am: 2773af62b8 am: c67e3c2433
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515218

Change-Id: Ie8f2ff1590c137154097cb9cd7d4c42d7a941462
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-30 05:48:07 +00:00