summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorDaria Evdokimova <dariaevdo@google.com>2015-06-17 22:26:43 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-06-17 22:26:43 +0000
commit6e061f7f3fe8bc3aca0e88e0169760b8396612ca (patch)
tree2950af525088213fb87e6624d0ecac626138aaf2 /res
parent580b231a86b6846ed84ae6e7cd32b25e03639a37 (diff)
parenta3e5d1fc6d3f92d53013acab89e3ae97a57b83c8 (diff)
downloadandroid_packages_apps_DeskClock-6e061f7f3fe8bc3aca0e88e0169760b8396612ca.tar.gz
android_packages_apps_DeskClock-6e061f7f3fe8bc3aca0e88e0169760b8396612ca.tar.bz2
android_packages_apps_DeskClock-6e061f7f3fe8bc3aca0e88e0169760b8396612ca.zip
am a3e5d1fc: am e6f73547: Picker UI for Alarms.
* commit 'a3e5d1fc6d3f92d53013acab89e3ae97a57b83c8': Picker UI for Alarms.
Diffstat (limited to 'res')
-rw-r--r--res/layout/alarm_row.xml63
-rw-r--r--res/layout/selection_layout.xml38
-rw-r--r--res/values/dimens.xml6
3 files changed, 106 insertions, 1 deletions
diff --git a/res/layout/alarm_row.xml b/res/layout/alarm_row.xml
new file mode 100644
index 000000000..5697e9e7d
--- /dev/null
+++ b/res/layout/alarm_row.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:dc="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:id="@+id/alarm_item"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="@dimen/alarm_label_padding"
+ android:gravity="top"
+ android:orientation="vertical">
+
+ <LinearLayout
+ android:orientation="horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <com.android.deskclock.widget.TextTime
+ android:id="@+id/digital_clock"
+ android:layout_marginTop="@dimen/alarm_clock_vertical_margin"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="@color/black"
+ android:textSize="@dimen/label_font_size"
+ android:textStyle="bold"
+ dc:format12Hour="@string/alarm_time_12_hours_format"
+ dc:format24Hour="@string/clock_24_hours_format" />
+
+ <TextView
+ android:id="@+id/daysOfWeek"
+ tools:text="M, T, W"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:ellipsize="end"
+ android:singleLine="true"
+ android:textSize="@dimen/label_font_size"
+ android:textColor="@color/black"
+ android:layout_marginTop="@dimen/alarm_clock_vertical_margin"
+ android:layout_marginStart="@dimen/alarm_clock_vertical_margin" />
+ </LinearLayout>
+
+ <com.android.deskclock.widget.EllipsizeLayout
+ android:id="@+id/summary"
+ android:layout_marginTop="@dimen/label_margin_big"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:gravity="bottom"
+ android:layout_gravity="end"
+ android:orientation="vertical"
+ android:layout_marginBottom="@dimen/alarm_clock_vertical_margin">
+
+ <TextView
+ android:id="@+id/label"
+ tools:text="Pick up kids"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:ellipsize="none"
+ android:singleLine="true"
+ android:textSize="@dimen/label_font_size"
+ android:textColor="@color/black_54p" />
+ </com.android.deskclock.widget.EllipsizeLayout>
+</LinearLayout>
diff --git a/res/layout/selection_layout.xml b/res/layout/selection_layout.xml
new file mode 100644
index 000000000..0da03d65b
--- /dev/null
+++ b/res/layout/selection_layout.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center_horizontal|top"
+ android:orientation="vertical"
+ android:paddingLeft="@dimen/alarm_picker_dialog_horizontal_margin"
+ android:paddingRight="@dimen/alarm_picker_dialog_horizontal_margin"
+ android:paddingTop="@dimen/alarm_picker_dialog_vertical_margin">
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/dismiss_alarm"
+ android:textColor="@color/black"
+ android:textSize="@dimen/header_font_size"
+ android:layout_marginBottom="@dimen/alarm_picker_margin_bottom"/>
+
+ <ListView
+ android:id="@android:id/list"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:dividerHeight="0dp"
+ android:divider="@null"/>
+
+ <Button
+ android:id="@+id/cancel_button"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/time_picker_cancel"
+ android:clickable="true"
+ android:gravity="end"
+ android:background="@android:color/transparent"
+ android:textColor="@android:color/holo_blue_light"/>
+
+</LinearLayout> \ No newline at end of file
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index cbbe29fdd..86404b9f0 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -19,7 +19,7 @@
<!-- These resources are around just to allow their values to be customized
for different hardware and product builds. -->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources>
<dimen name="label_text_size">14sp</dimen>
<dimen name="time_text_size">120dip</dimen>
<dimen name="ampm_text_size">20dip</dimen>
@@ -80,6 +80,10 @@
<dimen name="alarm_info_font_size">36sp</dimen>
<dimen name="no_alarm_font_size">16sp</dimen>
+ <dimen name="alarm_picker_dialog_horizontal_margin">30dp</dimen>
+ <dimen name="alarm_picker_dialog_vertical_margin">20dp</dimen>
+ <dimen name="alarm_picker_margin_bottom">10dp</dimen>
+
<dimen name="body_font_padding">4dp</dimen>
<dimen name="button_font_size">24sp</dimen>
<dimen name="dialog_button_font_size">16sp</dimen>