Commit Graph

109936 Commits

Author SHA1 Message Date
Chaohui Wang
99d6654e26 Merge "Clean up DarkUIInfoDialogFragment" into tm-dev am: 9ada0accef am: c308cad5c4 am: 0480f2f311 am: 22efb599ce
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18669107

Change-Id: If742859be5a7427bbab3cea99afeb319e2018896
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 13:41:32 +00:00
Chaohui Wang
bf6a182e98 Merge "Clean up DarkUIInfoDialogFragment" into tm-dev am: 9ada0accef am: 7c74b9ba19 am: c47291950d am: 6c090486a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18669107

Change-Id: I65e576feb006b453092d3d3409c986c7d868af06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 13:41:17 +00:00
Chaohui Wang
bfa9c894a7 Merge "Clean up DarkUIInfoDialogFragment" into tm-dev am: 9ada0accef am: 7c74b9ba19 am: 01e5be6e2a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18669107

Change-Id: I168865dfd4506ad866bbf2b382fcc4049b29cd1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 13:24:23 +00:00
Chaohui Wang
22efb599ce Merge "Clean up DarkUIInfoDialogFragment" into tm-dev am: 9ada0accef am: c308cad5c4 am: 0480f2f311
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18669107

Change-Id: Ic641223dc490cf426769c9faadc6c9c59731abed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 13:24:15 +00:00
Chaohui Wang
6c090486a0 Merge "Clean up DarkUIInfoDialogFragment" into tm-dev am: 9ada0accef am: 7c74b9ba19 am: c47291950d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18669107

Change-Id: I4d3edbf2d143de3bd7f37203438542389b72fb23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 13:24:00 +00:00
Chaohui Wang
01e5be6e2a Merge "Clean up DarkUIInfoDialogFragment" into tm-dev am: 9ada0accef am: 7c74b9ba19
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18669107

Change-Id: I4511c3d9357a37aee517b6431e4d0134b0273c6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 13:03:00 +00:00
Chaohui Wang
c47291950d Merge "Clean up DarkUIInfoDialogFragment" into tm-dev am: 9ada0accef am: 7c74b9ba19
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18669107

Change-Id: I9d987aa0747b3b5079a64623ee187a0398a4e84e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 13:02:56 +00:00
Chaohui Wang
0480f2f311 Merge "Clean up DarkUIInfoDialogFragment" into tm-dev am: 9ada0accef am: c308cad5c4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18669107

Change-Id: If9f224daecaa5a10d250656880f68bab30b8f537
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 13:02:51 +00:00
Chaohui Wang
a08a6e964c Merge "Clean up DarkUIInfoDialogFragment" into tm-dev am: 9ada0accef am: c8218514f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18669107

Change-Id: I803a98c15edc57a6ab9626c013a378004eef09e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 13:02:48 +00:00
Chaohui Wang
7c74b9ba19 Merge "Clean up DarkUIInfoDialogFragment" into tm-dev am: 9ada0accef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18669107

Change-Id: I493a08683c8f5ae0998f04fdcb987aead4d3fe5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 12:39:08 +00:00
Chaohui Wang
c8218514f2 Merge "Clean up DarkUIInfoDialogFragment" into tm-dev am: 9ada0accef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18669107

Change-Id: I19ed2d32594c8c61733cc033fb38c6fd3b9629ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 12:38:12 +00:00
Chaohui Wang
c308cad5c4 Merge "Clean up DarkUIInfoDialogFragment" into tm-dev am: 9ada0accef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18669107

Change-Id: I2b28f1f5052b553accc273ac356bd47ea832e805
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 12:37:45 +00:00
Chaohui Wang
9ada0accef Merge "Clean up DarkUIInfoDialogFragment" into tm-dev 2022-06-01 12:24:24 +00:00
Bill Yi
3466df0415 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I9c0c9eb87ae757d27c2917878e21cb2a7b3bc217
2022-06-01 03:43:59 -07:00
Rhed Jao
d6804cbff5 Merge "[Settings] Passing correct user id to getAppOpPermissionPackages" 2022-06-01 09:45:06 +00:00
Peter_Liang
4b13620457 Fix the preview section incorrectly ordered of the display size and text.
Goals: Set correct order into.

Fix: 233924113
Test: manual test
Change-Id: I88c65aa9c3f05281a5c5090c2ca9503327bb580f
2022-06-01 08:17:56 +00:00
Bill Yi
7e605531d0 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I577bf242a12cc6c991af536908032b74cf248c93
2022-06-01 00:12:09 -07: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
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
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
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
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
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