From fd2f1a1677bb363cc3f360035adbed85a6814bef Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Tue, 31 May 2011 20:25:04 +0900
Subject: Remove number hint from 7 inch layout

Bug: 4442045
Change-Id: I55ad5ea45bc2a089486e69ca38a0e174dd7957d6
---
 .../drawable-sw600dp-hdpi/key_hint_num0_holo.9.png | Bin 501 -> 0 bytes
 .../drawable-sw600dp-hdpi/key_hint_num1_holo.9.png | Bin 427 -> 0 bytes
 .../drawable-sw600dp-hdpi/key_hint_num2_holo.9.png | Bin 538 -> 0 bytes
 .../drawable-sw600dp-hdpi/key_hint_num3_holo.9.png | Bin 556 -> 0 bytes
 .../drawable-sw600dp-hdpi/key_hint_num4_holo.9.png | Bin 499 -> 0 bytes
 .../drawable-sw600dp-hdpi/key_hint_num5_holo.9.png | Bin 542 -> 0 bytes
 .../drawable-sw600dp-hdpi/key_hint_num6_holo.9.png | Bin 521 -> 0 bytes
 .../drawable-sw600dp-hdpi/key_hint_num7_holo.9.png | Bin 509 -> 0 bytes
 .../drawable-sw600dp-hdpi/key_hint_num8_holo.9.png | Bin 531 -> 0 bytes
 .../drawable-sw600dp-hdpi/key_hint_num9_holo.9.png | Bin 552 -> 0 bytes
 .../drawable-sw600dp-mdpi/key_hint_num0_holo.9.png | Bin 292 -> 0 bytes
 .../drawable-sw600dp-mdpi/key_hint_num1_holo.9.png | Bin 240 -> 0 bytes
 .../drawable-sw600dp-mdpi/key_hint_num2_holo.9.png | Bin 308 -> 0 bytes
 .../drawable-sw600dp-mdpi/key_hint_num3_holo.9.png | Bin 309 -> 0 bytes
 .../drawable-sw600dp-mdpi/key_hint_num4_holo.9.png | Bin 290 -> 0 bytes
 .../drawable-sw600dp-mdpi/key_hint_num5_holo.9.png | Bin 296 -> 0 bytes
 .../drawable-sw600dp-mdpi/key_hint_num6_holo.9.png | Bin 301 -> 0 bytes
 .../drawable-sw600dp-mdpi/key_hint_num7_holo.9.png | Bin 290 -> 0 bytes
 .../drawable-sw600dp-mdpi/key_hint_num8_holo.9.png | Bin 315 -> 0 bytes
 .../drawable-sw600dp-mdpi/key_hint_num9_holo.9.png | Bin 313 -> 0 bytes
 .../key_hint_num0_holo.9.png                       | Bin 554 -> 0 bytes
 .../key_hint_num1_holo.9.png                       | Bin 479 -> 0 bytes
 .../key_hint_num2_holo.9.png                       | Bin 595 -> 0 bytes
 .../key_hint_num3_holo.9.png                       | Bin 618 -> 0 bytes
 .../key_hint_num4_holo.9.png                       | Bin 559 -> 0 bytes
 .../key_hint_num5_holo.9.png                       | Bin 599 -> 0 bytes
 .../key_hint_num6_holo.9.png                       | Bin 566 -> 0 bytes
 .../key_hint_num7_holo.9.png                       | Bin 543 -> 0 bytes
 .../key_hint_num8_holo.9.png                       | Bin 593 -> 0 bytes
 .../key_hint_num9_holo.9.png                       | Bin 615 -> 0 bytes
 java/res/values-sw600dp/config.xml                 |   2 +-
 java/res/xml-sw600dp/kbd_azerty_rows.xml           |  10 ------
 java/res/xml-sw600dp/kbd_qwerty_row1.xml           |  10 ------
 .../xml-sw600dp/kbd_qwerty_rows_scandinavia.xml    |  10 ------
 java/res/xml-sw600dp/kbd_qwertz_rows.xml           |  10 ------
 java/res/xml-sw600dp/kbd_ru_rows.xml               |  35 +++++--------------
 java/res/xml-sw600dp/kbd_sr_rows.xml               |  38 +++++----------------
 37 files changed, 18 insertions(+), 97 deletions(-)
 delete mode 100644 java/res/drawable-sw600dp-hdpi/key_hint_num0_holo.9.png
 delete mode 100644 java/res/drawable-sw600dp-hdpi/key_hint_num1_holo.9.png
 delete mode 100644 java/res/drawable-sw600dp-hdpi/key_hint_num2_holo.9.png
 delete mode 100644 java/res/drawable-sw600dp-hdpi/key_hint_num3_holo.9.png
 delete mode 100644 java/res/drawable-sw600dp-hdpi/key_hint_num4_holo.9.png
 delete mode 100644 java/res/drawable-sw600dp-hdpi/key_hint_num5_holo.9.png
 delete mode 100644 java/res/drawable-sw600dp-hdpi/key_hint_num6_holo.9.png
 delete mode 100644 java/res/drawable-sw600dp-hdpi/key_hint_num7_holo.9.png
 delete mode 100644 java/res/drawable-sw600dp-hdpi/key_hint_num8_holo.9.png
 delete mode 100644 java/res/drawable-sw600dp-hdpi/key_hint_num9_holo.9.png
 delete mode 100644 java/res/drawable-sw600dp-mdpi/key_hint_num0_holo.9.png
 delete mode 100644 java/res/drawable-sw600dp-mdpi/key_hint_num1_holo.9.png
 delete mode 100644 java/res/drawable-sw600dp-mdpi/key_hint_num2_holo.9.png
 delete mode 100644 java/res/drawable-sw600dp-mdpi/key_hint_num3_holo.9.png
 delete mode 100644 java/res/drawable-sw600dp-mdpi/key_hint_num4_holo.9.png
 delete mode 100644 java/res/drawable-sw600dp-mdpi/key_hint_num5_holo.9.png
 delete mode 100644 java/res/drawable-sw600dp-mdpi/key_hint_num6_holo.9.png
 delete mode 100644 java/res/drawable-sw600dp-mdpi/key_hint_num7_holo.9.png
 delete mode 100644 java/res/drawable-sw600dp-mdpi/key_hint_num8_holo.9.png
 delete mode 100644 java/res/drawable-sw600dp-mdpi/key_hint_num9_holo.9.png
 delete mode 100644 java/res/drawable-sw600dp-xhdpi/key_hint_num0_holo.9.png
 delete mode 100644 java/res/drawable-sw600dp-xhdpi/key_hint_num1_holo.9.png
 delete mode 100644 java/res/drawable-sw600dp-xhdpi/key_hint_num2_holo.9.png
 delete mode 100644 java/res/drawable-sw600dp-xhdpi/key_hint_num3_holo.9.png
 delete mode 100644 java/res/drawable-sw600dp-xhdpi/key_hint_num4_holo.9.png
 delete mode 100644 java/res/drawable-sw600dp-xhdpi/key_hint_num5_holo.9.png
 delete mode 100644 java/res/drawable-sw600dp-xhdpi/key_hint_num6_holo.9.png
 delete mode 100644 java/res/drawable-sw600dp-xhdpi/key_hint_num7_holo.9.png
 delete mode 100644 java/res/drawable-sw600dp-xhdpi/key_hint_num8_holo.9.png
 delete mode 100644 java/res/drawable-sw600dp-xhdpi/key_hint_num9_holo.9.png

