DeskClock ViewPager layout (65d7dfb9) · Commits · e / os / android_packages_apps_DeskClock

Android.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -13,6 +13,8 @@ LOCAL_OVERRIDES_PACKAGES := AlarmClock

		LOCAL_SDK_VERSION := 16

		LOCAL_PROGUARD_FLAG_FILES := proguard.flags

		include $(BUILD_PACKAGE)

		# Use the following include to make our test apk.

AndroidManifest.xml

+13 −3

Original line number	Diff line number	Diff line
		@@ -49,6 +49,16 @@
		android:targetActivity="com.android.deskclock.AlarmClock"
		android:exported="true" />

		<activity android:name="HelpActivity"
		android:label="@string/help"
		android:taskAffinity=""
		android:excludeFromRecents="true"
		>
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		</intent-filter>
		</activity>

		<activity android:name="SettingsActivity"
		android:label="@string/settings"
		android:taskAffinity=""

proguard.flags

0 → 100644

+8 −0

Original line number	Diff line number	Diff line
		-keepclassmembers class com.android.deskclock.StopwatchFragment {
		*** stopWatchOnClickRight(...);
		*** stopWatchOnClickLeft(...);
		}

		-keepclassmembers class com.android.deskclock.DeskClock {
		*** clockButtonsOnClick(...);
		}
		No newline at end of file

res/layout/clock_fragment.xml

0 → 100644

+124 −0

Original line number	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.
		-->

		<!-- This is the alarm clock in desk dock mode. It shows the time in large
		type, plus information about active alarms and charge status. It can
		also show some additional status information (e.g. weather data).
		Buttons are provided to access alarms, music, and other useful functions.
		-->
		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="vertical" >
		<FrameLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_weight="1"
		android:id="@+id/window_touch"
		>

		<View
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:background="#00000000"
		android:visibility="visible"
		android:clickable="false"
		/>

		<!-- the top padding accounts for the status bar area -->
		<LinearLayout
		android:id="@+id/desk_clock"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="vertical"
		android:paddingTop="25dip"
		>

		<!-- nightmode button, the time, the date, and the next alarm -->
		<LinearLayout
		android:orientation="vertical"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_weight="1"
		android:gravity="center_vertical\|right"
		>
		<include layout="@layout/desk_clock_time_date"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginTop="@dimen/time_margin_top"
		android:layout_marginBottom="@dimen/time_margin_bottom"
		android:gravity="right"
		/>
		<TextView android:id="@+id/nextAlarm"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginRight="@dimen/time_margin_right"
		android:padding="@dimen/font_margin_adjust"
		android:gravity="right"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:textSize="@dimen/next_alarm_text_size"
		android:layout_marginTop="@dimen/next_alarm_margin_top"
		android:drawablePadding="4dip"
		android:drawableLeft="@drawable/ic_lock_idle_alarm"
		android:textColor="@color/white"
		android:background="?android:attr/listChoiceBackgroundIndicator"
		/>
		</LinearLayout>

		<include layout="@layout/desk_clock_battery"
		android:layout_height="wrap_content"
		android:layout_width="match_parent"
		android:layout_weight="0"
		android:layout_marginLeft="4dip"
		/>
		</LinearLayout>

		<View android:id="@+id/window_tint"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:background="#CC000000"
		android:visibility="visible"
		android:clickable="false"
		/>
		</FrameLayout>

		<LinearLayout
		android:gravity="bottom"
		android:layout_width="match_parent"
		android:layout_height="wrap_content" >
		<Button
		android:id="@+id/alarms_button"
		android:text="@string/button_alarms"
		android:onClick="clockButtonsOnClick"
		android:layout_width="0dip"
		android:layout_weight="1"
		android:layout_height="wrap_content" />
		<Button
		android:id="@+id/cities_button"
		android:text="@string/button_cities"
		android:onClick="clockButtonsOnClick"
		android:layout_width="0dip"
		android:layout_weight="1"
		android:layout_height="wrap_content" />
		<Button
		android:id="@+id/menu_button"
		android:text="@string/button_menu"
		android:onClick="clockButtonsOnClick"
		android:layout_width="0dip"
		android:layout_weight="1"
		android:layout_height="wrap_content" />
		</LinearLayout>
		</LinearLayout>

res/layout/desk_clock.xml

+2 −70

Original line number	Diff line number	Diff line
		@@ -19,75 +19,7 @@
		also show some additional status information (e.g. weather data).
		Buttons are provided to access alarms, music, and other useful functions.
		-->
		<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
		<ViewPager xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:id="@+id/window_touch"
		>

		<View
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:background="#00000000"
		android:visibility="visible"
		android:clickable="false"
		/>

		<!-- the top padding accounts for the status bar area -->
		<LinearLayout
		android:id="@+id/desk_clock"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="vertical"
		android:paddingTop="25dip"
		>

		<!-- nightmode button, the time, the date, and the next alarm -->
		<LinearLayout
		android:orientation="vertical"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_weight="1"
		android:gravity="center_vertical\|right"
		>
		<include layout="@layout/desk_clock_time_date"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginTop="@dimen/time_margin_top"
		android:layout_marginBottom="@dimen/time_margin_bottom"
		android:gravity="right"
		/>
		<TextView android:id="@+id/nextAlarm"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginRight="@dimen/time_margin_right"
		android:padding="@dimen/font_margin_adjust"
		android:gravity="right"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:textSize="@dimen/next_alarm_text_size"
		android:layout_marginTop="@dimen/next_alarm_margin_top"
		android:drawablePadding="4dip"
		android:drawableLeft="@drawable/ic_lock_idle_alarm"
		android:textColor="@color/white"
		android:background="?android:attr/listChoiceBackgroundIndicator"
		/>
		</LinearLayout>

		<include layout="@layout/desk_clock_battery"
		android:layout_height="wrap_content"
		android:layout_width="match_parent"
		android:layout_weight="0"
		android:layout_marginLeft="4dip"
		/>

		</LinearLayout>

		<View android:id="@+id/window_tint"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:background="#CC000000"
		android:visibility="visible"
		android:clickable="false"
		/>

		</FrameLayout>
		android:id="@+id/desk_clock_pager" />