Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d035f15 authored by Jorim Jaggi's avatar Jorim Jaggi
Browse files

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
parent 09e9dd26

packages/SystemUI/res/layout/signal_cluster_view.xml

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
    android:layout_width="wrap_content"

    android:gravity="center_vertical"

    android:orientation="horizontal"

    android:paddingEnd="@dimen/signal_cluster_battery_padding"

    >

    <ImageView

        android:id="@+id/vpn"

packages/SystemUI/res/layout/system_icons.xml

+1 −2
Original line number Diff line number Diff line
@@ -36,6 +36,5 @@ 
    <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_marginStart="7dp"/>

        android:layout_marginBottom="@dimen/battery_margin_bottom"/>

</LinearLayout>
 
 No newline at end of file

packages/SystemUI/res/values/dimens.xml

+6 −0
Original line number Diff line number Diff line
@@ -508,4 +508,10 @@ 
    <dimen name="fake_shadow_inset">1dp</dimen>



    <dimen name="fake_shadow_size">8dp</dimen>



    <!-- Padding between signal cluster and battery icon -->

    <dimen name="signal_cluster_battery_padding">7dp</dimen>



    <!-- Padding for signal cluster and battery icon when there are not icons in signal cluster -->

    <dimen name="no_signal_cluster_battery_padding">3dp</dimen>

</resources>

packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java

+9 −0
Original line number Diff line number Diff line
@@ -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);

    }

}