Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0e2681e authored by Kevin Chyn's avatar Kevin Chyn Committed by android-build-merger
Browse files

Merge "Fix fingerprint dialog icon color" into pi-dev 

am: 7c97601a

Change-Id: I2e6fd42656d56b91a18f030d18f70c7b81081b01
parents 756a8860 7c97601a

packages/SystemUI/res/drawable/fingerprint_dialog_error_to_fp.xml

0 → 100644
+525 −0

File added.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/res/drawable/fingerprint_dialog_fp_to_error.xml

0 → 100644
+854 −0

File added.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/res/values/colors.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -158,8 +158,8 @@ 
    <color name="fingerprint_dialog_text_dark_color">#dd000000</color> <!-- 87% black -->

    <color name="fingerprint_dialog_text_dark_color">#dd000000</color> <!-- 87% black -->

    <color name="fingerprint_dialog_text_light_color">#89000000</color> <!-- 54% black -->

    <color name="fingerprint_dialog_text_light_color">#89000000</color> <!-- 54% black -->

    <color name="fingerprint_dialog_dim_color">#80000000</color> <!-- 50% black -->

    <color name="fingerprint_dialog_dim_color">#80000000</color> <!-- 50% black -->

    <color name="fingerprint_dialog_error_message_color">#ffd93025</color> <!-- google red 600 -->

    <color name="fingerprint_dialog_error_color">#fff44336</color> <!-- red -->

    <color name="fingerprint_dialog_fingerprint_color">#ff008577</color> <!-- google blue 600 -->

    <color name="fingerprint_dialog_fingerprint_color">#ff008577</color> <!-- teal -->





    <!-- Logout button -->

    <!-- Logout button -->

    <color name="logout_button_bg_color">#ccffffff</color>

    <color name="logout_button_bg_color">#ccffffff</color>

packages/SystemUI/src/com/android/systemui/fingerprint/FingerprintDialogView.java

+28 −18
Original line number Original line Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.systemui.fingerprint;

package com.android.systemui.fingerprint;





import android.content.Context;

import android.content.Context;

import android.content.res.Configuration;

import android.graphics.Color;

import android.graphics.Color;

import android.graphics.PixelFormat;

import android.graphics.PixelFormat;

import android.graphics.PorterDuff;

import android.graphics.PorterDuff;
@@ -44,7 +43,6 @@ import android.widget.TextView; 




import com.android.systemui.Interpolators;

import com.android.systemui.Interpolators;

import com.android.systemui.R;

import com.android.systemui.R;

import com.android.systemui.util.leak.RotationUtils;





