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

Commit 832fa147 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6704724 from ac8249ac to sc-release 

Change-Id: Ifeb2ca5da45b3f9485aa7dea8de0a6df6489ec40
parents 2e8bb135 ac8249ac

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) {