OpenDelta: adjust styles to match settings

Change-Id: Ifaeb0beb7e0a1b668758987feb4c388faab9153a
This commit is contained in:
maxwen 2017-08-29 22:52:25 +02:00 committed by Max Weninger
parent 816ef9fae9
commit d26feaaddb
5 changed files with 27 additions and 14 deletions

View File

@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 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.
-->
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?android:attr/colorControlHighlight">
<item android:drawable="?android:attr/colorSecondary" />
</ripple>

View File

@ -12,7 +12,7 @@
android:layout_height="35dp"
android:addStatesFromChildren="false"
android:alwaysDrawnWithCache="false"
android:background="@color/title_text_bg"
android:background="@drawable/switchbar_background"
android:orientation="horizontal">
<TextView
@ -25,7 +25,7 @@
android:layout_weight="0.70"
android:gravity="start"
android:textAppearance="@android:style/TextAppearance.Material.Large"
android:textColor="@color/title_text_color" />
android:textColor="?android:attr/textColorPrimary" />
<ImageView

View File

@ -12,7 +12,7 @@
android:layout_height="67dp"
android:addStatesFromChildren="false"
android:alwaysDrawnWithCache="false"
android:background="@color/title_text_bg"
android:background="@drawable/switchbar_background"
android:orientation="horizontal">
<TextView
@ -25,7 +25,7 @@
android:layout_weight="1"
android:gravity="start"
android:textAppearance="@android:style/TextAppearance.Material.Large"
android:textColor="@color/title_text_color" />
android:textColor="?android:attr/textColorPrimary" />
<ImageView

View File

@ -1,8 +1,6 @@
<resources>
<color name="button_text_color">?android:attr/colorAccent</color>
<color name="button_text_color_disabled">#80009688</color>
<color name="title_text_color">@android:color/white</color>
<color name="title_text_bg">#ff263238</color>
<color name="logo_none">#fffafafa</color>
<color name="logo_disabled">#ff9E9E9E</color>
<color name="logo_err">#F44336</color>

View File

@ -1,15 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<style name="Theme.OpenDelta" parent="@android:style/Theme.Material.Settings">
<item name="android:actionBarStyle">@style/ThemeActionBar</item>
<style name="Theme.OpenDelta" parent="@android:style/Theme.DeviceDefault.Settings">
<item name="android:buttonStyle">?android:attr/borderlessButtonStyle</item>
</style>
<style name="Theme.OpenDelta.Settings" parent="@android:style/Theme.Material.Settings"></style>
<style name="ThemeActionBar" parent="@android:style/Widget.Material.ActionBar.Solid">
<item name="android:displayOptions"></item>
</style>
<style name="Theme.OpenDelta.Settings" parent="@style/Theme.OpenDelta"></style>
</resources>