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

Commit 477aab1f authored by Lucas Dupin's avatar Lucas Dupin Committed by Android (Google) Code Review
Browse files

Merge "A new shade pull down animation" into sc-dev

parents 63721f8c 976de38e

packages/SystemUI/plugin/src/com/android/systemui/plugins/qs/QS.java

+10 −2
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 


package com.android.systemui.plugins.qs;



import android.view.MotionEvent;

import android.view.View;

import android.view.View.OnClickListener;

import android.view.ViewGroup;
@@ -57,7 +56,6 @@ public interface QS extends FragmentBase { 
    void setQsExpansion(float qsExpansionFraction, float headerTranslation);

    void setHeaderListening(boolean listening);

    void notifyCustomizeChanged();



    void setContainer(ViewGroup container);

    void setExpandClickListener(OnClickListener onClickListener);
@@ -75,6 +73,16 @@ public interface QS extends FragmentBase { 
        return isShowingDetail();

    }



    /**

     * If QS should translate as we pull it down, or if it should be static.

     */

    void setTranslateWhileExpanding(boolean shouldTranslate);



    /**

     * A rounded corner clipping that makes QS feel as if it were behind everything.

     */

    void setFancyClipping(int top, int bottom, int cornerRadius, boolean visible);



    @ProvidesInterface(version = HeightListener.VERSION)

    interface HeightListener {

        int VERSION = 1;

packages/SystemUI/res/layout/super_notification_shade.xml

+3 −3
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
                   android:visibility="invisible" />

    </com.android.systemui.statusbar.BackDropView>



    <com.android.systemui.statusbar.ScrimView

    <com.android.systemui.scrim.ScrimView

        android:id="@+id/scrim_behind"

        android:layout_width="match_parent"

        android:layout_height="match_parent"
@@ -51,7 +51,7 @@ 
        sysui:ignoreRightInset="true"

        />



    <com.android.systemui.statusbar.ScrimView

    <com.android.systemui.scrim.ScrimView

        android:id="@+id/scrim_notifications"

        android:layout_width="match_parent"

        android:layout_height="match_parent"
@@ -72,7 +72,7 @@ 


    <include layout="@layout/brightness_mirror_container" />



    <com.android.systemui.statusbar.ScrimView

    <com.android.systemui.scrim.ScrimView

        android:id="@+id/scrim_in_front"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java

+15 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.keyguard;



import android.graphics.Rect;

import android.os.UserHandle;

import android.util.Slog;
@@ -48,6 +49,7 @@ public class KeyguardStatusViewController extends ViewController<KeyguardStatusV 
    private final ConfigurationController mConfigurationController;

    private final DozeParameters mDozeParameters;

    private final KeyguardVisibilityHelper mKeyguardVisibilityHelper;

    private final Rect mClipBounds = new Rect();



    private int mLockScreenMode = KeyguardUpdateMonitor.LOCK_SCREEN_MODE_NORMAL;
@@ -299,4 +301,17 @@ public class KeyguardStatusViewController extends ViewController<KeyguardStatusV 
            mView.updateLogoutView(shouldShowLogout());

        }

    };



    /**

     * Rect that specifies how KSV should be clipped, on its parent's coordinates.

     */

    public void setClipBounds(Rect clipBounds) {

        if (clipBounds != null) {

            mClipBounds.set(clipBounds.left, (int) (clipBounds.top - mView.getY()),

                    clipBounds.right, (int) (clipBounds.bottom - mView.getY()));

            mView.setClipBounds(mClipBounds);

        } else {

            mView.setClipBounds(null);

        }

    }

}

packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,6 @@ import com.android.internal.R; 
import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.colorextraction.ColorExtractor;

import com.android.internal.colorextraction.ColorExtractor.GradientColors;

import com.android.internal.colorextraction.drawable.ScrimDrawable;

import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.UiEvent;

import com.android.internal.logging.UiEventLogger;
@@ -117,6 +116,7 @@ import com.android.systemui.dagger.qualifiers.Main; 
import com.android.systemui.model.SysUiState;

import com.android.systemui.plugins.GlobalActions.GlobalActionsManager;

import com.android.systemui.plugins.GlobalActionsPanelPlugin;

import com.android.systemui.scrim.ScrimDrawable;

import com.android.systemui.statusbar.NotificationShadeDepthController;

import com.android.systemui.statusbar.NotificationShadeWindowController;

import com.android.systemui.statusbar.policy.ConfigurationController;

packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -30,11 +30,11 @@ import android.widget.ProgressBar; 
import android.widget.TextView;



import com.android.internal.R;

import com.android.internal.colorextraction.drawable.ScrimDrawable;

import com.android.keyguard.KeyguardUpdateMonitor;

import com.android.settingslib.Utils;

import com.android.systemui.Dependency;

import com.android.systemui.plugins.GlobalActions;

import com.android.systemui.scrim.ScrimDrawable;

import com.android.systemui.statusbar.BlurUtils;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.phone.ScrimController;