Merge "Fix null drawable for Mobile signal data edit QS tile" into oc-dev (38778637) · Commits · e / os / android_frameworks_base

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

+10 −4

Original line number	Diff line number	Diff line
		@@ -35,9 +35,7 @@ public class CellTileView extends SignalTileView {
		public CellTileView(Context context) {
		super(context);
		mSignalDrawable = new SignalDrawable(mContext);
		float dark = Utils.getColorAttr(context, android.R.attr.colorForeground) == 0xff000000
		? 1 : 0;
		mSignalDrawable.setDarkIntensity(dark);
		mSignalDrawable.setDarkIntensity(isDark(mContext));
		mSignalDrawable.setIntrinsicSize(context.getResources().getDimensionPixelSize(
		R.dimen.qs_tile_icon_size));
		}
		@@ -50,6 +48,10 @@ public class CellTileView extends SignalTileView {
		}
		}

		private static int isDark(Context context) {
		return Utils.getColorAttr(context, android.R.attr.colorForeground) == 0xff000000 ? 1 : 0;
		}

		public static class SignalIcon extends Icon {

		private final int mState;
		@@ -64,7 +66,11 @@ public class CellTileView extends SignalTileView {

		@Override
		public Drawable getDrawable(Context context) {
		return null;
		//TODO: Not the optimal solution to create this drawable
		SignalDrawable d = new SignalDrawable(context);
		d.setDarkIntensity(isDark(context));
		d.setLevel(getState());
		return d;
		}
		}
		}