diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2014-06-02 23:30:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-02 23:30:30 +0000 |
| commit | 6ba7075ae8afb1edc5cb7864bc71121c9992903f (patch) | |
| tree | d996e259c67a3a7b4e3968303e3718e9295e1f7c /res | |
| parent | 4e2104b1191e5c3a049ebc159150fbb9a7bc2d03 (diff) | |
| parent | e9cb75c636234e44c94b38a877f3c60091d907dc (diff) | |
| download | packages_apps_Settings-6ba7075ae8afb1edc5cb7864bc71121c9992903f.zip packages_apps_Settings-6ba7075ae8afb1edc5cb7864bc71121c9992903f.tar.gz packages_apps_Settings-6ba7075ae8afb1edc5cb7864bc71121c9992903f.tar.bz2 | |
Merge "Entire Switch bar should be a touch state" into lmp-preview-dev
Diffstat (limited to 'res')
| -rw-r--r-- | res/drawable/switchbar_background.xml | 23 | ||||
| -rw-r--r-- | res/layout/settings_main.xml | 2 | ||||
| -rw-r--r-- | res/values/colors.xml | 2 |
3 files changed, 25 insertions, 2 deletions
diff --git a/res/drawable/switchbar_background.xml b/res/drawable/switchbar_background.xml new file mode 100644 index 0000000..d329b6b --- /dev/null +++ b/res/drawable/switchbar_background.xml @@ -0,0 +1,23 @@ +<?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. +--> + +<ripple xmlns:android="http://schemas.android.com/apk/res/android" + android:tint="?android:attr/colorControlHighlight"> + <item> + <color android:color="@color/switchbar_background_color" /> + </item> +</ripple> + diff --git a/res/layout/settings_main.xml b/res/layout/settings_main.xml index 740932d..46ead18 100644 --- a/res/layout/settings_main.xml +++ b/res/layout/settings_main.xml @@ -31,7 +31,7 @@ <com.android.settings.widget.SwitchBar android:id="@+id/switch_bar" android:layout_height="?android:attr/actionBarSize" android:layout_width="match_parent" - android:background="@color/switch_bar_background_color" + android:background="@drawable/switchbar_background" android:theme="@android:style/Theme.Quantum" /> <FrameLayout diff --git a/res/values/colors.xml b/res/values/colors.xml index 8a2c1f5..2e378a2 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -59,6 +59,6 @@ <color name="actionbar_background_color">#ff263238</color> <color name="dashboard_background_color">#ffe1e1e0</color> - <color name="switch_bar_background_color">#ff384248</color> + <color name="switchbar_background_color">#ff384248</color> <color name="switch_accent_color">#ff7fcac3</color> </resources> |