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

Commit 3d2cf73d authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 7688383 from cc547d33 to sc-qpr1-release

Change-Id: Icd2980ca979034fa0e5b8d4f0df996a6d108c637
parents 989c65fc cc547d33
Loading
Loading
Loading
Loading
+2 −12
Original line number Original line Diff line number Diff line
@@ -260,8 +260,6 @@ public final class NotificationChannel implements Parcelable {
    private boolean mDemoted = false;
    private boolean mDemoted = false;
    private boolean mImportantConvo = false;
    private boolean mImportantConvo = false;
    private long mDeletedTime = DEFAULT_DELETION_TIME_MS;
    private long mDeletedTime = DEFAULT_DELETION_TIME_MS;
    // If the sound for this channel is missing, e.g. after restore.
    private boolean mIsSoundMissing;


    /**
    /**
     * Creates a notification channel.
     * Creates a notification channel.
@@ -716,13 +714,6 @@ public final class NotificationChannel implements Parcelable {
        return mSound;
        return mSound;
    }
    }


    /**
     * @hide
     */
    public boolean isSoundMissing() {
        return mIsSoundMissing;
    }

    /**
    /**
     * Returns the audio attributes for sound played by notifications posted to this channel.
     * Returns the audio attributes for sound played by notifications posted to this channel.
     */
     */
@@ -1007,9 +998,8 @@ public final class NotificationChannel implements Parcelable {
        // according to the docs because canonicalize method has to handle canonical uris as well.
        // according to the docs because canonicalize method has to handle canonical uris as well.
        Uri canonicalizedUri = contentResolver.canonicalize(uri);
        Uri canonicalizedUri = contentResolver.canonicalize(uri);
        if (canonicalizedUri == null) {
        if (canonicalizedUri == null) {
            // We got a null because the uri in the backup does not exist here.
            // We got a null because the uri in the backup does not exist here, so we return default
            mIsSoundMissing = true;
            return Settings.System.DEFAULT_NOTIFICATION_URI;
            return null;
        }
        }
        return contentResolver.uncanonicalize(canonicalizedUri);
        return contentResolver.uncanonicalize(canonicalizedUri);
    }
    }
+1 −1
Original line number Original line Diff line number Diff line
@@ -32,6 +32,7 @@ import android.content.res.ColorStateList;
import android.content.res.TypedArray;
import android.content.res.TypedArray;
import android.graphics.PixelFormat;
import android.graphics.PixelFormat;
import android.graphics.Rect;
import android.graphics.Rect;
import android.view.ContextThemeWrapper;
import android.view.Gravity;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.LayoutInflater;
import android.view.SurfaceControl;
import android.view.SurfaceControl;
@@ -44,7 +45,6 @@ import android.widget.ImageView;
import android.widget.TextView;
import android.widget.TextView;


import androidx.annotation.NonNull;
import androidx.annotation.NonNull;
import androidx.appcompat.view.ContextThemeWrapper;


import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.annotations.VisibleForTesting;
import com.android.wm.shell.R;
import com.android.wm.shell.R;
+1 −2
Original line number Original line Diff line number Diff line
@@ -132,8 +132,7 @@ public class KeyguardVisibilityHelper {
                        .alpha(1f)
                        .alpha(1f)
                        .withEndAction(mAnimateKeyguardStatusViewVisibleEndRunnable)
                        .withEndAction(mAnimateKeyguardStatusViewVisibleEndRunnable)
                        .start();
                        .start();
            } else if (mUnlockedScreenOffAnimationController
            } else if (mUnlockedScreenOffAnimationController.shouldAnimateInKeyguard()) {
                        .isScreenOffLightRevealAnimationPlaying()) {
                mKeyguardViewVisibilityAnimating = true;
                mKeyguardViewVisibilityAnimating = true;


                // Ask the screen off animation controller to animate the keyguard visibility for us
                // Ask the screen off animation controller to animate the keyguard visibility for us
+7 −0
Original line number Original line Diff line number Diff line
@@ -155,6 +155,13 @@ public class UdfpsKeyguardView extends UdfpsAnimationView {
        updateAlpha();
        updateAlpha();
    }
    }


    /**
     * @return alpha between 0 and 255
     */
    int getUnpausedAlpha() {
        return mAlpha;
    }

    @Override
    @Override
    protected int updateAlpha() {
    protected int updateAlpha() {
        int alpha = super.updateAlpha();
        int alpha = super.updateAlpha();
+6 −3
Original line number Original line Diff line number Diff line
@@ -163,7 +163,7 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud
        pw.println("mIsBouncerVisible=" + mIsBouncerVisible);
        pw.println("mIsBouncerVisible=" + mIsBouncerVisible);
        pw.println("mInputBouncerHiddenAmount=" + mInputBouncerHiddenAmount);
        pw.println("mInputBouncerHiddenAmount=" + mInputBouncerHiddenAmount);
        pw.println("mStatusBarExpansion=" + mStatusBarExpansion);
        pw.println("mStatusBarExpansion=" + mStatusBarExpansion);
        pw.println("mAlpha=" + mView.getAlpha());
        pw.println("unpausedAlpha=" + mView.getUnpausedAlpha());
        pw.println("mUdfpsRequested=" + mUdfpsRequested);
        pw.println("mUdfpsRequested=" + mUdfpsRequested);
        pw.println("mView.mUdfpsRequested=" + mView.mUdfpsRequested);
        pw.println("mView.mUdfpsRequested=" + mView.mUdfpsRequested);
        pw.println("mLaunchTransitionFadingAway=" + mLaunchTransitionFadingAway);
        pw.println("mLaunchTransitionFadingAway=" + mLaunchTransitionFadingAway);
@@ -178,13 +178,13 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud
            return false;
            return false;
        }
        }


        boolean udfpsAffordanceWasNotShowing = shouldPauseAuth();
        mShowingUdfpsBouncer = show;
        mShowingUdfpsBouncer = show;
        if (mShowingUdfpsBouncer) {
        if (mShowingUdfpsBouncer) {
            mLastUdfpsBouncerShowTime = mSystemClock.uptimeMillis();
            mLastUdfpsBouncerShowTime = mSystemClock.uptimeMillis();
        }
        }
        updatePauseAuth();
        if (mShowingUdfpsBouncer) {
        if (mShowingUdfpsBouncer) {
            if (mStatusBarState == StatusBarState.SHADE_LOCKED) {
            if (udfpsAffordanceWasNotShowing) {
                mView.animateInUdfpsBouncer(null);
                mView.animateInUdfpsBouncer(null);
            }
            }


@@ -197,6 +197,8 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud
        } else {
        } else {
            mKeyguardUpdateMonitor.requestFaceAuthOnOccludingApp(false);
            mKeyguardUpdateMonitor.requestFaceAuthOnOccludingApp(false);
        }
        }
        updateAlpha();
        updatePauseAuth();
        return true;
        return true;
    }
    }


@@ -330,6 +332,7 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud
                public void requestUdfps(boolean request, int color) {
                public void requestUdfps(boolean request, int color) {
                    mUdfpsRequested = request;
                    mUdfpsRequested = request;
                    mView.requestUdfps(request, color);
                    mView.requestUdfps(request, color);
                    updateAlpha();
                    updatePauseAuth();
                    updatePauseAuth();
                }
                }


Loading