Merge "[Media] Update constraints to fix scrubbing." into tm-qpr-dev (3486d72f) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/xml/media_session_expanded.xml

+4 −13

Original line number	Original line	Diff line number	Diff line
	@@ -88,20 +88,18 @@
	The chain is set to "spread" so that the progress bar can be weighted to fill any empty space.		The chain is set to "spread" so that the progress bar can be weighted to fill any empty space.
	-->		-->
	<Constraint		<Constraint
	android:id="@+id/media_scrubbing_elapsed_time"		android:id="@+id/actionPrev"
	android:layout_width="48dp"		android:layout_width="48dp"
	android:layout_height="48dp"		android:layout_height="48dp"
	app:layout_constraintLeft_toLeftOf="parent"		app:layout_constraintLeft_toLeftOf="parent"
	app:layout_constraintRight_toLeftOf="@id/actionPrev"
	app:layout_constraintBottom_toBottomOf="parent"		app:layout_constraintBottom_toBottomOf="parent"
	app:layout_constraintHorizontal_chainStyle="spread" />		app:layout_constraintHorizontal_chainStyle="spread" />

	<Constraint		<Constraint
	android:id="@+id/actionPrev"		android:id="@+id/media_scrubbing_elapsed_time"
	android:layout_width="48dp"		android:layout_width="48dp"
	android:layout_height="48dp"		android:layout_height="48dp"
	app:layout_constraintLeft_toRightOf="@id/media_scrubbing_elapsed_time"		app:layout_constraintLeft_toRightOf="@id/actionPrev"
	app:layout_constraintRight_toLeftOf="@id/media_progress_bar"
	app:layout_constraintBottom_toBottomOf="parent"		app:layout_constraintBottom_toBottomOf="parent"
	app:layout_constraintHorizontal_chainStyle="spread" />		app:layout_constraintHorizontal_chainStyle="spread" />

	@@ -109,7 +107,7 @@
	android:id="@+id/media_progress_bar"		android:id="@+id/media_progress_bar"
	android:layout_width="0dp"		android:layout_width="0dp"
	android:layout_height="48dp"		android:layout_height="48dp"
	app:layout_constraintLeft_toRightOf="@id/actionPrev"		app:layout_constraintLeft_toRightOf="@id/media_scrubbing_elapsed_time"
	app:layout_constraintRight_toLeftOf="@id/actionNext"		app:layout_constraintRight_toLeftOf="@id/actionNext"
	app:layout_constraintBottom_toBottomOf="parent"		app:layout_constraintBottom_toBottomOf="parent"
	app:layout_constraintHorizontal_weight="1" />		app:layout_constraintHorizontal_weight="1" />
	@@ -118,7 +116,6 @@
	android:id="@+id/actionNext"		android:id="@+id/actionNext"
	android:layout_width="48dp"		android:layout_width="48dp"
	android:layout_height="48dp"		android:layout_height="48dp"
	app:layout_constraintLeft_toRightOf="@id/media_progress_bar"
	app:layout_constraintRight_toLeftOf="@id/media_scrubbing_total_time"		app:layout_constraintRight_toLeftOf="@id/media_scrubbing_total_time"
	app:layout_constraintBottom_toBottomOf="parent" />		app:layout_constraintBottom_toBottomOf="parent" />

	@@ -126,7 +123,6 @@
	android:id="@+id/media_scrubbing_total_time"		android:id="@+id/media_scrubbing_total_time"
	android:layout_width="48dp"		android:layout_width="48dp"
	android:layout_height="48dp"		android:layout_height="48dp"
	app:layout_constraintLeft_toRightOf="@id/actionNext"
	app:layout_constraintRight_toLeftOf="@id/action0"		app:layout_constraintRight_toLeftOf="@id/action0"
	app:layout_constraintBottom_toBottomOf="parent" />		app:layout_constraintBottom_toBottomOf="parent" />

	@@ -134,7 +130,6 @@
	android:id="@+id/action0"		android:id="@+id/action0"
	android:layout_width="48dp"		android:layout_width="48dp"
	android:layout_height="48dp"		android:layout_height="48dp"
	app:layout_constraintLeft_toRightOf="@id/media_scrubbing_total_time"
	app:layout_constraintRight_toLeftOf="@id/action1"		app:layout_constraintRight_toLeftOf="@id/action1"
	app:layout_constraintBottom_toBottomOf="parent" />		app:layout_constraintBottom_toBottomOf="parent" />

	@@ -142,7 +137,6 @@
	android:id="@+id/action1"		android:id="@+id/action1"
	android:layout_width="48dp"		android:layout_width="48dp"
	android:layout_height="48dp"		android:layout_height="48dp"
	app:layout_constraintLeft_toRightOf="@id/action0"
	app:layout_constraintRight_toLeftOf="@id/action2"		app:layout_constraintRight_toLeftOf="@id/action2"
	app:layout_constraintBottom_toBottomOf="parent" />		app:layout_constraintBottom_toBottomOf="parent" />

	@@ -150,7 +144,6 @@
	android:id="@+id/action2"		android:id="@+id/action2"
	android:layout_width="48dp"		android:layout_width="48dp"
	android:layout_height="48dp"		android:layout_height="48dp"
	app:layout_constraintLeft_toRightOf="@id/action1"
	app:layout_constraintRight_toLeftOf="@id/action3"		app:layout_constraintRight_toLeftOf="@id/action3"
	app:layout_constraintBottom_toBottomOf="parent" />		app:layout_constraintBottom_toBottomOf="parent" />

	@@ -158,7 +151,6 @@
	android:id="@+id/action3"		android:id="@+id/action3"
	android:layout_width="48dp"		android:layout_width="48dp"
	android:layout_height="48dp"		android:layout_height="48dp"
	app:layout_constraintLeft_toRightOf="@id/action2"
	app:layout_constraintRight_toLeftOf="@id/action4"		app:layout_constraintRight_toLeftOf="@id/action4"
	app:layout_constraintBottom_toBottomOf="parent" />		app:layout_constraintBottom_toBottomOf="parent" />

	@@ -166,7 +158,6 @@
	android:id="@+id/action4"		android:id="@+id/action4"
	android:layout_width="48dp"		android:layout_width="48dp"
	android:layout_height="48dp"		android:layout_height="48dp"
	app:layout_constraintLeft_toRightOf="@id/action3"
	app:layout_constraintRight_toRightOf="parent"		app:layout_constraintRight_toRightOf="parent"
	app:layout_constraintBottom_toBottomOf="parent" />		app:layout_constraintBottom_toBottomOf="parent" />
	</ConstraintSet>		</ConstraintSet>