mirror of
https://gitlab.futo.org/keyboard/latinime.git
synced 2024-09-28 14:54:30 +01:00
Use Settings app's theme for L and later
This CL must be checked in together with I506b9ae6ea. Bug: 11866784 Change-Id: I00aa90618642758c783f7c92f162dc2ee16659a6
This commit is contained in:
parent
d966c0727f
commit
80c47b2f79
@ -33,6 +33,10 @@ LOCAL_AAPT_FLAGS := -0 .dict
|
|||||||
# Include all the resources regardless of system supported locales
|
# Include all the resources regardless of system supported locales
|
||||||
LOCAL_AAPT_INCLUDE_ALL_RESOURCES := true
|
LOCAL_AAPT_INCLUDE_ALL_RESOURCES := true
|
||||||
|
|
||||||
|
# TODO: Remove res-lxx reference once L-release becomes public.
|
||||||
|
res_dirs := res res-lxx
|
||||||
|
LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs))
|
||||||
|
|
||||||
LOCAL_SDK_VERSION := current
|
LOCAL_SDK_VERSION := current
|
||||||
|
|
||||||
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
|
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
|
||||||
|
@ -86,7 +86,7 @@
|
|||||||
</receiver>
|
</receiver>
|
||||||
|
|
||||||
<activity android:name=".settings.SettingsActivity"
|
<activity android:name=".settings.SettingsActivity"
|
||||||
android:theme="@style/platformActivityTheme"
|
android:theme="@style/platformSettingsTheme"
|
||||||
android:label="@string/english_ime_settings"
|
android:label="@string/english_ime_settings"
|
||||||
android:uiOptions="splitActionBarWhenNarrow">
|
android:uiOptions="splitActionBarWhenNarrow">
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
@ -95,7 +95,7 @@
|
|||||||
</activity>
|
</activity>
|
||||||
|
|
||||||
<activity android:name=".spellcheck.SpellCheckerSettingsActivity"
|
<activity android:name=".spellcheck.SpellCheckerSettingsActivity"
|
||||||
android:theme="@style/platformActivityTheme"
|
android:theme="@style/platformSettingsTheme"
|
||||||
android:label="@string/android_spell_checker_settings">
|
android:label="@string/android_spell_checker_settings">
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
<action android:name="android.intent.action.MAIN" />
|
<action android:name="android.intent.action.MAIN" />
|
||||||
@ -103,7 +103,7 @@
|
|||||||
</activity>
|
</activity>
|
||||||
|
|
||||||
<activity android:name=".settings.DebugSettingsActivity"
|
<activity android:name=".settings.DebugSettingsActivity"
|
||||||
android:theme="@style/platformActivityTheme"
|
android:theme="@style/platformSettingsTheme"
|
||||||
android:label="@string/english_ime_debug_settings">
|
android:label="@string/english_ime_debug_settings">
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
<action android:name="android.intent.action.MAIN" />
|
<action android:name="android.intent.action.MAIN" />
|
||||||
@ -150,7 +150,7 @@
|
|||||||
</receiver>
|
</receiver>
|
||||||
|
|
||||||
<activity android:name="com.android.inputmethod.dictionarypack.DictionarySettingsActivity"
|
<activity android:name="com.android.inputmethod.dictionarypack.DictionarySettingsActivity"
|
||||||
android:theme="@style/platformActivityTheme"
|
android:theme="@style/platformSettingsTheme"
|
||||||
android:label="@string/dictionary_settings_title"
|
android:label="@string/dictionary_settings_title"
|
||||||
android:uiOptions="splitActionBarWhenNarrow">
|
android:uiOptions="splitActionBarWhenNarrow">
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
|
@ -18,9 +18,21 @@
|
|||||||
*/
|
*/
|
||||||
-->
|
-->
|
||||||
|
|
||||||
<!-- TODO: This file is temporarily placed under values-v20. -->
|
|
||||||
<!-- TODO: It might be moved under values-v21. -->
|
|
||||||
<resources xmlns:android="http://schemas.android.com/apk/res/android">
|
<resources xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
<style name="platformActivityTheme" parent="@android:style/Theme.Material.Light" />
|
<style name="platformActivityTheme" parent="@android:style/Theme.Material.Light" />
|
||||||
|
<!-- From packages/apps/Settings -->
|
||||||
|
<style name="platformSettingsTheme" parent="@android:style/Theme.Material.Settings">
|
||||||
|
<item name="android:actionBarStyle">@android:style/Widget.Material.Light.ActionBar.Solid</item>
|
||||||
|
<item name="android:alertDialogTheme">@style/Theme.AlertDialog</item>
|
||||||
|
</style>
|
||||||
|
<!-- From packages/apps/Settings -->
|
||||||
|
<style name="Theme.AlertDialog" parent="@*android:style/Theme.Material.Light.Dialog.Alert">
|
||||||
|
<!-- Used by the ActionBar: @color/theme_primary -->
|
||||||
|
<item name="android:colorPrimary">#ff263238</item>
|
||||||
|
<!-- Used by the StatusBar: @color/theme_primary_dark -->
|
||||||
|
<item name="android:colorPrimaryDark">#ff21272b</item>
|
||||||
|
<!-- Used by controls, e.g. CheckBox, ProgressBar, etc.: @color/theme_accent -->
|
||||||
|
<item name="android:colorAccent">#ff009688</item>
|
||||||
|
</style>
|
||||||
<style name="platformDialogTheme" parent="@android:style/Theme.Material.Light.Dialog" />
|
<style name="platformDialogTheme" parent="@android:style/Theme.Material.Light.Dialog" />
|
||||||
</resources>
|
</resources>
|
@ -20,5 +20,6 @@
|
|||||||
|
|
||||||
<resources xmlns:android="http://schemas.android.com/apk/res/android">
|
<resources xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
<style name="platformActivityTheme" parent="@android:style/Theme.Holo" />
|
<style name="platformActivityTheme" parent="@android:style/Theme.Holo" />
|
||||||
|
<style name="platformSettingsTheme" parent="@android:style/Theme.Holo" />
|
||||||
<style name="platformDialogTheme" parent="@android:style/Theme.Holo.Dialog" />
|
<style name="platformDialogTheme" parent="@android:style/Theme.Holo.Dialog" />
|
||||||
</resources>
|
</resources>
|
||||||
|
Loading…
Reference in New Issue
Block a user