Merge "Remove visibility from tiles, make them always visible" (f12288bd) · Commits · e / os / android_frameworks_base

packages/SystemUI/AndroidManifest.xml

+0 −7

Original line number	Diff line number	Diff line
		@@ -180,13 +180,6 @@
		</intent-filter>
		</receiver>

		<receiver android:name=".qs.tiles.HotspotTile$APChangedReceiver"
		androidprv:systemUserOnly="true">
		<intent-filter>
		<action android:name="android.net.wifi.WIFI_AP_STATE_CHANGED" />
		</intent-filter>
		</receiver>

		<activity android:name=".tuner.TunerActivity"
		android:enabled="false"
		android:icon="@drawable/tuner"

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

+0 −5

Original line number	Diff line number	Diff line
		@@ -72,11 +72,6 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout {
		return ((ViewGroup) tile.tileView.getParent()).getTop();
		}

		@Override
		public void setTileVisibility(TileRecord tile, int visibility) {
		tile.tileView.setVisibility(visibility);
		}

		@Override
		public void addTile(TileRecord tile) {
		mTiles.add(tile);

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

+1 −18

Original line number	Diff line number	Diff line
		@@ -302,15 +302,6 @@ public class QSPanel extends FrameLayout implements Tunable {
		mHandler.obtainMessage(H.SHOW_DETAIL, show ? 1 : 0, 0, r).sendToTarget();
		}

		private void setTileVisibility(TileRecord record, int visibility) {
		mHandler.obtainMessage(H.SET_TILE_VISIBILITY, visibility, 0, record).sendToTarget();
		}

		private void handleSetTileVisibility(TileRecord tile, int visibility) {
		if (visibility == tile.tileView.getVisibility()) return;
		mTileLayout.setTileVisibility(tile, visibility);
		}

		public void setTiles(Collection<QSTile<?>> tiles) {
		for (TileRecord record : mRecords) {
		mTileLayout.removeTile(record);
		@@ -325,8 +316,6 @@ public class QSPanel extends FrameLayout implements Tunable {
		}

		private void drawTile(TileRecord r, QSTile.State state) {
		final int visibility = state.visible ? VISIBLE : GONE;
		setTileVisibility(r, visibility);
		r.tileView.onStateChanged(state);
		}

		@@ -338,7 +327,6 @@ public class QSPanel extends FrameLayout implements Tunable {
		final TileRecord r = new TileRecord();
		r.tile = tile;
		r.tileView = createTileView(tile);
		r.tileView.setVisibility(View.GONE);
		final QSTile.Callback callback = new QSTile.Callback() {
		@Override
		public void onStateChanged(QSTile.State state) {
		@@ -517,11 +505,9 @@ public class QSPanel extends FrameLayout implements Tunable {
		private void logTiles() {
		for (int i = 0; i < mRecords.size(); i++) {
		TileRecord tileRecord = mRecords.get(i);
		if (tileRecord.tile.getState().visible) {
		MetricsLogger.visible(mContext, tileRecord.tile.getMetricsCategory());
		}
		}
		}

		private void fireShowingDetail(QSTile.DetailAdapter detail) {
		if (mCallback != null) {
		@@ -556,8 +542,6 @@ public class QSPanel extends FrameLayout implements Tunable {
		public void handleMessage(Message msg) {
		if (msg.what == SHOW_DETAIL) {
		handleShowDetail((Record)msg.obj, msg.arg1 != 0);
		} else if (msg.what == SET_TILE_VISIBILITY) {
		handleSetTileVisibility((TileRecord) msg.obj, msg.arg1);
		}
		}
		}
		@@ -621,7 +605,6 @@ public class QSPanel extends FrameLayout implements Tunable {
		public interface QSTileLayout {
		void addTile(TileRecord tile);
		void removeTile(TileRecord tile);
		void setTileVisibility(TileRecord tile, int visibility);
		int getOffsetTop(TileRecord tile);
		void updateResources();
		}

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

+4 −5

Original line number	Diff line number	Diff line
		@@ -320,8 +320,10 @@ public abstract class QSTile<TState extends State> implements Listenable {
		public interface Host {
		void startActivityDismissingKeyguard(Intent intent);
		void startActivityDismissingKeyguard(PendingIntent intent);
		void startRunnableDismissingKeyguard(Runnable runnable);
		void warn(String message, Throwable t);
		void collapsePanels();
		void openPanels();
		Looper getLooper();
		Context getContext();
		Collection<QSTile<?>> getTiles();
		@@ -338,6 +340,7 @@ public abstract class QSTile<TState extends State> implements Listenable {
		UserSwitcherController getUserSwitcherController();
		UserInfoController getUserInfoController();
		BatteryController getBatteryController();
		void removeTile(String tileSpec);

		public interface Callback {
		void onTilesChanged();
		@@ -444,7 +447,6 @@ public abstract class QSTile<TState extends State> implements Listenable {
		}

		public static class State {
		public boolean visible;
		public Icon icon;
		public CharSequence label;
		public CharSequence contentDescription;
		@@ -454,14 +456,12 @@ public abstract class QSTile<TState extends State> implements Listenable {
		public boolean copyTo(State other) {
		if (other == null) throw new IllegalArgumentException();
		if (!other.getClass().equals(getClass())) throw new IllegalArgumentException();
		final boolean changed = other.visible != visible
		\|\| !Objects.equals(other.icon, icon)
		final boolean changed = !Objects.equals(other.icon, icon)
		\|\| !Objects.equals(other.label, label)
		\|\| !Objects.equals(other.contentDescription, contentDescription)
		\|\| !Objects.equals(other.autoMirrorDrawable, autoMirrorDrawable)
		\|\| !Objects.equals(other.dualLabelContentDescription,
		dualLabelContentDescription);
		other.visible = visible;
		other.icon = icon;
		other.label = label;
		other.contentDescription = contentDescription;
		@@ -477,7 +477,6 @@ public abstract class QSTile<TState extends State> implements Listenable {

		protected StringBuilder toStringBuilder() {
		final StringBuilder sb = new StringBuilder(getClass().getSimpleName()).append('[');
		sb.append("visible=").append(visible);
		sb.append(",icon=").append(icon);
		sb.append(",label=").append(label);
		sb.append(",contentDescription=").append(contentDescription);

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

+0 −5

Original line number	Diff line number	Diff line
		@@ -139,11 +139,6 @@ public class QuickQSPanel extends QSPanel {
		removeView(tile.tileView);
		}

		@Override
		public void setTileVisibility(TileRecord tile, int visibility) {
		tile.tileView.setVisibility(visibility);
		}

		@Override
		public int getOffsetTop(TileRecord tile) {
		return 0;