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

Commit 9ca6658e authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android Git Automerger
Browse files

am 0f33e614: Implement Floating Action Button more keys keyboard

* commit '0f33e614':
  Implement Floating Action Button more keys keyboard
parents f21c77d7 0f33e614
Loading
Loading
Loading
Loading
+21 −0
Original line number Original line Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2014 The Android Open Source Project

     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at

          http://www.apache.org/licenses/LICENSE-2.0

     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-->

<selector xmlns:android="http://schemas.android.com/apk/res/android">
    <item android:state_pressed="true"
          android:drawable="@drawable/btn_keyboard_key_active_pressed_lxx_dark" />
    <item android:drawable="@drawable/btn_keyboard_key_active_lxx_dark" />
</selector>
+21 −0
Original line number Original line Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2014 The Android Open Source Project

     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at

          http://www.apache.org/licenses/LICENSE-2.0

     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-->

<selector xmlns:android="http://schemas.android.com/apk/res/android">
    <item android:state_pressed="true"
          android:drawable="@drawable/btn_keyboard_key_active_pressed_lxx_light" />
    <item android:drawable="@drawable/btn_keyboard_key_active_lxx_light" />
</selector>
+32 −0
Original line number Original line Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2014, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
**     http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->

<LinearLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="wrap_content"
    android:layout_height="wrap_content"
    android:orientation="vertical"
>
    <com.android.inputmethod.keyboard.MoreKeysKeyboardView
        android:id="@+id/more_keys_keyboard_view"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        style="?attr/moreKeysKeyboardViewForActionStyle" />
</LinearLayout>
+4 −0
Original line number Original line Diff line number Diff line
@@ -32,6 +32,8 @@
        <attr name="moreKeysKeyboardStyle" format="reference" />
        <attr name="moreKeysKeyboardStyle" format="reference" />
        <!-- MoreKeysKeyboardView style -->
        <!-- MoreKeysKeyboardView style -->
        <attr name="moreKeysKeyboardViewStyle" format="reference" />
        <attr name="moreKeysKeyboardViewStyle" format="reference" />
        <!-- MoreKeysKeyboardView style for action key -->
        <attr name="moreKeysKeyboardViewForActionStyle" format="reference" />
        <!-- Suggestions strip style -->
        <!-- Suggestions strip style -->
        <attr name="suggestionStripViewStyle" format="reference" />
        <attr name="suggestionStripViewStyle" format="reference" />
        <!-- Suggestion word style -->
        <!-- Suggestion word style -->
@@ -119,6 +121,8 @@
        <attr name="keyPreviewDismissAnimator" format="reference" />
        <attr name="keyPreviewDismissAnimator" format="reference" />
        <!-- Layout resource for more keys keyboard -->
        <!-- Layout resource for more keys keyboard -->
        <attr name="moreKeysKeyboardLayout" format="reference" />
        <attr name="moreKeysKeyboardLayout" format="reference" />
        <!-- Layout resource for more keys keyboard of action key -->
        <attr name="moreKeysKeyboardForActionLayout" format="reference" />
        <attr name="backgroundDimAlpha" format="integer" />
        <attr name="backgroundDimAlpha" format="integer" />
        <!-- More keys keyboard will shown at touched point. -->
        <!-- More keys keyboard will shown at touched point. -->
        <attr name="showMoreKeysKeyboardAtTouchedPoint" format="boolean" />
        <attr name="showMoreKeysKeyboardAtTouchedPoint" format="boolean" />
+2 −0
Original line number Original line Diff line number Diff line
@@ -25,7 +25,9 @@
        <item name="mainKeyboardViewStyle">@style/MainKeyboardView.ICS</item>
        <item name="mainKeyboardViewStyle">@style/MainKeyboardView.ICS</item>
        <item name="emojiPalettesViewStyle">@style/EmojiPalettesView.ICS</item>
        <item name="emojiPalettesViewStyle">@style/EmojiPalettesView.ICS</item>
        <item name="moreKeysKeyboardStyle">@style/MoreKeysKeyboard.ICS</item>
        <item name="moreKeysKeyboardStyle">@style/MoreKeysKeyboard.ICS</item>
        <!-- Note: ICS theme uses the same style for both general more keys and action more keys. -->
        <item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView.ICS</item>
        <item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView.ICS</item>
        <item name="moreKeysKeyboardViewForActionStyle">@style/MoreKeysKeyboardView.ICS</item>
        <item name="suggestionStripViewStyle">@style/SuggestionStripView.ICS</item>
        <item name="suggestionStripViewStyle">@style/SuggestionStripView.ICS</item>
        <item name="suggestionWordStyle">@style/SuggestionWord.ICS</item>
        <item name="suggestionWordStyle">@style/SuggestionWord.ICS</item>
    </style>
    </style>
Loading