Merge "AOD clock and notification animation" into pi-dev (22db17a9) · Commits · e / os / android_frameworks_base

core/res/res/values/dimens.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -207,6 +207,9 @@
		<!-- The bottom padding for the notification header -->
		<dimen name="notification_header_padding_bottom">16dp</dimen>

		<!-- The margin at the top of the notification header when dozing. -->
		<dimen name="notification_header_margin_top_ambient">3dp</dimen>

		<!-- The margin at the bottom of the notification header. -->
		<dimen name="notification_header_margin_bottom">0dp</dimen>

+1 −0

Original line number	Diff line number	Diff line
		@@ -1309,6 +1309,7 @@ please see styles_device_defaults.xml.
		</style>

		<style name="Notification.Header.Ambient">
		<item name="layout_marginTop">@dimen/notification_header_margin_top_ambient</item>
		<item name="gravity">top\|center_horizontal</item>
		</style>

+1 −2

Original line number	Diff line number	Diff line
		@@ -46,8 +46,7 @@
		style="@style/widget_big_thin"
		android:format12Hour="@string/keyguard_widget_12_hours_format"
		android:format24Hour="@string/keyguard_widget_24_hours_format"
		android:baselineAligned="true"
		android:layout_marginBottom="@dimen/bottom_text_spacing_digital" />
		android:baselineAligned="true" />

		<include layout="@layout/keyguard_status_area" />
		<ImageView

+4 −2

Original line number	Diff line number	Diff line
		@@ -28,12 +28,14 @@
		android:clipToPadding="false"
		android:orientation="vertical"
		android:layout_centerHorizontal="true">
		<TextView android:id="@+id/title"
		<com.android.systemui.statusbar.AlphaOptimizedTextView
		android:id="@+id/title"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginBottom="7dp"
		android:layout_marginBottom="@dimen/widget_title_bottom_margin"
		android:paddingStart="64dp"
		android:paddingEnd="64dp"
		android:visibility="gone"
		android:textColor="?attr/wallpaperTextColor"
		android:theme="@style/TextAppearance.Keyguard"
		/>

+1 −5

Original line number	Diff line number	Diff line
		@@ -67,21 +67,17 @@
		android:singleLine="true"
		style="@style/widget_big_thin"
		android:format12Hour="@string/keyguard_widget_12_hours_format"
		android:format24Hour="@string/keyguard_widget_24_hours_format"
		android:layout_marginBottom="@dimen/bottom_text_spacing_digital" />
		android:format24Hour="@string/keyguard_widget_24_hours_format" />
		<View
		android:id="@+id/clock_separator"
		android:layout_width="@dimen/widget_separator_width"
		android:layout_height="@dimen/widget_separator_thickness"
		android:layout_marginTop="22dp"
		android:layout_below="@id/clock_view"
		android:background="#f00"
		android:backgroundTint="?attr/wallpaperTextColor"
		android:layout_centerHorizontal="true" />

		<include layout="@layout/keyguard_status_area"
		android:id="@+id/keyguard_status_area"
		android:layout_marginTop="20dp"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_below="@id/clock_separator" />