(limited to 'java/res')

diff --git a/java/res/drawable-sw600dp-hdpi/key_hint_num0_holo.9.png b/java/res/drawable-sw600dp-hdpi/key_hint_num0_holo.9.png
deleted file mode 100644
index 25df0ef0b..000000000
Binary files a/java/res/drawable-sw600dp-hdpi/key_hint_num0_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-hdpi/key_hint_num1_holo.9.png b/java/res/drawable-sw600dp-hdpi/key_hint_num1_holo.9.png
deleted file mode 100644
index 12df78ed3..000000000
Binary files a/java/res/drawable-sw600dp-hdpi/key_hint_num1_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-hdpi/key_hint_num2_holo.9.png b/java/res/drawable-sw600dp-hdpi/key_hint_num2_holo.9.png
deleted file mode 100644
index 03fcd0731..000000000
Binary files a/java/res/drawable-sw600dp-hdpi/key_hint_num2_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-hdpi/key_hint_num3_holo.9.png b/java/res/drawable-sw600dp-hdpi/key_hint_num3_holo.9.png
deleted file mode 100644
index 41c007b0a..000000000
Binary files a/java/res/drawable-sw600dp-hdpi/key_hint_num3_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-hdpi/key_hint_num4_holo.9.png b/java/res/drawable-sw600dp-hdpi/key_hint_num4_holo.9.png
deleted file mode 100644
index 2e7d7b3ca..000000000
Binary files a/java/res/drawable-sw600dp-hdpi/key_hint_num4_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-hdpi/key_hint_num5_holo.9.png b/java/res/drawable-sw600dp-hdpi/key_hint_num5_holo.9.png
deleted file mode 100644
index 28c470af2..000000000
Binary files a/java/res/drawable-sw600dp-hdpi/key_hint_num5_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-hdpi/key_hint_num6_holo.9.png b/java/res/drawable-sw600dp-hdpi/key_hint_num6_holo.9.png
deleted file mode 100644
index 33b6535db..000000000
Binary files a/java/res/drawable-sw600dp-hdpi/key_hint_num6_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-hdpi/key_hint_num7_holo.9.png b/java/res/drawable-sw600dp-hdpi/key_hint_num7_holo.9.png
deleted file mode 100644
index 6365e45b1..000000000
Binary files a/java/res/drawable-sw600dp-hdpi/key_hint_num7_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-hdpi/key_hint_num8_holo.9.png b/java/res/drawable-sw600dp-hdpi/key_hint_num8_holo.9.png
deleted file mode 100644
index 59b4426f6..000000000
Binary files a/java/res/drawable-sw600dp-hdpi/key_hint_num8_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-hdpi/key_hint_num9_holo.9.png b/java/res/drawable-sw600dp-hdpi/key_hint_num9_holo.9.png
deleted file mode 100644
index 426c4e502..000000000
Binary files a/java/res/drawable-sw600dp-hdpi/key_hint_num9_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-mdpi/key_hint_num0_holo.9.png b/java/res/drawable-sw600dp-mdpi/key_hint_num0_holo.9.png
deleted file mode 100644
index d9a162654..000000000
Binary files a/java/res/drawable-sw600dp-mdpi/key_hint_num0_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-mdpi/key_hint_num1_holo.9.png b/java/res/drawable-sw600dp-mdpi/key_hint_num1_holo.9.png
deleted file mode 100644
index ac6c7294b..000000000
Binary files a/java/res/drawable-sw600dp-mdpi/key_hint_num1_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-mdpi/key_hint_num2_holo.9.png b/java/res/drawable-sw600dp-mdpi/key_hint_num2_holo.9.png
deleted file mode 100644
index fc2877402..000000000
Binary files a/java/res/drawable-sw600dp-mdpi/key_hint_num2_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-mdpi/key_hint_num3_holo.9.png b/java/res/drawable-sw600dp-mdpi/key_hint_num3_holo.9.png
deleted file mode 100644
index 890af2690..000000000
Binary files a/java/res/drawable-sw600dp-mdpi/key_hint_num3_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-mdpi/key_hint_num4_holo.9.png b/java/res/drawable-sw600dp-mdpi/key_hint_num4_holo.9.png
deleted file mode 100644
index 72a57034f..000000000
Binary files a/java/res/drawable-sw600dp-mdpi/key_hint_num4_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-mdpi/key_hint_num5_holo.9.png b/java/res/drawable-sw600dp-mdpi/key_hint_num5_holo.9.png
deleted file mode 100644
index 03c117df4..000000000
Binary files a/java/res/drawable-sw600dp-mdpi/key_hint_num5_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-mdpi/key_hint_num6_holo.9.png b/java/res/drawable-sw600dp-mdpi/key_hint_num6_holo.9.png
deleted file mode 100644
index b07bef3b8..000000000
Binary files a/java/res/drawable-sw600dp-mdpi/key_hint_num6_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-mdpi/key_hint_num7_holo.9.png b/java/res/drawable-sw600dp-mdpi/key_hint_num7_holo.9.png
deleted file mode 100644
index 3ae17e152..000000000
Binary files a/java/res/drawable-sw600dp-mdpi/key_hint_num7_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-mdpi/key_hint_num8_holo.9.png b/java/res/drawable-sw600dp-mdpi/key_hint_num8_holo.9.png
deleted file mode 100644
index e2c6763d7..000000000
Binary files a/java/res/drawable-sw600dp-mdpi/key_hint_num8_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-mdpi/key_hint_num9_holo.9.png b/java/res/drawable-sw600dp-mdpi/key_hint_num9_holo.9.png
deleted file mode 100644
index ec03b2c78..000000000
Binary files a/java/res/drawable-sw600dp-mdpi/key_hint_num9_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-xhdpi/key_hint_num0_holo.9.png b/java/res/drawable-sw600dp-xhdpi/key_hint_num0_holo.9.png
deleted file mode 100644
index 3a9232b00..000000000
Binary files a/java/res/drawable-sw600dp-xhdpi/key_hint_num0_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-xhdpi/key_hint_num1_holo.9.png b/java/res/drawable-sw600dp-xhdpi/key_hint_num1_holo.9.png
deleted file mode 100644
index 1b2d80eb6..000000000
Binary files a/java/res/drawable-sw600dp-xhdpi/key_hint_num1_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-xhdpi/key_hint_num2_holo.9.png b/java/res/drawable-sw600dp-xhdpi/key_hint_num2_holo.9.png
deleted file mode 100644
index b80d17348..000000000
Binary files a/java/res/drawable-sw600dp-xhdpi/key_hint_num2_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-xhdpi/key_hint_num3_holo.9.png b/java/res/drawable-sw600dp-xhdpi/key_hint_num3_holo.9.png
deleted file mode 100644
index 2d7214e42..000000000
Binary files a/java/res/drawable-sw600dp-xhdpi/key_hint_num3_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-xhdpi/key_hint_num4_holo.9.png b/java/res/drawable-sw600dp-xhdpi/key_hint_num4_holo.9.png
deleted file mode 100644
index 2abdb37c1..000000000
Binary files a/java/res/drawable-sw600dp-xhdpi/key_hint_num4_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-xhdpi/key_hint_num5_holo.9.png b/java/res/drawable-sw600dp-xhdpi/key_hint_num5_holo.9.png
deleted file mode 100644
index af9b842b9..000000000
Binary files a/java/res/drawable-sw600dp-xhdpi/key_hint_num5_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-xhdpi/key_hint_num6_holo.9.png b/java/res/drawable-sw600dp-xhdpi/key_hint_num6_holo.9.png
deleted file mode 100644
index 859483926..000000000
Binary files a/java/res/drawable-sw600dp-xhdpi/key_hint_num6_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-xhdpi/key_hint_num7_holo.9.png b/java/res/drawable-sw600dp-xhdpi/key_hint_num7_holo.9.png
deleted file mode 100644
index 5727b06c5..000000000
Binary files a/java/res/drawable-sw600dp-xhdpi/key_hint_num7_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-xhdpi/key_hint_num8_holo.9.png b/java/res/drawable-sw600dp-xhdpi/key_hint_num8_holo.9.png
deleted file mode 100644
index 2628c107f..000000000
Binary files a/java/res/drawable-sw600dp-xhdpi/key_hint_num8_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-xhdpi/key_hint_num9_holo.9.png b/java/res/drawable-sw600dp-xhdpi/key_hint_num9_holo.9.png
deleted file mode 100644
index cd8476f27..000000000
Binary files a/java/res/drawable-sw600dp-xhdpi/key_hint_num9_holo.9.png and /dev/null differ
diff --git a/java/res/values-sw600dp/config.xml b/java/res/values-sw600dp/config.xml
index b6d8e33f9..c3d34456e 100644
--- a/java/res/values-sw600dp/config.xml
+++ b/java/res/values-sw600dp/config.xml
@@ -29,7 +29,7 @@
     <bool name="config_candidate_highlight_font_color_enabled">false</bool>
     <bool name="config_swipe_down_dismiss_keyboard_enabled">false</bool>
     <bool name="config_sliding_key_input_enabled">false</bool>
