Merge branch 'mr1.1-staging' of... (9e8b08ef) · Commits · e / os / android_packages_apps_DeskClock

Android.mk

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -12,7 +12,7 @@ LOCAL_PACKAGE_NAME := DeskClock

	LOCAL_OVERRIDES_PACKAGES := AlarmClock		LOCAL_OVERRIDES_PACKAGES := AlarmClock

	LOCAL_SDK_VERSION := current		LOCAL_SDK_VERSION := 17

	LOCAL_PROGUARD_FLAG_FILES := proguard.flags		LOCAL_PROGUARD_FLAG_FILES := proguard.flags

res/layout-land/stopwatch_fragment.xml

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -25,7 +25,7 @@
	android:layout_height="match_parent"		android:layout_height="match_parent"
	android:layout_marginLeft="@dimen/circle_margin"		android:layout_marginLeft="@dimen/circle_margin"
	android:layout_marginRight="@dimen/circle_margin"		android:layout_marginRight="@dimen/circle_margin"
	android:layout_weight="1" >		android:layout_weight="0.95" >

	<com.android.deskclock.timer.CountingTimerView		<com.android.deskclock.timer.CountingTimerView
	android:id="@+id/stopwatch_time_text"		android:id="@+id/stopwatch_time_text"
	@@ -78,8 +78,7 @@
	<ListView		<ListView
	android:id="@+id/laps_list"		android:id="@+id/laps_list"
	android:layout_weight="1"		android:layout_weight="1"
	android:layout_marginLeft="@dimen/laps_margin"		android:layout_marginRight="@dimen/sw_right_margin"
	android:layout_marginRight="@dimen/laps_margin"
	android:layout_gravity="center"		android:layout_gravity="center"
	android:layout_width="0dip"		android:layout_width="0dip"
	android:layout_height="wrap_content" />		android:layout_height="wrap_content" />

res/layout-land/time_setup_view.xml

0 → 100644

+138 −0

Original line number	Original line	Diff line number	Diff line
			<?xml version="1.0" encoding="utf-8"?>
			<!-- Copyright (C) 2012 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.
			-->
			<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
			android:layout_width="match_parent"
			android:layout_height="match_parent"
			android:orientation="vertical">
			<LinearLayout
			android:layout_width="match_parent"
			android:layout_height="wrap_content">
			<com.android.deskclock.timer.TimerView
			android:id="@+id/timer_time_text"
			android:layout_width="0dip"
			android:layout_weight="2"
			android:layout_height="wrap_content"
			android:paddingTop="@dimen/medium_font_padding"
			android:paddingBottom="@dimen/medium_font_padding"
			android:paddingLeft="@dimen/timer_padding_left"
			android:layout_gravity="center"
			android:gravity="top"
			android:baselineAligned="false">
			<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
			android:id="@+id/hours_label"
			android:singleLine="true"
			android:ellipsize="none"
			style="@style/label"
			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
			android:id="@+id/minutes_tens"
			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
			android:id="@+id/minutes_label"
			android:singleLine="true"
			android:ellipsize="none"
			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
			android:id="@+id/seconds"
			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
			android:id="@+id/seconds_label"
			android:singleLine="true"
			android:ellipsize="none"
			style="@style/label"
			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>
			<ImageButton
			android:id="@+id/delete"
			android:layout_width="0dip"
			android:layout_weight="1"
			android:gravity="center"
			android:layout_gravity="center"
			android:paddingBottom="@dimen/body_font_padding"
			android:src="@drawable/ic_backspace"
			android:background="@drawable/item_background"
			android:contentDescription="@string/timer_delete"
			android:layout_height="match_parent" />
			</LinearLayout>
			<View
			android:layout_width="match_parent"
			android:layout_height="1dip"
			android:layout_marginBottom="8dip"
			android:background="#28ffffff" />
			<include layout="@layout/three_keys_view"
			android:id="@+id/first" />

			<include layout="@layout/three_keys_view"
			android:id="@+id/second"/>

			<include layout="@layout/three_keys_view"
			android:id="@+id/third"/>

			<include layout="@layout/three_keys_view"
			android:id="@+id/fourth" />

			<View
			android:layout_width="match_parent"
			android:layout_height="1dip"
			android:layout_marginTop="16dip" />
			</LinearLayout>

res/layout-land/timer_list_item.xml

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -27,8 +27,8 @@
	android:id="@+id/timer_frame"		android:id="@+id/timer_frame"
	android:layout_width="@dimen/timer_circle_width"		android:layout_width="@dimen/timer_circle_width"
	android:layout_height="@dimen/timer_circle_diameter"		android:layout_height="@dimen/timer_circle_diameter"
	android:layout_marginLeft="@dimen/circle_margin"		android:layout_marginLeft="@dimen/timer_circle_margin"
	android:layout_marginRight="@dimen/circle_margin">		android:layout_marginRight="@dimen/timer_circle_margin">

	<com.android.deskclock.CircleTimerView		<com.android.deskclock.CircleTimerView
	android:id="@+id/timer_time"		android:id="@+id/timer_time"

res/layout/desk_clock_saver.xml

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -29,8 +29,10 @@
	android:orientation="vertical"		android:orientation="vertical"
	android:layout_width="wrap_content"		android:layout_width="wrap_content"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
			android:layout_marginLeft="@dimen/screensaver_margin"
			android:layout_marginRight="@dimen/screensaver_margin"
	android:layout_marginTop="@dimen/time_margin_top"		android:layout_marginTop="@dimen/time_margin_top"
	android:layout_marginBottom="@dimen/time_margin_bottom">		android:layout_marginBottom="@dimen/screensaver_margin">

	<include layout="@layout/desk_clock_time_date"		<include layout="@layout/desk_clock_time_date"
	android:id="@+id/digital_clock"		android:id="@+id/digital_clock"
	@@ -38,6 +40,7 @@
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:gravity="center"		android:gravity="center"
	android:layout_gravity="center"		android:layout_gravity="center"
			android:layout_marginBottom="@dimen/digital_margin_bottom"
	/>		/>
	<com.android.deskclock.AnalogClock		<com.android.deskclock.AnalogClock
	android:id="@+id/analog_clock"		android:id="@+id/analog_clock"