diff options
| author | James Kung <kingkung@google.com> | 2013-04-23 17:48:13 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-23 17:48:13 -0700 |
| commit | 5160f4b6d7bb2ddddfbe96d4d89c2cf1b0a657a0 (patch) | |
| tree | 358e4c705e8a0bc6cb3de1bfa5cc2f80cbcf42e6 | |
| parent | 52a5023d477a3e4e11809bd45dc42d037d6c5405 (diff) | |
| parent | 28c76ab6100d55b162c15fe21bc293cccec120db (diff) | |
am 28c76ab6: Consistent done button picker color
* commit '28c76ab6100d55b162c15fe21bc293cccec120db':
Consistent done button picker color
| -rw-r--r-- | res/color/done_text_color.xml | 21 | ||||
| -rw-r--r-- | res/values/colors.xml | 3 |
2 files changed, 23 insertions, 1 deletions
diff --git a/res/color/done_text_color.xml b/res/color/done_text_color.xml new file mode 100644 index 0000000..e6e55ed --- /dev/null +++ b/res/color/done_text_color.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 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. +--> +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + + <item android:state_enabled="false" android:color="@color/done_text_color_disabled"/> + <item android:state_enabled="true" android:color="@color/done_text_color_normal"/> + +</selector>
\ No newline at end of file diff --git a/res/values/colors.xml b/res/values/colors.xml index 23afd47..ec1d495 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -20,7 +20,8 @@ <color name="circle_background">#f2f2f2</color> <color name="line_background">#cccccc</color> <color name="ampm_text_color">#8c8c8c</color> - <color name="done_text_color">#8c8c8c</color> + <color name="done_text_color_normal">#333333</color> + <color name="done_text_color_disabled">#CCCCCC</color> <color name="numbers_text_color">#8c8c8c</color> <color name="transparent_black">#7F000000</color> |