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

Commit e00ecf3b authored by Wilson Wu's avatar Wilson Wu
Browse files

Lower fields visibility for InputMethodManager 

Some of local variables are declared as package-access
but they only used in InputMethodManager. We can safely
convert them to private.

This is a mechanical refactor without user visible
change.

Bug: 236920321
Test: presubmit
Change-Id: Iaf8de0d7f0d4a8572df81810e1f8593436e3b771
parent 665c55a4

core/java/android/view/inputmethod/InputMethodManager.java

+35 −35
Original line number Diff line number Diff line
@@ -266,10 +266,10 @@ import java.util.function.Consumer; 
@SystemService(Context.INPUT_METHOD_SERVICE)

@RequiresFeature(PackageManager.FEATURE_INPUT_METHODS)

public final class InputMethodManager {

    static final boolean DEBUG = false;

    static final String TAG = "InputMethodManager";

    private static final boolean DEBUG = false;

    private static final String TAG = "InputMethodManager";



    static final String PENDING_EVENT_COUNTER = "aq:imm";

    private static final String PENDING_EVENT_COUNTER = "aq:imm";



    private static final int NOT_A_SUBTYPE_ID = -1;
@@ -361,7 +361,7 @@ public final class InputMethodManager { 
    /**

     * Timeout in milliseconds for delivering a key to an IME.

     */

    static final long INPUT_METHOD_NOT_RESPONDING_TIMEOUT = 2500;

    private static final long INPUT_METHOD_NOT_RESPONDING_TIMEOUT = 2500;



    /** @hide */

    public static final int DISPATCH_IN_PROGRESS = -1;
@@ -400,7 +400,7 @@ public final class InputMethodManager { 
    @Deprecated

    @UnsupportedAppUsage

    final IInputMethodManager mService;

    final Looper mMainLooper;

    private final Looper mMainLooper;



    @NonNull

    private final IInputMethodManagerInvoker mServiceInvoker;
@@ -422,7 +422,7 @@ public final class InputMethodManager { 
    /**

     * True if this input method client is active, initially false.

     */

    boolean mActive = false;

    private boolean mActive = false;



    /**

     * {@code true} if next {@link ImeFocusController#onPostWindowFocus} needs to
@@ -433,7 +433,7 @@ public final class InputMethodManager { 
    /**

     * As reported by IME through InputConnection.

     */

    boolean mFullscreenMode;

    private boolean mFullscreenMode;



    // -----------------------------------------------------------
@@ -447,33 +447,33 @@ public final class InputMethodManager { 
     * This is set when we are in the process of connecting, to determine

     * when we have actually finished.

     */

    boolean mServedConnecting;

    private boolean mServedConnecting;

    /**

     * This is non-null when we have connected the served view; it holds

     * the attributes that were last retrieved from the served view and given

     * to the input connection.

     */

    EditorInfo mCurrentEditorInfo;

    private EditorInfo mCurrentEditorInfo;

    /**

     * The InputConnection that was last retrieved from the served view.

     */

    RemoteInputConnectionImpl mServedInputConnection;

    private RemoteInputConnectionImpl mServedInputConnection;

    /**

     * The completions that were last provided by the served view.

     */

    CompletionInfo[] mCompletions;

    private CompletionInfo[] mCompletions;



    // Cursor position on the screen.

    @UnsupportedAppUsage

    Rect mTmpCursorRect = new Rect();

    @UnsupportedAppUsage

    Rect mCursorRect = new Rect();

    int mCursorSelStart;

    int mCursorSelEnd;

    int mCursorCandStart;

    int mCursorCandEnd;

    int mInitialSelStart;

    int mInitialSelEnd;

    private int mCursorSelStart;

    private int mCursorSelEnd;

    private int mCursorCandStart;

    private int mCursorCandEnd;

    private int mInitialSelStart;

    private int mInitialSelEnd;



    /**

     * Handler for {@link RemoteInputConnectionImpl#getInputConnection()}.
@@ -534,8 +534,8 @@ public final class InputMethodManager { 
    private final SparseArray<IAccessibilityInputMethodSessionInvoker>

            mAccessibilityInputMethodSession = new SparseArray<>();



    InputChannel mCurChannel;

    ImeInputEventSender mCurSender;

    private InputChannel mCurChannel;

    private ImeInputEventSender mCurSender;



    private static final int REQUEST_UPDATE_CURSOR_ANCHOR_INFO_NONE = 0x0;
@@ -551,25 +551,25 @@ public final class InputMethodManager { 
     */

    private ImeInsetsSourceConsumer mImeInsetsConsumer;



    final Pool<PendingEvent> mPendingEventPool = new SimplePool<>(20);

    final SparseArray<PendingEvent> mPendingEvents = new SparseArray<>(20);

    private final Pool<PendingEvent> mPendingEventPool = new SimplePool<>(20);

    private final SparseArray<PendingEvent> mPendingEvents = new SparseArray<>(20);



    final DelegateImpl mDelegate = new DelegateImpl();

    private final DelegateImpl mDelegate = new DelegateImpl();



    // -----------------------------------------------------------



    static final int MSG_DUMP = 1;

    static final int MSG_BIND = 2;

    static final int MSG_UNBIND = 3;

    static final int MSG_SET_ACTIVE = 4;

    static final int MSG_SEND_INPUT_EVENT = 5;

    static final int MSG_TIMEOUT_INPUT_EVENT = 6;

    static final int MSG_FLUSH_INPUT_EVENT = 7;

    static final int MSG_REPORT_FULLSCREEN_MODE = 10;

    static final int MSG_BIND_ACCESSIBILITY_SERVICE = 11;

    static final int MSG_UNBIND_ACCESSIBILITY_SERVICE = 12;

    static final int MSG_UPDATE_VIRTUAL_DISPLAY_TO_SCREEN_MATRIX = 30;

    static final int MSG_ON_SHOW_REQUESTED = 31;

    private static final int MSG_DUMP = 1;

    private static final int MSG_BIND = 2;

    private static final int MSG_UNBIND = 3;

    private static final int MSG_SET_ACTIVE = 4;

    private static final int MSG_SEND_INPUT_EVENT = 5;

    private static final int MSG_TIMEOUT_INPUT_EVENT = 6;

    private static final int MSG_FLUSH_INPUT_EVENT = 7;

    private static final int MSG_REPORT_FULLSCREEN_MODE = 10;

    private static final int MSG_BIND_ACCESSIBILITY_SERVICE = 11;

    private static final int MSG_UNBIND_ACCESSIBILITY_SERVICE = 12;

    private static final int MSG_UPDATE_VIRTUAL_DISPLAY_TO_SCREEN_MATRIX = 30;

    private static final int MSG_ON_SHOW_REQUESTED = 31;



    private static boolean isAutofillUIShowing(View servedView) {

        AutofillManager afm = servedView.getContext().getSystemService(AutofillManager.class);
@@ -1142,7 +1142,7 @@ public final class InputMethodManager { 
        }

    }



    final IInputMethodClient.Stub mClient = new IInputMethodClient.Stub() {

    private final IInputMethodClient.Stub mClient = new IInputMethodClient.Stub() {

        @Override

        protected void dump(FileDescriptor fd, PrintWriter fout, String[] args) {

            // No need to check for dump permission, since we only give this