Merge "Replace lights out mode with screensaver." into ics-ub-clock-amazon (416b210e) · Commits · e / os / android_packages_apps_DeskClock

AndroidManifest.xml

+6 −0

Original line number	Diff line number	Diff line
		@@ -107,6 +107,12 @@
		android:screenOrientation="nosensor"
		android:configChanges="orientation\|screenSize\|keyboardHidden\|keyboard\|navigation"/>

		<activity android:name="ScreensaverActivity"
		android:excludeFromRecents="true"
		android:taskAffinity=""
		android:theme="@style/ScreensaverActivityTheme"
		android:configChanges="orientation\|screenSize\|keyboardHidden\|keyboard" />

		<receiver android:name="AlarmReceiver"
		android:exported="false">
		<intent-filter>

res/layout-land/stopwatch_fragment.xml

+0 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		android:id="@+id/stopwatch_circle"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:onClick="clockOnViewClick"
		android:orientation="horizontal"
		android:paddingTop="?android:attr/actionBarSize" >

res/layout/clock_fragment.xml

+0 −1

Original line number	Diff line number	Diff line
		@@ -30,7 +30,6 @@
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="vertical"
		android:onClick="clockOnViewClick"
		>
		<ListView
		android:id="@+id/cities"

res/layout/desk_clock_saver.xml

+107 −22

Original line number	Diff line number	Diff line
		@@ -21,26 +21,111 @@
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:background="#FF000000">
		<LinearLayout
		android:id="@+id/main_digital_clock"
		android:orientation="vertical"
		android:layout_gravity="center"
		android:gravity="center"
		android:layout_marginTop="@dimen/time_margin_top"
		android:layout_marginBottom="@dimen/time_margin_bottom"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		>
		<LinearLayout
		android:id="@+id/digital_clock_extras"
		android:layout_marginLeft="@dimen/label_margin_big"
		android:layout_marginBottom="@dimen/label_margin_big"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:visibility="gone">
		<TextView android:id="@+id/date_digital"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:textColor="@color/clock_white"
		style="@style/label"
		android:gravity="center"
		/>
		<TextView android:id="@+id/slash_digital"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginLeft="@dimen/style_label_space"
		android:layout_marginRight="@dimen/style_label_space"
		android:textColor="@color/clock_gray"
		android:text="@string/slash"
		style="@style/label"
		android:gravity="center"
		/>
		<TextView android:id="@+id/nextAlarm_digital"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:drawablePadding="2dip"
		android:drawableLeft="@drawable/ic_alarm_small"
		android:textColor="@color/clock_gray"
		style="@style/label"
		android:gravity="center"
		/>
		</LinearLayout>
		<include layout="@layout/desk_clock_time_date"
		android:id="@+id/digital_clock"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center"
		/>
		</LinearLayout>

		<LinearLayout
		android:id="@+id/main_analog_clock"
		android:orientation="vertical"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginTop="@dimen/time_margin_top"
		android:layout_marginBottom="@dimen/time_margin_bottom"
		/>
		>
		<com.android.deskclock.AnalogClock
		android:id="@+id/analog_clock"
		android:layout_width="@dimen/analog_clock_diameter"
		android:layout_height="@dimen/analog_clock_diameter"
		android:layout_gravity="center"
		android:dial="@drawable/clock_analog_dial"
		android:hand_hour="@drawable/clock_analog_hour"
		android:hand_minute="@drawable/clock_analog_minute"
		android:layout_marginTop="@dimen/time_margin_top"
		android:layout_marginBottom="@dimen/time_margin_bottom"
		dc:jewelRadius="5dp"
		dc:jewelOffset="23dp"
		dc:jewelColor="@color/clock_white"
		android:dial="@drawable/clock_analog_dial"
		android:hand_hour="@drawable/clock_analog_hour"
		android:hand_minute="@drawable/clock_analog_minute"
		android:layout_marginBottom="@dimen/time_margin_bottom"/>
		<LinearLayout
		android:id="@+id/analog_clock_extras"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center"
		android:gravity="center"
		android:visibility="gone">
		<TextView android:id="@+id/date"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:textColor="@color/clock_white"
		style="@style/label"
		android:gravity="center"
		/>
		<TextView android:id="@+id/slash"
		android:text="@string/slash"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:textColor="@color/clock_gray"
		android:layout_marginLeft="4dip"
		android:layout_marginRight="4dip"
		style="@style/label"
		android:gravity="center"
		/>
		<TextView android:id="@+id/nextAlarm"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:drawablePadding="2dip"
		android:drawableLeft="@drawable/ic_alarm_small"
		android:textColor="@color/clock_gray"
		style="@style/label"
		android:gravity="center"
		/>
		</LinearLayout>
		</LinearLayout>
		</LinearLayout>

res/layout/main_clock_frame.xml

+1 −2

Original line number	Diff line number	Diff line
		@@ -38,7 +38,6 @@
		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginBottom="@dimen/medium_space"
		android:gravity="center">
		<TextView android:id="@+id/date"
		android:layout_width="wrap_content"
		@@ -114,7 +113,7 @@
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center"
		android:layout_marginBottom="@dimen/medium_space"
		android:layout_marginBottom="@dimen/medium_space_bottom"
		/>
		</LinearLayout>
		</FrameLayout>
		No newline at end of file