Merge "Fix difference in icon size for quick QS" into nyc-dev (bbcdab6f) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -281,7 +281,7 @@ public class QSPanel extends LinearLayout implements Tunable, Callback {
		}
		}

		private void drawTile(TileRecord r, QSTile.State state) {
		protected void drawTile(TileRecord r, QSTile.State state) {
		r.tileView.onStateChanged(state);
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -48,7 +48,7 @@ public class QSTileBaseView extends LinearLayout {

		// Default to Quick Tile padding, and QSTileView will specify its own padding.
		int padding = context.getResources().getDimensionPixelSize(R.dimen.qs_quick_tile_padding);
		setPadding(padding, padding, padding, padding);
		setPadding(0, padding, 0, padding);
		setClipChildren(false);
		setClipToPadding(false);
		}

+15 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,8 @@ import android.view.View;
		import android.widget.LinearLayout;
		import android.widget.Space;
		import com.android.systemui.R;
		import com.android.systemui.qs.QSTile.SignalState;
		import com.android.systemui.qs.QSTile.State;

		import java.util.ArrayList;
		import java.util.Collection;
		@@ -59,6 +61,19 @@ public class QuickQSPanel extends QSPanel {
		mHeader = header;
		}

		@Override
		protected void drawTile(TileRecord r, State state) {
		if (state instanceof SignalState) {
		State copy = r.tile.newTileState();
		state.copyTo(copy);
		// No activity shown in the quick panel.
		((SignalState) copy).activityIn = false;
		((SignalState) copy).activityOut = false;
		state = copy;
		}
		super.drawTile(r, state);
		}

		@Override
		protected void showDetail(boolean show, Record r) {
		// Do nothing, will be handled by the QSPanel.