Removed redundant style inheritances for auto themes

This commit is contained in:
pdroidandroid@gmail.com 2021-01-23 20:41:39 +01:00 committed by Daniele Laudani
parent 99e9b934fc
commit 4c8ffa6eaa
6 changed files with 30 additions and 333 deletions

View file

@ -1,59 +1,25 @@
<?xml version="1.0" encoding="utf-8"?> <?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 xmlns:android="http://schemas.android.com/apk/res/android"> <resources>
<style name="KeyboardTheme.LXX_Auto_Amoled" <style name="KeyboardTheme.LXX_Auto_Amoled"
parent="KeyboardTheme.LXX_Dark_Amoled" parent="KeyboardTheme.LXX_Dark_Amoled">
>
</style>
<style
name="Keyboard.LXX_Auto_Amoled"
parent="Keyboard"
>
<!-- This should be aligned with KeyboardTheme.THEME_ID_* -->
<item name="themeId">LXXAutoAmoled</item>
</style>
<style
name="KeyboardView.LXX_Auto_Amoled"
parent="KeyboardView.LXX_Dark_Amoled"
>
</style>
<style
name="MainKeyboardView.LXX_Auto_Amoled"
parent="MainKeyboardView.LXX_Dark_Amoled"
>
</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.LXX_Auto_Amoled"
parent="EmojiPalettesView.LXX_Dark_Amoled"
>
</style>
<style
name="MoreKeysKeyboard.LXX_Auto_Amoled"
parent="MoreKeysKeyboard.LXX_Dark_Amoled"
>
</style>
<style
name="MoreKeysKeyboardView.LXX_Auto_Amoled"
parent="MoreKeysKeyboardView.LXX_Dark_Amoled"
>
</style>
<style
name="MoreKeysKeyboardView.LXX_Auto_Amoled.Action"
parent="MoreKeysKeyboardView.LXX_Dark_Amoled.Action"
>
</style>
<style
name="SuggestionStripView.LXX_Auto_Amoled"
parent="SuggestionStripView.LXX_Dark_Amoled"
>
</style>
<style
name="SuggestionWord.LXX_Auto_Amoled"
parent="SuggestionWord.LXX_Dark_Amoled"
>
</style> </style>
</resources> </resources>

View file

@ -18,63 +18,8 @@
*/ */
--> -->
<resources xmlns:android="http://schemas.android.com/apk/res/android"> <resources>
<style name="KeyboardTheme.LXX_Auto_Border" <style name="KeyboardTheme.LXX_Auto_Border"
parent="KeyboardTheme.LXX_Dark_Border" parent="KeyboardTheme.LXX_Dark_Border">
>
</style> </style>
<style
name="Keyboard.LXX_Auto_Border"
parent="Keyboard"
>
<!-- This should be aligned with KeyboardTheme.THEME_ID_* -->
<item name="themeId">LXXAutoBorder</item>
</style>
<style
name="KeyboardView.LXX_Auto_Border"
parent="KeyboardView.LXX_Dark_Border"
>
</style>
<style
name="MainKeyboardView.LXX_Auto_Border"
parent="MainKeyboardView.LXX_Dark_Border"
>
</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.LXX_Auto_Border"
parent="EmojiPalettesView.LXX_Dark_Border"
>
</style>
<style
name="MoreKeysKeyboard.LXX_Auto_Border"
parent="MoreKeysKeyboard.LXX_Dark_Border"
>
</style>
<style
name="MoreKeysKeyboardView.LXX_Auto_Border"
parent="MoreKeysKeyboardView.LXX_Dark_Border"
>
</style>
<style
name="MoreKeysKeyboardView.LXX_Auto_Border.Action"
parent="MoreKeysKeyboardView.LXX_Dark_Border.Action"
>
</style>
<style
name="SuggestionStripView.LXX_Auto_Border"
parent="SuggestionStripView.LXX_Dark_Border"
>
</style>
<style
name="SuggestionWord.LXX_Auto_Border"
parent="SuggestionWord.LXX_Dark_Border"
>
</style>
</resources> </resources>

View file

@ -18,60 +18,8 @@
*/ */
--> -->
<resources xmlns:android="http://schemas.android.com/apk/res/android"> <resources>
<style name="KeyboardTheme.LXX_Auto" <style name="KeyboardTheme.LXX_Auto"
parent="KeyboardTheme.LXX_Dark" parent="KeyboardTheme.LXX_Dark">
>
</style>
<style
name="Keyboard.LXX_Auto"
parent="Keyboard"
>
<!-- This should be aligned with KeyboardTheme.THEME_ID_* -->
<item name="themeId">LXXAuto</item>
</style>
<style
name="KeyboardView.LXX_Auto"
parent="KeyboardView.LXX_Dark"
>
</style>
<style
name="MainKeyboardView.LXX_Auto"
parent="MainKeyboardView.LXX_Dark"
>
</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.LXX_Auto"
parent="EmojiPalettesView.LXX_Dark"
>
</style>
<style
name="MoreKeysKeyboard.LXX_Auto"
parent="MoreKeysKeyboard.LXX_Dark"
>
</style>
<style
name="MoreKeysKeyboardView.LXX_Auto"
parent="MoreKeysKeyboardView.LXX_Dark"
>
</style>
<style
name="MoreKeysKeyboardView.LXX_Auto.Action"
parent="MoreKeysKeyboardView.LXX_Dark.Action"
>
</style>
<style
name="SuggestionStripView.LXX_Auto"
parent="SuggestionStripView.LXX_Dark"
>
</style>
<style
name="SuggestionWord.LXX_Auto"
parent="SuggestionWord.LXX_Dark"
>
</style> </style>
</resources> </resources>

