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

Commit a573e291 authored by Winson Chung's avatar Winson Chung Committed by android-build-merger
Browse files

Merge "Fix a couple issues with sysui state" into qt-dev 

am: 5120161a

Change-Id: I6468cd7860e07ae671e755774553576b7de30890
parents 20293000 5120161a

packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java

+7 −4
Original line number Original line Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.systemui.recents;

package com.android.systemui.recents;





import static android.content.pm.PackageManager.MATCH_SYSTEM_ONLY;

import static android.content.pm.PackageManager.MATCH_SYSTEM_ONLY;

import static android.view.Display.DEFAULT_DISPLAY;

import static android.view.MotionEvent.ACTION_CANCEL;

import static android.view.MotionEvent.ACTION_CANCEL;

import static android.view.MotionEvent.ACTION_DOWN;

import static android.view.MotionEvent.ACTION_DOWN;

import static android.view.MotionEvent.ACTION_UP;

import static android.view.MotionEvent.ACTION_UP;
@@ -29,7 +30,6 @@ import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_WIN 
import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_BOUNCER_SHOWING;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_BOUNCER_SHOWING;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NAV_BAR_HIDDEN;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NAV_BAR_HIDDEN;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_SCREEN_PINNING;





import android.annotation.FloatRange;

import android.annotation.FloatRange;

import android.app.ActivityTaskManager;

import android.app.ActivityTaskManager;
@@ -477,7 +477,12 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis 
        }

        }

    }

    }





    public void setSystemUiStateFlag(int flag, boolean enabled) {

    public void setSystemUiStateFlag(int flag, boolean enabled, int displayId) {

        if (displayId != DEFAULT_DISPLAY) {

            // Ignore non-default displays for now

            return;

        }



        int newState = mSysUiStateFlags;

        int newState = mSysUiStateFlags;

        if (enabled) {

        if (enabled) {

            newState |= flag;

            newState |= flag;
@@ -502,8 +507,6 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis 
                && statusBar.getPanel().isFullyExpanded();

                && statusBar.getPanel().isFullyExpanded();

        final boolean bouncerShowing = statusBar != null && statusBar.isBouncerShowing();

        final boolean bouncerShowing = statusBar != null && statusBar.isBouncerShowing();

        mSysUiStateFlags = 0;

        mSysUiStateFlags = 0;

        mSysUiStateFlags |= ActivityManagerWrapper.getInstance().isScreenPinningActive()

                ? SYSUI_STATE_SCREEN_PINNING : 0;

        mSysUiStateFlags |= (navBarFragment != null && !navBarFragment.isNavBarWindowVisible())

        mSysUiStateFlags |= (navBarFragment != null && !navBarFragment.isNavBarWindowVisible())

                ? SYSUI_STATE_NAV_BAR_HIDDEN : 0;

                ? SYSUI_STATE_NAV_BAR_HIDDEN : 0;

        mSysUiStateFlags |= panelExpanded

        mSysUiStateFlags |= panelExpanded

packages/SystemUI/src/com/android/systemui/recents/ScreenPinningRequest.java

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




package com.android.systemui.recents;

package com.android.systemui.recents;





import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_SCREEN_PINNING;

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

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

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

import static com.android.systemui.util.leak.RotationUtils.ROTATION_SEASCAPE;
@@ -139,7 +138,6 @@ public class ScreenPinningRequest implements View.OnClickListener, 
        if (v.getId() == R.id.screen_pinning_ok_button || mRequestWindow == v) {

        if (v.getId() == R.id.screen_pinning_ok_button || mRequestWindow == v) {

            try {

            try {

                ActivityTaskManager.getService().startSystemLockTaskMode(taskId);

                ActivityTaskManager.getService().startSystemLockTaskMode(taskId);

                mOverviewProxyService.setSystemUiStateFlag(SYSUI_STATE_SCREEN_PINNING, true);

            } catch (RemoteException e) {}

            } catch (RemoteException e) {}

        }

        }

        clearPrompt();

        clearPrompt();

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

+7 −5
Original line number Original line Diff line number Diff line
@@ -27,7 +27,6 @@ import static com.android.systemui.recents.OverviewProxyService.OverviewProxyLis 
import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_A11Y_BUTTON_CLICKABLE;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_A11Y_BUTTON_CLICKABLE;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_A11Y_BUTTON_LONG_CLICKABLE;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_A11Y_BUTTON_LONG_CLICKABLE;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NAV_BAR_HIDDEN;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NAV_BAR_HIDDEN;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_SCREEN_PINNING;

import static com.android.systemui.statusbar.phone.BarTransitions.MODE_LIGHTS_OUT;

import static com.android.systemui.statusbar.phone.BarTransitions.MODE_LIGHTS_OUT;

import static com.android.systemui.statusbar.phone.BarTransitions.MODE_LIGHTS_OUT_TRANSPARENT;

import static com.android.systemui.statusbar.phone.BarTransitions.MODE_LIGHTS_OUT_TRANSPARENT;

import static com.android.systemui.statusbar.phone.BarTransitions.MODE_OPAQUE;

import static com.android.systemui.statusbar.phone.BarTransitions.MODE_OPAQUE;
@@ -328,7 +327,10 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback 
        filter.addAction(Intent.ACTION_USER_SWITCHED);

        filter.addAction(Intent.ACTION_USER_SWITCHED);

        getContext().registerReceiverAsUser(mBroadcastReceiver, UserHandle.ALL, filter, null, null);

        getContext().registerReceiverAsUser(mBroadcastReceiver, UserHandle.ALL, filter, null, null);

        notifyNavigationBarScreenOn();

        notifyNavigationBarScreenOn();



        mOverviewProxyService.addCallback(mOverviewProxyListener);

        mOverviewProxyService.addCallback(mOverviewProxyListener);

        mOverviewProxyService.setSystemUiStateFlag(SYSUI_STATE_NAV_BAR_HIDDEN,

                !isNavBarWindowVisible(), mDisplayId);





        // Currently there is no accelerometer sensor on non-default display.

        // Currently there is no accelerometer sensor on non-default display.

        if (mIsOnDefaultDisplay) {

        if (mIsOnDefaultDisplay) {
@@ -464,7 +466,7 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback 
            if (DEBUG_WINDOW_STATE) Log.d(TAG, "Navigation bar " + windowStateToString(state));

            if (DEBUG_WINDOW_STATE) Log.d(TAG, "Navigation bar " + windowStateToString(state));





            mOverviewProxyService.setSystemUiStateFlag(SYSUI_STATE_NAV_BAR_HIDDEN,

            mOverviewProxyService.setSystemUiStateFlag(SYSUI_STATE_NAV_BAR_HIDDEN,

                    !isNavBarWindowVisible());

                    !isNavBarWindowVisible(), mDisplayId);

            mNavigationBarView.getRotateSuggestionButton()

            mNavigationBarView.getRotateSuggestionButton()

                    .onNavigationBarWindowVisibilityChange(isNavBarWindowVisible());

                    .onNavigationBarWindowVisibilityChange(isNavBarWindowVisible());

        }

        }
@@ -825,7 +827,6 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback 
                    activityManager.stopSystemLockTaskMode();

                    activityManager.stopSystemLockTaskMode();

                    // When exiting refresh disabled flags.

                    // When exiting refresh disabled flags.

                    mNavigationBarView.updateNavButtonIcons();

                    mNavigationBarView.updateNavButtonIcons();

                    mOverviewProxyService.setSystemUiStateFlag(SYSUI_STATE_SCREEN_PINNING, false);

                }

                }

            }

            }
