Merge "Fix crashes during density changes" into nyc-dev (ac4a59cc) · Commits · e / os / android_frameworks_base

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -89,6 +89,7 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha

		public void setHost(QSTileHost qsh) {
		qsh.addCallback(this);
		updateAnimators();
		}

		@Override
		@@ -133,6 +134,7 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha
		TouchAnimator.Builder translationYBuilder = new Builder();
		TouchAnimator.Builder lastRowBuilder = new Builder();

		if (mQsPanel.getHost() == null) return;
		Collection<QSTile<?>> tiles = mQsPanel.getHost().getTiles();
		int count = 0;
		int[] loc1 = new int[2];

+11 −1

Original line number	Diff line number	Diff line
		@@ -26,6 +26,8 @@ import android.widget.Space;
		import com.android.systemui.R;
		import com.android.systemui.qs.QSTile.SignalState;
		import com.android.systemui.qs.QSTile.State;
		import com.android.systemui.qs.customize.QSCustomizer;
		import com.android.systemui.statusbar.phone.QSTileHost;
		import com.android.systemui.tuner.TunerService;
		import com.android.systemui.tuner.TunerService.Tunable;

		@@ -95,10 +97,18 @@ public class QuickQSPanel extends QSPanel {
		return new QSTileBaseView(mContext, tile.createTileView(mContext));
		}

		@Override
		public void setHost(QSTileHost host, QSCustomizer customizer) {
		super.setHost(host, customizer);
		setTiles(mHost.getTiles());
		}

		public void setMaxTiles(int maxTiles) {
		mMaxTiles = maxTiles;
		if (mHost != null) {
		setTiles(mHost.getTiles());
		}
		}

		@Override
		protected void onTileClick(QSTile<?> tile) {