inputmethod: allow hiding navigation ime bar

Change-Id: Iaa15dda08d614d01fae64ae2b5aa72f50513af99

Author: rmp22

packages/SystemUI/src/com/android/systemui/navigationbar/views/NavigationBar.java

@@ -62,6 +62,7 @@
 import android.app.StatusBarManager.NavbarFlags;
 import android.content.Context;
 import android.content.res.Configuration;
+import android.database.ContentObserver;
 import android.graphics.Insets;
 import android.graphics.PixelFormat;
 import android.graphics.Point;
@@ -70,12 +71,16 @@
 import android.graphics.Region;
 import android.inputmethodservice.InputMethodService.BackDispositionMode;
 import android.inputmethodservice.InputMethodService.ImeWindowVisibility;
+import android.net.Uri;
 import android.os.Binder;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Looper;
 import android.os.RemoteException;
 import android.os.Trace;
+import android.os.UserHandle;
 import android.provider.DeviceConfig;
+import android.provider.Settings;
 import android.telecom.TelecomManager;
 import android.text.TextUtils;
 import android.util.Log;
@@ -234,6 +239,8 @@ public class NavigationBar extends ViewController<NavigationBarView> implements
     private EdgeBackGestureHandler mEdgeBackGestureHandler;
     private NavigationBarFrame mFrame;
     private MotionEvent mCurrentDownEvent;
+    
+    private final ContentObserver mNavBarObserver;
 
     private @WindowVisibleState int mNavigationBarWindowState = WINDOW_STATE_SHOWING;
 
@@ -690,6 +697,23 @@ public boolean isSamplingEnabled() {
         mView.setEdgeBackGestureHandler(mEdgeBackGestureHandler);
         mView.setDisplayTracker(mDisplayTracker);
         mNavBarMode = mNavigationModeController.addListener(mModeChangedListener);
+        
+        mNavBarObserver = new ContentObserver(new Handler(Looper.getMainLooper())) {
+            @Override
+            public void onChange(boolean selfChange, Uri uri) {
+                super.onChange(selfChange, uri);
+                if (mView != null) {
+                    mView.setNavBarMode(mNavBarMode, getShowNavBarIme());
+                }
+            }
+        };
+    }
+    
+    private boolean getShowNavBarIme() {
+        return Settings.Secure.getIntForUser(
+            mContext.getContentResolver(), 
+            "sysui_show_nav_bar_ime", 1, 
+            UserHandle.USER_CURRENT) == 1;
     }
 
     public NavigationBarView getView() {
@@ -864,6 +888,13 @@ public void onViewAttached() {
         AutoHideController autoHideController = mAutoHideControllerStore.forDisplay(mDisplayId);
         setAutoHideController(autoHideController);
         restoreAppearanceAndTransientState();
+
+        mContext.getContentResolver().registerContentObserver(
+                Settings.Secure.getUriFor("sysui_show_nav_bar_ime"),
+                false,
+                mNavBarObserver,
+                UserHandle.USER_ALL
+        );
     }
 
     @Override
@@ -897,6 +928,7 @@ public void onViewDetached() {
         mPipOptional.ifPresent(mView::removePipExclusionBoundsChangeListener);
         mFrame = null;
         mOrientationHandle = null;
+        mContext.getContentResolver().unregisterContentObserver(mNavBarObserver);
     }
 
     // TODO: Remove this when we update nav bar recreation
@@ -2044,7 +2076,7 @@ public void setNavigationBarLumaSamplingEnabled(boolean enable) {
     }
 
     private void setNavBarMode(int mode) {
-        mView.setNavBarMode(mode, mNavigationModeController.getImeDrawsImeNavBar());
+        mView.setNavBarMode(mode, getShowNavBarIme());
         if (isGesturalMode(mode)) {
             mRegionSamplingHelper.start(mSamplingBounds);
         } else {

services/core/java/com/android/server/inputmethod/InputMethodManagerService.java

@@ -505,6 +505,9 @@ void registerContentObserverForAllUsers() {
                         LineageSettings.Secure.FEATURE_TOUCH_HOVERING),
                         false, this, UserHandle.ALL);
             }
+            resolver.registerContentObserverAsUser(Settings.Secure.getUriFor(
+                    "sysui_show_nav_bar_ime"),
+                    false, this, UserHandle.ALL);
         }
 
         @Override
@@ -520,6 +523,8 @@ private void onChangeInternal(@NonNull Uri uri, @UserIdInt int userId) {
                     LineageSettings.System.HIGH_TOUCH_SENSITIVITY_ENABLE);
             final Uri touchHoveringUri = LineageSettings.Secure.getUriFor(
                     LineageSettings.Secure.FEATURE_TOUCH_HOVERING);
+            final Uri navBarUri = Settings.Secure.getUriFor(
+                    "sysui_show_nav_bar_ime");
             synchronized (ImfLock.class) {
                 if (!mConcurrentMultiUserModeEnabled && mCurrentImeUserId != userId) {
                     return;
@@ -530,6 +535,8 @@ private void onChangeInternal(@NonNull Uri uri, @UserIdInt int userId) {
                     updateTouchSensitivity();
                 } else if (touchHoveringUri.equals(uri)) {
                     updateTouchHovering();
+                } else if (navBarUri.equals(uri)) {
+                    onUpdateResourceOverlay(userId);
                 }
             }
         }
@@ -1241,10 +1248,9 @@ private void initializeUsersAsync(@UserIdInt int[] userIds) {
                     InputMethodSettingsRepository.put(userId, settings);
 
                     final int profileParentId = userManagerInternal.getProfileParentId(userId);
-                    final boolean value =
-                            InputMethodDrawsNavBarResourceMonitor.evaluate(context,
-                                    profileParentId);
-                    userData.mImeDrawsNavBar.set(value);
+                    final boolean showNavBarIme = Settings.Secure.getIntForUser(
+                        context.getContentResolver(), "sysui_show_nav_bar_ime", 1, userId) == 1;
+                    userData.mImeDrawsNavBar.set(showNavBarIme);
 
                     userData.mBackgroundLoadLatch.countDown();
                     Slog.d(TAG, "Complete initialization for user=" + userId);
@@ -5248,13 +5254,13 @@ void sendOnNavButtonFlagsChangedLocked(@NonNull UserData userData) {
     @WorkerThread
     private void onUpdateResourceOverlay(@UserIdInt int userId) {
         final int profileParentId = mUserManagerInternal.getProfileParentId(userId);
-        final boolean value =
-                InputMethodDrawsNavBarResourceMonitor.evaluate(mContext, profileParentId);
         final var profileUserIds = mUserManagerInternal.getProfileIds(profileParentId, false);
+        final boolean showNavBarIme = Settings.Secure.getIntForUser(
+            mContext.getContentResolver(), "sysui_show_nav_bar_ime", 1, userId) == 1;
         final ArrayList<UserData> updatedUsers = new ArrayList<>();
         for (int profileUserId : profileUserIds) {
             final var userData = getUserData(profileUserId);
-            userData.mImeDrawsNavBar.set(value);
+            userData.mImeDrawsNavBar.set(showNavBarIme);
             updatedUsers.add(userData);
         }
         synchronized (ImfLock.class) {