Skip to content

Commit a832b98

Browse files
author
Peter Elliott
committed
Adding holo dark text color and removing unused colors
1 parent 3a25cec commit a832b98

File tree

2 files changed

+25
-3
lines changed

2 files changed

+25
-3
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!-- Copyright (C) 2010 The Android Open Source Project
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
-->
16+
17+
<selector xmlns:android="http://schemas.android.com/apk/res/android">
18+
<item android:state_enabled="false" android:color="@color/bright_foreground_disabled_holo_dark"/>
19+
<item android:state_window_focused="false" android:color="@color/bright_foreground_holo_dark"/>
20+
<item android:state_pressed="true" android:color="@color/bright_foreground_holo_dark"/>
21+
<item android:state_selected="true" android:color="@color/bright_foreground_holo_dark"/>
22+
<item android:state_activated="true" android:color="@color/bright_foreground_holo_dark"/>
23+
<item android:color="@color/bright_foreground_holo_dark"/> <!-- not selected -->
24+
</selector>

library/res/values/sdl__colors.xml

+1-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<color name="sdl_message_text_dark">#FFFFFF</color>
55
<color name="sdl_title_text_dark">#ff0099cc</color>
66
<color name="sdl_title_separator_dark">#ff0099cc</color>
7-
<color name="sdl_button_text_dark">#FFFFFF</color>
7+
<color name="sdl_button_text_dark">@color/primary_text_holo_dark</color>
88
<color name="sdl_button_normal_dark">@android:color/transparent</color>
99
<color name="sdl_button_pressed_dark">#990099cc</color> <!-- 60 % opacity -->
1010
<color name="sdl_button_focused_dark">#4C0099cc</color> <!-- 30 % opacity -->
@@ -20,8 +20,6 @@
2020
<color name="sdl_button_separator_light">#25000000</color> <!-- 7% opacity -->
2121

2222
<!-- holo colors: -->
23-
<color name="background_holo_dark">#ff000000</color>
24-
<color name="background_holo_light">#fff3f3f3</color>
2523
<color name="bright_foreground_holo_dark">#fff3f3f3</color>
2624
<color name="bright_foreground_holo_light">#ff000000</color>
2725
<color name="bright_foreground_disabled_holo_dark">#ff4c4c4c</color>

0 commit comments

Comments
 (0)