Merge "Putting battery and status icons of shade header in one container" into... (ec426e58) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/layout/combined_qs_header.xml

+23 −30

Original line number	Original line	Diff line number	Diff line
	@@ -74,7 +74,7 @@ frame when animating QS <-> QQS transition
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:id="@+id/barrier"		android:id="@+id/barrier"
	app:barrierDirection="start"		app:barrierDirection="start"
	app:constraint_referenced_ids="statusIcons,privacy_container" />		app:constraint_referenced_ids="shade_header_system_icons,privacy_container" />

	<com.android.systemui.statusbar.policy.Clock		<com.android.systemui.statusbar.policy.Clock
	android:id="@+id/clock"		android:id="@+id/clock"
	@@ -108,46 +108,39 @@ frame when animating QS <-> QQS transition
	<include		<include
	android:id="@+id/carrier_group"		android:id="@+id/carrier_group"
	layout="@layout/shade_carrier_group"		layout="@layout/shade_carrier_group"
	app:layout_constraintHeight_min="@dimen/large_screen_shade_header_min_height"
	android:minHeight="@dimen/large_screen_shade_header_min_height"
	app:layout_constraintWidth_min="48dp"
	android:layout_width="0dp"		android:layout_width="0dp"
	android:layout_height="0dp"		android:layout_height="0dp"
	app:layout_constrainedWidth="true"
	android:layout_gravity="end\|center_vertical"		android:layout_gravity="end\|center_vertical"
	android:layout_marginStart="8dp"		android:layout_marginStart="8dp"
	app:layout_constraintStart_toEndOf="@id/date"
	app:layout_constraintEnd_toStartOf="@id/statusIcons"
	app:layout_constraintTop_toTopOf="@id/clock"
	app:layout_constraintBottom_toBottomOf="parent"		app:layout_constraintBottom_toBottomOf="parent"
			app:layout_constraintEnd_toStartOf="@id/shade_header_system_icons"
	app:layout_constraintHorizontal_bias="1"		app:layout_constraintHorizontal_bias="1"
	/>		app:layout_constraintStart_toEndOf="@id/date"
			app:layout_constraintTop_toTopOf="@id/clock" />

	<com.android.systemui.statusbar.phone.StatusIconContainer		<LinearLayout
	android:id="@+id/statusIcons"		android:id="@+id/shade_header_system_icons"
	app:layout_constraintHeight_min="@dimen/large_screen_shade_header_min_height"
	android:paddingEnd="@dimen/signal_cluster_battery_padding"
	android:layout_width="wrap_content"		android:layout_width="wrap_content"
			app:layout_constraintHeight_min="@dimen/large_screen_shade_header_min_height"
	android:layout_height="@dimen/large_screen_shade_header_min_height"		android:layout_height="@dimen/large_screen_shade_header_min_height"
	app:layout_constraintStart_toEndOf="@id/carrier_group"		android:clickable="true"
	app:layout_constraintEnd_toStartOf="@id/batteryRemainingIcon"		android:orientation="horizontal"
	app:layout_constraintTop_toTopOf="@id/clock"
	app:layout_constraintBottom_toBottomOf="parent"		app:layout_constraintBottom_toBottomOf="parent"
	app:layout_constraintHorizontal_bias="1"		app:layout_constraintEnd_toEndOf="@id/privacy_container"
	/>		app:layout_constraintTop_toTopOf="@id/clock">

			<com.android.systemui.statusbar.phone.StatusIconContainer
			android:id="@+id/statusIcons"
			android:layout_width="wrap_content"
			android:layout_height="match_parent"
			android:paddingEnd="@dimen/signal_cluster_battery_padding" />

	<com.android.systemui.battery.BatteryMeterView		<com.android.systemui.battery.BatteryMeterView
	android:id="@+id/batteryRemainingIcon"		android:id="@+id/batteryRemainingIcon"
	android:layout_width="wrap_content"		android:layout_width="wrap_content"
	android:layout_height="@dimen/large_screen_shade_header_min_height"		android:layout_height="match_parent"
	app:layout_constraintHeight_min="@dimen/large_screen_shade_header_min_height"		app:textAppearance="@style/TextAppearance.QS.Status" />
	app:layout_constrainedWidth="true"		</LinearLayout>
	app:textAppearance="@style/TextAppearance.QS.Status"
	app:layout_constraintStart_toEndOf="@id/statusIcons"
	app:layout_constraintEnd_toEndOf="parent"
	app:layout_constraintTop_toTopOf="@id/clock"
	app:layout_constraintBottom_toBottomOf="parent"
	/>

	<FrameLayout		<FrameLayout
	android:id="@+id/privacy_container"		android:id="@+id/privacy_container"

packages/SystemUI/res/xml/combined_qs_header_scene.xml

+6 −34

