Merge "Fix battery off center" (1af0ad71) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/values/dimens.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -607,4 +607,7 @@

		<dimen name="docked_divider_handle_width">16dp</dimen>
		<dimen name="docked_divider_handle_height">2dp</dimen>

		<dimen name="battery_height">14.5dp</dimen>
		<dimen name="battery_width">9.5dp</dimen>
		</resources>

+15 −0

Original line number	Diff line number	Diff line
		@@ -51,6 +51,8 @@ public class BatteryMeterDrawable extends Drawable implements DemoMode,
		private static final float BOLT_LEVEL_THRESHOLD = 0.3f; // opaque bolt below this fraction

		private final int[] mColors;
		private final int mIntrinsicWidth;
		private final int mIntrinsicHeight;

		private boolean mShowPercent;
		private float mButtonHeightFraction;
		@@ -161,6 +163,19 @@ public class BatteryMeterDrawable extends Drawable implements DemoMode,
		mLightModeBackgroundColor =
		context.getColor(R.color.light_mode_icon_color_dual_tone_background);
		mLightModeFillColor = context.getColor(R.color.light_mode_icon_color_dual_tone_fill);

		mIntrinsicWidth = context.getResources().getDimensionPixelSize(R.dimen.battery_width);
		mIntrinsicHeight = context.getResources().getDimensionPixelSize(R.dimen.battery_height);
		}

		@Override
		public int getIntrinsicHeight() {
		return mIntrinsicHeight;
		}

		@Override
		public int getIntrinsicWidth() {
		return mIntrinsicWidth;
		}

		public void startListening() {

+2 −1

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import android.view.View;
		import android.view.ViewGroup;
		import android.widget.ImageView;

		import android.widget.ImageView.ScaleType;
		import com.android.systemui.R;

		import java.util.Objects;
		@@ -96,7 +97,7 @@ public class QSIconView extends ViewGroup {
		protected View createIcon() {
		final ImageView icon = new ImageView(mContext);
		icon.setId(android.R.id.icon);
		icon.setScaleType(ImageView.ScaleType.CENTER_INSIDE);
		icon.setScaleType(ScaleType.FIT_CENTER);
		return icon;
		}