Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Settings: Pass empty lottie resource for quickly open camera animation"

Browse Source 
This reverts commit 212730dd7599f49f306214a1fe4923c4c45ebe9f.
This commit is contained in:
Joey Huab
2025-04-04 23:36:10 +09:00
committed by Joey
parent 2cfd52ca24
commit 51a13a02e3
5 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/drawable/quickly_open_camera.xml Normal file
View File

@@ -0,0 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<shape>
</shape>

0
res/raw/lottie_quickly_open_camera.json
View File

2
res/xml/double_tap_power_settings.xml
View File

@@ -22,7 +22,7 @@
<com.android.settingslib.widget.IllustrationPreference <com.android.settingslib.widget.IllustrationPreference
android:key="gesture_double_tap_power_video" android:key="gesture_double_tap_power_video"
settings:searchable="false" settings:searchable="false"
settings:lottie_rawRes="@raw/lottie_quickly_open_camera" settings:lottie_rawRes="@drawable/quickly_open_camera"
settings:controller="com.android.settings.gestures.DoubleTapPowerIllustrationPreferenceController"/> settings:controller="com.android.settings.gestures.DoubleTapPowerIllustrationPreferenceController"/>
<com.android.settingslib.widget.MainSwitchPreference <com.android.settingslib.widget.MainSwitchPreference

2
res/xml/double_tap_power_to_open_camera_settings.xml
View File

@@ -23,7 +23,7 @@
<com.android.settingslib.widget.IllustrationPreference <com.android.settingslib.widget.IllustrationPreference
android:key="gesture_double_tap_power_video" android:key="gesture_double_tap_power_video"
settings:searchable="false" settings:searchable="false"
settings:lottie_rawRes="@raw/lottie_quickly_open_camera"/> settings:lottie_rawRes="@drawable/quickly_open_camera"/>
<SwitchPreferenceCompat <SwitchPreferenceCompat
android:key="gesture_double_tap_power" android:key="gesture_double_tap_power"

2
src/com/android/settings/gestures/DoubleTapPowerIllustrationPreferenceController.java
View File

@@ -78,7 +78,7 @@ public class DoubleTapPowerIllustrationPreferenceController extends BasePreferen
DoubleTapPowerSettingsUtils DoubleTapPowerSettingsUtils
.isDoubleTapPowerButtonGestureForCameraLaunchEnabled( .isDoubleTapPowerButtonGestureForCameraLaunchEnabled(
mContext) mContext)
? R.raw.lottie_quickly_open_camera ? R.drawable.quickly_open_camera
: R.drawable.double_tap_power_for_wallet); : R.drawable.double_tap_power_for_wallet);
} }