diff options
Diffstat (limited to 'res/drawable')
-rw-r--r-- | res/drawable/list_border.xml | 2 | ||||
-rw-r--r-- | res/drawable/scene_filter_item_bg.xml (renamed from res/drawable/list_selector.xml) | 2 | ||||
-rw-r--r-- | res/drawable/scene_mode_view_border_selected.xml | 36 | ||||
-rw-r--r-- | res/drawable/setting_list_item_bg.xml (renamed from res/drawable/scene_mode_view_border.xml) | 12 | ||||
-rw-r--r-- | res/drawable/setting_picker.xml | 21 |
5 files changed, 8 insertions, 65 deletions
diff --git a/res/drawable/list_border.xml b/res/drawable/list_border.xml index 1ab11ddfe..7d05a087f 100644 --- a/res/drawable/list_border.xml +++ b/res/drawable/list_border.xml @@ -29,7 +29,7 @@ <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" > - <solid android:color="@color/setting_color" /> + <solid android:color="@color/popup_background" /> <stroke android:width="1dip" diff --git a/res/drawable/list_selector.xml b/res/drawable/scene_filter_item_bg.xml index ada9b365a..2e2b06343 100644 --- a/res/drawable/list_selector.xml +++ b/res/drawable/scene_filter_item_bg.xml @@ -28,7 +28,7 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:drawable="@color/setting_color_light" android:state_pressed="true"/> + <item android:drawable="@color/scene_item_selected" android:state_activated="true"/> <item android:drawable="@android:color/transparent"/> </selector> diff --git a/res/drawable/scene_mode_view_border_selected.xml b/res/drawable/scene_mode_view_border_selected.xml deleted file mode 100644 index 535e2d168..000000000 --- a/res/drawable/scene_mode_view_border_selected.xml +++ /dev/null @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (c) 2014, The Linux Foundation. All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are - met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials provided - with the distribution. - * Neither the name of The Linux Foundation nor the names of its - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED - WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT - ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS - BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR - BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE - OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN - IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ---> -<shape xmlns:android="http://schemas.android.com/apk/res/android" - android:shape="rectangle" > - - <stroke - android:width="1dip" - android:color="#cc33b5e5" /> - -</shape> diff --git a/res/drawable/scene_mode_view_border.xml b/res/drawable/setting_list_item_bg.xml index 68431ece6..079f036c0 100644 --- a/res/drawable/scene_mode_view_border.xml +++ b/res/drawable/setting_list_item_bg.xml @@ -26,11 +26,11 @@ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --> -<shape xmlns:android="http://schemas.android.com/apk/res/android" - android:shape="rectangle" > +<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <stroke - android:width="1dip" - android:color="#cc000000" /> + <item android:drawable="@color/setting_list_pressed" android:state_pressed="true"/> + <item android:drawable="@color/setting_list_selected" android:state_checked="true"/> + <item android:drawable="@color/setting_list_selected" android:state_activated="true"/> + <item android:drawable="@android:color/transparent"/> -</shape> +</selector> diff --git a/res/drawable/setting_picker.xml b/res/drawable/setting_picker.xml deleted file mode 100644 index c3bff41ea..000000000 --- a/res/drawable/setting_picker.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 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_checked="true" - android:drawable="@drawable/list_pressed_holo_light" /> - <item android:drawable="@android:color/transparent" /> -</selector> |