Original line number	Original line	Diff line number	Diff line
	@@ -53,56 +53,28 @@
	android:alpha="0"		android:alpha="0"
	/>		/>
	<KeyPosition		<KeyPosition
			app:motionTarget="@id/shade_header_system_icons"
	app:keyPositionType="deltaRelative"		app:keyPositionType="deltaRelative"
	app:percentX="0"		app:percentX="0"
	app:percentY="@dimen/percent_displacement_at_fade_out"		app:percentY="@dimen/percent_displacement_at_fade_out"
	app:framePosition="@integer/fade_out_complete_frame"		app:framePosition="@integer/fade_out_complete_frame"
	app:sizePercent="0"		app:sizePercent="0"
	app:curveFit="linear"		app:curveFit="linear" />
	app:motionTarget="@id/statusIcons" />
	<KeyPosition		<KeyPosition
			app:motionTarget="@id/shade_header_system_icons"
	app:keyPositionType="deltaRelative"		app:keyPositionType="deltaRelative"
	app:percentX="1"		app:percentX="1"
	app:percentY="0.5"		app:percentY="0.5"
	app:framePosition="50"		app:framePosition="50"
	app:sizePercent="1"		app:sizePercent="1"
	app:curveFit="linear"		app:curveFit="linear" />
	app:motionTarget="@id/statusIcons" />
	<KeyAttribute
	app:motionTarget="@id/statusIcons"
	app:framePosition="@integer/fade_out_complete_frame"
	android:alpha="0"
	/>
	<KeyAttribute
	app:motionTarget="@id/statusIcons"
	app:framePosition="@integer/fade_in_start_frame"
	android:alpha="0"
	/>
	<KeyPosition
	app:keyPositionType="deltaRelative"
	app:percentX="0"
	app:percentY="@dimen/percent_displacement_at_fade_out"
	app:framePosition="@integer/fade_out_complete_frame"
	app:percentWidth="1"
	app:percentHeight="1"
	app:curveFit="linear"
	app:motionTarget="@id/batteryRemainingIcon" />
	<KeyPosition
	app:keyPositionType="deltaRelative"
	app:percentX="1"
	app:percentY="0.5"
	app:framePosition="50"
	app:percentWidth="1"
	app:percentHeight="1"
	app:curveFit="linear"
	app:motionTarget="@id/batteryRemainingIcon" />
	<KeyAttribute		<KeyAttribute
	app:motionTarget="@id/batteryRemainingIcon"		app:motionTarget="@id/shade_header_system_icons"
	app:framePosition="@integer/fade_out_complete_frame"		app:framePosition="@integer/fade_out_complete_frame"
	android:alpha="0"		android:alpha="0"
	/>		/>
	<KeyAttribute		<KeyAttribute
	app:motionTarget="@id/batteryRemainingIcon"		app:motionTarget="@id/shade_header_system_icons"
	app:framePosition="@integer/fade_in_start_frame"		app:framePosition="@integer/fade_in_start_frame"
	android:alpha="0"		android:alpha="0"
	/>		/>

packages/SystemUI/res/xml/large_screen_shade_header.xml

+3 −14

Original line number	Original line	Diff line number	Diff line
	@@ -45,7 +45,7 @@
	android:layout_height="0dp"		android:layout_height="0dp"
	android:layout_gravity="end\|center_vertical"		android:layout_gravity="end\|center_vertical"
	app:layout_constraintBottom_toBottomOf="parent"		app:layout_constraintBottom_toBottomOf="parent"
	app:layout_constraintEnd_toStartOf="@id/statusIcons"		app:layout_constraintEnd_toStartOf="@id/shade_header_system_icons"
	app:layout_constraintStart_toEndOf="@id/date"		app:layout_constraintStart_toEndOf="@id/date"
	app:layout_constraintTop_toTopOf="parent"		app:layout_constraintTop_toTopOf="parent"
	app:layout_constraintWidth_default="wrap"		app:layout_constraintWidth_default="wrap"
	@@ -53,28 +53,17 @@
	<PropertySet android:alpha="1" />		<PropertySet android:alpha="1" />
	</Constraint>		</Constraint>

	<Constraint android:id="@+id/statusIcons">		<Constraint android:id="@+id/shade_header_system_icons">
	<Layout		<Layout
	android:layout_width="wrap_content"		android:layout_width="wrap_content"
	android:layout_height="@dimen/large_screen_shade_header_min_height"		android:layout_height="@dimen/large_screen_shade_header_min_height"
	app:layout_constraintBottom_toBottomOf="parent"		app:layout_constraintBottom_toBottomOf="parent"
	app:layout_constraintEnd_toStartOf="@id/batteryRemainingIcon"		app:layout_constraintEnd_toStartOf="@id/privacy_container"
	app:layout_constraintTop_toTopOf="parent"		app:layout_constraintTop_toTopOf="parent"
	app:layout_constraintEnd_toEndOf="@id/carrier_group"/>		app:layout_constraintEnd_toEndOf="@id/carrier_group"/>
	<PropertySet android:alpha="1" />		<PropertySet android:alpha="1" />
	</Constraint>		</Constraint>

	<Constraint android:id="@+id/batteryRemainingIcon">
	<Layout
	android:layout_width="wrap_content"
	android:layout_height="0dp"
	app:layout_constraintHeight_min="@dimen/large_screen_shade_header_min_height"
	app:layout_constraintBottom_toBottomOf="parent"
	app:layout_constraintEnd_toStartOf="@id/privacy_container"
	app:layout_constraintTop_toTopOf="parent" />
	<PropertySet android:alpha="1" />
	</Constraint>

	<Constraint android:id="@+id/privacy_container">		<Constraint android:id="@+id/privacy_container">
	<Layout		<Layout
	android:layout_width="wrap_content"		android:layout_width="wrap_content"

