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

Commit 14889dd6 authored by Deepanshu Gupta's avatar Deepanshu Gupta Committed by android-build-merger
Browse files

Merge branch 'master' of... 

Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
parents 08df5384 f43491f8

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java

+2 −2
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ public class NotificationPanelView extends PanelView implements 
    public static final long DOZE_ANIMATION_DURATION = 700;



    private KeyguardAffordanceHelper mAfforanceHelper;

    private BaseStatusBarHeader mHeader;

    protected BaseStatusBarHeader mHeader;

    private KeyguardUserSwitcher mKeyguardUserSwitcher;

    private KeyguardStatusBarView mKeyguardStatusBar;

    private QSContainer mQsContainer;
@@ -2404,7 +2404,7 @@ public class NotificationPanelView extends PanelView implements 
        setVerticalPanelTranslation(0f);

    }



    private void setVerticalPanelTranslation(float translation) {

    protected void setVerticalPanelTranslation(float translation) {

        mNotificationStackScroller.setTranslationX(translation);

        mScrollView.setTranslationX(translation);

        mHeader.setTranslationX(translation);

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

+1 −3
Original line number Diff line number Diff line
@@ -795,7 +795,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
                mKeyguardBottomArea.getLockIcon());

        mKeyguardBottomArea.setKeyguardIndicationController(mKeyguardIndicationController);



        // set the inital view visibility

        // set the initial view visibility

        setAreThereNotifications();



        mIconController = new StatusBarIconController(
@@ -2339,8 +2339,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 


    }



    Animator mScrollViewAnim, mClearButtonAnim;



    @Override

    public void animateExpandNotificationsPanel() {

        if (SPEW) Log.d(TAG, "animateExpand: mExpandedVisible=" + mExpandedVisible);