From 6d035f15d5c8c67d97a4d5b6ed44f8cca0772e1f Mon Sep 17 00:00:00 2001 From: Jorim Jaggi Date: Fri, 17 Oct 2014 18:43:43 +0200 Subject: Fix padding between battery and system icons The padding was wrong when nothing from the signal cluster view was visible. Now the padding between battery/signal cluster is modified when nothing is visible to fix this issue. Bug: 17585428 Change-Id: I10f7e42ed029aab7453cbc227188bdf99f414677 --- .../src/com/android/systemui/statusbar/SignalClusterView.java | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'packages/SystemUI/src/com') diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java b/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java index 4f82f66..9154a48 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java @@ -57,6 +57,8 @@ public class SignalClusterView View mWifiSignalSpacer; private int mWideTypeIconStartPadding; + private int mEndPadding; + private int mEndPaddingNothingVisible; public SignalClusterView(Context context) { this(context, null); @@ -87,6 +89,10 @@ public class SignalClusterView super.onFinishInflate(); mWideTypeIconStartPadding = getContext().getResources().getDimensionPixelSize( R.dimen.wide_type_icon_start_padding); + mEndPadding = getContext().getResources().getDimensionPixelSize( + R.dimen.signal_cluster_battery_padding); + mEndPaddingNothingVisible = getContext().getResources().getDimensionPixelSize( + R.dimen.no_signal_cluster_battery_padding); } @Override @@ -255,6 +261,9 @@ public class SignalClusterView mMobileStrengthId, mMobileTypeId)); mMobileType.setVisibility(mMobileTypeId != 0 ? View.VISIBLE : View.GONE); + + boolean anythingVisible = mWifiVisible || mIsAirplaneMode || mMobileVisible || mVpnVisible; + setPaddingRelative(0, 0, anythingVisible ? mEndPadding : mEndPaddingNothingVisible, 0); } } -- cgit v1.1