Merge "Fix padding between R and wifi icon" into lmp-dev (f832638b) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/layout/signal_cluster_view.xml

+6 −0

Original line number	Diff line number	Diff line
		@@ -43,6 +43,12 @@
		android:layout_width="wrap_content"
		/>
		</FrameLayout>
		<View
		android:id="@+id/wifi_signal_spacer"
		android:layout_width="4dp"
		android:layout_height="4dp"
		android:visibility="gone"
		/>
		<FrameLayout
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"

+8 −0

Original line number	Diff line number	Diff line
		@@ -476,4 +476,12 @@
		<fraction name="battery_subpixel_smoothing_right">0%</fraction>

		<dimen name="battery_margin_bottom">0dp</dimen>

		<!-- Extra padding between the mobile data type icon and the strength indicator when the data
		type icon is wide. -->
		<dimen name="wide_type_icon_start_padding">2dp</dimen>

		<!-- Extra padding between the mobile data type icon and the strength indicator when the data
		type icon is wide for the tile in quick settings. -->
		<dimen name="wide_type_icon_start_padding_qs">3dp</dimen>
		</resources>

+5 −1

Original line number	Diff line number	Diff line
		@@ -373,6 +373,7 @@ public abstract class QSTile<TState extends State> implements Listenable {
		public boolean activityOut;
		public int overlayIconId;
		public boolean filter;
		public boolean isOverlayIconWide;

		@Override
		public boolean copyTo(State other) {
		@@ -380,13 +381,15 @@ public abstract class QSTile<TState extends State> implements Listenable {
		final boolean changed = o.enabled != enabled
		\|\| o.connected != connected \|\| o.activityIn != activityIn
		\|\| o.activityOut != activityOut
		\|\| o.overlayIconId != overlayIconId;
		\|\| o.overlayIconId != overlayIconId
		\|\| o.isOverlayIconWide != isOverlayIconWide;
		o.enabled = enabled;
		o.connected = connected;
		o.activityIn = activityIn;
		o.activityOut = activityOut;
		o.overlayIconId = overlayIconId;
		o.filter = filter;
		o.isOverlayIconWide = isOverlayIconWide;
		return super.copyTo(other) \|\| changed;
		}

		@@ -399,6 +402,7 @@ public abstract class QSTile<TState extends State> implements Listenable {
		rt.insert(rt.length() - 1, ",activityOut=" + activityOut);
		rt.insert(rt.length() - 1, ",overlayIconId=" + overlayIconId);
		rt.insert(rt.length() - 1, ",filter=" + filter);
		rt.insert(rt.length() - 1, ",wideOverlayIcon=" + isOverlayIconWide);
		return rt;
		}
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -230,7 +230,7 @@ public class QSTileView extends ViewGroup {
		final int w = MeasureSpec.getSize(widthMeasureSpec);
		final int h = MeasureSpec.getSize(heightMeasureSpec);
		final int iconSpec = exactly(mIconSizePx);
		mIcon.measure(iconSpec, iconSpec);
		mIcon.measure(MeasureSpec.makeMeasureSpec(w, MeasureSpec.AT_MOST), iconSpec);
		labelView().measure(widthMeasureSpec, MeasureSpec.makeMeasureSpec(h, MeasureSpec.AT_MOST));
		if (mDual) {
		mDivider.measure(widthMeasureSpec, exactly(mDivider.getLayoutParams().height));

+10 −0

Original line number	Diff line number	Diff line
		@@ -37,11 +37,16 @@ public final class SignalTileView extends QSTileView {
		private ImageView mIn;
		private ImageView mOut;

		private int mWideOverlayIconStartPadding;

		public SignalTileView(Context context) {
		super(context);

		mIn = addTrafficView(R.drawable.ic_qs_signal_in);
		mOut = addTrafficView(R.drawable.ic_qs_signal_out);

		mWideOverlayIconStartPadding = context.getResources().getDimensionPixelSize(
		R.dimen.wide_type_icon_start_padding_qs);
		}

		private ImageView addTrafficView(int icon) {
		@@ -106,6 +111,11 @@ public final class SignalTileView extends QSTileView {
		} else {
		mOverlay.setVisibility(GONE);
		}
		if (s.overlayIconId > 0 && s.isOverlayIconWide) {
		mSignal.setPaddingRelative(mWideOverlayIconStartPadding, 0, 0, 0);
		} else {
		mSignal.setPaddingRelative(0, 0, 0, 0);
		}
		Drawable drawable = mSignal.getDrawable();
		if (state.autoMirrorDrawable && drawable != null) {
		drawable.setAutoMirrored(true);