Joshua Mccloskey
5f34ae0309
Merge "Ensure lottie animations are not empty." into tm-dev am: 14a5aded8f
am: 3dd64a3e25
am: 0f27b0ab5c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18688745
Change-Id: I49fc372a55010ec9979515b4ab07193ae7770af6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 20:07:26 +00:00
Joshua Mccloskey
63451e68e5
Merge "Ensure lottie animations are not empty." into tm-dev am: 14a5aded8f
am: 7747c3b5dd
am: 569a8b4073
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18688745
Change-Id: Iae0613e80126b30bd3af29c459a2e8e5859e3111
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 20:07:01 +00:00
Joshua Mccloskey
8012fcd59b
Merge "Ensure lottie animations are not empty." into tm-dev am: 14a5aded8f
am: 7747c3b5dd
am: c665d436d6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18688745
Change-Id: I506c28d6c531c1e3582d8553235b9fc94799a3f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 20:05:33 +00:00
Joshua Mccloskey
0f27b0ab5c
Merge "Ensure lottie animations are not empty." into tm-dev am: 14a5aded8f
am: 3dd64a3e25
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18688745
Change-Id: I873d0537d902ac0ed9c5b8d6fa03f51e11fbebf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 19:42:35 +00:00
Joshua Mccloskey
569a8b4073
Merge "Ensure lottie animations are not empty." into tm-dev am: 14a5aded8f
am: 7747c3b5dd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18688745
Change-Id: Ic4fd9c1126a818bb40ef9b33a1e95ec2eafbe35e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 19:42:26 +00:00
Joshua Mccloskey
c665d436d6
Merge "Ensure lottie animations are not empty." into tm-dev am: 14a5aded8f
am: 7747c3b5dd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18688745
Change-Id: Ifd73e88826de5765f1a6e277716966c05d82feb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 19:42:05 +00:00
Joshua Mccloskey
7747c3b5dd
Merge "Ensure lottie animations are not empty." into tm-dev am: 14a5aded8f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18688745
Change-Id: If6c7958e49bb3b3a7c931ad8cd5a8c8bf0b9dde4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 18:54:44 +00:00
Joshua Mccloskey
3dd64a3e25
Merge "Ensure lottie animations are not empty." into tm-dev am: 14a5aded8f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18688745
Change-Id: Icd03348aae7c7f2814a4b00244016caaf8f6bbf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 18:53:17 +00:00
Joshua Mccloskey
14a5aded8f
Merge "Ensure lottie animations are not empty." into tm-dev
2022-06-01 18:02:39 +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
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
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
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
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
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
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
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
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
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
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
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
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