-    <bool name="config_digit_popup_characters_enabled">true</bool>
+    <bool name="config_digit_popup_characters_enabled">false</bool>
     <!-- Whether or not Popup on key press is enabled by default -->
     <bool name="config_default_popup_preview">false</bool>
     <bool name="config_default_sound_enabled">true</bool>
diff --git a/java/res/xml-sw600dp/kbd_azerty_rows.xml b/java/res/xml-sw600dp/kbd_azerty_rows.xml
index 3d57ae715..140aec6f1 100644
--- a/java/res/xml-sw600dp/kbd_azerty_rows.xml
+++ b/java/res/xml-sw600dp/kbd_azerty_rows.xml
@@ -29,44 +29,34 @@
     >
         <Key
             latin:keyLabel="a"
-            latin:keyHintIcon="@drawable/key_hint_num1_holo"
             latin:popupCharacters="@string/alternates_for_a"
             latin:keyEdgeFlags="left" />
         <Key
             latin:keyLabel="z"
-            latin:keyHintIcon="@drawable/key_hint_num2_holo"
             latin:popupCharacters="@string/alternates_for_z" />
         <Key
             latin:keyLabel="e"
-            latin:keyHintIcon="@drawable/key_hint_num3_holo"
             latin:popupCharacters="@string/alternates_for_e" />
         <Key
             latin:keyLabel="r"
