diff options
| author | LuK1337 <priv.luk@gmail.com> | 2015-10-29 23:51:14 +0100 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2015-11-01 15:48:34 -0800 |
| commit | 172c15ab4683f8e48582b4faddef0c3a6af19137 (patch) | |
| tree | 2f10faeebaf4b40a97ea7860a8fe52c187f4f78f | |
| parent | d361e53a08ab7a7812bf5298c25191c851f973b8 (diff) | |
| download | frameworks_base-172c15ab4683f8e48582b4faddef0c3a6af19137.zip frameworks_base-172c15ab4683f8e48582b4faddef0c3a6af19137.tar.gz frameworks_base-172c15ab4683f8e48582b4faddef0c3a6af19137.tar.bz2 | |
SystemUI: Fix padding for text & hidden battery style
before: http://imgur.com/a/oUtTA
after: http://imgur.com/a/c5ii1
Change-Id: I02be624cdeea9ac0d9a4b79e851449facbec1901
3 files changed, 2 insertions, 12 deletions
diff --git a/packages/SystemUI/res/layout/signal_cluster_view.xml b/packages/SystemUI/res/layout/signal_cluster_view.xml index f8bd6fd..e2c1810 100644 --- a/packages/SystemUI/res/layout/signal_cluster_view.xml +++ b/packages/SystemUI/res/layout/signal_cluster_view.xml @@ -25,7 +25,6 @@ android:layout_width="wrap_content" android:gravity="center_vertical" android:orientation="horizontal" - android:paddingEnd="@dimen/signal_cluster_battery_padding" > <ImageView android:id="@+id/vpn" diff --git a/packages/SystemUI/res/layout/system_icons.xml b/packages/SystemUI/res/layout/system_icons.xml index 943e846..8d15898 100644 --- a/packages/SystemUI/res/layout/system_icons.xml +++ b/packages/SystemUI/res/layout/system_icons.xml @@ -36,5 +36,6 @@ <com.android.systemui.BatteryMeterView android:id="@+id/battery" android:layout_height="14.5dp" android:layout_width="9.5dp" - android:layout_marginBottom="@dimen/battery_margin_bottom"/> + android:layout_marginBottom="@dimen/battery_margin_bottom" + android:layout_marginStart="@dimen/signal_cluster_battery_padding"/> </LinearLayout>
\ No newline at end of file diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java b/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java index cc30882..b0fc398 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java @@ -88,8 +88,6 @@ public class SignalClusterView private int mWideTypeIconStartPadding; private int mSecondaryTelephonyPadding; - private int mEndPadding; - private int mEndPaddingNothingVisible; private boolean mBlockAirplane; private boolean mBlockMobile; @@ -150,10 +148,6 @@ public class SignalClusterView R.dimen.wide_type_icon_start_padding); mSecondaryTelephonyPadding = getContext().getResources().getDimensionPixelSize( R.dimen.secondary_telephony_padding); - mEndPadding = getContext().getResources().getDimensionPixelSize( - R.dimen.signal_cluster_battery_padding); - mEndPaddingNothingVisible = getContext().getResources().getDimensionPixelSize( - R.dimen.no_signal_cluster_battery_padding); } @Override @@ -447,10 +441,6 @@ public class SignalClusterView } mNoSimsCombo.setVisibility(mNoSimsVisible ? View.VISIBLE : View.GONE); - - boolean anythingVisible = mNoSimsVisible || mWifiVisible || mIsAirplaneMode - || anyMobileVisible || mVpnVisible || mEthernetVisible; - setPaddingRelative(0, 0, anythingVisible ? mEndPadding : mEndPaddingNothingVisible, 0); } public void setIconTint(int tint, float darkIntensity) { |