diff options
author | Andrew Lee <anwlee@google.com> | 2014-05-07 23:41:42 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-07 23:41:42 +0000 |
commit | 2b22fdedeab34ce8fd684a174e14fb5524ca0f56 (patch) | |
tree | 8c5e50bdf4d97a96ef81fedc4bb999eeb0901ee8 /InCallUI | |
parent | 0917d142789db4a387fd9f30d7515736c060cb8b (diff) | |
parent | c49d9ee8083a8382f8d6c30d265dbaeb921741bf (diff) |
am 46c8fb8e: Merge "Change selected/unselected states of buttons."
* commit '46c8fb8e67ae14cd95f5e614d27468a94e37c88f':
Change selected/unselected states of buttons.
Diffstat (limited to 'InCallUI')
-rw-r--r-- | InCallUI/res/color/selectable_icon_tint.xml | 7 | ||||
-rw-r--r-- | InCallUI/res/drawable/btn_background.xml | 17 | ||||
-rw-r--r-- | InCallUI/res/drawable/btn_compound_background.xml | 29 | ||||
-rw-r--r-- | InCallUI/res/drawable/btn_selected.xml | 25 | ||||
-rw-r--r-- | InCallUI/res/drawable/btn_selected_focused.xml | 29 | ||||
-rw-r--r-- | InCallUI/res/drawable/btn_unselected.xml | 25 | ||||
-rw-r--r-- | InCallUI/res/drawable/btn_unselected_focused.xml | 28 |
7 files changed, 137 insertions, 23 deletions
diff --git a/InCallUI/res/color/selectable_icon_tint.xml b/InCallUI/res/color/selectable_icon_tint.xml index 8665272ec..42aa310bb 100644 --- a/InCallUI/res/color/selectable_icon_tint.xml +++ b/InCallUI/res/color/selectable_icon_tint.xml @@ -16,8 +16,9 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:color="#ffffffff" android:state_selected="true" /> - <item android:color="#ffffffff" android:state_pressed="true" /> - <item android:color="#99ffffff" /> + <item android:color="#ffeeff41" android:state_selected="true" /> + <item android:color="#ffeeff41" android:state_pressed="true" /> + <!-- 70% white. --> + <item android:color="#b3ffffff" /> </selector> diff --git a/InCallUI/res/drawable/btn_background.xml b/InCallUI/res/drawable/btn_background.xml index be4644670..fabcf7c65 100644 --- a/InCallUI/res/drawable/btn_background.xml +++ b/InCallUI/res/drawable/btn_background.xml @@ -18,12 +18,15 @@ <!-- Background resource for "compound buttons" in the in-call UI. These buttons have two states (checked and unchecked), and show a blue bar along the bottom edge when checked. --> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> +<touch-feedback xmlns:android="http://schemas.android.com/apk/res/android" + android:tint="@color/tab_pressed_color" + android:pinned="true"> + <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_pressed="true" - android:drawable="@color/tab_pressed_color" /> - <item android:state_focused="true" - android:drawable="@drawable/tab_unselected_focused" /> - <item android:drawable="@android:color/transparent" /> + <item android:state_focused="true" + android:drawable="@drawable/btn_unselected_focused" /> -</selector> + <item android:drawable="@drawable/btn_unselected" /> + + </selector> +</touch-feedback>
\ No newline at end of file diff --git a/InCallUI/res/drawable/btn_compound_background.xml b/InCallUI/res/drawable/btn_compound_background.xml index 5af7cca77..2f5a39d34 100644 --- a/InCallUI/res/drawable/btn_compound_background.xml +++ b/InCallUI/res/drawable/btn_compound_background.xml @@ -15,19 +15,22 @@ --> <!-- Background resource for "compound buttons" in the in-call UI. - These buttons have two states (checked and unchecked), and - show a blue bar along the bottom edge when checked. --> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> + These buttons have two states (selected and unselected). --> +<touch-feedback xmlns:android="http://schemas.android.com/apk/res/android" + android:tint="@color/tab_pressed_color" + android:pinned="true"> + <item> + <selector> + <item android:state_selected="true" android:state_focused="true" + android:drawable="@drawable/btn_selected_focused" /> - <item android:state_pressed="true" - android:drawable="@color/tab_pressed_color" /> - <item android:state_selected="true" android:state_focused="true" - android:drawable="@drawable/tab_selected_focused" /> - <item android:state_focused="true" - android:drawable="@drawable/tab_unselected_focused" /> - <item android:state_selected="true" - android:drawable="@drawable/tab_selected" /> + <item android:state_focused="true" + android:drawable="@drawable/btn_unselected_focused" />cd - <item android:drawable="@android:color/transparent" /> + <item android:state_selected="true" + android:drawable="@drawable/btn_selected" /> -</selector> + <item android:drawable="@drawable/btn_unselected" /> + </selector> + </item> +</touch-feedback>
\ No newline at end of file diff --git a/InCallUI/res/drawable/btn_selected.xml b/InCallUI/res/drawable/btn_selected.xml new file mode 100644 index 000000000..1446e4163 --- /dev/null +++ b/InCallUI/res/drawable/btn_selected.xml @@ -0,0 +1,25 @@ +<?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 + --> + +<layer-list xmlns:android="http://schemas.android.com/apk/res/android" > + <item> + <shape android:shape="oval"> + <solid android:color="@color/button_selected_color" /> + </shape> + </item> +</layer-list>
\ No newline at end of file diff --git a/InCallUI/res/drawable/btn_selected_focused.xml b/InCallUI/res/drawable/btn_selected_focused.xml new file mode 100644 index 000000000..2eda9bf8b --- /dev/null +++ b/InCallUI/res/drawable/btn_selected_focused.xml @@ -0,0 +1,29 @@ +<?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 + --> + +<layer-list xmlns:android="http://schemas.android.com/apk/res/android" > + <item android:drawable="@drawable/btn_selected" /> + + <item> + <shape android:shape="oval" > + <stroke + android:width="4dp" + android:color="@color/focus_color" /> + </shape> + </item> +</layer-list>
\ No newline at end of file diff --git a/InCallUI/res/drawable/btn_unselected.xml b/InCallUI/res/drawable/btn_unselected.xml new file mode 100644 index 000000000..aed995cec --- /dev/null +++ b/InCallUI/res/drawable/btn_unselected.xml @@ -0,0 +1,25 @@ +<?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 + --> + +<layer-list xmlns:android="http://schemas.android.com/apk/res/android" > + <item> + <shape android:shape="oval"> + <solid android:color="@color/incall_background_color" /> + </shape> + </item> +</layer-list>
\ No newline at end of file diff --git a/InCallUI/res/drawable/btn_unselected_focused.xml b/InCallUI/res/drawable/btn_unselected_focused.xml new file mode 100644 index 000000000..66075d427 --- /dev/null +++ b/InCallUI/res/drawable/btn_unselected_focused.xml @@ -0,0 +1,28 @@ +<?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 + --> + +<layer-list xmlns:android="http://schemas.android.com/apk/res/android" > + <item android:drawable="@drawable/btn_unselected" /> + <item> + <shape android:shape="oval" > + <stroke + android:width="4dp" + android:color="@color/focus_color" /> + </shape> + </item> +</layer-list>
\ No newline at end of file |