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

Commit 1070bc8a authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/lineage-20.0' into v1-t

parents 3ba2c899 53816cdb

packages/SystemUI/res/values/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -302,7 +302,7 @@ 


    <!-- Nav bar button default ordering/layout -->

    <string name="config_navBarLayout" translatable="false">left[.5W],back[1WC];home;recent[1WC],right[.5W]</string>

    <string name="config_navBarLayoutQuickstep" translatable="false">back[1.7WC];home;contextual[1.7WC]</string>

    <string name="config_navBarLayoutQuickstep" translatable="false">back[1.7WC];home;menu_ime[1.7WC]</string>

    <string name="config_navBarLayoutHandle" translatable="false">back[70AC];home_handle;ime_switcher[70AC]</string>



    <!-- Whether to show a warning notification when device's skin temperature is high. -->

packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java

+2 −1
Original line number Diff line number Diff line
@@ -657,7 +657,8 @@ public class NavigationBarView extends FrameLayout implements TunerService.Tunab 
        // Update IME button visibility, a11y and rotate button always overrides the appearance

        boolean disableImeSwitcher =

                (mNavigationIconHints & StatusBarManager.NAVIGATION_HINT_IME_SWITCHER_SHOWN) == 0

                || isImeRenderingNavButtons() || !disableCursorKeys;

                || isImeRenderingNavButtons()

                || (!QuickStepContract.isSwipeUpMode(mNavBarMode) && !disableCursorKeys);

        mContextualButtonGroup.setButtonVisibility(R.id.ime_switcher, !disableImeSwitcher);



        mBarTransitions.reapplyDarkIntensity();

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

+10 −8
Original line number Diff line number Diff line
@@ -1466,6 +1466,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    }



    private void backLongPress() {

        if (hasLongPressOnBackBehavior()) {

            mBackKeyHandled = true;



            long now = SystemClock.uptimeMillis();
@@ -1477,6 +1478,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                    "Back - Long Press");

            performKeyAction(mBackLongPressAction, event);

        }

    }



    private void accessibilityShortcutActivated() {

        mAccessibilityShortcutController.performAccessibilityShortcut();

services/core/java/com/android/server/wm/DisplayPolicy.java

+2 −2
Original line number Diff line number Diff line
@@ -2341,8 +2341,8 @@ public class DisplayPolicy { 
                && Arrays.equals(mLastLetterboxDetails, letterboxDetails)) {

            return;

        }

        if (mDisplayContent.isDefaultDisplay && mLastFocusIsFullscreen != isFullscreen

                && ((mLastAppearance ^ appearance) & APPEARANCE_LOW_PROFILE_BARS) != 0) {

        if (mDisplayContent.isDefaultDisplay && (mLastFocusIsFullscreen != isFullscreen

                || ((mLastAppearance ^ appearance) & APPEARANCE_LOW_PROFILE_BARS) != 0)) {

            mService.mInputManager.setSystemUiLightsOut(

                    isFullscreen || (appearance & APPEARANCE_LOW_PROFILE_BARS) != 0);

        }