Commit Graph

104015 Commits

Author SHA1 Message Date
Joshua McCloskey
68f6089745 Ensure lottie animations are not empty.
Test: Verified device doesn't crash in AOSP when lottie
animations are empty.
Bug: 228284341

Change-Id: If39096b3169c4956cb7f3ec66c4df58e41c66e86
2022-06-01 01:01:12 +00:00
Lin Yuan
c877dce583 Fix: policy enforcement for location wifi scanning
Make DISALLOW_CONFIG_LOCATION effectively disallow wifi scanning and
bluetooth scanning settings for location services.

screenshots: http://shortn/_EUOdqrOcnS, http://shortn/_j320QDm1Zo

Bug: 228315522
Bug: 228315529
Test: atest SettingsRoboTests, on device

Change-Id: I78291579a79e915a27ebdd051b3caf3fc04efc41
(cherry picked from commit fcae147f58)
2022-05-31 23:00:32 +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
Raphael Kim
c548f102e5 Extract app label from component name in notification access confirmation UI
Bug: 228178437
Test: Manually tested on POC
Change-Id: I8613d9b87a53d4641c0689bca9c961c66a2e9415
Merged-In: I8613d9b87a53d4641c0689bca9c961c66a2e9415
2022-05-31 17:21:36 +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
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
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
Chaohui Wang
75e4028b3e Clean up DarkUIInfoDialogFragment
The usage of this dialog is removed in
Change Ie2cf147de53385ae0c626c8472306f1b85317686

But this dialog is created (but not show) in DarkUIPreferenceController
each time dark mode toggle is turned on by user.

So clean this up.

Fix: 234419979
Test: make Settings
Change-Id: Icdc9d7a4fb77dc8b2a3f1a9d8e3f40fc0af4917d
2022-05-31 17:58:05 +08: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
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
Edgar Wang
4f5a65d4bb Merge "Enable hyphenation on most of preference." into tm-dev am: 610538e10b am: 1767504702
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515218

Change-Id: I0e30a9c258df97364b0ef848ed669d73e5a9b75a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-30 05:05:29 +00:00
Edgar Wang
1767504702 Merge "Enable hyphenation on most of preference." into tm-dev am: 610538e10b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515218

Change-Id: I584713ed38df60ecb9742f79f5cbc2e0c2ea90bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-30 04:36:10 +00:00
Edgar Wang
610538e10b Merge "Enable hyphenation on most of preference." into tm-dev 2022-05-30 04:00:19 +00:00
Chaohui Wang
304a3fd37e Merge "Enable Kotlin for Settings App" into tm-qpr-dev 2022-05-30 02:43:23 +00:00
Chaohui Wang
9ec6f0e41a Enable Kotlin for Settings App
Currently Kotlin files cannot build with library app-compat-annotations.

Only one @ChangeId need this library, create separate build target
library Settings-change-ids to solve this issue.

After this cl, Kotlin could be used for Settings App.

