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

Commit c3fc3222 authored by Daniel Sandler's avatar Daniel Sandler
Browse files

Fix Google Now on lockscreen. 

We can't make the navbar slippery anymore if lockscreen is
going to intercept all the touches. :)

Bug: 7413021
Change-Id: I1658262e43c37d0b1a554cda434ac43c0a0a86c0
parent 7bc8af3a

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

+6 −1
Original line number Diff line number Diff line
@@ -55,6 +55,9 @@ public class NavigationBarView extends LinearLayout { 


    final static boolean NAVBAR_ALWAYS_AT_RIGHT = true;



    // slippery nav bar when everything is disabled, e.g. during setup

    final static boolean SLIPPERY_WHEN_DISABLED= true;



    final static boolean ANIMATE_HIDE_TRANSITION = false; // turned off because it introduces unsightly delay when videos goes to full screen



    protected IStatusBarService mBarService;
@@ -237,7 +240,9 @@ public class NavigationBarView extends LinearLayout { 
        final boolean disableBack = ((disabledFlags & View.STATUS_BAR_DISABLE_BACK) != 0);

        final boolean disableSearch = ((disabledFlags & View.STATUS_BAR_DISABLE_SEARCH) != 0);



        setSlippery(disableHome && disableRecent && disableBack);

        if (SLIPPERY_WHEN_DISABLED) {

            setSlippery(disableHome && disableRecent && disableBack && disableSearch);

        }



        if (!mScreenOn && mCurrentView != null) {

            ViewGroup navButtons = (ViewGroup) mCurrentView.findViewById(R.id.nav_buttons);