/**

/**

 * This class loads the view for the system-provided dialog. The view consists of:

 * This class loads the view for the system-provided dialog. The view consists of:
@@ -67,7 +65,7 @@ public class FingerprintDialogView extends LinearLayout { 
    private final Interpolator mLinearOutSlowIn;

    private final Interpolator mLinearOutSlowIn;

    private final WindowManager mWindowManager;

    private final WindowManager mWindowManager;

    private final float mAnimationTranslationOffset;

    private final float mAnimationTranslationOffset;

    private final int mErrorTextColor;

    private final int mErrorColor;

    private final int mTextColor;

    private final int mTextColor;

    private final int mFingerprintColor;

    private final int mFingerprintColor;
@@ -87,8 +85,8 @@ public class FingerprintDialogView extends LinearLayout { 
        mWindowManager = (WindowManager) mContext.getSystemService(Context.WINDOW_SERVICE);

        mWindowManager = (WindowManager) mContext.getSystemService(Context.WINDOW_SERVICE);

        mAnimationTranslationOffset = getResources()

        mAnimationTranslationOffset = getResources()

                .getDimension(R.dimen.fingerprint_dialog_animation_translation_offset);

                .getDimension(R.dimen.fingerprint_dialog_animation_translation_offset);

        mErrorTextColor = Color.parseColor(

        mErrorColor = Color.parseColor(

                getResources().getString(R.color.fingerprint_dialog_error_message_color));

                getResources().getString(R.color.fingerprint_dialog_error_color));

        mTextColor = Color.parseColor(

        mTextColor = Color.parseColor(

                getResources().getString(R.color.fingerprint_dialog_text_light_color));

                getResources().getString(R.color.fingerprint_dialog_text_light_color));

        mFingerprintColor = Color.parseColor(

        mFingerprintColor = Color.parseColor(
@@ -268,7 +266,7 @@ public class FingerprintDialogView extends LinearLayout { 
        mHandler.removeMessages(FingerprintDialogImpl.MSG_CLEAR_MESSAGE);

        mHandler.removeMessages(FingerprintDialogImpl.MSG_CLEAR_MESSAGE);

        updateFingerprintIcon(STATE_FINGERPRINT_ERROR);

        updateFingerprintIcon(STATE_FINGERPRINT_ERROR);

        mErrorText.setText(message);

        mErrorText.setText(message);

        mErrorText.setTextColor(mErrorTextColor);

        mErrorText.setTextColor(mErrorColor);

        mErrorText.setContentDescription(message);

        mErrorText.setContentDescription(message);

        mHandler.sendMessageDelayed(mHandler.obtainMessage(FingerprintDialogImpl.MSG_CLEAR_MESSAGE),

        mHandler.sendMessageDelayed(mHandler.obtainMessage(FingerprintDialogImpl.MSG_CLEAR_MESSAGE),

                BiometricDialog.HIDE_DIALOG_DELAY);

                BiometricDialog.HIDE_DIALOG_DELAY);
@@ -285,17 +283,13 @@ public class FingerprintDialogView extends LinearLayout { 
    }

    }





    private void updateFingerprintIcon(int newState) {

    private void updateFingerprintIcon(int newState) {

        Drawable icon  = getAnimationResForTransition(mLastState, newState);

        Drawable icon  = getAnimationForTransition(mLastState, newState);





        if (icon == null) {

        if (icon == null) {

            Log.e(TAG, "Animation not found");

            Log.e(TAG, "Animation not found");

            return;

            return;

        }

        }





        if (newState == STATE_FINGERPRINT) {

            icon.setColorFilter(mFingerprintColor, PorterDuff.Mode.SRC_IN);

        }



        final AnimatedVectorDrawable animation = icon instanceof AnimatedVectorDrawable

        final AnimatedVectorDrawable animation = icon instanceof AnimatedVectorDrawable

                ? (AnimatedVectorDrawable) icon

                ? (AnimatedVectorDrawable) icon

                : null;

                : null;
@@ -303,7 +297,7 @@ public class FingerprintDialogView extends LinearLayout { 
        final ImageView fingerprint_icon = mLayout.findViewById(R.id.fingerprint_icon);

        final ImageView fingerprint_icon = mLayout.findViewById(R.id.fingerprint_icon);

        fingerprint_icon.setImageDrawable(icon);

        fingerprint_icon.setImageDrawable(icon);





        if (animation != null) {

        if (animation != null && shouldAnimateForTransition(mLastState, newState)) {

            animation.forceAnimationOnUI();

            animation.forceAnimationOnUI();

            animation.start();

            animation.start();

        }

        }
@@ -311,17 +305,33 @@ public class FingerprintDialogView extends LinearLayout { 
        mLastState = newState;

        mLastState = newState;

    }

    }





    private Drawable getAnimationResForTransition(int oldState, int newState) {

    private boolean shouldAnimateForTransition(int oldState, int newState) {

        if (oldState == STATE_NONE && newState == STATE_FINGERPRINT) {

            return false;

        } else if (oldState == STATE_FINGERPRINT && newState == STATE_FINGERPRINT_ERROR) {

            return true;

        } else if (oldState == STATE_FINGERPRINT_ERROR && newState == STATE_FINGERPRINT) {

            return true;

        } else if (oldState == STATE_FINGERPRINT && newState == STATE_FINGERPRINT_AUTHENTICATED) {

            // TODO(b/77328470): add animation when fingerprint is authenticated

            return false;

        }

        return false;

    }



    private Drawable getAnimationForTransition(int oldState, int newState) {

        int iconRes;

        int iconRes;

        if (oldState == STATE_NONE && newState == STATE_FINGERPRINT) {

        if (oldState == STATE_NONE && newState == STATE_FINGERPRINT) {

            iconRes = R.drawable.lockscreen_fingerprint_draw_on_animation;

            iconRes = R.drawable.fingerprint_dialog_fp_to_error;

        } else if (oldState == STATE_FINGERPRINT && newState == STATE_FINGERPRINT_ERROR) {

        } else if (oldState == STATE_FINGERPRINT && newState == STATE_FINGERPRINT_ERROR) {

            iconRes = R.drawable.lockscreen_fingerprint_fp_to_error_state_animation;

            iconRes = R.drawable.fingerprint_dialog_fp_to_error;

        } else if (oldState == STATE_FINGERPRINT_ERROR && newState == STATE_FINGERPRINT) {

        } else if (oldState == STATE_FINGERPRINT_ERROR && newState == STATE_FINGERPRINT) {

            iconRes = R.drawable.lockscreen_fingerprint_error_state_to_fp_animation;

            iconRes = R.drawable.fingerprint_dialog_error_to_fp;

        } else if (oldState == STATE_FINGERPRINT && newState == STATE_FINGERPRINT_AUTHENTICATED) {

        } else if (oldState == STATE_FINGERPRINT && newState == STATE_FINGERPRINT_AUTHENTICATED) {

            iconRes = R.drawable.lockscreen_fingerprint_draw_off_animation;

            // TODO(b/77328470): add animation when fingerprint is authenticated

        } else {

            iconRes = R.drawable.fingerprint_dialog_error_to_fp;

        }

        else {

            return null;

            return null;

        }

        }

        return mContext.getDrawable(iconRes);

        return mContext.getDrawable(iconRes);