Merge "Use config_imeDrawsImeNavBar" (5128d9d8) · Commits · e / os / android_frameworks_base

core/java/android/inputmethodservice/NavigationBarController.java

+10 −12

Original line number	Diff line number	Diff line
		@@ -45,7 +45,6 @@ import android.view.ViewTreeObserver;
		import android.view.Window;
		import android.view.WindowInsets;
		import android.view.WindowInsetsController.Appearance;
		import android.view.WindowManagerPolicyConstants;
		import android.view.animation.Interpolator;
		import android.view.animation.PathInterpolator;
		import android.widget.FrameLayout;
		@@ -138,7 +137,7 @@ final class NavigationBarController {

		private boolean mDestroyed = false;

		private boolean mRenderGesturalNavButtons;
		private boolean mImeDrawsImeNavBar;

		@Nullable
		private NavigationBarFrame mNavigationBarFrame;
		@@ -185,7 +184,7 @@ final class NavigationBarController {
		}

		private void installNavigationBarFrameIfNecessary() {
		if (!mRenderGesturalNavButtons) {
		if (!mImeDrawsImeNavBar) {
		return;
		}
		if (mNavigationBarFrame != null) {
		@@ -253,7 +252,7 @@ final class NavigationBarController {
		@Override
		public void updateTouchableInsets(@NonNull InputMethodService.Insets originalInsets,
		@NonNull ViewTreeObserver.InternalInsetsInfo dest) {
		if (!mRenderGesturalNavButtons \|\| mNavigationBarFrame == null
		if (!mImeDrawsImeNavBar \|\| mNavigationBarFrame == null
		\|\| mService.isExtractViewShown()) {
		return;
		}
		@@ -360,13 +359,12 @@ final class NavigationBarController {
		});
		}

		private boolean isGesturalNavigationEnabled() {
		private boolean imeDrawsImeNavBar() {
		final Resources resources = mService.getResources();
		if (resources == null) {
		return false;
		}
		return resources.getInteger(com.android.internal.R.integer.config_navBarInteractionMode)
		== WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL;
		return resources.getBoolean(com.android.internal.R.bool.config_imeDrawsImeNavBar);
		}

		@Override
		@@ -381,7 +379,7 @@ final class NavigationBarController {
		if (mDestroyed) {
		return;
		}
		mRenderGesturalNavButtons = isGesturalNavigationEnabled();
		mImeDrawsImeNavBar = imeDrawsImeNavBar();
		if (mSystemOverlayChangedReceiver == null) {
		final IntentFilter intentFilter = new IntentFilter(ACTION_OVERLAY_CHANGED);
		intentFilter.addDataScheme(IntentFilter.SCHEME_PACKAGE);
		@@ -392,8 +390,8 @@ final class NavigationBarController {
		if (mDestroyed) {
		return;
		}
		mRenderGesturalNavButtons = isGesturalNavigationEnabled();
		if (mRenderGesturalNavButtons) {
		mImeDrawsImeNavBar = imeDrawsImeNavBar();
		if (mImeDrawsImeNavBar) {
		installNavigationBarFrameIfNecessary();
		} else {
		uninstallNavigationBarFrameIfNecessary();
		@@ -423,7 +421,7 @@ final class NavigationBarController {

		@Override
		public void onWindowShown() {
		if (mDestroyed \|\| !mRenderGesturalNavButtons \|\| mNavigationBarFrame == null) {
		if (mDestroyed \|\| !mImeDrawsImeNavBar \|\| mNavigationBarFrame == null) {
		return;
		}
		final Insets systemInsets = getSystemInsets();
		@@ -546,7 +544,7 @@ final class NavigationBarController {

		@Override
		public String toDebugString() {
		return "{mRenderGesturalNavButtons=" + mRenderGesturalNavButtons
		return "{mImeDrawsImeNavBar=" + mImeDrawsImeNavBar
		+ " mNavigationBarFrame=" + mNavigationBarFrame
		+ " mShouldShowImeSwitcherWhenImeIsShown="
		+ mShouldShowImeSwitcherWhenImeIsShown

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

+4 −1

Original line number	Diff line number	Diff line
		@@ -125,6 +125,7 @@ public class NavigationBarView extends FrameLayout implements
		int mDisabledFlags = 0;
		int mNavigationIconHints = 0;
		private int mNavBarMode;
		private boolean mImeDrawsImeNavBar;

		private final Region mTmpRegion = new Region();
		private final int[] mTmpPosition = new int[2];
		@@ -324,6 +325,7 @@ public class NavigationBarView extends FrameLayout implements
		mIsVertical = false;
		mLongClickableAccessibilityButton = false;
		mNavBarMode = Dependency.get(NavigationModeController.class).addListener(this);
		mImeDrawsImeNavBar = Dependency.get(NavigationModeController.class).getImeDrawsImeNavBar();

		mSysUiFlagContainer = Dependency.get(SysUiState.class);
		// Set up the context group of buttons
		@@ -773,7 +775,7 @@ public class NavigationBarView extends FrameLayout implements

		updateRecentsIcon();

		boolean isImeRenderingNavButtons = isGesturalMode(mNavBarMode)
		boolean isImeRenderingNavButtons = mImeDrawsImeNavBar
		&& mImeCanRenderGesturalNavButtons
		&& (mNavigationIconHints & StatusBarManager.NAVIGATION_HINT_IME_SHOWN) != 0;

		@@ -966,6 +968,7 @@ public class NavigationBarView extends FrameLayout implements
		@Override
		public void onNavigationModeChanged(int mode) {
		mNavBarMode = mode;
		mImeDrawsImeNavBar = Dependency.get(NavigationModeController.class).getImeDrawsImeNavBar();
		mBarTransitions.onNavigationModeChanged(mNavBarMode);
		mEdgeBackGestureHandler.onNavigationModeChanged(mNavBarMode);
		updateRotationButton();

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

+5 −0

Original line number	Diff line number	Diff line
		@@ -156,6 +156,11 @@ public class NavigationModeController implements Dumpable {
		mListeners.remove(listener);
		}

		public boolean getImeDrawsImeNavBar() {
		return mCurrentUserContext.getResources().getBoolean(
		com.android.internal.R.bool.config_imeDrawsImeNavBar);
		}

		private int getCurrentInteractionMode(Context context) {
		int mode = context.getResources().getInteger(
		com.android.internal.R.integer.config_navBarInteractionMode);