-            latin:keyHintIcon="@drawable/key_hint_num4_holo"
             latin:popupCharacters="@string/alternates_for_r" />
         <Key
             latin:keyLabel="t"
-            latin:keyHintIcon="@drawable/key_hint_num5_holo"
             latin:popupCharacters="@string/alternates_for_t" />
         <Key
             latin:keyLabel="y"
-            latin:keyHintIcon="@drawable/key_hint_num6_holo"
             latin:popupCharacters="@string/alternates_for_y" />
         <Key
             latin:keyLabel="u"
-            latin:keyHintIcon="@drawable/key_hint_num7_holo"
             latin:popupCharacters="@string/alternates_for_u" />
         <Key
             latin:keyLabel="i"
-            latin:keyHintIcon="@drawable/key_hint_num8_holo"
             latin:popupCharacters="@string/alternates_for_i" />
         <Key
             latin:keyLabel="o"
-            latin:keyHintIcon="@drawable/key_hint_num9_holo"
             latin:popupCharacters="@string/alternates_for_o" />
         <Key
             latin:keyLabel="p"
-            latin:keyHintIcon="@drawable/key_hint_num0_holo"
             latin:popupCharacters="@string/alternates_for_p" />
         <Key
             latin:keyStyle="deleteKeyStyle"
