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

Commit 225b4dc7 authored by Cosmin Băieș's avatar Cosmin Băieș Committed by Android (Google) Code Review
Browse files

Merge "Restore initial config and await secure setting" into main

parents fbfc15f0 5aefade7
Loading
Loading
Loading
Loading
+13 −1
Original line number Diff line number Diff line
@@ -1725,9 +1725,21 @@ public class InputMethodService extends AbstractInputMethodService {
            return "SettingsObserver{mShowImeWithHardKeyboard=" + mShowImeWithHardKeyboard  + "}";
        }
    }

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
    private SettingsObserver mSettingsObserver;

    /**
     * Checks whether the IME should be shown when a hardware keyboard is connected, as configured
     * through {@link Settings.Secure#SHOW_IME_WITH_HARD_KEYBOARD}, for testing purposes only.
     *
     * @hide
     */
    @VisibleForTesting
    public final boolean getShouldShowImeWithHardKeyboardForTesting() {
        return mSettingsObserver.shouldShowImeWithHardKeyboard();
    }

    /**
     * You can call this to customize the theme used by your IME's window.
     * This theme should typically be one that derives from
@@ -4454,7 +4466,7 @@ public class InputMethodService extends AbstractInputMethodService {
     *
     * @hide
     */
    @VisibleForTesting(visibility = VisibleForTesting.Visibility.PRIVATE)
    @VisibleForTesting
    public final boolean isImeNavigationBarShownForTesting() {
        return mNavigationBarController.isShown();
    }
+216 −174

File changed.

Preview size limit exceeded, changes collapsed.