Merge "Add missing layout sizes in XML" into jb-mr1-dev (b390675a) · Commits · e / os / android_packages_apps_DeskClock

res/layout/alarm_alert.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -68,6 +68,7 @@
		<com.android.deskclock.ZeroTopPaddingTextView
		android:id="@+id/am_pm"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		style="@style/label"
		android:singleLine="true"
		android:ellipsize="none"

res/layout/alarm_clock.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,8 @@

		<com.android.deskclock.widget.ActionableToastBar
		android:id="@+id/undo_bar"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="bottom"
		android:layout_marginBottom="40dp"
		android:layout_marginLeft="8dp"

res/layout/desk_clock_battery.xml

deleted100644 → 0

+0 −26

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2009 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->

		<!-- battery/charge status -->
		<TextView android:id="@+id/battery" xmlns:android="http://schemas.android.com/apk/res/android"
		android:gravity="right"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:drawablePadding="6dip"
		android:shadowColor="#C0000000"
		android:shadowDx="0"
		android:shadowDy="0"
		android:shadowRadius="3.0"
		/>

res/layout/time_picker_view.xml

+10 −0

Original line number	Diff line number	Diff line
		@@ -37,12 +37,16 @@
		android:singleLine="true"
		android:ellipsize="none"
		style="@style/medium_bold"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:textColor="@color/clock_white"/>
		<com.android.deskclock.ZeroTopPaddingTextView
		android:id="@+id/hours_ones"
		android:singleLine="true"
		android:ellipsize="none"
		style="@style/medium_bold"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:textColor="@color/clock_white"/>

		<com.android.deskclock.ZeroTopPaddingTextView
		@@ -51,6 +55,8 @@
		android:ellipsize="none"
		style="@style/medium_light"
		android:text="@string/time_picker_time_seperator"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:textColor="@color/clock_white"/>

		<com.android.deskclock.ZeroTopPaddingTextView
		@@ -58,12 +64,16 @@
		android:singleLine="true"
		android:ellipsize="none"
		style="@style/medium_bold"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:textColor="@color/clock_white"/>
		<com.android.deskclock.ZeroTopPaddingTextView
		android:id="@+id/minutes_ones"
		android:singleLine="true"
		android:ellipsize="none"
		style="@style/medium_bold"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:textColor="@color/clock_white"/>

		<com.android.deskclock.ZeroTopPaddingTextView

res/layout/time_setup_view.xml

+14 −0

Original line number	Diff line number	Diff line
		@@ -36,6 +36,8 @@
		android:singleLine="true"
		android:ellipsize="none"
		style="@style/medium_bold"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:textColor="@color/clock_white"/>

		<com.android.deskclock.ZeroTopPaddingTextView
		@@ -46,6 +48,8 @@
		android:layout_gravity="top"
		android:contentDescription="@string/hours_label_description"
		android:text="@string/hours_label"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:textColor="@color/clock_white"/>

		<com.android.deskclock.ZeroTopPaddingTextView
		@@ -53,6 +57,8 @@
		android:singleLine="true"
		android:ellipsize="none"
		style="@style/medium_bold"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:textColor="@color/clock_white"/>

		<com.android.deskclock.ZeroTopPaddingTextView
		@@ -60,6 +66,8 @@
		android:singleLine="true"
		android:ellipsize="none"
		style="@style/medium_bold"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:textColor="@color/clock_white"/>
		<com.android.deskclock.ZeroTopPaddingTextView
		android:id="@+id/minutes_label"
		@@ -68,6 +76,8 @@
		style="@style/label"
		android:contentDescription="@string/minutes_label_description"
		android:text="@string/minutes_label"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:textColor="@color/clock_white"/>

		<com.android.deskclock.ZeroTopPaddingTextView
		@@ -75,6 +85,8 @@
		android:singleLine="true"
		android:ellipsize="none"
		style="@style/medium_light"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:textColor="@color/clock_white"/>

		<com.android.deskclock.ZeroTopPaddingTextView
		@@ -85,6 +97,8 @@
		android:layout_gravity="top"
		android:contentDescription="@string/seconds_label_description"
		android:text="@string/seconds_label"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:textColor="@color/clock_white"/>

		</com.android.deskclock.timer.TimerView>