cd7025db5c
Co-authored-by: Arian <arian.kulmer@web.de> Change-Id: Iad52ad7d41ae69d8855dd80175b1faf79e56e382 Signed-off-by: Fiqri Ardyansyah <fiqri191002@gmail.com>
146 lines
4.1 KiB
Diff
146 lines
4.1 KiB
Diff
From 46d9d51b8fc8a9c82003c8461fab2fdd5fc16088 Mon Sep 17 00:00:00 2001
|
|
From: Arian <arian.kulmer@web.de>
|
|
Date: Tue, 15 Oct 2024 18:58:34 +0200
|
|
Subject: [PATCH 08/10] Read AOSP integer camera_launch_source intent in
|
|
STILL_IMAGE_CAMERA case
|
|
|
|
MIUI changed the camera_launch_source to be a string, but AOSP provides integers.
|
|
---
|
|
smali/com/android/camera/s2.smali | 78 +++++++++++--------------------
|
|
1 file changed, 27 insertions(+), 51 deletions(-)
|
|
|
|
diff --git a/smali/com/android/camera/s2.smali b/smali/com/android/camera/s2.smali
|
|
index 2b38cd214..874c246cd 100644
|
|
--- a/smali/com/android/camera/s2.smali
|
|
+++ b/smali/com/android/camera/s2.smali
|
|
@@ -528,9 +528,11 @@
|
|
|
|
const-string v1, "com.android.systemui.camera_launch_source"
|
|
|
|
- invoke-virtual {v0, v1}, Landroid/content/Intent;->getStringExtra(Ljava/lang/String;)Ljava/lang/String;
|
|
+ const/4 v2, -0x1
|
|
|
|
- move-result-object v0
|
|
+ invoke-virtual {v0, v1, v2}, Landroid/content/Intent;->getIntExtra(Ljava/lang/String;I)I
|
|
+
|
|
+ move-result v0
|
|
|
|
new-instance v1, Ljava/lang/StringBuilder;
|
|
|
|
@@ -540,7 +542,7 @@
|
|
|
|
invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
|
|
|
- invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
|
+ invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
|
|
|
|
invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
|
|
|
|
@@ -562,19 +564,23 @@
|
|
|
|
move-result v1
|
|
|
|
- const-string v3, "power_double_tap"
|
|
+ # CAMERA_LAUNCH_SOURCE_POWER_DOUBLE_TAP = 1
|
|
+ const/4 v4, 0x1
|
|
|
|
if-eqz v1, :cond_0
|
|
|
|
- invoke-static {v0, v3}, Landroid/text/TextUtils;->equals(Ljava/lang/CharSequence;Ljava/lang/CharSequence;)Z
|
|
+ const/4 v2, 0x1
|
|
|
|
- move-result p0
|
|
+ if-eq v0, v4, :cond_3
|
|
|
|
- invoke-static {p0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
|
|
+ const/4 v2, 0x0
|
|
|
|
- move-result-object p0
|
|
+ :cond_3
|
|
+ invoke-static {v2}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
|
|
|
|
- return-object p0
|
|
+ move-result-object v2
|
|
+
|
|
+ return-object v2
|
|
|
|
:cond_0
|
|
iget-object p0, p0, Lcom/android/camera/s2;->a:Landroid/content/Intent;
|
|
@@ -589,35 +595,9 @@
|
|
|
|
if-eqz p0, :cond_1
|
|
|
|
- invoke-static {v0, v3}, Landroid/text/TextUtils;->equals(Ljava/lang/CharSequence;Ljava/lang/CharSequence;)Z
|
|
-
|
|
- move-result p0
|
|
-
|
|
- if-nez p0, :cond_1
|
|
-
|
|
- const-string p0, "double_click_volume_down"
|
|
-
|
|
- invoke-static {v0, p0}, Landroid/text/TextUtils;->equals(Ljava/lang/CharSequence;Ljava/lang/CharSequence;)Z
|
|
-
|
|
- move-result p0
|
|
-
|
|
- if-nez p0, :cond_1
|
|
-
|
|
- const-string/jumbo p0, "stabilizer"
|
|
-
|
|
- invoke-static {v0, p0}, Landroid/text/TextUtils;->equals(Ljava/lang/CharSequence;Ljava/lang/CharSequence;)Z
|
|
-
|
|
- move-result p0
|
|
-
|
|
- if-nez p0, :cond_1
|
|
-
|
|
- const-string p0, "miwatch"
|
|
-
|
|
- invoke-static {v0, p0}, Landroid/text/TextUtils;->equals(Ljava/lang/CharSequence;Ljava/lang/CharSequence;)Z
|
|
+ if-eq v0, v4, :cond_1
|
|
|
|
- move-result p0
|
|
-
|
|
- if-eqz p0, :cond_2
|
|
+ goto :cond_2
|
|
|
|
:cond_1
|
|
const/4 v2, 0x1
|
|
@@ -1078,25 +1058,21 @@
|
|
|
|
const-string v0, "com.android.systemui.camera_launch_source"
|
|
|
|
- invoke-virtual {p0, v0}, Landroid/content/Intent;->getStringExtra(Ljava/lang/String;)Ljava/lang/String;
|
|
-
|
|
- move-result-object p0
|
|
-
|
|
- const-string v0, "lockscreen_affordance"
|
|
-
|
|
- invoke-static {p0, v0}, Landroid/text/TextUtils;->equals(Ljava/lang/CharSequence;Ljava/lang/CharSequence;)Z
|
|
-
|
|
- move-result v0
|
|
+ const/4 v1, -0x1
|
|
|
|
- if-nez v0, :cond_3
|
|
+ invoke-virtual {p0, v0, v1}, Landroid/content/Intent;->getIntExtra(Ljava/lang/String;I)I
|
|
|
|
- const-string v0, "power_double_tap"
|
|
+ move-result p0
|
|
|
|
- invoke-static {p0, v0}, Landroid/text/TextUtils;->equals(Ljava/lang/CharSequence;Ljava/lang/CharSequence;)Z
|
|
+ # CAMERA_LAUNCH_SOURCE_POWER_DOUBLE_TAP = 1
|
|
+ const/4 v1, 0x1
|
|
+ if-eq p0, v1, :cond_3
|
|
|
|
- move-result p0
|
|
+ # CAMERA_LAUNCH_SOURCE_QUICK_AFFORDANCE = 3
|
|
+ const/4 v1, 0x3
|
|
+ if-eq p0, v1, :cond_3
|
|
|
|
- if-eqz p0, :cond_4
|
|
+ goto :cond_4
|
|
|
|
:cond_3
|
|
const/4 v2, 0x1
|
|
--
|
|
2.47.2
|
|
|