diff options
Diffstat (limited to 'packages/SystemUI')
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) { |