Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix crashes during density changes" into nyc-dev

Browse Source 
am: 93a075ecdd

* commit '93a075ecdd40fb9ecf656316add05966ddc36b96':
  Fix crashes during density changes
This commit is contained in:
Jason Monk
2016-03-15 19:27:27 +00:00
committed by android-build-merger
parent 50ef6102e4 93a075ecdd
commit ac4a59ccb3
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java
View File

@@ -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];

12
packages/SystemUI/src/com/android/systemui/qs/QuickQSPanel.java
View File

@@ -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,9 +97,17 @@ 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;
setTiles(mHost.getTiles());
if (mHost != null) {
setTiles(mHost.getTiles());
}
}
@Override