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

Commit a1c24bf8 authored by Mathew Inwood's avatar Mathew Inwood
Browse files

resolve merge conflicts of d609a403 to stage-aosp-master 

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I0049d94802b5e6801789e733847be4cfdabb0040
parents 2ea36ff2 d609a403

config/hiddenapi-light-greylist.txt

+0 −20
Original line number Diff line number Diff line
@@ -2376,26 +2376,6 @@ Landroid/icu/util/UResourceBundle;->getString()Ljava/lang/String; 
Landroid/icu/util/UResourceBundle;->getType()I

Landroid/icu/util/UResourceBundleIterator;->hasNext()Z

Landroid/icu/util/UResourceBundleIterator;->next()Landroid/icu/util/UResourceBundle;

Landroid/inputmethodservice/InputMethodService$SettingsObserver;->shouldShowImeWithHardKeyboard()Z

Landroid/inputmethodservice/InputMethodService;->mExtractEditText:Landroid/inputmethodservice/ExtractEditText;

Landroid/inputmethodservice/InputMethodService;->mExtractView:Landroid/view/View;

Landroid/inputmethodservice/InputMethodService;->mRootView:Landroid/view/View;

Landroid/inputmethodservice/InputMethodService;->mSettingsObserver:Landroid/inputmethodservice/InputMethodService$SettingsObserver;

Landroid/inputmethodservice/InputMethodService;->mTheme:I

Landroid/inputmethodservice/InputMethodService;->mTmpInsets:Landroid/inputmethodservice/InputMethodService$Insets;

Landroid/inputmethodservice/InputMethodService;->onExtractedDeleteText(II)V

Landroid/inputmethodservice/InputMethodService;->onExtractedReplaceText(IILjava/lang/CharSequence;)V

Landroid/inputmethodservice/InputMethodService;->onExtractedSetSpan(Ljava/lang/Object;III)V

Landroid/inputmethodservice/Keyboard;->mModifierKeys:Ljava/util/List;

Landroid/inputmethodservice/Keyboard;->mTotalHeight:I

Landroid/inputmethodservice/Keyboard;->mTotalWidth:I

Landroid/inputmethodservice/Keyboard;->resize(II)V

Landroid/inputmethodservice/KeyboardView;->mKeyBackground:Landroid/graphics/drawable/Drawable;

Landroid/inputmethodservice/KeyboardView;->mLabelTextSize:I

Landroid/inputmethodservice/KeyboardView;->mPreviewText:Landroid/widget/TextView;

Landroid/inputmethodservice/KeyboardView;->openPopupIfRequired(Landroid/view/MotionEvent;)Z

Landroid/inputmethodservice/KeyboardView;->repeatKey()Z

Landroid/inputmethodservice/KeyboardView;->showKey(I)V

Landroid/location/Country;-><init>(Ljava/lang/String;I)V

Landroid/location/Country;->getCountryIso()Ljava/lang/String;

Landroid/location/Country;->getSource()I

core/java/android/inputmethodservice/InputMethodService.java

+11 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import android.annotation.IntDef; 
import android.annotation.MainThread;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.UnsupportedAppUsage;

import android.app.ActivityManager;

import android.app.Dialog;

