Skip to content
This repository was archived by the owner on Dec 12, 2023. It is now read-only.

Commit 2da787f

Browse files
poncesponces
committed
FOD: update patch based on PixelExperience/frameworks_base@02aef7e 
1 parent ff931e6 commit 2da787f

File tree

1 file changed

+141
-32
lines changed

1 file changed

+141
-32
lines changed

‎patches/0001-Squashed-revert-of-LOS-FOD-implementation.patch

+141-32
Original file line numberDiff line numberDiff line change
@@ -7,38 +7,40 @@ Better than having an ever-growing string of revert commands?
77

88
Change-Id: I4650cef96617c32e52d5dd088c8afffb06ab5e1d
99
---
10-
.../internal/statusbar/IStatusBar.aidl | 6 -
11-
.../internal/statusbar/IStatusBarService.aidl | 6 -
12-
data/etc/com.android.systemui.xml | 1 -
13-
packages/SystemUI/Android.bp | 2 -
14-
packages/SystemUI/AndroidManifest.xml | 1 -
15-
.../res-keyguard/values/custom_dimens.xml | 20 -
16-
.../res/drawable-nodpi/fod_icon_pressed.png | Bin 108 -> 0 bytes
17-
.../res/drawable/fod_icon_default.xml | 25 -
18-
packages/SystemUI/res/values/config.xml | 1 -
19-
.../SystemUI/res/values/custom_config.xml | 4 -
20-
.../keyguard/KeyguardSecurityContainer.java | 15 +-
21-
.../keyguard/KeyguardUpdateMonitor.java | 8 +-
22-
.../systemui/biometrics/FODCircleView.java | 544 ------------------
23-
.../biometrics/FODCircleViewImpl.java | 128 -----
24-
.../biometrics/FODCircleViewImplCallback.java | 25 -
25-
.../systemui/dagger/SystemUIBinder.java | 7 -
26-
.../keyguard/KeyguardViewMediator.java | 10 +-
27-
.../systemui/statusbar/CommandQueue.java | 28 -
28-
.../notification/ActivityLaunchAnimator.java | 21 +-
29-
.../systemui/statusbar/phone/StatusBar.java | 70 +--
30-
.../phone/StatusBarGoogle.java | 7 +-
31-
.../phone/StatusBarKeyguardViewManager.java | 11 +-
32-
.../phone/dagger/StatusBarGoogleModule.java | 7 +-
33-
.../ActivityLaunchAnimatorTest.java | 6 +-
34-
.../statusbar/phone/StatusBarTest.java | 5 +-
35-
services/core/Android.bp | 1 -
36-
.../biometrics/BiometricServiceBase.java | 2 +-
37-
.../fingerprint/FingerprintService.java | 112 ----
38-
.../statusbar/StatusBarManagerService.java | 22 -
39-
.../statusbar/UnusedStatusBar.java | 7 +-
40-
.../statusbar/UnusedStatusBarModule.java | 7 +-
41-
31 files changed, 19 insertions(+), 1088 deletions(-)
10+
.../internal/statusbar/IStatusBar.aidl | 6 -
11+
.../internal/statusbar/IStatusBarService.aidl | 6 -
12+
data/etc/com.android.systemui.xml | 1 -
13+
packages/SystemUI/Android.bp | 2 -
14+
packages/SystemUI/AndroidManifest.xml | 1 -
15+
.../res-keyguard/values/custom_dimens.xml | 20 -
16+
.../res/drawable-nodpi/fod_icon_pressed.png | Bin 108 -> 0 bytes
17+
.../res/drawable/fod_icon_default.xml | 25 -
18+
packages/SystemUI/res/values/config.xml | 1 -
19+
.../SystemUI/res/values/custom_config.xml | 4 -
20+
.../keyguard/KeyguardSecurityContainer.java | 15 +-
21+
.../keyguard/KeyguardUpdateMonitor.java | 8 +-
22+
.../systemui/biometrics/FODCircleView.java | 544 ------------------
23+
.../biometrics/FODCircleViewImpl.java | 128 -----
24+
.../biometrics/FODCircleViewImplCallback.java | 25 -
25+
.../systemui/dagger/SystemUIBinder.java | 7 -
26+
.../keyguard/KeyguardViewMediator.java | 10 +-
27+
.../systemui/statusbar/CommandQueue.java | 28 -
28+
.../notification/ActivityLaunchAnimator.java | 21 +-
29+
.../systemui/statusbar/phone/StatusBar.java | 70 +--
30+
.../phone/StatusBarGoogle.java | 7 +-
31+
.../phone/StatusBarKeyguardViewManager.java | 11 +-
32+
.../phone/dagger/StatusBarGoogleModule.java | 7 +-
33+
.../ActivityLaunchAnimatorTest.java | 6 +-
34+
.../statusbar/phone/StatusBarTest.java | 5 +-
35+
services/core/Android.bp | 1 -
36+
.../biometrics/BiometricServiceBase.java | 2 +-
37+
.../fingerprint/FingerprintService.java | 112 ----
38+
.../statusbar/StatusBarManagerService.java | 22 -
39+
.../statusbar/UnusedStatusBar.java | 7 +-
40+
.../statusbar/UnusedStatusBarModule.java | 7 +-
41+
.../biometrics/AuthBiometricFingerprintView.java | 13 -
42+
.../biometrics/AuthBiometricView.java | 30 +-
43+
33 files changed, 22 insertions(+), 1128 deletions(-)
4244
delete mode 100644 packages/SystemUI/res-keyguard/values/custom_dimens.xml
4345
delete mode 100644 packages/SystemUI/res/drawable-nodpi/fod_icon_pressed.png
4446
delete mode 100644 packages/SystemUI/res/drawable/fod_icon_default.xml
@@ -2037,6 +2039,113 @@ index 28bcaf6c144..f2cef14b558 100644
20372039
+ tunerService);
20382040
}
20392041
}
2042+
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricFingerprintView.java b/packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricFingerprintView.java
2043+
index c2671733ba0..45ee4ad9ae5 100644
2044+
--- a/packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricFingerprintView.java
2045+
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricFingerprintView.java
2046+
@@ -22,7 +22,6 @@ import android.graphics.drawable.AnimatedVectorDrawable;
2047+
import android.graphics.drawable.Drawable;
2048+
import android.util.AttributeSet;
2049+
import android.util.Log;
2050+
-import android.view.View;
2051+
2052+
import com.android.systemui.R;
2053+
2054+
@@ -77,18 +76,6 @@ public class AuthBiometricFingerprintView extends AuthBiometricView {
2055+
showTouchSensorString();
2056+
}
2057+
2058+
- @Override
2059+
- void onFinishInflateInternal() {
2060+
- super.onFinishInflateInternal();
2061+
- if (mHasFod) {
2062+
- mIconView.setVisibility(View.INVISIBLE);
2063+
- mIconView.setPadding(0, 0, 0, 0);
2064+
- // Add IndicatorView above the biometric icon
2065+
- removeView(mIndicatorView);
2066+
- addView(mIndicatorView, indexOfChild(mIconView));
2067+
- }
2068+
- }
2069+
-
2070+
private void showTouchSensorString() {
2071+
mIndicatorView.setText(R.string.fingerprint_dialog_touch_sensor);
2072+
mIndicatorView.setTextColor(mTextColorHint);
2073+
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricView.java b/packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricView.java
2074+
index 17ea9a12694..113bf394aa4 100644
2075+
--- a/packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricView.java
2076+
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricView.java
2077+
@@ -24,7 +24,6 @@ import android.annotation.IntDef;
2078+
import android.annotation.NonNull;
2079+
import android.annotation.Nullable;
2080+
import android.content.Context;
2081+
-import android.content.pm.PackageManager;
2082+
import android.hardware.biometrics.BiometricPrompt;
2083+
import android.os.Bundle;
2084+
import android.os.Handler;
2085+
@@ -41,8 +40,6 @@ import android.widget.LinearLayout;
2086+
import android.widget.TextView;
2087+
2088+
import com.android.internal.annotations.VisibleForTesting;
2089+
-import com.android.systemui.statusbar.phone.StatusBar;
2090+
-import com.android.systemui.Dependency;
2091+
import com.android.systemui.R;
2092+
2093+
import java.lang.annotation.Retention;
2094+
@@ -50,8 +47,6 @@ import java.lang.annotation.RetentionPolicy;
2095+
import java.util.ArrayList;
2096+
import java.util.List;
2097+
2098+
-import com.android.internal.util.custom.fod.FodUtils;
2099+
-
2100+
/**
2101+
* Contains the Biometric views (title, subtitle, icon, buttons, etc) and its controllers.
2102+
*/
2103+
@@ -197,8 +192,6 @@ public abstract class AuthBiometricView extends LinearLayout {
2104+
protected boolean mDialogSizeAnimating;
2105+
protected Bundle mSavedState;
2106+
2107+
- protected boolean mHasFod;
2108+
-
2109+
/**
2110+
* Delay after authentication is confirmed, before the dialog should be animated away.
2111+
*/
2112+
@@ -261,10 +254,6 @@ public abstract class AuthBiometricView extends LinearLayout {
2113+
2114+
mAccessibilityManager = context.getSystemService(AccessibilityManager.class);
2115+
2116+
- PackageManager packageManager = context.getPackageManager();
2117+
- mHasFod = packageManager.hasSystemFeature(PackageManager.FEATURE_FINGERPRINT) &&
2118+
- FodUtils.hasFodSupport(context);
2119+
-
2120+
mResetErrorRunnable = () -> {
2121+
updateState(getStateForAfterError());
2122+
handleResetAfterError();
2123+
@@ -734,22 +723,9 @@ public abstract class AuthBiometricView extends LinearLayout {
2124+
final View child = getChildAt(i);
2125+
2126+
if (child.getId() == R.id.biometric_icon) {
2127+
- if (this instanceof AuthBiometricFingerprintView && mHasFod) {
2128+
- final int buttonBarHeight =
2129+
- findViewById(R.id.button_bar).getLayoutParams().height;
2130+
- // The view is invisible, so it still takes space and
2131+
- // we use that to adjust for the FOD icon
2132+
- final int fodHeight = Dependency.get(StatusBar.class).getFodHeight(true) -
2133+
- buttonBarHeight - findViewById(R.id.button_bar).getPaddingTop();
2134+
-
2135+
- child.measure(
2136+
- MeasureSpec.makeMeasureSpec(newWidth, MeasureSpec.AT_MOST),
2137+
- MeasureSpec.makeMeasureSpec(fodHeight, MeasureSpec.EXACTLY));
2138+
- } else {
2139+
- child.measure(
2140+
- MeasureSpec.makeMeasureSpec(newWidth, MeasureSpec.AT_MOST),
2141+
- MeasureSpec.makeMeasureSpec(height, MeasureSpec.AT_MOST));
2142+
- }
2143+
+ child.measure(
2144+
+ MeasureSpec.makeMeasureSpec(newWidth, MeasureSpec.AT_MOST),
2145+
+ MeasureSpec.makeMeasureSpec(height, MeasureSpec.AT_MOST));
2146+
} else if (child.getId() == R.id.button_bar) {
2147+
child.measure(
2148+
MeasureSpec.makeMeasureSpec(newWidth, MeasureSpec.EXACTLY),
20402149
--
20412150
2.25.1
20422151

0 commit comments

Comments
 (0)