Merge "Fix crashes in QS tuner" into mnc-dev (5ac88a39) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/tuner/QsTuner.java

+22 −5

Original line number	Diff line number	Diff line
		@@ -150,14 +150,24 @@ public class QsTuner extends Fragment implements Callback {
		}

		public void onStartDrag() {
		mDropTarget.post(new Runnable() {
		@Override
		public void run() {
		mDropTarget.setVisibility(View.VISIBLE);
		mAddTarget.setVisibility(View.GONE);
		}
		});
		}

		public void stopDrag() {
		mDropTarget.post(new Runnable() {
		@Override
		public void run() {
		mDropTarget.setVisibility(View.GONE);
		mAddTarget.setVisibility(View.VISIBLE);
		}
		});
		}

		@Override
		public void onTilesChanged() {
		@@ -230,9 +240,16 @@ public class QsTuner extends Fragment implements Callback {

		public void showAddDialog() {
		List<String> tiles = mTileSpecs;
		int numBroadcast = 0;
		for (int i = 0; i < tiles.size(); i++) {
		if (tiles.get(i).startsWith(IntentTile.PREFIX)) {
		numBroadcast++;
		}
		}
		String[] defaults =
		getContext().getString(R.string.quick_settings_tiles_default).split(",");
		final String[] available = new String[defaults.length + 1 - tiles.size()];
		final String[] available = new String[defaults.length + 1
		- (tiles.size() - numBroadcast)];
		final String[] availableTiles = new String[available.length];
		int index = 0;
		for (int i = 0; i < defaults.length; i++) {