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

Commit 697ae451 authored by Yohei Yukawa's avatar Yohei Yukawa
Browse files

Use config_imeDrawsImeNavBar in Launcher 

With this CL, the Launcher starts checking

  config_imeDrawsImeNavBar [1]

instead of

  config_navBarInteractionMode

when determining whether the IME should render the back and IME
switcher buttons or not.

There should be no observable behavior change as long as

  config_navBarInteractionMode

is set to true when the gestural navigation is enabled.

Bug: 216118048
Test: presubmit
Change-Id: Ia8269e240e0b18e1c7b8bd550dbb197ad58a6dbc
parent 40570799

quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT 


        boolean isThreeButtonNav = mContext.isThreeButtonNav();

        mIsImeRenderingNavButtons =

                InputMethodService.canImeRenderGesturalNavButtons() && mContext.isGestureNav();

                InputMethodService.canImeRenderGesturalNavButtons() && mContext.imeDrawsImeNavBar();

        if (!mIsImeRenderingNavButtons) {

            // IME switcher

            View imeSwitcherButton = addButton(R.drawable.ic_ime_switcher, BUTTON_IME_SWITCH,

quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java

+8 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ public class TaskbarActivityContext extends ContextThemeWrapper implements Activ 
    private int mLastRequestedNonFullscreenHeight;



    private final SysUINavigationMode.Mode mNavMode;

    private final boolean mImeDrawsImeNavBar;

    private final ViewCache mViewCache = new ViewCache();



    private final boolean mIsSafeModeEnabled;
@@ -133,6 +134,7 @@ public class TaskbarActivityContext extends ContextThemeWrapper implements Activ 
        mDeviceProfile = dp;



        mNavMode = SysUINavigationMode.getMode(windowContext);

        mImeDrawsImeNavBar = SysUINavigationMode.getImeDrawsImeNavBar(windowContext);

        mIsSafeModeEnabled = TraceHelper.allowIpcs("isSafeMode",

                () -> getPackageManager().isSafeMode());

        mIsUserSetupComplete = SettingsCache.INSTANCE.get(this).getValue(
@@ -270,6 +272,10 @@ public class TaskbarActivityContext extends ContextThemeWrapper implements Activ 
        return mNavMode == Mode.NO_BUTTON;

    }



    public boolean imeDrawsImeNavBar() {

        return mImeDrawsImeNavBar;

    }



    public int getLeftCornerRadius() {

        return mLeftCorner == null ? 0 : mLeftCorner.getRadius();

    }
@@ -726,6 +732,8 @@ public class TaskbarActivityContext extends ContextThemeWrapper implements Activ 


        pw.println(String.format(

                "%s\tmNavMode=%s", prefix, mNavMode));

        pw.println(String.format(

                "%s\tmImeDrawsImeNavBar=%b", prefix, mImeDrawsImeNavBar));

        pw.println(String.format(

                "%s\tmIsUserSetupComplete=%b", prefix, mIsUserSetupComplete));

        pw.println(String.format(

quickstep/src/com/android/quickstep/SysUINavigationMode.java

+14 −2
Original line number Diff line number Diff line
@@ -60,17 +60,22 @@ public class SysUINavigationMode { 
        return INSTANCE.get(context).getMode();

    }



    public static boolean getImeDrawsImeNavBar(Context context) {

        return INSTANCE.get(context).getImeDrawsImeNavBar();

    }



    public static final MainThreadInitializedObject<SysUINavigationMode> INSTANCE =

            new MainThreadInitializedObject<>(SysUINavigationMode::new);



    private static final String TAG = "SysUINavigationMode";

    private static final String ACTION_OVERLAY_CHANGED = "android.intent.action.OVERLAY_CHANGED";

    private static final String NAV_BAR_INTERACTION_MODE_RES_NAME =

            "config_navBarInteractionMode";

    private static final String NAV_BAR_INTERACTION_MODE_RES_NAME = "config_navBarInteractionMode";

    private static final String IME_DRAWS_IME_NAV_BAR_RES_NAME = "config_imeDrawsImeNavBar";

    private static final String TARGET_OVERLAY_PACKAGE = "android";



    private final Context mContext;

    private Mode mMode;

    private boolean mImeDrawsImeNavBar;



    private int mNavBarGesturalHeight;

    private int mNavBarLargerGesturalHeight;
@@ -135,6 +140,8 @@ public class SysUINavigationMode { 
        mNavBarLargerGesturalHeight = ResourceUtils.getDimenByName(

                ResourceUtils.NAVBAR_BOTTOM_GESTURE_LARGER_SIZE, mContext.getResources(),

                mNavBarGesturalHeight);

        mImeDrawsImeNavBar = ResourceUtils.getBoolByName(IME_DRAWS_IME_NAV_BAR_RES_NAME,

                mContext.getResources(), false);



        if (modeInt == INVALID_RESOURCE_HANDLE) {

            Log.e(TAG, "Failed to get system resource ID. Incompatible framework version?");
@@ -167,9 +174,14 @@ public class SysUINavigationMode { 
        return mMode;

    }



    public boolean getImeDrawsImeNavBar() {

        return mImeDrawsImeNavBar;

    }



    public void dump(PrintWriter pw) {

        pw.println("SysUINavigationMode:");

        pw.println("  mode=" + mMode.name());

        pw.println("  mImeDrawsImeNavBar=:" + mImeDrawsImeNavBar);

        pw.println("  mNavBarGesturalHeight=:" + mNavBarGesturalHeight);

    }