View file

@ -18,60 +18,7 @@
*/ */
--> -->
<resources xmlns:android="http://schemas.android.com/apk/res/android"> <resources>
<style name="KeyboardTheme.LXX_Auto_Amoled" <style name="KeyboardTheme.LXX_Auto_Amoled"
parent="KeyboardTheme.LXX_Light" parent="KeyboardTheme.LXX_Light"/>
>
</style>
<style
name="Keyboard.LXX_Auto_Amoled"
parent="Keyboard"
>
<!-- This should be aligned with KeyboardTheme.THEME_ID_* -->
<item name="themeId">LXXAuto</item>
</style>
<style
name="KeyboardView.LXX_Auto_Amoled"
parent="KeyboardView.LXX_Light"
>
</style>
<style
name="MainKeyboardView.LXX_Auto_Amoled"
parent="MainKeyboardView.LXX_Light"
>
</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.LXX_Auto_Amoled"
parent="EmojiPalettesView.LXX_Light"
>
</style>
<style
name="MoreKeysKeyboard.LXX_Auto_Amoled"
parent="MoreKeysKeyboard.LXX_Light"
>
</style>
<style
name="MoreKeysKeyboardView.LXX_Auto_Amoled"
parent="MoreKeysKeyboardView.LXX_Light"
>
</style>
<style
name="MoreKeysKeyboardView.LXX_Auto_Amoled.Action"
parent="MoreKeysKeyboardView.LXX_Light.Action"
>
</style>
<style
name="SuggestionStripView.LXX_Auto_Amoled"
parent="SuggestionStripView.LXX_Light"
>
</style>
<style
name="SuggestionWord.LXX_Auto_Amoled"
parent="SuggestionWord.LXX_Light"
>
</style>
</resources> </resources>

View file

@ -18,63 +18,7 @@
*/ */
--> -->
<resources xmlns:android="http://schemas.android.com/apk/res/android"> <resources>
<style name="KeyboardTheme.LXX_Auto_Border" <style name="KeyboardTheme.LXX_Auto_Border"
parent="KeyboardTheme.LXX_Light_Border" parent="KeyboardTheme.LXX_Light_Border"/>
>
</style>
<style
name="Keyboard.LXX_Auto_Border"
parent="Keyboard"
>
<!-- This should be aligned with KeyboardTheme.THEME_ID_* -->
<item name="themeId">LXXAutoBorder</item>
</style>
<style
name="KeyboardView.LXX_Auto_Border"
parent="KeyboardView.LXX_Light_Border"
>
</style>
<style
name="MainKeyboardView.LXX_Auto_Border"
parent="MainKeyboardView.LXX_Light_Border"
>
</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.LXX_Auto_Border"
parent="EmojiPalettesView.LXX_Light_Border"
>
</style>
<style
name="MoreKeysKeyboard.LXX_Auto_Border"
parent="MoreKeysKeyboard.LXX_Light_Border"
>
</style>
<style
name="MoreKeysKeyboardView.LXX_Auto_Border"
parent="MoreKeysKeyboardView.LXX_Light_Border"
>
</style>
<style
name="MoreKeysKeyboardView.LXX_Auto_Border.Action"
parent="MoreKeysKeyboardView.LXX_Light_Border.Action"
>
</style>
<style
name="SuggestionStripView.LXX_Auto_Border"
parent="SuggestionStripView.LXX_Light_Border"
>
</style>
<style
name="SuggestionWord.LXX_Auto_Border"
parent="SuggestionWord.LXX_Light_Border"
>
</style>
</resources> </resources>

View file

@ -18,60 +18,7 @@
*/ */
--> -->
<resources xmlns:android="http://schemas.android.com/apk/res/android"> <resources>
<style name="KeyboardTheme.LXX_Auto" <style name="KeyboardTheme.LXX_Auto"
parent="KeyboardTheme.LXX_Light" parent="KeyboardTheme.LXX_Light"/>
>
</style>
<style
name="Keyboard.LXX_Auto"
parent="Keyboard"
>
<!-- This should be aligned with KeyboardTheme.THEME_ID_* -->
<item name="themeId">LXXAuto</item>
</style>
<style
name="KeyboardView.LXX_Auto"
parent="KeyboardView.LXX_Light"
>
</style>
<style
name="MainKeyboardView.LXX_Auto"
parent="MainKeyboardView.LXX_Light"
>
</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.LXX_Auto"
parent="EmojiPalettesView.LXX_Light"
>
</style>
<style
name="MoreKeysKeyboard.LXX_Auto"
parent="MoreKeysKeyboard.LXX_Light"
>
</style>
<style
name="MoreKeysKeyboardView.LXX_Auto"
parent="MoreKeysKeyboardView.LXX_Light"
>
</style>
<style
name="MoreKeysKeyboardView.LXX_Auto.Action"
parent="MoreKeysKeyboardView.LXX_Light.Action"
>
</style>
<style
name="SuggestionStripView.LXX_Auto"
parent="SuggestionStripView.LXX_Light"
>
</style>
<style
name="SuggestionWord.LXX_Auto"
parent="SuggestionWord.LXX_Light"
>
</style>
</resources> </resources>