summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Ng <petergng@google.com>2012-09-20 13:23:50 -0700
committerIsaac Katzenelson <isaack@android.com>2012-09-20 15:17:43 -0700
commitb6be3d044326a8b2a8f4f13377386b790b526982 (patch)
tree599f542eab14899629e1f3b68d5ec8a8ac726956
parent51eb2d54650a3600ce68e942f8a7fe37aa731f9e (diff)
downloadandroid_packages_apps_DeskClock-b6be3d044326a8b2a8f4f13377386b790b526982.tar.gz
android_packages_apps_DeskClock-b6be3d044326a8b2a8f4f13377386b790b526982.tar.bz2
android_packages_apps_DeskClock-b6be3d044326a8b2a8f4f13377386b790b526982.zip
timer spacing fix
Change-Id: I3eb9b750976823e8194a52093d4217ed9f12aea4 Conflicts: res/layout/timer_fragment.xml
-rw-r--r--res/layout/timer_fragment.xml4
-rw-r--r--res/layout/timer_list_item.xml4
2 files changed, 6 insertions, 2 deletions
diff --git a/res/layout/timer_fragment.xml b/res/layout/timer_fragment.xml
index 2dda55d97..e12791cc1 100644
--- a/res/layout/timer_fragment.xml
+++ b/res/layout/timer_fragment.xml
@@ -27,6 +27,8 @@
<ListView
android:id="@+id/timers_list"
android:layout_weight="1"
+ android:divider="@null"
+ android:dividerHeight="24dp"
android:layout_width="match_parent"
android:layout_height="0dip"/>
<View
@@ -42,7 +44,7 @@
android:background="?android:attr/selectableItemBackground"
android:layout_height="wrap_content" />
</LinearLayout>
- <LinearLayout
+ <LinearLayout
android:id="@+id/new_timer_page"
android:layout_width="match_parent"
android:layout_height="match_parent"
diff --git a/res/layout/timer_list_item.xml b/res/layout/timer_list_item.xml
index 49f1c3bd1..5d842e0b1 100644
--- a/res/layout/timer_list_item.xml
+++ b/res/layout/timer_list_item.xml
@@ -92,7 +92,9 @@
</FrameLayout>
<LinearLayout
android:layout_width="match_parent"
- android:layout_height="wrap_content" >
+ android:layout_height="wrap_content"
+ android:paddingTop="12dp"
+ android:paddingBottom="12dp" >
<Button
android:id="@+id/timer_delete"
android:layout_width="0dip"