Change background color when alarm goes off
Bug:15758218
Change-Id: I722482fa3ae4f34ce6db90a0bbfef2f884c4cdb1
diff --git a/res/layout-land/alarm_alert.xml b/res/layout-land/alarm_alert.xml
index deee704..5baf974 100644
--- a/res/layout-land/alarm_alert.xml
+++ b/res/layout-land/alarm_alert.xml
@@ -20,7 +20,6 @@
xmlns:dc="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/black"
android:baselineAligned="false"
android:gravity="center_vertical" >
diff --git a/res/layout/alarm_alert.xml b/res/layout/alarm_alert.xml
index 8cf0b6b..2446d39 100644
--- a/res/layout/alarm_alert.xml
+++ b/res/layout/alarm_alert.xml
@@ -18,8 +18,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:dc="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="@color/black">
+ android:layout_height="match_parent">
<LinearLayout
android:layout_width="wrap_content"
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 6440407..f00e039 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -44,7 +44,7 @@
<item name="android:dividerPadding">12dp</item>
<item name="android:gravity">center</item>
</style>
- <style name="DeskClockBarStyle" parent="@android:style/Widget.ActionBar">
+ <style name="DeskClockBarStyle" parent="@android:style/Widget.Material.ActionBar">
<item name="android:background">@null</item>
<item name="android:backgroundStacked">@null</item>
<item name="android:backgroundSplit">@null</item>
diff --git a/src/com/android/deskclock/alarms/AlarmActivity.java b/src/com/android/deskclock/alarms/AlarmActivity.java
index 11320c6..be8a820 100644
--- a/src/com/android/deskclock/alarms/AlarmActivity.java
+++ b/src/com/android/deskclock/alarms/AlarmActivity.java
@@ -198,6 +198,7 @@
private void updateLayout() {
final LayoutInflater inflater = LayoutInflater.from(this);
final View view = inflater.inflate(R.layout.alarm_alert, null);
+ view.setBackgroundColor(Utils.getCurrentHourColor());
view.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LOW_PROFILE);
setContentView(view);
updateTitle();