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

Unverified Commit 9a74c147 authored by Steve Kondik's avatar Steve Kondik Committed by Michael Bestas
Browse files

Compilation fixes 

Change-Id: Id9d70e26f2970a696abb77dd73a323347f673035
parent ad36a42d

services/core/java/com/android/server/policy/PhoneWindowManager.java

+12 −20
Original line number Diff line number Diff line
@@ -2094,6 +2094,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        final boolean hasAppSwitch = (activeHardwareKeys & KEY_MASK_APP_SWITCH) != 0;



        final ContentResolver resolver = mContext.getContentResolver();

        final Resources res = mContext.getResources();



        // Initialize all assignments to sane defaults.

        mPressOnMenuBehavior = KEY_ACTION_MENU;
@@ -2108,10 +2109,10 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        mPressOnAssistBehavior = KEY_ACTION_SEARCH;

        mLongPressOnAssistBehavior = KEY_ACTION_VOICE_SEARCH;

        mPressOnAppSwitchBehavior = KEY_ACTION_APP_SWITCH;

        mLongPressOnAppSwitchBehavior = mContext.getResources().getInteger(

        mLongPressOnAppSwitchBehavior = res.getInteger(

                com.android.internal.R.integer.config_longPressOnAppSwitchBehavior);



        mLongPressOnHomeBehavior = mContext.getResources().getInteger(

        mLongPressOnHomeBehavior = res.getInteger(

                com.android.internal.R.integer.config_longPressOnHomeBehavior);

        if (mLongPressOnHomeBehavior < KEY_ACTION_NOTHING ||

                mLongPressOnHomeBehavior > KEY_ACTION_SLEEP) {
@@ -2285,10 +2286,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                    Settings.System.END_BUTTON_BEHAVIOR,

                    Settings.System.END_BUTTON_BEHAVIOR_DEFAULT,

                    UserHandle.USER_CURRENT);

            mIncallPowerBehavior = CMSettings.Secure.getIntForUser(resolver,

                    CMSettings.Secure.INCALL_POWER_BUTTON_BEHAVIOR,

                    CMSettings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_DEFAULT,

                    UserHandle.USER_CURRENT);

            mHomeWakeScreen = (CMSettings.System.getIntForUser(resolver,

                    CMSettings.System.HOME_WAKE_SCREEN, 1, UserHandle.USER_CURRENT) == 1) &&

                    ((mDeviceHardwareWakeKeys & KEY_MASK_HOME) != 0);
@@ -2380,11 +2377,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            if (mImmersiveModeConfirmation != null) {

                mImmersiveModeConfirmation.loadSetting(mCurrentUserId);

            }



            // Volume wake

            mVolumeWakeScreen = (Settings.System.getIntForUser(resolver,

                    Settings.System.VOLUME_WAKE_SCREEN, 0, UserHandle.USER_CURRENT) == 1);



        }

        synchronized (mWindowManagerFuncs.getWindowManagerLock()) {

            PolicyControl.reloadFromSetting(mContext);
@@ -4596,8 +4588,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            navVisible |= !canHideNavigationBar();



            boolean updateSysUiVisibility = layoutNavigationBar(displayWidth, displayHeight,

                    displayRotation, uiMode, overscanLeft, overscanRight, overscanBottom, dcf, navVisible, navTranslucent,

                    navAllowedHidden, statusBarExpandedNotKeyguard);

                    displayRotation, uiMode, overscanLeft, overscanRight, overscanBottom,

                    dcf, navVisible, navTranslucent, navAllowedHidden, statusBarExpandedNotKeyguard);

            if (DEBUG_LAYOUT) Slog.i(TAG, String.format("mDock rect: (%d,%d - %d,%d)",

                    mDockLeft, mDockTop, mDockRight, mDockBottom));

            updateSysUiVisibility |= layoutStatusBar(pf, df, of, vf, dcf, sysui, isKeyguardShowing);
@@ -4715,7 +4707,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            } else if (mNavigationBarPosition == NAV_BAR_LEFT) {

                // Landscape screen; nav bar goes to the left.

                int right = overscanLeft + getNavigationBarWidth(displayRotation, uiMode);

                mTmpNavigationFrame.set(left, 0, right, displayHeight);

                mTmpNavigationFrame.set(0, 0, right, displayHeight);

                mStableLeft = mStableFullscreenLeft = mTmpNavigationFrame.right;

                if (transientNavBarShowing) {

                    mNavigationBarController.setBarShowingLw(true);