diff options
| author |   Satoshi Kataoka <satok@google.com> | 2013-09-19 11:50:13 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2013-09-19 11:50:14 +0000 |
| commit | 5fe31f23920351a3d7a91caa5c70d549d73c6d48 (patch) | |
| tree | bc65733f4571fe1678e010a8c5e80e9aed4b9b78 /java/res | |
| parent | 80f934af540178b1d1581306b401d8b1cbe9698f (diff) | |
| parent | 250a12f6c216f65f3b6459b9fa620d20a6b94475 (diff) | |
| download | latinime-5fe31f23920351a3d7a91caa5c70d549d73c6d48.tar.gz latinime-5fe31f23920351a3d7a91caa5c70d549d73c6d48.tar.xz latinime-5fe31f23920351a3d7a91caa5c70d549d73c6d48.zip | |
Merge "Show Emoji category page id indicator"
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/layout/emoji_keyboard_view.xml | 5 | ||||
| -rw-r--r-- | java/res/values/colors.xml | 2 | ||||
| -rw-r--r-- | java/res/values/dimens.xml | 3 |
3 files changed, 9 insertions, 1 deletions
diff --git a/java/res/layout/emoji_keyboard_view.xml b/java/res/layout/emoji_keyboard_view.xml index 5fee419d0..36909a159 100644 --- a/java/res/layout/emoji_keyboard_view.xml +++ b/java/res/layout/emoji_keyboard_view.xml @@ -72,6 +72,11 @@ android:id="@+id/emoji_keyboard_pager" android:layout_width="match_parent" android:layout_height="wrap_content" /> + <com.android.inputmethod.keyboard.EmojiCategoryPageIndicatorView + android:id="@+id/emoji_category_page_id_view" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@color/emoji_category_page_id_view_background" /> <LinearLayout android:id="@+id/emoji_action_bar" android:orientation="horizontal" diff --git a/java/res/values/colors.xml b/java/res/values/colors.xml index ea762f977..a37f28206 100644 --- a/java/res/values/colors.xml +++ b/java/res/values/colors.xml @@ -55,4 +55,6 @@ <color name="setup_text_action">@android:color/holo_blue_light</color> <color name="setup_step_background">@android:color/background_light</color> <color name="setup_welcome_video_margin_color">#FFCCCCCC</color> + <color name="emoji_category_page_id_view_background">#FF000000</color> + <color name="emoji_category_page_id_view_foreground">#80FFFFFF</color> </resources> diff --git a/java/res/values/dimens.xml b/java/res/values/dimens.xml index 88e327f26..4e3b2f567 100644 --- a/java/res/values/dimens.xml +++ b/java/res/values/dimens.xml @@ -113,13 +113,14 @@ <dimen name="gesture_floating_preview_text_offset">73dp</dimen> <dimen name="gesture_floating_preview_horizontal_padding">24dp</dimen> <dimen name="gesture_floating_preview_vertical_padding">16dp</dimen> - <dimen name="gesture_floating_preview_round_radius">3dp</dimen> + <dimen name="gesture_floating_preview_round_radius">2dp</dimen> <!-- Emoji keyboard --> <fraction name="emoji_keyboard_key_width">14.2857%p</fraction> <fraction name="emoji_keyboard_row_height">33%p</fraction> <fraction name="emoji_keyboard_key_letter_size">90%p</fraction> <integer name="emoji_keyboard_max_key_count">21</integer> + <dimen name="emoji_category_page_id_height">3dp</dimen> <!-- Inset used in Accessibility mode to avoid accidental key presses when a finger slides off the screen. --> <dimen name="accessibility_edge_slop">8dp</dimen> |