remove holo_no_border theme, just make the keys transparent

app/src/main/java/org/dslul/openboard/inputmethod/keyboard/KeyboardTheme.java

@@ -43,17 +43,14 @@ public final class KeyboardTheme implements Comparable<KeyboardTheme> {
     // These should be aligned with Keyboard.themeId and Keyboard.Case.keyboardTheme
     // attributes' values in attrs.xml.
     public static final int THEME_ID_HOLO_BASE = 0;
-    public static final int THEME_ID_HOLO_BASE_NO_BORDER = 1;
+    public static final int THEME_ID_LXX_BASE = 1;
-    public static final int THEME_ID_LXX_BASE = 2;
+    public static final int THEME_ID_LXX_BASE_BORDER = 2;
-    public static final int THEME_ID_LXX_BASE_BORDER = 3;
     public static final int DEFAULT_THEME_ID = THEME_ID_LXX_BASE;
 
     /* package private for testing */
     static final KeyboardTheme[] KEYBOARD_THEMES = {
             new KeyboardTheme(THEME_ID_HOLO_BASE, "HoloBase", R.style.KeyboardTheme_HoloBase,
                     VERSION_CODES.BASE),
-            new KeyboardTheme(THEME_ID_HOLO_BASE_NO_BORDER, "HoloBaseNoBorder", R.style.KeyboardTheme_HoloBaseNoBorder,
-                    VERSION_CODES.BASE),
             new KeyboardTheme(THEME_ID_LXX_BASE, "LXXBase", R.style.KeyboardTheme_LXX_Base,
                     VERSION_CODES.LOLLIPOP),
             new KeyboardTheme(THEME_ID_LXX_BASE_BORDER, "LXXBaseBorder", R.style.KeyboardTheme_LXX_Base_Border,
@@ -121,7 +118,7 @@ public final class KeyboardTheme implements Comparable<KeyboardTheme> {
         final boolean borders = prefs.getBoolean(Settings.PREF_THEME_KEY_BORDERS, false);
         final int matchingId;
         if (style.equals(THEME_STYLE_HOLO))
-            matchingId = borders ? THEME_ID_HOLO_BASE : THEME_ID_HOLO_BASE_NO_BORDER;
+            matchingId = THEME_ID_HOLO_BASE;
         else
             matchingId = borders ? THEME_ID_LXX_BASE_BORDER : THEME_ID_LXX_BASE;
         for (KeyboardTheme keyboardTheme : KEYBOARD_THEMES) {

app/src/main/java/org/dslul/openboard/inputmethod/latin/common/Colors.kt

@@ -124,8 +124,8 @@ class Colors (
             functionalKeyBackgroundFilter = keyBackgroundFilter
             spaceBarFilter = colorFilter(spaceBar)
             backgroundStateList = stateList(brightenOrDarken(background, true), background)
-            keyStateList = backgroundStateList
+            keyStateList = stateList(brightenOrDarken(background, true), Color.TRANSPARENT)
-            functionalKeyStateList = backgroundStateList
+            functionalKeyStateList = keyStateList
             actionKeyStateList = if (themeStyle == THEME_STYLE_HOLO) functionalKeyStateList
                 else stateList(brightenOrDarken(accent, true), accent)
             spaceBarStateList = stateList(brightenOrDarken(spaceBar, true), spaceBar)
@@ -169,7 +169,10 @@ class Colors (
             BackgroundType.SUGGESTION, BackgroundType.ACTION_MORE_KEYS ->
                 attr.getDrawable(R.styleable.KeyboardView_keyBackground)
             BackgroundType.FUNCTIONAL -> attr.getDrawable(R.styleable.KeyboardView_functionalKeyBackground)
-            BackgroundType.SPACE -> attr.getDrawable(R.styleable.KeyboardView_spacebarBackground)
+            BackgroundType.SPACE -> {
+                if (hasKeyBorders) attr.getDrawable(R.styleable.KeyboardView_spacebarBackground)
+                else attr.getDrawable(R.styleable.KeyboardView_spacebarNoBorderBackground)
+            }
             BackgroundType.ACTION -> {
                 if (themeStyle == THEME_STYLE_HOLO && hasKeyBorders) // no borders has a very small pressed drawable otherwise
                     attr.getDrawable(R.styleable.KeyboardView_functionalKeyBackground)

app/src/main/res/values/attrs.xml

@@ -58,6 +58,7 @@
              {@link android.graphics.drawable.StateListDrawable}, with the following possible
              states: normal, pressed. -->
         <attr name="spacebarBackground" format="reference" />
+        <attr name="spacebarNoBorderBackground" format="reference" />
         <attr name="spacebarIconWidthRatio" format="float" />
         <!-- Right padding of hint letter to the edge of the key.-->
         <attr name="keyHintLetterPadding" format="dimension" />
@@ -228,9 +229,8 @@
             <!-- This should be aligned with
                  {@link org.dslul.openboard.inputmethod.keyboard.KeyboardTheme#THEME_ID_HOLO_BASE} etc. -->
             <enum name="HoloBase" value="0" />
-            <enum name="HoloBaseNoBorder" value="1" />
+            <enum name="LXXBase" value="1" />
-            <enum name="LXXBase" value="2" />
+            <enum name="LXXBaseBorder" value="2" />
-            <enum name="LXXBaseBorder" value="3" />
         </attr>
         <!-- Touch position correction -->
         <attr name="touchPositionCorrectionData" format="reference" />
@@ -486,9 +486,8 @@
              {@link org.dslul.openboard.inputmethod.keyboard.KeyboardTheme#THEME_ID_HOLO_BASE} etc. -->
         <attr name="keyboardTheme" format="enum|string">
             <enum name="HoloBase" value="0" />
-            <enum name="HoloBaseNoBorder" value="1" />
+            <enum name="LXXBase" value="1" />
-            <enum name="LXXBase" value="2" />
+            <enum name="LXXBaseBorder" value="2" />
-            <enum name="LXXBaseBorder" value="3" />
         </attr>
         <!-- This should be aligned with
              {@link org.dslul.openboard.inputmethod.keyboard.KeyboardId#MODE_TEXT} etc. -->

app/src/main/res/values/themes-common.xml

@@ -101,6 +101,8 @@
         <item name="gestureRecognitionUpdateTime">@integer/config_gesture_recognition_update_time</item>
         <item name="gestureRecognitionSpeedThreshold">@fraction/config_gesture_recognition_speed_threshold</item>
         <item name="suppressKeyPreviewAfterBatchInputDuration">@integer/config_suppress_key_preview_after_batch_input_duration</item>
+
+        <item name="spacebarNoBorderBackground">@drawable/btn_keyboard_spacebar_base</item>
     </style>
     <style
         name="MainKeyboardView"

app/src/main/res/values/themes-holo.xml

@@ -1,43 +0,0 @@
-<?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.
-*/
--->
-
-<resources>
-    <style
-        name="InputView.Holo"
-        parent="InputView"
-    />
-    <!-- Holo KeyboardView theme (HoloBase) -->
-    <style
-        name="KeyboardView.Holo"
-        parent="KeyboardView"
-    >
-        <item name="keyTypeface">bold</item>
-        <item name="keyLetterSize">@fraction/config_key_letter_ratio_holo</item>
-        <item name="keyLabelSize">@fraction/config_key_label_ratio_holo</item>
-        <item name="keyHintLetterRatio">@fraction/config_key_hint_letter_ratio_holo</item>
-        <item name="keyShiftedLetterHintRatio">@fraction/config_key_shifted_letter_hint_ratio_holo</item>
-        <item name="keyLargeLetterRatio">@fraction/config_key_large_letter_ratio_holo</item>
-        <item name="keyLabelOffCenterRatio">-175%</item>
-        <item name="keyHintLabelRatio">@fraction/config_key_hint_label_ratio_holo</item>
-        <item name="keyHintLabelOffCenterRatio">200%</item>
-        <!-- U+2026: "…" HORIZONTAL ELLIPSIS -->
-        <item name="keyPopupHintLetter">&#x2026;</item>
-    </style>
-</resources>

app/src/main/res/values/themes-holo_base.xml

@@ -20,7 +20,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
     <style name="KeyboardTheme.HoloBase" parent="KeyboardIcons.Holo">
-        <item name="inputViewStyle">@style/InputView.Holo</item>
+        <item name="inputViewStyle">@style/InputView</item>
         <item name="keyboardStyle">@style/Keyboard.HoloBase</item>
         <item name="keyboardViewStyle">@style/KeyboardView.HoloBase</item>
         <item name="mainKeyboardViewStyle">@style/MainKeyboardView.HoloBase</item>
@@ -42,8 +42,20 @@
     </style>
     <style
         name="KeyboardView.HoloBase"
-        parent="KeyboardView.Holo"
+        parent="KeyboardView"
     >
+        <item name="keyTypeface">bold</item>
+        <item name="keyLetterSize">@fraction/config_key_letter_ratio_holo</item>
+        <item name="keyLabelSize">@fraction/config_key_label_ratio_holo</item>
+        <item name="keyHintLetterRatio">@fraction/config_key_hint_letter_ratio_holo</item>
+        <item name="keyShiftedLetterHintRatio">@fraction/config_key_shifted_letter_hint_ratio_holo</item>
+        <item name="keyLargeLetterRatio">@fraction/config_key_large_letter_ratio_holo</item>
+        <item name="keyLabelOffCenterRatio">-175%</item>
+        <item name="keyHintLabelRatio">@fraction/config_key_hint_label_ratio_holo</item>
+        <item name="keyHintLabelOffCenterRatio">200%</item>
+        <!-- U+2026: "…" HORIZONTAL ELLIPSIS -->
+        <item name="keyPopupHintLetter">&#x2026;</item>
+
         <item name="android:background">@android:color/white</item>
         <item name="keyBackground">@drawable/btn_keyboard_key_holo_white</item>
         <item name="functionalKeyBackground">@drawable/btn_keyboard_key_pressed_klp_light</item>

app/src/main/res/values/themes-holo_base_no_border.xml

@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2015, 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.
-*/
--->
-
-<resources>
-    <style name="KeyboardTheme.HoloBaseNoBorder" parent="KeyboardTheme.HoloBase">
-        <item name="inputViewStyle">@style/InputView.Holo</item>
-        <item name="keyboardStyle">@style/Keyboard.HoloBaseNoBorder</item>
-        <item name="keyboardViewStyle">@style/KeyboardView.HoloBase</item>
-        <item name="mainKeyboardViewStyle">@style/MainKeyboardView.HoloBaseNoBorder</item>
-        <item name="emojiPalettesViewStyle">@style/EmojiPalettesView.HoloBaseNoBorder</item>
-        <item name="clipboardHistoryViewStyle">@style/ClipboardHistoryView.HoloBaseNoBorder</item>
-        <item name="moreKeysKeyboardStyle">@style/MoreKeysKeyboard.HoloBase</item>
-        <!-- Note: HoloBase theme uses the same style for both general more keys and action more keys. -->
-        <item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView.HoloBase</item>
-        <item name="moreKeysKeyboardViewForActionStyle">@style/MoreKeysKeyboardView.HoloBase</item>
-        <item name="suggestionStripViewStyle">@style/SuggestionStripView.HoloBase</item>
-        <item name="suggestionWordStyle">@style/SuggestionWord.HoloBase</item>
-    </style>
-    <style
-        name="Keyboard.HoloBaseNoBorder"
-        parent="Keyboard"
-    >
-        <!-- This should be aligned with KeyboardTheme.THEME_ID_* -->
-        <item name="themeId">HoloBaseNoBorder</item>
-    </style>
-    <style
-        name="MainKeyboardView.HoloBaseNoBorder"
-        parent="MainKeyboardView.HoloBase"
-    >
-        <item name="keyBackground">@drawable/btn_keyboard_key_holo_white_no_border</item>
-        <item name="functionalKeyBackground">@drawable/btn_keyboard_key_holo_white_no_border</item>
-        <item name="spacebarBackground">@drawable/btn_keyboard_spacebar_lxx_base</item>
-    </style>
-    <style
-        name="EmojiPalettesView.HoloBaseNoBorder"
-        parent="EmojiPalettesView.HoloBase"
-        >
-        <item name="functionalKeyBackground">@drawable/btn_keyboard_key_holo_white_no_border</item>
-        <item name="spacebarBackground">@drawable/btn_keyboard_spacebar_lxx_base</item>
-    </style>
-    <style
-            name="ClipboardHistoryView.HoloBaseNoBorder"
-            parent="ClipboardHistoryView.HoloBase"
-            >
-        <item name="keyBackground">@drawable/btn_keyboard_key_holo_white_no_border</item>
-        <item name="functionalKeyBackground">@drawable/btn_keyboard_key_holo_white_no_border</item>
-    </style>
-</resources>

app/src/main/res/values/themes-holo_blue.xml

@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, 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.
-*/
--->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-    <!--
-    <style name="KeyboardTheme.HoloBlue" parent="KeyboardIcons.Holo">
-        <item name="inputViewStyle">@style/InputView.Holo</item>
-        <item name="keyboardStyle">@style/Keyboard.HoloBlue</item>
-        <item name="keyboardViewStyle">@style/KeyboardView.HoloBlue</item>
-        <item name="mainKeyboardViewStyle">@style/MainKeyboardView.HoloBlue</item>
-        <item name="emojiPalettesViewStyle">@style/EmojiPalettesView.HoloBlue</item>
-        <item name="clipboardHistoryViewStyle">@style/ClipboardHistoryView.HoloBlue</item>
-        <item name="moreKeysKeyboardStyle">@style/MoreKeysKeyboard.HoloBlue</item>
-        <!- - Note: HoloBlue theme uses the same style for both general more keys and action more keys. -->
-<!--        <item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView.HoloBlue</item>
-        <item name="moreKeysKeyboardViewForActionStyle">@style/MoreKeysKeyboardView.HoloBlue</item>
-        <item name="suggestionStripViewStyle">@style/SuggestionStripView.HoloBlue</item>
-        <item name="suggestionWordStyle">@style/SuggestionWord.HoloBlue</item>
-    </style>
-    <style
-        name="Keyboard.HoloBlue"
-        parent="Keyboard"
-    >
-        <!- - This should be aligned with KeyboardTheme.THEME_ID_* -->
-<!--        <item name="themeId">HoloBlue</item>
-    </style>
-    <style
-        name="KeyboardView.HoloBlue"
-        parent="KeyboardView.Holo"
-    >
-        <item name="android:background">@drawable/keyboard_background_holo</item>
-        <item name="keyBackground">@drawable/btn_keyboard_key_holo_blue</item>
-        <item name="functionalKeyBackground">@drawable/btn_keyboard_key_functional_holo_blue</item>
-        <item name="spacebarBackground">@drawable/btn_keyboard_spacebar_holo_blue</item>
-        <item name="keyTextColor">@color/key_text_color_blue</item>
-        <item name="keyTextInactivatedColor">@color/key_text_inactivated_color_holo</item>
-        <item name="functionalTextColor">@color/key_text_color_blue</item>
-        <item name="keyHintLetterColor">@color/key_hint_letter_color_holo</item>
-        <item name="keyHintLabelColor">@color/key_hint_label_color_holo</item>
-        <item name="keyShiftedLetterHintInactivatedColor">@color/key_shifted_letter_hint_inactivated_color_holo</item>
-        <item name="keyShiftedLetterHintActivatedColor">@color/key_shifted_letter_hint_activated_color_holo</item>
-        <item name="keyPreviewTextColor">@color/key_text_color_blue</item>
-    </style>
-    <style
-        name="MainKeyboardView.HoloBlue"
-        parent="KeyboardView.HoloBlue"
-    >
-        <item name="keyPreviewBackground">@drawable/keyboard_key_feedback_holo_blue</item>
-        <item name="keyPreviewHeight">@dimen/config_key_preview_height_holo</item>
-        <item name="keyPreviewOffset">@dimen/config_key_preview_offset_holo</item>
-        <item name="keyPreviewShowUpAnimator">@anim/key_preview_show_up_holo</item>
-        <item name="keyPreviewDismissAnimator">@anim/key_preview_dismiss_holo</item>
-        <item name="gestureFloatingPreviewTextColor">@color/highlight_color_holo_blue</item>
-        <item name="gestureFloatingPreviewColor">@color/gesture_floating_preview_color_holo</item>
-        <item name="gestureTrailColor">@color/highlight_color_holo_blue</item>
-        <item name="slidingKeyInputPreviewColor">@color/highlight_translucent_color_holo_blue</item>
-        <item name="languageOnSpacebarTextColor">@color/spacebar_text_color_holo</item>
-        <item name="languageOnSpacebarTextShadowRadius">1.0</item>
-        <item name="languageOnSpacebarTextShadowColor">@color/spacebar_text_shadow_color_holo</item>
-    </style>
-    <!- - Though {@link org.dslul.openboard.inputmethod.keyboard.emoji.EmojiPalettesView} doesn't extend
-         {@link org.dslul.openboard.inputmethod.keyboard.KeyboardView}, some views inside it, for instance
-         delete button, need themed {@link org.dslul.openboard.inputmethod.keyboard.KeyboardView}
-         attributes. -->
-<!--    <style
-        name="EmojiPalettesView.HoloBlue"
-        parent="MainKeyboardView.HoloBlue"
-    >
-        <item name="categoryIndicatorEnabled">true</item>
-        <item name="categoryIndicatorDrawable">@drawable/emoji_category_tab_selected_holo_blue</item>
-        <item name="categoryIndicatorBackground">@drawable/emoji_category_tab_unselected_holo_dark</item>
-        <item name="categoryPageIndicatorColor">@color/highlight_color_holo_blue</item>
-        <item name="categoryPageIndicatorBackground">@color/emoji_tab_page_indicator_background_holo</item>
-        <item name="iconEmojiRecentsTab">@drawable/ic_emoji_recents_holo_dark</item>
-        <item name="iconEmojiCategory1Tab">@drawable/ic_emoji_smileys_emotion_holo_dark</item>
-        <item name="iconEmojiCategory2Tab">@drawable/ic_emoji_people_body_holo_dark</item>
-        <item name="iconEmojiCategory3Tab">@drawable/ic_emoji_animals_nature_holo_dark</item>
-        <item name="iconEmojiCategory4Tab">@drawable/ic_emoji_food_drink_holo_dark</item>
-        <item name="iconEmojiCategory5Tab">@drawable/ic_emoji_travel_places_holo_dark</item>
-        <item name="iconEmojiCategory6Tab">@drawable/ic_emoji_activities_holo_dark</item>
-        <item name="iconEmojiCategory7Tab">@drawable/ic_emoji_objects_holo_dark</item>
-        <item name="iconEmojiCategory8Tab">@drawable/ic_emoji_symbols_holo_dark</item>
-        <item name="iconEmojiCategory9Tab">@drawable/ic_emoji_flags_holo_dark</item>
-        <item name="iconEmojiCategory10Tab">@drawable/ic_emoji_emoticons_holo_dark</item>
-    </style>
-    <style
-            name="ClipboardHistoryView.HoloBlue"
-            parent="MainKeyboardView.HoloBlue"
-            >
-        <item name="iconPinnedClip">@drawable/ic_clipboard_pin_holo_dark</item>
-        <item name="dividerBackground">@color/emoji_tab_page_indicator_background_holo</item>
-    </style>
-    <style
-        name="MoreKeysKeyboard.HoloBlue"
-        parent="Keyboard.HoloBlue"
-    >
-        <item name="keyboardTopPadding">0%p</item>
-        <item name="keyboardBottomPadding">0%p</item>
-        <item name="horizontalGap">0%p</item>
-        <item name="horizontalGapNarrow">0%p</item>
-        <item name="touchPositionCorrectionData">@null</item>
-    </style>
-    <style
-        name="MoreKeysKeyboardView.HoloBlue"
-        parent="KeyboardView.HoloBlue"
-    >
-        <item name="android:background">@drawable/keyboard_popup_panel_background_holo_blue</item>
-        <item name="keyBackground">@drawable/btn_keyboard_key_popup_holo_blue</item>
-        <item name="divider">@drawable/more_keys_divider</item>
-        <item name="keyTypeface">normal</item>
-        <item name="verticalCorrection">@dimen/config_more_keys_keyboard_vertical_correction_holo</item>
-    </style>
-    <style
-        name="SuggestionStripView.HoloBlue"
-        parent="KeyboardView.HoloBlue"
-    >
-        <item name="suggestionsCountInStrip">@integer/config_suggestions_count_in_strip</item>
-        <item name="centerSuggestionPercentile">@fraction/config_center_suggestion_percentile</item>
-        <item name="maxMoreSuggestionsRow">@integer/config_max_more_suggestions_row</item>
-        <item name="minMoreSuggestionsWidth">@fraction/config_min_more_suggestions_width</item>
-        <item name="android:background">@drawable/keyboard_suggest_strip_holo</item>
-        <item name="android:src">@drawable/suggestions_strip_divider_holo</item>
-        <item name="suggestionStripOptions">autoCorrectBold|validTypedWordBold</item>
-        <item name="colorValidTypedWord">@color/typed_word_color_holo_blue</item>
-        <item name="colorTypedWord">@color/typed_word_color_holo_blue</item>
-        <item name="colorAutoCorrect">@color/highlight_color_holo_blue</item>
-        <item name="colorSuggested">@color/suggested_word_color_holo_blue</item>
-        <item name="alphaObsoleted">70%</item>
-    </style>
-    <style
-        name="SuggestionWord.HoloBlue"
-        parent="SuggestionWord"
-    >
-        <item name="android:background">@drawable/btn_suggestion_holo_blue</item>
-        <item name="android:textColor">@color/highlight_color_holo_blue</item>
-    </style>
--->
-</resources>

app/src/main/res/values/themes-lxx-base.xml

@@ -28,7 +28,6 @@
         <item name="android:background">@color/keyboard_background_lxx_base</item>
         <item name="keyBackground">@drawable/btn_keyboard_key_lxx_base</item>
         <item name="functionalKeyBackground">@drawable/btn_keyboard_key_lxx_base</item>
-        <item name="spacebarBackground">@drawable/btn_keyboard_spacebar_lxx_base</item>
         <item name="keyTextColor">@color/key_text_color_lxx_light</item>
         <item name="keyTextInactivatedColor">@color/key_text_inactive_color_lxx_light</item>
         <item name="functionalTextColor">@color/key_functional_text_color_lxx_light</item>

app/src/main/res/xml-sw600dp/key_styles_common.xml

@@ -73,7 +73,7 @@
     </switch>
     <!-- numpadKeyStyle -->
     <switch>
-        <case latin:keyboardTheme="HoloBase|HoloBaseNoBorder|LXXBaseBorder|LXXBase">
+        <case latin:keyboardTheme="HoloBase|LXXBaseBorder|LXXBase">
             <key-style
                 latin:styleName="numpadKeyStyle"
                 latin:keySpec="!icon/numpad_key|!code/key_numpad"
@@ -91,7 +91,7 @@
     </switch>
     <!-- alphaNumpadKeyStyle -->
     <switch>
-        <case latin:keyboardTheme="HoloBase|HoloBaseNoBorder|LXXBaseBorder|LXXBase">
+        <case latin:keyboardTheme="HoloBase|LXXBaseBorder|LXXBase">
             <key-style
                 latin:styleName="alphaNumpadKeyStyle"
                 latin:keySpec="!text/keylabel_to_alpha|!code/key_alphaNumpad"
@@ -109,7 +109,7 @@
     </switch>
     <!-- symbolNumpadKeyStyle -->
     <switch>
-        <case latin:keyboardTheme="HoloBase|HoloBaseNoBorder|LXXBaseBorder|LXXBase">
+        <case latin:keyboardTheme="HoloBase|LXXBaseBorder|LXXBase">
             <key-style
                 latin:styleName="symbolNumpadKeyStyle"
                 latin:keySpec="!text/keylabel_to_symbol|!code/key_symbolNumpad"

app/src/main/res/xml-sw600dp/key_styles_enter.xml

@@ -81,7 +81,7 @@
     </switch>
     <!-- Enter key style -->
     <switch>
-        <case latin:keyboardTheme="HoloBase|HoloBaseNoBorder|LXXBaseBorder">
+        <case latin:keyboardTheme="HoloBase|LXXBaseBorder">
             <key-style
                 latin:styleName="defaultEnterKeyStyle"
                 latin:keySpec="!icon/enter_key|!code/key_enter"

app/src/main/res/xml/key_styles_common.xml

@@ -78,7 +78,7 @@
         latin:backgroundType="functional" />
     <!-- emojiKeyStyle must be defined before including @xml/key_syles_enter. -->
     <switch>
-        <case latin:keyboardTheme="HoloBase|HoloBaseNoBorder|LXXBaseBorder">
+        <case latin:keyboardTheme="HoloBase|LXXBaseBorder">
             <key-style
                 latin:styleName="emojiKeyStyle"
                 latin:keySpec="!icon/emoji_normal_key|!code/key_emoji"
@@ -97,7 +97,7 @@
     </switch>
     <!-- numpadKeyStyle -->
     <switch>
-        <case latin:keyboardTheme="HoloBase|HoloBaseNoBorder|LXXBaseBorder|LXXBase">
+        <case latin:keyboardTheme="HoloBase|LXXBaseBorder|LXXBase">
             <key-style
                 latin:styleName="numpadKeyStyle"
                 latin:keySpec="!icon/numpad_key|!code/key_numpad"
@@ -115,7 +115,7 @@
     </switch>
     <!-- alphaNumpadKeyStyle -->
     <switch>
-        <case latin:keyboardTheme="HoloBase|HoloBaseNoBorder|LXXBaseBorder|LXXBase">
+        <case latin:keyboardTheme="HoloBase|LXXBaseBorder|LXXBase">
             <key-style
                 latin:styleName="alphaNumpadKeyStyle"
                 latin:keySpec="!text/keylabel_to_alpha|!code/key_alphaNumpad"
@@ -133,7 +133,7 @@
     </switch>
     <!-- symbolNumpadKeyStyle -->
     <switch>
-        <case latin:keyboardTheme="HoloBase|HoloBaseNoBorder|LXXBaseBorder|LXXBase">
+        <case latin:keyboardTheme="HoloBase|LXXBaseBorder|LXXBase">
             <key-style
                 latin:styleName="symbolNumpadKeyStyle"
                 latin:keySpec="!text/keylabel_to_symbol|!code/key_symbolNumpad"

app/src/main/res/xml/key_styles_enter.xml

@@ -213,7 +213,7 @@
     </switch>
     <!-- Enter key style -->
     <switch>
-        <case latin:keyboardTheme="HoloBase|HoloBaseNoBorder|LXXBaseBorder">
+        <case latin:keyboardTheme="HoloBase|LXXBaseBorder">
             <key-style
                 latin:styleName="defaultEnterKeyStyle"
                 latin:keySpec="!icon/enter_key|!code/key_enter"

app/src/main/res/xml/key_styles_navigate_more_keys.xml

@@ -22,7 +22,7 @@
     xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
-        <case latin:keyboardTheme="HoloBase|HoloBaseNoBorder">
+        <case latin:keyboardTheme="HoloBase">
             <key-style
                 latin:styleName="navigateNextMoreKeysStyle"
                 latin:keyLabelFlags="hasPopupHint|preserveCase"

app/src/main/res/xml/key_styles_number.xml

@@ -109,7 +109,7 @@
     <!-- TODO: Consolidate these space key styles with numSpaceKeyStyle above by introducing <case>
          predicator that checks device form-factor. -->
     <switch>
-        <case latin:keyboardTheme="HoloBase|HoloBaseNoBorder">
+        <case latin:keyboardTheme="HoloBase">
             <key-style
                 latin:styleName="tabletNumSpaceKeyStyle"
                 latin:keySpec="!icon/space_key|!code/key_space"