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

Commit c8e45ddb authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Rename LatinKeyboardView to MainKeyboardView 

Change-Id: I8f3123b8d727c7beb72e226f80c17794f89c8b60
parent a4f762ff

java/proguard.flags

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
  *;

}



-keep class com.android.inputmethod.keyboard.LatinKeyboardView {

-keep class com.android.inputmethod.keyboard.MainKeyboardView {

  # Keep getter/setter methods for ObjectAnimator

  int getLanguageOnSpacebarAnimAlpha();

  void setLanguageOnSpacebarAnimAlpha(int);

java/res/layout/input_view.xml

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ 
            style="?attr/suggestionsStripBackgroundStyle" />

    </LinearLayout>



    <com.android.inputmethod.keyboard.LatinKeyboardView

    <com.android.inputmethod.keyboard.MainKeyboardView

        android:id="@+id/keyboard_view"

        android:layout_alignParentBottom="true"

        android:layout_width="match_parent"

java/res/values-sw600dp/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
    <string name="config_default_keyboard_theme_index" translatable="false">5</string>

    <integer name="config_max_more_keys_column">5</integer>

    <!--

        Configuration for LatinKeyboardView

        Configuration for MainKeyboardView

    -->

    <dimen name="config_key_hysteresis_distance">40.0dp</dimen>

    <bool name="config_sliding_key_input_enabled">false</bool>

java/res/values-sw768dp/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
    <string name="config_default_keyboard_theme_index" translatable="false">5</string>

    <integer name="config_max_more_keys_column">5</integer>

    <!--

        Configuration for LatinKeyboardView

        Configuration for MainKeyboardView

    -->

    <bool name="config_sliding_key_input_enabled">false</bool>

    <!-- Showing more keys keyboard, just above the touched point if true, aligned to the key if

java/res/values/attrs.xml

+3 −6
Original line number Diff line number Diff line
@@ -18,13 +18,10 @@ 
    <declare-styleable name="KeyboardTheme">

        <!-- Keyboard style -->

        <attr name="keyboardStyle" format="reference" />

        <!-- TODO: Get rid of latinKeyboardStyle -->

        <!-- LatinKeyboard style -->

        <attr name="latinKeyboardStyle" format="reference" />

        <!-- KeyboardView style -->

        <attr name="keyboardViewStyle" format="reference" />

        <!-- LatinKeyboardView style -->

        <attr name="latinKeyboardViewStyle" format="reference" />

        <!-- MainKeyboardView style -->

        <attr name="mainKeyboardViewStyle" format="reference" />

        <!-- MoreKeysKeyboard style -->

        <attr name="moreKeysKeyboardStyle" format="reference" />

        <!-- MoreKeysKeyboardView style -->
@@ -123,7 +120,7 @@ 
        </attr>

    </declare-styleable>



    <declare-styleable name="LatinKeyboardView">

    <declare-styleable name="MainKeyboardView">

        <attr name="autoCorrectionSpacebarLedEnabled" format="boolean" />

        <attr name="autoCorrectionSpacebarLedIcon" format="reference" />

        <!-- Size of the text for spacebar language label, in the proportion of key height. -->