diff --git a/java/res/xml-sw600dp/kbd_qwerty_row1.xml b/java/res/xml-sw600dp/kbd_qwerty_row1.xml
index af1bd5d50..1a6ed9728 100644
--- a/java/res/xml-sw600dp/kbd_qwerty_row1.xml
+++ b/java/res/xml-sw600dp/kbd_qwerty_row1.xml
@@ -27,44 +27,34 @@
     >
         <Key
             latin:keyLabel="q"
-            latin:keyHintIcon="@drawable/key_hint_num1_holo"
             latin:popupCharacters="@string/alternates_for_q"
             latin:keyEdgeFlags="left" />
         <Key
             latin:keyLabel="w"
-            latin:keyHintIcon="@drawable/key_hint_num2_holo"
             latin:popupCharacters="@string/alternates_for_w" />
         <Key
             latin:keyLabel="e"
-            latin:keyHintIcon="@drawable/key_hint_num3_holo"
             latin:popupCharacters="@string/alternates_for_e" />
         <Key
             latin:keyLabel="r"
-            latin:keyHintIcon="@drawable/key_hint_num4_holo"
             latin:popupCharacters="@string/alternates_for_r" />
         <Key
             latin:keyLabel="t"
-            latin:keyHintIcon="@drawable/key_hint_num5_holo"
             latin:popupCharacters="@string/alternates_for_t" />
         <Key
             latin:keyLabel="y"
