summaryrefslogtreecommitdiff
path: root/java/com/android/dialer/theme
diff options
context:
space:
mode:
authortwyen <twyen@google.com>2018-04-24 14:34:33 -0700
committerCopybara-Service <copybara-piper@google.com>2018-04-25 11:45:21 -0700
commit0a5c34d103dc8701e55035e98e6d9fd6c2caf33e (patch)
tree5a2abde1030ae51aea7df5a8830cd3f782fcfddb /java/com/android/dialer/theme
parent66adad0ab9921afcf3aefab270c030ceee9888df (diff)
Disable entries in CallingAccountSelector that are not selectable
This CL also unifies the disabled color for primary and secondary text. The in call UI dialog will be implemented in a followup CL. TEST=TAP DEFAULT_VALUE_OK=no server. Bug: 69675796,72618783 Test: TAP PiperOrigin-RevId: 194147061 Change-Id: I5be5a45a7df09061a3bf391f6ae2a32d9c73b6e3
Diffstat (limited to 'java/com/android/dialer/theme')
-rw-r--r--java/com/android/dialer/theme/res/color/dialer_primary_text_color.xml21
-rw-r--r--java/com/android/dialer/theme/res/color/dialer_secondary_text_color.xml21
-rw-r--r--java/com/android/dialer/theme/res/values/colors.xml6
3 files changed, 43 insertions, 5 deletions
diff --git a/java/com/android/dialer/theme/res/color/dialer_primary_text_color.xml b/java/com/android/dialer/theme/res/color/dialer_primary_text_color.xml
new file mode 100644
index 000000000..347db41bc
--- /dev/null
+++ b/java/com/android/dialer/theme/res/color/dialer_primary_text_color.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2018 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
+ -->
+<!-- Primary text color in the Phone app -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:state_enabled="false" android:color="@color/dialer_disabled_text_color"/>
+ <item android:color="#212121"/>
+</selector> \ No newline at end of file
diff --git a/java/com/android/dialer/theme/res/color/dialer_secondary_text_color.xml b/java/com/android/dialer/theme/res/color/dialer_secondary_text_color.xml
new file mode 100644
index 000000000..920b46792
--- /dev/null
+++ b/java/com/android/dialer/theme/res/color/dialer_secondary_text_color.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2018 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
+ -->
+<!-- Secondary text color in the Phone app -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:state_enabled="false" android:color="@color/dialer_disabled_text_color"/>
+ <item android:color="#636363"/>
+</selector> \ No newline at end of file
diff --git a/java/com/android/dialer/theme/res/values/colors.xml b/java/com/android/dialer/theme/res/values/colors.xml
index e80fc4b30..2185d861c 100644
--- a/java/com/android/dialer/theme/res/values/colors.xml
+++ b/java/com/android/dialer/theme/res/values/colors.xml
@@ -36,15 +36,11 @@
<color name="dialer_secondary_color">#F50057</color>
- <!-- Primary text color in the Phone app -->
- <color name="dialer_primary_text_color">#333333</color>
<color name="dialer_primary_text_color_white">#ffffff</color>
<color name="dialer_edit_text_hint_color">#DE78909C</color>
- <!-- Secondary text color in the Phone app -->
- <color name="dialer_secondary_text_color">#636363</color>
<!-- 38% opacity -->
- <color name="dialer_secondary_text_color_hiden">#61000000</color>
+ <color name="dialer_disabled_text_color">#9E9E9E</color>
<color name="dialer_link_color">#2A56C6</color>