Merge change I63863614 into eclair (1196a729) · Commits · e / os / android_packages_apps_DeskClock

res/drawable-hdpi/ic_lock_idle_alarm.png

−178 B (1.17 KiB)

Loading image diff...

−732 B (815 B)

Loading image diff...

−138 B (786 B)

Loading image diff...

−434 B (572 B)

Loading image diff...

+9 −6

Original line number	Diff line number	Diff line
		@@ -25,20 +25,23 @@
		android:layout_width="fill_parent"
		android:layout_height="fill_parent"
		android:orientation="vertical"
		android:paddingTop="18dip"
		android:paddingTop="25dip"
		>

		<!-- Entire display region (everything but bottom buttons) -->
		<!-- Left margin is 4 dip shy of desired to allow for the time to
		"hang off" the left-hand side, accommodating the extra glyph
		escapement in Clockopia and 3px of text shadow -->
		<LinearLayout
		android:orientation="vertical"
		android:layout_gravity="left"
		android:layout_weight="1"
		android:layout_width="fill_parent"
		android:layout_height="fill_parent"
		android:layout_marginLeft="20dip"
		android:layout_marginTop="20dip"
		android:layout_marginRight="20dip"
		android:layout_marginBottom="14dip"
		android:layout_marginLeft="25dip"
		android:layout_marginTop="18dip"
		android:layout_marginRight="18dip"
		android:layout_marginBottom="12dip"
		>

		<!-- across the top: next alarm, battery, nightmode button -->
		@@ -48,6 +51,7 @@
		android:layout_height="wrap_content"
		android:layout_weight="0"
		android:layout_marginBottom="6dip"
		android:layout_marginLeft="4dip"
		android:gravity="center_vertical"
		>
		<TextView android:id="@+id/nextAlarm"
		@@ -88,7 +92,6 @@
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:gravity="bottom"
		android:layout_marginBottom="12dip"
		>

		<include layout="@layout/desk_clock_time_date"