summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authordankoman <dankoman30@gmail.com>2015-01-16 19:50:19 +0100
committerSteve Kondik <steve@cyngn.com>2015-10-18 13:52:55 -0700
commit1f06777d5624a6cec1b722b686cad513d8150e5e (patch)
treea3b2bafa012441d625b90137ed41d74e5d33d2e7 /res
parent89d6956d34bd88b3fdf093da75b37ed161a49668 (diff)
downloadandroid_packages_apps_Calendar-1f06777d5624a6cec1b722b686cad513d8150e5e.tar.gz
android_packages_apps_Calendar-1f06777d5624a6cec1b722b686cad513d8150e5e.tar.bz2
android_packages_apps_Calendar-1f06777d5624a6cec1b722b686cad513d8150e5e.zip
Calendar: fix recurrence picker switch
Let switch pull style from framework instead of using local resource. Change-Id: I75ffa8bea5bd83c4c7680c3a7608350203f7b6d3
Diffstat (limited to 'res')
-rw-r--r--res/drawable-hdpi/switch_thumb_activated_holo_light.9.pngbin549 -> 0 bytes
-rw-r--r--res/drawable-hdpi/switch_thumb_disabled_holo_light.9.pngbin535 -> 0 bytes
-rw-r--r--res/drawable-hdpi/switch_thumb_holo_light_v2.9.pngbin477 -> 0 bytes
-rw-r--r--res/drawable-hdpi/switch_thumb_pressed_holo_light.9.pngbin566 -> 0 bytes
-rw-r--r--res/drawable-mdpi/switch_thumb_activated_holo_light.9.pngbin351 -> 0 bytes
-rw-r--r--res/drawable-mdpi/switch_thumb_disabled_holo_light.9.pngbin350 -> 0 bytes
-rw-r--r--res/drawable-mdpi/switch_thumb_holo_light_v2.9.pngbin340 -> 0 bytes
-rw-r--r--res/drawable-mdpi/switch_thumb_pressed_holo_light.9.pngbin362 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/switch_thumb_activated_holo_light.9.pngbin653 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/switch_thumb_disabled_holo_light.9.pngbin633 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/switch_thumb_holo_light_v2.9.pngbin595 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/switch_thumb_pressed_holo_light.9.pngbin660 -> 0 bytes
-rw-r--r--res/drawable/switch_thumb.xml25
-rw-r--r--res/layout/recurrencepicker.xml1
-rw-r--r--res/values/colors.xml1
-rw-r--r--res/values/styles.xml4
16 files changed, 5 insertions, 26 deletions
diff --git a/res/drawable-hdpi/switch_thumb_activated_holo_light.9.png b/res/drawable-hdpi/switch_thumb_activated_holo_light.9.png
deleted file mode 100644
index 9c5147ef..00000000
--- a/res/drawable-hdpi/switch_thumb_activated_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/switch_thumb_disabled_holo_light.9.png b/res/drawable-hdpi/switch_thumb_disabled_holo_light.9.png
deleted file mode 100644
index a257e26d..00000000
--- a/res/drawable-hdpi/switch_thumb_disabled_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/switch_thumb_holo_light_v2.9.png b/res/drawable-hdpi/switch_thumb_holo_light_v2.9.png
deleted file mode 100644
index 9b16618c..00000000
--- a/res/drawable-hdpi/switch_thumb_holo_light_v2.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/switch_thumb_pressed_holo_light.9.png b/res/drawable-hdpi/switch_thumb_pressed_holo_light.9.png
deleted file mode 100644
index ea54380f..00000000
--- a/res/drawable-hdpi/switch_thumb_pressed_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/switch_thumb_activated_holo_light.9.png b/res/drawable-mdpi/switch_thumb_activated_holo_light.9.png
deleted file mode 100644
index 3d7c236a..00000000
--- a/res/drawable-mdpi/switch_thumb_activated_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/switch_thumb_disabled_holo_light.9.png b/res/drawable-mdpi/switch_thumb_disabled_holo_light.9.png
deleted file mode 100644
index 82f05d62..00000000
--- a/res/drawable-mdpi/switch_thumb_disabled_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/switch_thumb_holo_light_v2.9.png b/res/drawable-mdpi/switch_thumb_holo_light_v2.9.png
deleted file mode 100644
index b3cee3f7..00000000
--- a/res/drawable-mdpi/switch_thumb_holo_light_v2.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/switch_thumb_pressed_holo_light.9.png b/res/drawable-mdpi/switch_thumb_pressed_holo_light.9.png
deleted file mode 100644
index 670dc2e9..00000000
--- a/res/drawable-mdpi/switch_thumb_pressed_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/switch_thumb_activated_holo_light.9.png b/res/drawable-xhdpi/switch_thumb_activated_holo_light.9.png
deleted file mode 100644
index ca48bd86..00000000
--- a/res/drawable-xhdpi/switch_thumb_activated_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/switch_thumb_disabled_holo_light.9.png b/res/drawable-xhdpi/switch_thumb_disabled_holo_light.9.png
deleted file mode 100644
index c3d80f0e..00000000
--- a/res/drawable-xhdpi/switch_thumb_disabled_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/switch_thumb_holo_light_v2.9.png b/res/drawable-xhdpi/switch_thumb_holo_light_v2.9.png
deleted file mode 100644
index 39592ac8..00000000
--- a/res/drawable-xhdpi/switch_thumb_holo_light_v2.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/switch_thumb_pressed_holo_light.9.png b/res/drawable-xhdpi/switch_thumb_pressed_holo_light.9.png
deleted file mode 100644
index 4acb32b1..00000000
--- a/res/drawable-xhdpi/switch_thumb_pressed_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/switch_thumb.xml b/res/drawable/switch_thumb.xml
deleted file mode 100644
index 5c425e53..00000000
--- a/res/drawable/switch_thumb.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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:drawable="@drawable/switch_thumb_disabled_holo_light" android:state_enabled="false"/>
- <item android:drawable="@drawable/switch_thumb_pressed_holo_light" android:state_pressed="true"/>
- <item android:drawable="@drawable/switch_thumb_activated_holo_light" android:state_checked="true"/>
- <item android:drawable="@drawable/switch_thumb_holo_light_v2"/>
-
-</selector> \ No newline at end of file
diff --git a/res/layout/recurrencepicker.xml b/res/layout/recurrencepicker.xml
index 49daabe4..250bb9cb 100644
--- a/res/layout/recurrencepicker.xml
+++ b/res/layout/recurrencepicker.xml
@@ -66,7 +66,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
- android:thumb="@drawable/switch_thumb"
android:layout_marginLeft="4dp" />
</LinearLayout>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 81f77950..87109548 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -172,4 +172,5 @@
<color name="recurrence_picker_background">#fff2f2f2</color>
<color name="recurrence_bubble_text_normal">#ff737373</color>
+ <color name="recurrence_buble_background">#ff36b5e4</color>
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index be60876f..95647b39 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -256,6 +256,10 @@
<style name="TextAppearance.Recurrence_SpinnerButton"
parent="android:style/Widget.Holo.Light.Spinner" />
+ <style name="RecurrenceDialogTheme" parent="android:Theme.Material.Light.Dialog">
+ <item name="android:colorAccent">@color/recurrence_buble_background</item>
+ </style>
+
<style name="RecurrenceDayOfWeekStyle">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>