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

Commit 614cb02a authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android (Google) Code Review
Browse files

Merge "Rename mini keyboard to more keys keyboard"

parents 1bd1cd19 2affaf91

java/proguard.flags

+1 −1
Original line number Diff line number Diff line
@@ -35,6 +35,6 @@ 
  *;

}



-keep class com.android.inputmethod.keyboard.MiniKeyboard$Builder$MiniKeyboardParams {

-keep class com.android.inputmethod.keyboard.MoreKeysKeyboard$Builder$MoreKeysKeyboardParams {

  <init>(...);

}

java/res/anim/mini_keyboard_fadein.xml→java/res/anim/more_keys_keyboard_fadein.xml

+1 −1
Original line number Diff line number Diff line
@@ -25,5 +25,5 @@ 
    <alpha

        android:fromAlpha="0.5"

        android:toAlpha="1.0"

        android:duration="@integer/config_mini_keyboard_fadein_anim_time" />

        android:duration="@integer/config_more_keys_keyboard_fadein_anim_time" />

</set>

java/res/anim/mini_keyboard_fadeout.xml→java/res/anim/more_keys_keyboard_fadeout.xml

+1 −1
Original line number Diff line number Diff line
@@ -25,5 +25,5 @@ 
    <alpha

        android:fromAlpha="1.0"

        android:toAlpha="0.0"

        android:duration="@integer/config_mini_keyboard_fadeout_anim_time" />

        android:duration="@integer/config_more_keys_keyboard_fadeout_anim_time" />

</set>

java/res/layout/mini_keyboard.xml→java/res/layout/more_keys_keyboard.xml

+3 −3
Original line number Diff line number Diff line
@@ -22,11 +22,11 @@ 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:orientation="horizontal"

        style="?attr/miniKeyboardPanelStyle"

        style="?attr/moreKeysKeyboardPanelStyle"

        >

    <com.android.inputmethod.keyboard.MiniKeyboardView

    <com.android.inputmethod.keyboard.MoreKeysKeyboardView

            xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"

            android:id="@+id/mini_keyboard_view"

            android:id="@+id/more_keys_keyboard_view"

            android:layout_alignParentBottom="true"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

java/res/layout/more_suggestions.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:orientation="horizontal"

        style="?attr/miniKeyboardPanelStyle"

        style="?attr/moreKeysKeyboardPanelStyle"

        >

    <com.android.inputmethod.latin.suggestions.MoreSuggestionsView

            xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"