diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2013-12-13 17:09:16 +0900 |
|---|---|---|
| committer | Ken Wakasa <kwakasa@google.com> | 2013-12-13 17:13:32 +0900 |
| commit | 2fa3693c264a4c150ac307d9bb7f6f8f18cc4ffc (patch) | |
| tree | 56a5652edf71dd19d04161f72e3e013608cc2a9c /java/res/layout/emoji_keyboard_page.xml | |
| parent | 18d033405c18a8dc28f60ca22d1d0df23a679384 (diff) | |
| download | latinime-2fa3693c264a4c150ac307d9bb7f6f8f18cc4ffc.tar.gz latinime-2fa3693c264a4c150ac307d9bb7f6f8f18cc4ffc.tar.xz latinime-2fa3693c264a4c150ac307d9bb7f6f8f18cc4ffc.zip | |
Reset to 9bd6dac4708ad94fd0257c53e977df62b152e20c
The bulk merge from -bayo to klp-dev should not have been merged to master.
Change-Id: I527a03a76f5247e4939a672f27c314dc11cbb854
Diffstat (limited to 'java/res/layout/emoji_keyboard_page.xml')
| -rw-r--r-- | java/res/layout/emoji_keyboard_page.xml | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/java/res/layout/emoji_keyboard_page.xml b/java/res/layout/emoji_keyboard_page.xml index e0b752b32..9afad366a 100644 --- a/java/res/layout/emoji_keyboard_page.xml +++ b/java/res/layout/emoji_keyboard_page.xml @@ -18,16 +18,9 @@ */ --> -<com.android.inputmethod.keyboard.internal.ScrollViewWithNotifier +<com.android.inputmethod.keyboard.internal.EmojiPageKeyboardView xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/emoji_keyboard_scroller" - android:clipToPadding="false" - android:layout_width="match_parent" - android:layout_height="match_parent" -> - <com.android.inputmethod.keyboard.internal.ScrollKeyboardView - android:id="@+id/emoji_keyboard_page" - android:layoutDirection="ltr" - android:layout_width="wrap_content" - android:layout_height="wrap_content" /> -</com.android.inputmethod.keyboard.internal.ScrollViewWithNotifier> + android:id="@+id/emoji_keyboard_page" + android:layoutDirection="ltr" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> |