-            latin:keyHintIcon="@drawable/key_hint_num6_holo"
             latin:popupCharacters="@string/alternates_for_y" />
         <Key
             latin:keyLabel="u"
-            latin:keyHintIcon="@drawable/key_hint_num7_holo"
             latin:popupCharacters="@string/alternates_for_u" />
         <Key
             latin:keyLabel="i"
-            latin:keyHintIcon="@drawable/key_hint_num8_holo"
             latin:popupCharacters="@string/alternates_for_i" />
         <Key
             latin:keyLabel="o"
-            latin:keyHintIcon="@drawable/key_hint_num9_holo"
             latin:popupCharacters="@string/alternates_for_o" />
         <Key
             latin:keyLabel="p"
-            latin:keyHintIcon="@drawable/key_hint_num0_holo"
             latin:popupCharacters="@string/alternates_for_p" />
         <Key
             latin:keyStyle="deleteKeyStyle"
diff --git a/java/res/xml-sw600dp/kbd_qwerty_rows_scandinavia.xml b/java/res/xml-sw600dp/kbd_qwerty_rows_scandinavia.xml
index 0974a9d7c..59e86c5c8 100644
--- a/java/res/xml-sw600dp/kbd_qwerty_rows_scandinavia.xml
+++ b/java/res/xml-sw600dp/kbd_qwerty_rows_scandinavia.xml
@@ -29,45 +29,35 @@
     >
         <Key
             latin:keyLabel="q"
-            latin:keyHintIcon="@drawable/key_hint_num1_holo"
             latin:popupCharacters="@string/alternates_for_q"
             latin:keyXPos="2.15%p"
             latin:keyEdgeFlags="left" />
         <Key
             latin:keyLabel="w"
-            latin:keyHintIcon="@drawable/key_hint_num2_holo"
             latin:popupCharacters="@string/alternates_for_w" />
         <Key
             latin:keyLabel="e"
-            latin:keyHintIcon="@drawable/key_hint_num3_holo"
             latin:popupCharacters="@string/alternates_for_e" />
         <Key
             latin:keyLabel="r"
-            latin:keyHintIcon="@drawable/key_hint_num4_holo"
             latin:popupCharacters="@string/alternates_for_r" />
         <Key
             latin:keyLabel="t"
-            latin:keyHintIcon="@drawable/key_hint_num5_holo"
             latin:popupCharacters="@string/alternates_for_t" />
         <Key
             latin:keyLabel="y"
-            latin:keyHintIcon="@drawable/key_hint_num6_holo"
             latin:popupCharacters="@string/alternates_for_y" />
         <Key
             latin:keyLabel="u"
-            latin:keyHintIcon="@drawable/key_hint_num7_holo"
             latin:popupCharacters="@string/alternates_for_u" />
         <Key
             latin:keyLabel="i"