packages/SystemUI/res/xml/qqs_header.xml

+1 −16

Original line number	Original line	Diff line number	Diff line
	@@ -54,27 +54,12 @@
	</Constraint>		</Constraint>

	<Constraint		<Constraint
	android:id="@+id/statusIcons">		android:id="@+id/shade_header_system_icons">
	<Layout		<Layout
	android:layout_width="wrap_content"		android:layout_width="wrap_content"
	android:layout_height="@dimen/new_qs_header_non_clickable_element_height"		android:layout_height="@dimen/new_qs_header_non_clickable_element_height"
	app:layout_constraintHeight_min="@dimen/new_qs_header_non_clickable_element_height"		app:layout_constraintHeight_min="@dimen/new_qs_header_non_clickable_element_height"
	app:layout_constraintStart_toEndOf="@id/date"		app:layout_constraintStart_toEndOf="@id/date"
	app:layout_constraintEnd_toStartOf="@id/batteryRemainingIcon"
	app:layout_constraintTop_toTopOf="parent"
	app:layout_constraintBottom_toBottomOf="@id/qqs_header_bottom_guideline"
	app:layout_constraintHorizontal_bias="1"
	app:layout_constraintHorizontal_chainStyle="packed"
	/>
	</Constraint>

	<Constraint
	android:id="@+id/batteryRemainingIcon">
	<Layout
	android:layout_width="wrap_content"
	android:layout_height="@dimen/new_qs_header_non_clickable_element_height"
	app:layout_constraintHeight_min="@dimen/new_qs_header_non_clickable_element_height"
	app:layout_constraintStart_toEndOf="@id/statusIcons"
	app:layout_constraintEnd_toEndOf="@id/end_guide"		app:layout_constraintEnd_toEndOf="@id/end_guide"
	app:layout_constraintTop_toTopOf="parent"		app:layout_constraintTop_toTopOf="parent"
	app:layout_constraintBottom_toBottomOf="@id/qqs_header_bottom_guideline"		app:layout_constraintBottom_toBottomOf="@id/qqs_header_bottom_guideline"

packages/SystemUI/res/xml/qs_header.xml

+2 −16

Original line number	Original line	Diff line number	Diff line
	@@ -59,7 +59,7 @@
	/>		/>
	</Constraint>		</Constraint>

	<!-- LargeScreenShadeHeaderController helps with managing clock width to layout this view -->		<!-- ShadeHeaderController helps with managing clock width to layout this view -->
	<Constraint		<Constraint
	android:id="@+id/carrier_group">		android:id="@+id/carrier_group">
	<Layout		<Layout
	@@ -78,25 +78,11 @@
	</Constraint>		</Constraint>

	<Constraint		<Constraint
	android:id="@+id/statusIcons">		android:id="@+id/shade_header_system_icons">
	<Layout		<Layout
	android:layout_width="0dp"		android:layout_width="0dp"
	android:layout_height="@dimen/new_qs_header_non_clickable_element_height"		android:layout_height="@dimen/new_qs_header_non_clickable_element_height"
	app:layout_constraintWidth_default="wrap"		app:layout_constraintWidth_default="wrap"
	app:layout_constraintStart_toEndOf="@id/date"
	app:layout_constraintEnd_toStartOf="@id/batteryRemainingIcon"
	app:layout_constraintTop_toTopOf="@id/date"
	app:layout_constraintBottom_toBottomOf="@id/date"
	/>
	</Constraint>

	<Constraint
	android:id="@+id/batteryRemainingIcon">
	<Layout
	android:layout_width="0dp"
	android:layout_height="@dimen/new_qs_header_non_clickable_element_height"
	app:layout_constraintWidth_default="wrap"
	app:layout_constraintHeight_min="@dimen/new_qs_header_non_clickable_element_height"
	app:layout_constraintEnd_toEndOf="parent"		app:layout_constraintEnd_toEndOf="parent"
	app:layout_constraintTop_toTopOf="@id/date"		app:layout_constraintTop_toTopOf="@id/date"
	app:layout_constraintBottom_toBottomOf="@id/date"		app:layout_constraintBottom_toBottomOf="@id/date"