Fix: 229037247
Test: make Settings
Change-Id: I4a0d99425c9e6cc2cbc015d2561daa68609ca0fd
2022-05-30 01:58:25 +08:00
Ilya Matyukhin
28608774cb Update biometrics OWNERS
Bug: 234195983
Test: N/A
Change-Id: I9843d0d6fad638cd14296624b11f86a273baab1c
2022-05-28 05:36:43 +00:00
TreeHugger Robot
7b75a759ac [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8720510d2d -s ours am: 56da28b680 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0afaecd36ca72d2f3d678f59feab3bb0abd4fc82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 17:12:59 +00:00
Bill Yi
f3ba7e3f06 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4fcb08305a -s ours am: cda0c42d9e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5565696d5dddc6468dfbd6add59b29f19093178e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 17:12:49 +00:00
TreeHugger Robot
2ba92e1138 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: a55b8573ef -s ours am: 0f7ae55fd9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibe970d983b9836ee7b1cf596fc3c450cc2ff706a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 17:12:33 +00:00
Bill Yi
fcf0332625 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ff457d8594 -s ours am: d9de74c23a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3fb0dc099644deff88e0bb8b8268ee3a70af3591
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 17:12:15 +00:00
TreeHugger Robot
56da28b680 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8720510d2d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I43e638073a5b58e2e72866101e72ecd66c865aff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 16:56:13 +00:00
Bill Yi
cda0c42d9e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4fcb08305a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icabe13a3d76f22248a3fc6f27f9d8f206232548a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 16:56:09 +00:00
TreeHugger Robot
0f7ae55fd9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: a55b8573ef -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0bba91cc0b512d6c8fdabbe84e1f12b679e76b09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 16:55:56 +00:00
Bill Yi
d9de74c23a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ff457d8594 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I62366470c595bf8351efffa900bae281c69e4d6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 16:55:29 +00:00
TreeHugger Robot
8720510d2d Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-05-27 16:45:14 +00:00
TreeHugger Robot
a55b8573ef Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-05-27 16:45:14 +00:00
TreeHugger Robot
ca0b0e7ca2 Merge "Fix can't change notification sound for work profile." into tm-dev am: 07db5f4362 am: 1340a91c73
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618750

Change-Id: I9ae683784754566b48e88d302b59f575fedca2b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 16:14:26 +00:00
TreeHugger Robot
1340a91c73 Merge "Fix can't change notification sound for work profile." into tm-dev am: 07db5f4362
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618750

Change-Id: Ifdd591d7f032facbfe0f0f6dfe6db587271ec386
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 15:56:19 +00:00
TreeHugger Robot
07db5f4362 Merge "Fix can't change notification sound for work profile." into tm-dev 2022-05-27 15:36:13 +00:00
SongFerng Wang
b5bc3952c5 Merge "[MEP] The removale slot can read the esim card" into tm-dev am: a67d5e25a3 am: e4d42c1515
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618753

Change-Id: Ie73fca56e20e0c70230ff6823eba12ff63c208f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 15:33:56 +00:00
SongFerng Wang
e4d42c1515 Merge "[MEP] The removale slot can read the esim card" into tm-dev am: a67d5e25a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618753

Change-Id: I4c163ea303beefcf265ba6b67585d7559aab9ff4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 15:18:44 +00:00
SongFerng Wang
a67d5e25a3 Merge "[MEP] The removale slot can read the esim card" into tm-dev 2022-05-27 14:58:43 +00:00
Tsung-Mao Fang
40fbcf333f Fix can't change notification sound for work profile.
Use correct user id context to query the type,
so we won't get empty result unexpectedly.

If we get the null result, then we won't set sound sucessfully.

Fix: 233580016
Test: Manual test and set work profile sound works.
Change-Id: I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad
2022-05-27 21:13:33 +08:00
Chaohui Wang
2ff3a05456 Merge "Fix flicker for AppDataUsage when zero usage" into tm-dev am: 98429fbe65 am: 408728d4ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18617746

Change-Id: Ied58d877d63ad065e783cadbf401589e065a0d07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 10:42:53 +00:00
Chaohui Wang
71961276bd Merge "Fix flicker for AppDataUsagePreference" into tm-dev am: 05f6617b64 am: 7f4341f9aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603832

Change-Id: I5c6bbd8f0ab3f816492bcf1ecaf34a9acbcd3c63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 10:42:45 +00:00
Jason Chiu
9ac3a4c795 Merge "Don't start two pane for singleInstance deep links" into tm-dev am: bd6107d172 am: aaa3ad0890
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603833

Change-Id: I16bdab3cae1f85976e34b8e0ce781cd2397a837d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 10:42:28 +00:00
Chaohui Wang
408728d4ab Merge "Fix flicker for AppDataUsage when zero usage" into tm-dev am: 98429fbe65
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18617746

Change-Id: I47ff02a503fd52cd79be438647d0f45c74c22a11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 10:34:44 +00:00
Chaohui Wang
98429fbe65 Merge "Fix flicker for AppDataUsage when zero usage" into tm-dev 2022-05-27 10:29:51 +00:00
Chaohui Wang
7f4341f9aa Merge "Fix flicker for AppDataUsagePreference" into tm-dev am: 05f6617b64
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603832

Change-Id: I98bd7e8de5893d0f39fe91c99472346a3a9cadae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 10:18:53 +00:00
Jason Chiu
aaa3ad0890 Merge "Don't start two pane for singleInstance deep links" into tm-dev am: bd6107d172
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603833

Change-Id: I62b60adb13e8068ef8c16aef67ef01c2ad988161
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 10:18:46 +00:00
Chaohui Wang
05f6617b64 Merge "Fix flicker for AppDataUsagePreference" into tm-dev 2022-05-27 10:13:41 +00:00
Jason Chiu
bd6107d172 Merge "Don't start two pane for singleInstance deep links" into tm-dev 2022-05-27 09:52:30 +00:00
SongFerngWang
18f10bb8b1 [MEP] The removale slot can read the esim card
Revert the wrong logic for removale slot part at ag/18579901,
the removable slot can read the esim card.

Bug: 233338345
Test: atest UiccSlotUtilTest
Change-Id: Ic2ac6a5cc4d5846b8b1e2ca766348f239bb1b719
2022-05-27 16:44:52 +08:00
SongFerng Wang
af87b62083 Merge "Changing the condition since the esim may be removable" into tm-dev am: fa5407c60f am: 15c33001a2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579901

Change-Id: I8bbfbd514c1c667134c3d798e477ea6d3e87faa3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 06:55:41 +00:00
SongFerng Wang
15c33001a2 Merge "Changing the condition since the esim may be removable" into tm-dev am: fa5407c60f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579901

Change-Id: If3afab7ab294f3ce2836f96c12ba1d95dd82fbb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 06:41:11 +00:00
SongFerng Wang
fa5407c60f Merge "Changing the condition since the esim may be removable" into tm-dev 2022-05-27 06:23:16 +00:00
Hank Sheng
55e4e5d0e3 Merge "Create the glifv4 theme and set to glifv4 theme when the themestring is glifv4." into tm-dev am: 3dfcc708aa am: 349b36bb91
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579898

Change-Id: Ifcef39885b565fbbdc950fe43c6b26d57e2bdcfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 05:48:57 +00:00
Chaohui Wang
6737a44fba Merge "Fix unable to toggle off Pause app activity" into tm-dev am: bc2e0f5fc4 am: caabb4fe49
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18581945

Change-Id: I97d75ae94ed28e05698b516ef7e43d6c638c2b7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 05:48:18 +00:00
Hank Sheng
349b36bb91 Merge "Create the glifv4 theme and set to glifv4 theme when the themestring is glifv4." into tm-dev am: 3dfcc708aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579898

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