-            latin:keyHintIcon="@drawable/key_hint_num8_holo"
             latin:popupCharacters="@string/alternates_for_i" />
         <Key
             latin:keyLabel="o"
-            latin:keyHintIcon="@drawable/key_hint_num9_holo"
             latin:popupCharacters="@string/alternates_for_o" />
         <Key
             latin:keyLabel="p"
-            latin:keyHintIcon="@drawable/key_hint_num0_holo"
             latin:popupCharacters="@string/alternates_for_p" />
         <Key
             latin:keyLabel="å" />
diff --git a/java/res/xml-sw600dp/kbd_qwertz_rows.xml b/java/res/xml-sw600dp/kbd_qwertz_rows.xml
index 3490cc7fd..7adfc07f0 100644
--- a/java/res/xml-sw600dp/kbd_qwertz_rows.xml
+++ b/java/res/xml-sw600dp/kbd_qwertz_rows.xml
@@ -29,44 +29,34 @@
     >
         <Key
             latin:keyLabel="q"
-            latin:keyHintIcon="@drawable/key_hint_num1_holo"
             latin:popupCharacters="@string/alternates_for_q"
             latin:keyEdgeFlags="left" />
         <Key
             latin:keyLabel="w"
-            latin:keyHintIcon="@drawable/key_hint_num2_holo"
             latin:popupCharacters="@string/alternates_for_w" />
         <Key
             latin:keyLabel="e"
-            latin:keyHintIcon="@drawable/key_hint_num3_holo"
             latin:popupCharacters="@string/alternates_for_e" />
         <Key
             latin:keyLabel="r"
-            latin:keyHintIcon="@drawable/key_hint_num4_holo"
             latin:popupCharacters="@string/alternates_for_r" />
         <Key
             latin:keyLabel="t"
-            latin:keyHintIcon="@drawable/key_hint_num5_holo"
             latin:popupCharacters="@string/alternates_for_t" />
         <Key
             latin:keyLabel="z"
-            latin:keyHintIcon="@drawable/key_hint_num6_holo"
             latin:popupCharacters="@string/alternates_for_z" />
         <Key
             latin:keyLabel="u"
-            latin:keyHintIcon="@drawable/key_hint_num7_holo"
             latin:popupCharacters="@string/alternates_for_u" />
         <Key
             latin:keyLabel="i"
-            latin:keyHintIcon="@drawable/key_hint_num8_holo"
             latin:popupCharacters="@string/alternates_for_i" />
         <Key
             latin:keyLabel="o"
-            latin:keyHintIcon="@drawable/key_hint_num9_holo"
             latin:popupCharacters="@string/alternates_for_o" />
         <Key
             latin:keyLabel="p"
-            latin:keyHintIcon="@drawable/key_hint_num0_holo"
             latin:popupCharacters="@string/alternates_for_p" />
         <Key
             latin:keyStyle="deleteKeyStyle"
diff --git a/java/res/xml-sw600dp/kbd_ru_rows.xml b/java/res/xml-sw600dp/kbd_ru_rows.xml
index 95f297dd1..8b80aaa61 100644
--- a/java/res/xml-sw600dp/kbd_ru_rows.xml
+++ b/java/res/xml-sw600dp/kbd_ru_rows.xml
@@ -29,46 +29,27 @@
     >
         <Key
             latin:keyLabel="й"
-            latin:keyHintIcon="@drawable/key_hint_num1_holo"
-            latin:popupCharacters="1"
             latin:keyXPos="2.15%p"
             latin:keyEdgeFlags="left" />
         <Key
-            latin:keyLabel="ц"
-            latin:keyHintIcon="@drawable/key_hint_num2_holo"
-            latin:popupCharacters="2" />
+            latin:keyLabel="ц" />
         <Key
-            latin:keyLabel="у"
-            latin:keyHintIcon="@drawable/key_hint_num3_holo"
-            latin:popupCharacters="3" />
+            latin:keyLabel="у" />
         <Key