@@ -877,9 +878,10 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback 
        boolean clickable = (flags & SYSUI_STATE_A11Y_BUTTON_CLICKABLE) != 0;

        boolean clickable = (flags & SYSUI_STATE_A11Y_BUTTON_CLICKABLE) != 0;

        boolean longClickable = (flags & SYSUI_STATE_A11Y_BUTTON_LONG_CLICKABLE) != 0;

        boolean longClickable = (flags & SYSUI_STATE_A11Y_BUTTON_LONG_CLICKABLE) != 0;

        mNavigationBarView.setAccessibilityButtonState(clickable, longClickable);

        mNavigationBarView.setAccessibilityButtonState(clickable, longClickable);

        mOverviewProxyService.setSystemUiStateFlag(SYSUI_STATE_A11Y_BUTTON_CLICKABLE, clickable);

        mOverviewProxyService.setSystemUiStateFlag(

        mOverviewProxyService.setSystemUiStateFlag(

                SYSUI_STATE_A11Y_BUTTON_LONG_CLICKABLE, longClickable);

                SYSUI_STATE_A11Y_BUTTON_CLICKABLE, clickable, mDisplayId);

        mOverviewProxyService.setSystemUiStateFlag(

                SYSUI_STATE_A11Y_BUTTON_LONG_CLICKABLE, longClickable, mDisplayId);

    }

    }





    /**

    /**

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -725,7 +725,7 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav 
    public void onPanelExpandedChange(boolean expanded) {

    public void onPanelExpandedChange(boolean expanded) {

        updateSlippery();

        updateSlippery();

        mOverviewProxyService.setSystemUiStateFlag(SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED,

        mOverviewProxyService.setSystemUiStateFlag(SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED,

                expanded);

                expanded, getContext().getDisplayId());

    }

    }





    public void updateStates() {

    public void updateStates() {

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -3589,7 +3589,7 @@ public class StatusBar extends SystemUI implements DemoMode, 




        // Notify overview proxy service of the new states

        // Notify overview proxy service of the new states

        Dependency.get(OverviewProxyService.class).setSystemUiStateFlag(SYSUI_STATE_BOUNCER_SHOWING,

        Dependency.get(OverviewProxyService.class).setSystemUiStateFlag(SYSUI_STATE_BOUNCER_SHOWING,

                isBouncerShowing());

                isBouncerShowing(), mContext.getDisplayId());

    }

    }





    /**

    /**