Merge cherrypicks of ['ag/20690268', 'ag/20877927', 'ag/20965081'] into tm-qpr2-release. (cbd27dc9) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/layout/combined_qs_header.xml

+0 −5

Original line number	Diff line number	Diff line
		@@ -148,9 +148,4 @@
		<include layout="@layout/ongoing_privacy_chip"/>
		</FrameLayout>

		<Space
		android:layout_width="0dp"
		android:layout_height="0dp"
		android:id="@+id/space"
		/>
		</com.android.systemui.util.NoRemeasureMotionLayout>
		No newline at end of file

packages/SystemUI/res/xml/qs_header.xml

+7 −23

Original line number	Diff line number	Diff line
		@@ -56,13 +56,9 @@
		<Layout
		android:layout_width="wrap_content"
		android:layout_height="@dimen/new_qs_header_non_clickable_element_height"
		app:layout_constrainedWidth="true"
		app:layout_constraintStart_toStartOf="parent"
		app:layout_constraintEnd_toStartOf="@id/space"
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintTop_toBottomOf="@id/carrier_group"
		app:layout_constraintHorizontal_bias="0"
		app:layout_constraintHorizontal_chainStyle="spread_inside"
		/>
		</Constraint>

		@@ -87,39 +83,27 @@
		<Constraint
		android:id="@+id/statusIcons">
		<Layout
		android:layout_width="wrap_content"
		android:layout_width="0dp"
		android:layout_height="@dimen/new_qs_header_non_clickable_element_height"
		app:layout_constraintStart_toEndOf="@id/space"
		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="parent"
		app:layout_constraintHorizontal_bias="1"
		app:layout_constraintBottom_toBottomOf="@id/date"
		/>
		</Constraint>

		<Constraint
		android:id="@+id/batteryRemainingIcon">
		<Layout
		android:layout_width="wrap_content"
		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_constraintStart_toEndOf="@id/statusIcons"
		app:layout_constraintEnd_toEndOf="parent"
		app:layout_constraintTop_toTopOf="@id/date"
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintHorizontal_bias="1"
		app:layout_constraintHorizontal_chainStyle="spread_inside"
		app:layout_constraintBottom_toBottomOf="@id/date"
		/>
		</Constraint>


		<Constraint
		android:id="@id/space">
		<Layout
		android:layout_width="0dp"
		android:layout_height="0dp"
		app:layout_constraintStart_toEndOf="@id/date"
		app:layout_constraintEnd_toStartOf="@id/statusIcons"
		/>
		</Constraint>
		</ConstraintSet>
		No newline at end of file

packages/SystemUI/src/com/android/systemui/qs/QSHost.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -36,7 +36,6 @@ public interface QSHost {
		void removeCallback(Callback callback);
		void removeTile(String tileSpec);
		void removeTiles(Collection<String> specs);
		void unmarkTileAsAutoAdded(String tileSpec);

		int indexOf(String tileSpec);

packages/SystemUI/src/com/android/systemui/qs/QSTileHost.java

+0 −5

Original line number	Diff line number	Diff line
		@@ -427,11 +427,6 @@ public class QSTileHost implements QSHost, Tunable, PluginListener<QSFactory>, P
		mMainExecutor.execute(() -> changeTileSpecs(tileSpecs -> tileSpecs.removeAll(specs)));
		}

		@Override
		public void unmarkTileAsAutoAdded(String spec) {
		if (mAutoTiles != null) mAutoTiles.unmarkTileAsAutoAdded(spec);
		}

		/**
		* Add a tile to the end
		*

packages/SystemUI/src/com/android/systemui/qs/tiles/WorkModeTile.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -101,7 +101,6 @@ public class WorkModeTile extends QSTileImpl<BooleanState> implements
		@MainThread
		public void onManagedProfileRemoved() {
		mHost.removeTile(getTileSpec());
		mHost.unmarkTileAsAutoAdded(getTileSpec());
		}

		@Override