import android.content.Context;
@@ -343,10 +344,12 @@ public class InputMethodService extends AbstractInputMethodService { 


    InputMethodManager mImm;

    

    @UnsupportedAppUsage

    int mTheme = 0;

    

    LayoutInflater mInflater;

    TypedArray mThemeAttrs;

    @UnsupportedAppUsage

    View mRootView;

    SoftInputWindow mWindow;

    boolean mInitialized;
@@ -391,8 +394,10 @@ public class InputMethodService extends AbstractInputMethodService { 


    boolean mFullscreenApplied;

    boolean mIsFullscreen;

    @UnsupportedAppUsage

    View mExtractView;

    boolean mExtractViewHidden;

    @UnsupportedAppUsage

    ExtractEditText mExtractEditText;

    ViewGroup mExtractAccessories;

    View mExtractAction;
@@ -415,6 +420,7 @@ public class InputMethodService extends AbstractInputMethodService { 
     */

    boolean mShouldClearInsetOfPreviousIme;



    @UnsupportedAppUsage

    final Insets mTmpInsets = new Insets();

    final int[] mTmpLocation = new int[2];
@@ -824,6 +830,7 @@ public class InputMethodService extends AbstractInputMethodService { 
            mService.getContentResolver().unregisterContentObserver(this);

        }



        @UnsupportedAppUsage

        private boolean shouldShowImeWithHardKeyboard() {

            // Lazily initialize as needed.

            if (mShowImeWithHardKeyboard == ShowImeWithHardKeyboardType.UNKNOWN) {
@@ -863,6 +870,7 @@ public class InputMethodService extends AbstractInputMethodService { 
            return "SettingsObserver{mShowImeWithHardKeyboard=" + mShowImeWithHardKeyboard  + "}";

        }

    }

    @UnsupportedAppUsage

    private SettingsObserver mSettingsObserver;



    /**
@@ -2507,6 +2515,7 @@ public class InputMethodService extends AbstractInputMethodService { 
    /**

     * @hide

     */

    @UnsupportedAppUsage

    public void onExtractedDeleteText(int start, int end) {

        InputConnection conn = getCurrentInputConnection();

        if (conn != null) {
@@ -2519,6 +2528,7 @@ public class InputMethodService extends AbstractInputMethodService { 
    /**

     * @hide

     */

    @UnsupportedAppUsage

    public void onExtractedReplaceText(int start, int end, CharSequence text) {

        InputConnection conn = getCurrentInputConnection();

        if (conn != null) {
@@ -2530,6 +2540,7 @@ public class InputMethodService extends AbstractInputMethodService { 
    /**

     * @hide

     */

    @UnsupportedAppUsage

    public void onExtractedSetSpan(Object span, int start, int end, int flags) {

        InputConnection conn = getCurrentInputConnection();

        if (conn != null) {

core/java/android/inputmethodservice/Keyboard.java

+5 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package android.inputmethodservice; 


import org.xmlpull.v1.XmlPullParserException;



import android.annotation.UnsupportedAppUsage;

import android.annotation.XmlRes;

import android.content.Context;

import android.content.res.Resources;
@@ -110,18 +111,21 @@ public class Keyboard { 
    private int mKeyHeight;

    

    /** Total height of the keyboard, including the padding and keys */

    @UnsupportedAppUsage

    private int mTotalHeight;

    

    /** 

     * Total width of the keyboard, including left side gaps and keys, but not any gaps on the

     * right side.

     */

    @UnsupportedAppUsage

    private int mTotalWidth;

    

    /** List of keys in this keyboard */

    private List<Key> mKeys;

    

    /** List of modifier keys such as Shift & Alt, if any */

    @UnsupportedAppUsage

    private List<Key> mModifierKeys;

    

    /** Width of the screen available to fit the keyboard */
@@ -623,6 +627,7 @@ public class Keyboard { 
        rows.add(row);

    }



    @UnsupportedAppUsage

    final void resize(int newWidth, int newHeight) {

        int numRows = rows.size();

        for (int rowIndex = 0; rowIndex < numRows; ++rowIndex) {

core/java/android/inputmethodservice/KeyboardView.java

+7 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.inputmethodservice;



import android.annotation.UnsupportedAppUsage;

import android.content.Context;

import android.content.res.TypedArray;

import android.graphics.Bitmap;
@@ -133,6 +134,7 @@ public class KeyboardView extends View implements View.OnClickListener { 


    private Keyboard mKeyboard;

    private int mCurrentKeyIndex = NOT_A_KEY;

    @UnsupportedAppUsage

    private int mLabelTextSize;

    private int mKeyTextSize;

    private int mKeyTextColor;
@@ -140,6 +142,7 @@ public class KeyboardView extends View implements View.OnClickListener { 
    private int mShadowColor;

    private float mBackgroundDimAmount;



    @UnsupportedAppUsage

    private TextView mPreviewText;

    private PopupWindow mPreviewPopup;

    private int mPreviewTextSizeLarge;
@@ -217,6 +220,7 @@ public class KeyboardView extends View implements View.OnClickListener { 
    private float mOldPointerX;

    private float mOldPointerY;



    @UnsupportedAppUsage

    private Drawable mKeyBackground;



    private static final int REPEAT_INTERVAL = 50; // ~20 keys per second
@@ -910,6 +914,7 @@ public class KeyboardView extends View implements View.OnClickListener { 
        }

    }



    @UnsupportedAppUsage

    private void showKey(final int keyIndex) {

        final PopupWindow previewPopup = mPreviewPopup;

        final Key[] keys = mKeys;
@@ -1052,6 +1057,7 @@ public class KeyboardView extends View implements View.OnClickListener { 
                key.x + key.width + mPaddingLeft, key.y + key.height + mPaddingTop);

    }



    @UnsupportedAppUsage

    private boolean openPopupIfRequired(MotionEvent me) {

        // Check if we have a popup layout specified first.

        if (mPopupLayout == 0) {
@@ -1357,6 +1363,7 @@ public class KeyboardView extends View implements View.OnClickListener { 
        return true;

    }



    @UnsupportedAppUsage

    private boolean repeatKey() {

        Key key = mKeys[mRepeatKeyIndex];

        detectAndSendKey(mCurrentKey, key.x, key.y, mLastTapTime);