Merge "Minor cleanup for FingerprintDialog"
diff --git a/core/java/android/hardware/fingerprint/FingerprintManager.java b/core/java/android/hardware/fingerprint/FingerprintManager.java
index 1a0b276..62d92c4 100644
--- a/core/java/android/hardware/fingerprint/FingerprintManager.java
+++ b/core/java/android/hardware/fingerprint/FingerprintManager.java
@@ -552,9 +552,8 @@
* Per-user version, see {@link FingerprintManager#authenticate(CryptoObject,
* CancellationSignal, Bundle, Executor, IFingerprintDialogReceiver, AuthenticationCallback)}
* @param userId the user ID that the fingerprint hardware will authenticate for.
- * @hide
*/
- public void authenticate(int userId,
+ private void authenticate(int userId,
@Nullable CryptoObject crypto,
@NonNull CancellationSignal cancel,
@NonNull Bundle bundle,
diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
index 8e2ad9a..d1e55b6 100644
--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
@@ -892,4 +892,5 @@
<dimen name="fingerprint_dialog_icon_size">44dp</dimen>
<dimen name="fingerprint_dialog_fp_icon_size">60dp</dimen>
+ <dimen name="fingerprint_dialog_animation_translation_offset">350dp</dimen>
</resources>
diff --git a/packages/SystemUI/src/com/android/systemui/fingerprint/FingerprintDialogImpl.java b/packages/SystemUI/src/com/android/systemui/fingerprint/FingerprintDialogImpl.java
index 1b785a2..262c71a 100644
--- a/packages/SystemUI/src/com/android/systemui/fingerprint/FingerprintDialogImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/fingerprint/FingerprintDialogImpl.java
@@ -92,7 +92,7 @@
return;
}
getComponent(CommandQueue.class).addCallbacks(this);
- mWindowManager = (WindowManager) mContext.getSystemService(Context.WINDOW_SERVICE);
+ mWindowManager = (WindowManager) mContext.getSystemService(Context.WINDOW_SERVICE);
mDialogView = new FingerprintDialogView(mContext, mHandler);
}
diff --git a/packages/SystemUI/src/com/android/systemui/fingerprint/FingerprintDialogView.java b/packages/SystemUI/src/com/android/systemui/fingerprint/FingerprintDialogView.java
index d4afa84..19bc2ec 100644
--- a/packages/SystemUI/src/com/android/systemui/fingerprint/FingerprintDialogView.java
+++ b/packages/SystemUI/src/com/android/systemui/fingerprint/FingerprintDialogView.java
@@ -16,7 +16,6 @@
package com.android.systemui.fingerprint;
-import android.animation.Animator;
import android.app.ActivityManager;
import android.content.ComponentName;
import android.content.Context;
@@ -28,21 +27,19 @@
import android.os.Bundle;
import android.os.Handler;
import android.os.IBinder;
-import android.util.DisplayMetrics;
import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
-import android.view.ViewPropertyAnimator;
import android.view.WindowManager;
-import android.view.animation.AnimationUtils;
import android.view.animation.Interpolator;
import android.widget.Button;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
+import com.android.systemui.Interpolators;
import com.android.systemui.R;
import com.android.systemui.shared.system.ActivityManagerWrapper;
import com.android.systemui.shared.system.PackageManagerWrapper;
@@ -56,33 +53,30 @@
private static final String TAG = "FingerprintDialogView";
- private static final int ANIMATION_VERTICAL_OFFSET_DP = 96;
private static final int ANIMATION_DURATION = 250; // ms
private final IBinder mWindowToken = new Binder();
- private final WindowManager mWindowManager;
private final ActivityManagerWrapper mActivityManagerWrapper;
private final PackageManagerWrapper mPackageManageWrapper;
private final Interpolator mLinearOutSlowIn;
private final Interpolator mFastOutLinearIn;
+ private final float mAnimationTranslationOffset;
private ViewGroup mLayout;
private final TextView mErrorText;
private Handler mHandler;
private Bundle mBundle;
- private final float mDensity;
private final LinearLayout mDialog;
public FingerprintDialogView(Context context, Handler handler) {
super(context);
mHandler = handler;
- mWindowManager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
mActivityManagerWrapper = ActivityManagerWrapper.getInstance();
mPackageManageWrapper = PackageManagerWrapper.getInstance();
- mLinearOutSlowIn = AnimationUtils
- .loadInterpolator(getContext(), android.R.interpolator.linear_out_slow_in);
- mFastOutLinearIn = AnimationUtils
- .loadInterpolator(getContext(), android.R.interpolator.fast_out_linear_in);
+ mLinearOutSlowIn = Interpolators.LINEAR_OUT_SLOW_IN;
+ mFastOutLinearIn = Interpolators.FAST_OUT_LINEAR_IN;
+ mAnimationTranslationOffset = getResources()
+ .getDimension(R.dimen.fingerprint_dialog_animation_translation_offset);
// Create the dialog
LayoutInflater factory = LayoutInflater.from(getContext());
@@ -90,9 +84,6 @@
addView(mLayout);
mDialog = mLayout.findViewById(R.id.dialog);
- DisplayMetrics metrics = new DisplayMetrics();
- mWindowManager.getDefaultDisplay().getMetrics(metrics);
- mDensity = metrics.density;
mErrorText = mLayout.findViewById(R.id.error);
@@ -167,7 +158,7 @@
}
// Dim the background and slide the dialog up
- mDialog.setTranslationY(ANIMATION_VERTICAL_OFFSET_DP * mDensity);
+ mDialog.setTranslationY(mAnimationTranslationOffset);
mLayout.setAlpha(0f);
postOnAnimation(new Runnable() {
@Override