Turning alarm config into dialog activities (fb6883da) · Commits · e / os / android_packages_apps_DeskClock

AndroidManifest.xml

+6 −3

Original line number	Original line	Diff line number	Diff line
	@@ -41,6 +41,7 @@

	<activity android:name="AlarmClock"		<activity android:name="AlarmClock"
	android:label="@string/alarm_list_title"		android:label="@string/alarm_list_title"
			android:theme="@style/AlarmClockTheme"
	android:taskAffinity=""		android:taskAffinity=""
	android:excludeFromRecents="true"		android:excludeFromRecents="true"
	android:configChanges="orientation\|keyboardHidden\|keyboard\|navigation"		android:configChanges="orientation\|keyboardHidden\|keyboard\|navigation"
	@@ -60,12 +61,14 @@
	</intent-filter>		</intent-filter>
	</activity>		</activity>

	<activity android:name="SetAlarm" android:label="@string/set_alarm"		<activity android:name="SetAlarm"
			android:label="@string/set_alarm"
			android:theme="@style/SetAlarmTheme"
	android:configChanges="orientation\|keyboardHidden\|keyboard\|navigation" />		android:configChanges="orientation\|keyboardHidden\|keyboard\|navigation" />

	<activity android:name="AlarmAlert"		<activity android:name="AlarmAlert"
	android:excludeFromRecents="true"		android:excludeFromRecents="true"
	android:theme="@style/alarm_alert"		android:theme="@style/AlarmAlertTheme"
	android:launchMode="singleInstance"		android:launchMode="singleInstance"
	android:taskAffinity=""		android:taskAffinity=""
	android:configChanges="orientation\|keyboardHidden\|keyboard\|navigation"/>		android:configChanges="orientation\|keyboardHidden\|keyboard\|navigation"/>
	@@ -75,7 +78,7 @@
	with the wallpaper background. -->		with the wallpaper background. -->
	<activity android:name="AlarmAlertFullScreen"		<activity android:name="AlarmAlertFullScreen"
	android:excludeFromRecents="true"		android:excludeFromRecents="true"
	android:theme="@android:style/Theme.Wallpaper.NoTitleBar"		android:theme="@style/AlarmAlertFullScreenTheme"
	android:launchMode="singleInstance"		android:launchMode="singleInstance"
	android:taskAffinity=""		android:taskAffinity=""
	android:configChanges="orientation\|keyboardHidden\|keyboard\|navigation"/>		android:configChanges="orientation\|keyboardHidden\|keyboard\|navigation"/>

res/layout-xlarge-land/desk_clock.xml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -50,7 +50,7 @@
	android:layout_alignBaseline="@id/timeDisplay"		android:layout_alignBaseline="@id/timeDisplay"
	android:layout_marginLeft="32dip"		android:layout_marginLeft="32dip"
	android:textSize="160sp"		android:textSize="160sp"
	android:textColor="#999999"		android:textColor="#FFFFFFFF"
	fontHighlightsEnabled="false"		fontHighlightsEnabled="false"
	shortForm="true" />		shortForm="true" />

res/layout-xlarge/alarm_clock.xml

0 → 100644

+67 −0

Original line number	Original line	Diff line number	Diff line
			<?xml version="1.0" encoding="utf-8"?>
			<!-- Copyright (C) 2010 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:id="@+id/base_layout"
			android:layout_width="400dip"
			android:layout_height="match_parent"
			android:orientation="vertical">

			<ListView
			android:id="@+id/alarms_list"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:layout_weight="1"
			android:layout_marginLeft="16dip"
			android:layout_marginRight="16dip" />

			<View
			android:layout_width="match_parent"
			android:layout_height="1dip"
			android:layout_marginLeft="16dip"
			android:layout_marginRight="16dip"
			android:background="?android:attr/dividerHorizontal" />

			<LinearLayout
			android:id="@+id/add_alarm"
			android:clickable="true"
			android:focusable="true"
			android:layout_width="match_parent"
			android:layout_height="?android:attr/listPreferredItemHeight"
			android:orientation="horizontal"
			android:background="?android:attr/listChoiceBackgroundIndicator">

			<ImageView
			android:layout_height="match_parent"
			android:layout_width="96dip"
			android:layout_marginRight="8dip"
			android:gravity="center"
			android:scaleType="center"
			android:src="@drawable/add_alarm" />

			<TextView
			android:duplicateParentState="true"
			android:layout_height="match_parent"
			android:layout_width="wrap_content"
			android:gravity="center_vertical"
			android:textAppearance="?android:attr/textAppearanceLarge"
			android:textColor="?android:attr/textColorPrimary"
			android:text="@string/add_alarm" />

			</LinearLayout>

			</LinearLayout>

res/layout-xlarge/desk_clock.xml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -50,7 +50,7 @@
	android:layout_alignBaseline="@id/timeDisplay"		android:layout_alignBaseline="@id/timeDisplay"
	android:layout_marginLeft="32dip"		android:layout_marginLeft="32dip"
	android:textSize="90sp"		android:textSize="90sp"
	android:textColor="#999999"		android:textColor="#FFFFFFFF"
	fontHighlightsEnabled="false"		fontHighlightsEnabled="false"
	shortForm="true" />		shortForm="true" />

res/layout/alarm_alert.xml

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -57,13 +57,15 @@
	android:layout_width="wrap_content"		android:layout_width="wrap_content"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:textSize="64sp"		android:textSize="64sp"
	android:textColor="?android:attr/textColorPrimary"/>		android:textColor="?android:attr/textColorPrimary"
			android:layout_marginRight="6dip"/>

	<com.android.deskclock.AndroidClockTextView		<com.android.deskclock.AndroidClockTextView
	android:id="@+id/am_pm"		android:id="@+id/am_pm"
	android:layout_width="wrap_content"		android:layout_width="wrap_content"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:textStyle="bold"		android:textStyle="bold"
			android:textSize="32sp"
	android:textAppearance="?android:attr/textAppearanceMedium"		android:textAppearance="?android:attr/textAppearanceMedium"
	android:textColor="?android:attr/textColorPrimary"/>		android:textColor="?android:attr/textColorPrimary"/>