summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlinus_lee <llee@cyngn.com>2014-12-23 16:28:21 -0800
committerlinus_lee <llee@cyngn.com>2014-12-23 16:28:21 -0800
commit58bb79b3c83f841ff0356a6d7ce9a6c8f3d0756a (patch)
treeddbc13e2c1409ca52fbe579e488b5e23ce1b8f78
parent1b409dfd9b6a26807d6f3ff7aaeca3018c9534ca (diff)
downloadandroid_packages_apps_DeskClock-58bb79b3c83f841ff0356a6d7ce9a6c8f3d0756a.tar.gz
android_packages_apps_DeskClock-58bb79b3c83f841ff0356a6d7ce9a6c8f3d0756a.tar.bz2
android_packages_apps_DeskClock-58bb79b3c83f841ff0356a6d7ce9a6c8f3d0756a.zip
DeskClock: Fix background notification color of the stopwatch
Remove colors and update the targetsdk so that it uses the proper colors as defined for L Change-Id: I2717995c0efa2cd8ac1e43bb3bbc6278b9fbfc8a
-rwxr-xr-xAndroidManifest.xml2
-rw-r--r--res/layout/stopwatch_notif_collapsed.xml3
-rw-r--r--res/layout/stopwatch_notif_expanded.xml3
3 files changed, 3 insertions, 5 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c8119edde..c354dde77 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -19,7 +19,7 @@
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="com.android.deskclock.worldclock.permissions.WRITE_DATABASE" />
- <uses-sdk android:minSdkVersion="17" android:targetSdkVersion="17" ></uses-sdk>
+ <uses-sdk android:minSdkVersion="17" android:targetSdkVersion="21" ></uses-sdk>
<application android:label="@string/app_label"
android:icon="@mipmap/ic_launcher_alarmclock"
diff --git a/res/layout/stopwatch_notif_collapsed.xml b/res/layout/stopwatch_notif_collapsed.xml
index 7d5636661..b8bdba95f 100644
--- a/res/layout/stopwatch_notif_collapsed.xml
+++ b/res/layout/stopwatch_notif_collapsed.xml
@@ -21,8 +21,7 @@
android:layout_width="match_parent"
android:layout_height="64dp"
internal:layout_maxHeight="64dp"
- internal:layout_minHeight="64dp"
- android:background="?android:attr/selectableItemBackground" >
+ internal:layout_minHeight="64dp" >
<include layout="@layout/stopwatch_notification_icon"/>
diff --git a/res/layout/stopwatch_notif_expanded.xml b/res/layout/stopwatch_notif_expanded.xml
index dff2da27b..adbfffd33 100644
--- a/res/layout/stopwatch_notif_expanded.xml
+++ b/res/layout/stopwatch_notif_expanded.xml
@@ -27,8 +27,7 @@
android:layout_width="match_parent"
android:layout_height="64dp"
internal:layout_maxHeight="64dp"
- internal:layout_minHeight="64dp"
- android:background="?android:attr/selectableItemBackground" >
+ internal:layout_minHeight="64dp" >
<include layout="@layout/stopwatch_notification_icon"/>