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

Commit 1a57c0fe authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [12204290, 12204195, 12205772, 12205773, 12205663] into rvc-release 

Change-Id: I96f4acd2bc4ae6cccf9bdb93f9c84d34b24603da
parents 408e00c4 bb2eb8cc

core/java/android/view/inputmethod/EditorInfo.java

+6 −4
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.os.LocaleList; 
import android.os.Parcel;

import android.os.Parcelable;

import android.os.UserHandle;

import android.text.Editable;

import android.text.InputType;

import android.text.TextUtils;

import android.util.Printer;
@@ -567,7 +568,8 @@ public class EditorInfo implements InputType, Parcelable { 
     *                      editor wants to trim out the first 10 chars, subTextStart should be 10.

     */

    public void setInitialSurroundingSubText(@NonNull CharSequence subText, int subTextStart) {

        Objects.requireNonNull(subText);

        CharSequence newSubText = Editable.Factory.getInstance().newEditable(subText);

        Objects.requireNonNull(newSubText);



        // Swap selection start and end if necessary.

        final int subTextSelStart = initialSelStart > initialSelEnd
@@ -575,7 +577,7 @@ public class EditorInfo implements InputType, Parcelable { 
        final int subTextSelEnd = initialSelStart > initialSelEnd

                ? initialSelStart - subTextStart : initialSelEnd - subTextStart;



        final int subTextLength = subText.length();

        final int subTextLength = newSubText.length();

        // Unknown or invalid selection.

        if (subTextStart < 0 || subTextSelStart < 0 || subTextSelEnd > subTextLength) {

            mInitialSurroundingText = new InitialSurroundingText();
@@ -589,12 +591,12 @@ public class EditorInfo implements InputType, Parcelable { 
        }



        if (subTextLength <= MEMORY_EFFICIENT_TEXT_LENGTH) {

            mInitialSurroundingText = new InitialSurroundingText(subText, subTextSelStart,

            mInitialSurroundingText = new InitialSurroundingText(newSubText, subTextSelStart,

                    subTextSelEnd);

            return;

        }



        trimLongSurroundingText(subText, subTextSelStart, subTextSelEnd);

        trimLongSurroundingText(newSubText, subTextSelStart, subTextSelEnd);

    }



    /**

core/tests/coretests/src/android/view/inputmethod/EditorInfoTest.java

+19 −0
Original line number Diff line number Diff line
@@ -264,6 +264,25 @@ public class EditorInfoTest { 
                        InputConnection.GET_TEXT_WITH_STYLES)));

    }



    @Test

    public void surroundingTextRetrieval_writeToParcel_noException() {

        StringBuilder sb = new StringBuilder("abcdefg");

        Parcel parcel = Parcel.obtain();

        EditorInfo editorInfo = new EditorInfo();

        editorInfo.initialSelStart = 2;

        editorInfo.initialSelEnd = 5;

        editorInfo.inputType = EditorInfo.TYPE_CLASS_TEXT;



        editorInfo.setInitialSurroundingText(sb);

        sb.setLength(0);

        editorInfo.writeToParcel(parcel, 0);



        try {

            editorInfo.getInitialTextBeforeCursor(60, 1);

            fail("Test shouldn't have exception");

        } catch (AssertionError e) { }

    }



    private static void assertExpectedTextLength(EditorInfo editorInfo,

            @Nullable Integer expectBeforeCursorLength, @Nullable Integer expectSelectionLength,

            @Nullable Integer expectAfterCursorLength) {

packages/SystemUI/res-keyguard/values-af/strings.xml

+0 −3
Original line number Diff line number Diff line
@@ -101,9 +101,6 @@ 
    <string name="keyguard_carrier_default" msgid="6359808469637388586">"Geen diens nie."</string>

    <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Wissel invoermetode"</string>

    <string name="airplane_mode" msgid="2528005343938497866">"Vliegtuigmodus"</string>

    <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"PIN word vereis om vir opdatering voor te berei"</string>

    <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"Patroon word vereis om vir opdatering voor te berei"</string>

    <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"Wagwoord word vereis om vir opdatering voor te berei"</string>

    <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Patroon word vereis nadat toestel herbegin het"</string>

    <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"PIN word vereis nadat toestel herbegin het"</string>

    <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Wagwoord word vereis nadat toestel herbegin het"</string>

packages/SystemUI/res-keyguard/values-am/strings.xml

+0 −3
Original line number Diff line number Diff line
@@ -101,9 +101,6 @@ 
    <string name="keyguard_carrier_default" msgid="6359808469637388586">"ከአገልግሎት መስጫ ክልል ውጪ።"</string>

    <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"የግቤት ስልት ቀይር"</string>

    <string name="airplane_mode" msgid="2528005343938497866">"የአውሮፕላን ሁነታ"</string>

    <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"ለዝማኔ ለማዘጋጀት ፒን ያስፈልጋል"</string>

    <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"ለዝማኔ ለማዘጋጀት ሥርዓተ ጥለት ያስፈልጋል"</string>

    <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"ለዝማኔ ለማዘጋጀት የይለፍ ቃል ያስፈልጋል"</string>

    <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"መሣሪያ ዳግም ከጀመረ በኋላ ሥርዓተ ጥለት ያስፈልጋል"</string>

    <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"መሣሪያ ዳግም ከተነሳ በኋላ ፒን ያስፈልጋል"</string>

    <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"መሣሪያ ዳግም ከጀመረ በኋላ የይለፍ ቃል ያስፈልጋል"</string>

packages/SystemUI/res-keyguard/values-ar/strings.xml

+0 −3
Original line number Diff line number Diff line
@@ -113,9 +113,6 @@ 
    <string name="keyguard_carrier_default" msgid="6359808469637388586">"لا تتوفر خدمة."</string>

    <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"تبديل أسلوب الإدخال"</string>

    <string name="airplane_mode" msgid="2528005343938497866">"وضع الطائرة"</string>

    <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"يجب إدخال رقم التعريف الشخصي للتحضير للتحديث."</string>

    <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"يجب رسم النقش للتحضير للتحديث."</string>

    <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"يجب إدخال كلمة المرور للتحضير للتحديث."</string>

    <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"يجب رسم النقش بعد إعادة تشغيل الجهاز"</string>

    <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"يجب إدخال رقم التعريف الشخصي بعد إعادة تشغيل الجهاز"</string>

    <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"يجب إدخال كلمة المرور بعد إعادة تشغيل الجهاز"</string>