Merge changes I3e8594f6,I2c6d40ee into rvc-dev am: 08327f1659 am: ae5b0f2974... (4535a847) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/layout/people_strip.xml

+10 −2

Original line number	Diff line number	Diff line
		@@ -31,13 +31,16 @@
		android:layout_height="match_parent"
		android:layout_marginEnd="8dp"
		android:gravity="bottom"
		android:orientation="horizontal">
		android:orientation="horizontal"
		android:forceHasOverlappingRendering="false"
		android:clipChildren="false">

		<FrameLayout
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:gravity="start\|center_vertical"
		android:layout_weight="1">
		android:layout_weight="1"
		android:forceHasOverlappingRendering="false">

		<TextView
		style="@style/TextAppearance.NotificationSectionHeaderButton"
		@@ -53,6 +56,7 @@
		android:layout_height="48dp"
		android:padding="8dp"
		android:scaleType="fitCenter"
		android:forceHasOverlappingRendering="false"
		/>

		<ImageView
		@@ -60,6 +64,7 @@
		android:layout_height="48dp"
		android:padding="8dp"
		android:scaleType="fitCenter"
		android:forceHasOverlappingRendering="false"
		/>

		<ImageView
		@@ -67,6 +72,7 @@
		android:layout_height="48dp"
		android:padding="8dp"
		android:scaleType="fitCenter"
		android:forceHasOverlappingRendering="false"
		/>

		<ImageView
		@@ -74,6 +80,7 @@
		android:layout_height="48dp"
		android:padding="8dp"
		android:scaleType="fitCenter"
		android:forceHasOverlappingRendering="false"
		/>

		<ImageView
		@@ -81,6 +88,7 @@
		android:layout_height="48dp"
		android:padding="8dp"
		android:scaleType="fitCenter"
		android:forceHasOverlappingRendering="false"
		/>

		</LinearLayout>

+2 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,8 @@
		android:layout_gravity="bottom"
		android:gravity="center_vertical"
		android:orientation="horizontal"
		android:forceHasOverlappingRendering="false"
		android:clipChildren="false"
		>
		<include layout="@layout/status_bar_notification_section_header_contents"/>
		</LinearLayout>

+2 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@
		android:id="@+id/header_label"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:forceHasOverlappingRendering="false"
		android:text="@string/notification_section_header_gentle"
		/>

		@@ -41,5 +42,6 @@
		android:tint="?attr/wallpaperTextColor"
		android:tintMode="src_in"
		android:visibility="gone"
		android:forceHasOverlappingRendering="false"
		/>
		</merge>

+2 −2

Original line number	Diff line number	Diff line
		@@ -184,8 +184,8 @@
		<!-- Vertical translation of pulsing notification animations -->
		<dimen name="pulsing_notification_appear_translation">10dp</dimen>

		<!-- The amount the content shifts upwards when transforming into the icon -->
		<dimen name="notification_icon_transform_content_shift">32dp</dimen>
		<!-- The amount the content shifts upwards when transforming into the shelf -->
		<dimen name="shelf_transform_content_shift">32dp</dimen>

		<!-- The padding on the bottom of the notifications on the keyguard -->
		<dimen name="keyguard_indication_bottom_padding">12sp</dimen>

+134 −126

File changed.

Preview size limit exceeded, changes collapsed.