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

Commit c1a6a00c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update language to comply with Android’s inclusive language guidance"... 

Merge "Update language to comply with Android’s inclusive language guidance" am: 4eb19221 am: a2695d0c am: a61e424d am: 9ebba46c

Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1371236

Change-Id: I685b5e27b3ae1301a94471e11daa64e3b146ade7
parents b586d0f0 9ebba46c

java/res/xml-sw600dp/key_styles_common.xml

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
    <include

        latin:keyboardLayout="@xml/key_styles_settings" />

    <!-- Functional key styles -->

    <!-- Base style for shift key. A single space is used for dummy label in moreKeys. -->

    <!-- Base style for shift key. A single space is used for base label in moreKeys. -->

    <key-style

        latin:styleName="baseForShiftKeyStyle"

        latin:keyActionFlags="noKeyPreview"

java/res/xml/key_styles_common.xml

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
    <include

        latin:keyboardLayout="@xml/key_styles_settings" />

    <!-- Functional key styles -->

    <!-- Base style for shift key. A single space is used for dummy label in moreKeys. -->

    <!-- Base style for shift key. A single space is used for base label in moreKeys. -->

    <key-style

        latin:styleName="baseForShiftKeyStyle"

        latin:keyActionFlags="noKeyPreview"

java/res/xml/prefs_screen_accounts.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"

    android:title="@string/settings_screen_accounts">



    <!-- This preference is a dummy view of the underlying preference.

    <!-- This preference is a fake view of the underlying preference.

         This isn't persisted and the summary/title is refreshed by the fragment

         after inspecting the underlying account preference. -->

    <Preference

java/src/com/android/inputmethod/dictionarypack/MetadataDbHelper.java

+1 −1
Original line number Diff line number Diff line
@@ -870,7 +870,7 @@ public class MetadataDbHelper extends SQLiteOpenHelper { 
     */

    public static void updateClientInfo(final Context context, final String clientId,

            final ContentValues values) {

        // Sanity check the content values

        // Validity check the content values

        final String valuesClientId = values.getAsString(CLIENT_CLIENT_ID_COLUMN);

        final String valuesMetadataUri = values.getAsString(CLIENT_METADATA_URI_COLUMN);

        final String valuesMetadataAdditionalId =

java/src/com/android/inputmethod/event/Event.java

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ public class Event { 
        mSuggestedWordInfo = suggestedWordInfo;

        mFlags = flags;

        mNextEvent = next;

        // Sanity checks

        // Validity checks

        // mSuggestedWordInfo is non-null if and only if the type is SUGGESTION_PICKED

        if (EVENT_TYPE_SUGGESTION_PICKED == mEventType) {

            if (null == mSuggestedWordInfo) {