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

Commit a0f45b24 authored by haiyangl's avatar haiyangl Committed by Steve Kondik
Browse files

SystemUI: Fix status bar icons overlapped issue 

Missing RTL(RightToLeft) support for MSimSignalClusterView and its
layout.

Convert left/right layout properties to start/end properties.
Reload drawables when RTL property is changed.

Change-Id: I7c3deb29ad3bb0e4407772da642689213c3ca156
CRs-Fixed: 740221
parent 2b3262cb

packages/SystemUI/res/layout/msim_signal_cluster_view.xml

+5 −5
Original line number Diff line number Diff line
@@ -54,13 +54,13 @@ 
        android:id="@+id/wimax_combo"

        android:layout_height="wrap_content"

        android:layout_width="wrap_content"

        android:layout_marginRight="-6dp"

        android:layout_marginEnd="-6dp"

        >

        <ImageView

            android:id="@+id/wimax_signal"

            android:layout_height="wrap_content"

            android:layout_width="wrap_content"

            android:layout_alignParentRight="true"

            android:layout_alignParentEnd="true"

            android:layout_centerVertical="true"

            android:scaleType="center"

            />
@@ -160,7 +160,7 @@ 
                android:id="@+id/mobile_inout"

                android:layout_height="wrap_content"

                android:layout_width="wrap_content"

                android:layout_gravity="right|bottom"

                android:layout_gravity="end|bottom"

                />

            <ImageView

                android:id="@+id/no_sim"
@@ -239,7 +239,7 @@ 
                android:id="@+id/mobile_inout_sub2"

                android:layout_height="wrap_content"

                android:layout_width="wrap_content"

                android:layout_gravity="right|bottom"

                android:layout_gravity="end|bottom"

                />

            <ImageView

                android:id="@+id/no_sim_slot2"
@@ -318,7 +318,7 @@ 
                android:id="@+id/mobile_inout_sub3"

                android:layout_height="wrap_content"

                android:layout_width="wrap_content"

                android:layout_gravity="right|bottom"

                android:layout_gravity="end|bottom"

                />

            <ImageView

                android:id="@+id/no_sim_slot3"

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

+32 −0
Original line number Diff line number Diff line
@@ -381,6 +381,38 @@ public class MSimSignalClusterView 
        return phoneId;

    }



    @Override

    public void onRtlPropertiesChanged(int layoutDirection) {

        super.onRtlPropertiesChanged(layoutDirection);



        int count = TelephonyManager.getDefault().getPhoneCount();



        if (mWifi != null) {

            mWifi.setImageDrawable(null);

        }

        if (mWifiActivity != null) {

            mWifiActivity.setImageDrawable(null);

        }

        if (mAirplane != null) {

            mAirplane.setImageDrawable(null);

        }

        for (int i = 0; i < count; i++) {

            if (mMobile[i] != null) {

                mMobile[i].setImageDrawable(null);

            }

            if (mMobileActivity[i] != null) {

                mMobileActivity[i].setImageDrawable(null);

            }

            if (mMobileType[i] != null) {

                mMobileType[i].setImageDrawable(null);

            }

            if (mNoSimSlot[i] != null) {

                mNoSimSlot[i].setImageDrawable(null);

            }



            apply(i);

        }

    }



    // Run after each indicator change.

    private void apply(int phoneId) {