-            latin:keyLabel="к"
-            latin:keyHintIcon="@drawable/key_hint_num4_holo"
-            latin:popupCharacters="4" />
+            latin:keyLabel="к" />
         <Key
             latin:keyLabel="е"
-            latin:keyHintIcon="@drawable/key_hint_num5_holo"
             latin:popupCharacters="@string/alternates_for_cyrillic_e" />
         <Key
-            latin:keyLabel="н"
-            latin:keyHintIcon="@drawable/key_hint_num6_holo"
-            latin:popupCharacters="6" />
+            latin:keyLabel="н" />
         <Key
-            latin:keyLabel="г"
-            latin:keyHintIcon="@drawable/key_hint_num7_holo"
-            latin:popupCharacters="7" />
+            latin:keyLabel="г" />
         <Key
-            latin:keyLabel="ш"
-            latin:keyHintIcon="@drawable/key_hint_num8_holo"
-            latin:popupCharacters="8" />
+            latin:keyLabel="ш" />
         <Key
-            latin:keyLabel="щ"
-            latin:keyHintIcon="@drawable/key_hint_num9_holo"
-            latin:popupCharacters="9" />
+            latin:keyLabel="щ" />
         <Key
-            latin:keyLabel="з"
-            latin:keyHintIcon="@drawable/key_hint_num0_holo"
-            latin:popupCharacters="0" />
+            latin:keyLabel="з" />
         <Key
             latin:keyLabel="х" />
         <Key
diff --git a/java/res/xml-sw600dp/kbd_sr_rows.xml b/java/res/xml-sw600dp/kbd_sr_rows.xml
index 8c8539ec2..225420aa4 100644
--- a/java/res/xml-sw600dp/kbd_sr_rows.xml
+++ b/java/res/xml-sw600dp/kbd_sr_rows.xml
@@ -29,46 +29,26 @@
     >
         <Key
             latin:keyLabel="љ"
-            latin:keyHintIcon="@drawable/key_hint_num1_holo"
-            latin:popupCharacters="1"
             latin:keyXPos="2.15%p"
             latin:keyEdgeFlags="left" />
         <Key
-            latin:keyLabel="њ"
-            latin:keyHintIcon="@drawable/key_hint_num2_holo"
-            latin:popupCharacters="2" />
+            latin:keyLabel="њ" />
         <Key
-            latin:keyLabel="е"
-            latin:keyHintIcon="@drawable/key_hint_num3_holo"
-            latin:popupCharacters="3" />
+            latin:keyLabel="е" />
         <Key
-            latin:keyLabel="р"
-            latin:keyHintIcon="@drawable/key_hint_num4_holo"
-            latin:popupCharacters="4" />
+            latin:keyLabel="р" />
         <Key
-            latin:keyLabel="т"
-            latin:keyHintIcon="@drawable/key_hint_num5_holo"
-            latin:popupCharacters="5" />
+            latin:keyLabel="т" />
         <Key
-            latin:keyLabel="з"
-            latin:keyHintIcon="@drawable/key_hint_num6_holo"
-            latin:popupCharacters="6" />
+            latin:keyLabel="з" />
         <Key
-            latin:keyLabel="у"
-            latin:keyHintIcon="@drawable/key_hint_num7_holo"
-            latin:popupCharacters="7" />
+            latin:keyLabel="у" />
         <Key
-            latin:keyLabel="и"
-            latin:keyHintIcon="@drawable/key_hint_num8_holo"
-            latin:popupCharacters="8" />
+            latin:keyLabel="и" />
         <Key
-            latin:keyLabel="о"
-            latin:keyHintIcon="@drawable/key_hint_num9_holo"
-            latin:popupCharacters="9" />
+            latin:keyLabel="о" />
         <Key
-            latin:keyLabel="п"
-            latin:keyHintIcon="@drawable/key_hint_num0_holo"
-            latin:popupCharacters="0" />
+            latin:keyLabel="п" />
         <Key
             latin:keyLabel="ш" />
         <Key
-- 
cgit v1.2.3-83-g751a