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

Commit e269a172 authored by dhacker29's avatar dhacker29
Browse files

Untangle the statusbar for dual sim 

This is just enough to get the statusbar to not forceclose.

TODO in future patch set:
  Implement signal text for dual sim.
  Implement hidden view for dual sim.

Change-Id: Ieeb95e3a0b1653b0e80527e1a388075654097b89
parent 898206a5

packages/SystemUI/res/layout/msim_signal_cluster_view.xml

+7 −8
Original line number Diff line number Diff line
@@ -22,21 +22,22 @@ 


<com.android.systemui.statusbar.MSimSignalClusterView

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_height="wrap_content"

    android:layout_height="match_parent"

    android:layout_width="wrap_content"

    android:gravity="center"

    android:orientation="horizontal"

    >

    <FrameLayout

        android:id="@+id/wifi_combo"

        android:layout_height="wrap_content"

        android:layout_width="wrap_content"

        android:layout_marginRight="-6dp"

        android:layout_marginEnd="-6dp"

        >

        <ImageView

            android:id="@+id/wifi_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"

            />
@@ -57,13 +58,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"

            />
@@ -181,19 +182,17 @@ 
                android:id="@+id/mobile_signal"

                android:layout_height="wrap_content"

                android:layout_width="wrap_content"

                android:layout_gravity="center|bottom"

                />

            <ImageView

                android:id="@+id/mobile_type"

                android:layout_height="wrap_content"

                android:layout_width="wrap_content"

                android:layout_gravity="center|bottom"

                />

            <ImageView

                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"

packages/SystemUI/res/layout/msim_status_bar.xml

+29 −14
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
        android:id="@+id/notification_lights_out"

        android:layout_width="@dimen/status_bar_icon_size"

        android:layout_height="match_parent"

        android:paddingLeft="6dip"

        android:paddingStart="6dip"

        android:paddingBottom="2dip"

        android:src="@drawable/ic_sysbar_lights_out_dot_small"

        android:scaleType="center"
@@ -46,8 +46,8 @@ 
    <LinearLayout android:id="@+id/status_bar_contents"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:paddingLeft="6dip"

        android:paddingRight="6dip"

        android:paddingStart="6dip"

        android:paddingEnd="6dip"

        android:orientation="horizontal"

        >
@@ -68,7 +68,7 @@ 
            <com.android.systemui.statusbar.phone.IconMerger android:id="@+id/notificationIcons"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:layout_alignParentLeft="true"

                android:layout_alignParentStart="true"

                android:gravity="center_vertical"

                android:orientation="horizontal"/>

        </LinearLayout>
@@ -88,7 +88,7 @@ 
                android:id="@+id/signal_battery_cluster"

                android:layout_width="wrap_content"

                android:layout_height="match_parent"

                android:paddingLeft="2dp"

                android:paddingStart="2dp"

                android:orientation="horizontal"

                android:gravity="center"

                >
@@ -97,11 +97,26 @@ 
                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    />

                <ImageView

                    android:id="@+id/battery"

                    android:layout_height="wrap_content"

                <!-- <include layout="@layout/signal_cluster_text_view"

                    android:id="@+id/signal_cluster_text"

                    android:layout_width="wrap_content"

                    android:paddingLeft="4dip"

                    android:layout_height="wrap_content"

                    /> -->

                <!-- battery must be padded below to match assets -->

                <com.android.systemui.BatteryMeterView

                    android:id="@+id/battery"

                    android:layout_height="@dimen/status_bar_battery_height"

                    android:layout_width="@dimen/status_bar_battery_width"

                    android:layout_marginBottom="@dimen/status_bar_battery_bottom_padding"

                    android:layout_marginStart="4dip"

                    />

                <com.android.systemui.DockBatteryMeterView

                    android:id="@+id/dock_battery"

                    android:layout_height="@dimen/status_bar_battery_height"

                    android:layout_width="@dimen/status_bar_battery_width"

                    android:layout_marginBottom="@dimen/status_bar_battery_bottom_padding"

                    android:layout_marginStart="4dip"

                    android:visibility="gone"

                    />

            </LinearLayout>
@@ -111,8 +126,8 @@ 
                android:layout_width="wrap_content"

                android:layout_height="match_parent"

                android:singleLine="true"

                android:paddingLeft="6dip"

                android:gravity="center_vertical|left"

                android:paddingStart="6dip"

                android:gravity="center_vertical|start"

                />

        </LinearLayout>

    </LinearLayout>
@@ -120,13 +135,13 @@ 
    <LinearLayout android:id="@+id/ticker"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:paddingLeft="6dip"

        android:paddingStart="6dip"

        android:animationCache="false"

        android:orientation="horizontal" >

        <ImageSwitcher android:id="@+id/tickerIcon"

            android:layout_width="@dimen/status_bar_icon_size"

            android:layout_height="@dimen/status_bar_icon_size"

            android:layout_marginRight="4dip"

            android:layout_marginEnd="4dip"

            >

            <com.android.systemui.statusbar.AnimatedImageView

                android:layout_width="@dimen/status_bar_icon_size"
@@ -144,7 +159,7 @@ 
            android:layout_weight="1"

            android:layout_height="wrap_content"

            android:paddingTop="2dip"

            android:paddingRight="10dip">

            android:paddingEnd="10dip">

            <TextView

                android:textAppearance="@style/TextAppearance.StatusBar.PhoneTicker"

                android:layout_width="match_parent"

packages/SystemUI/src/com/android/systemui/quicksettings/AirplaneModeTile.java

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ import android.view.View.OnLongClickListener; 
import com.android.systemui.R;

import com.android.systemui.statusbar.phone.QuickSettingsController;

import com.android.systemui.statusbar.phone.QuickSettingsContainerView;

import com.android.systemui.statusbar.policy.MSimNetworkController;

import com.android.systemui.statusbar.policy.NetworkController;

import com.android.systemui.statusbar.policy.NetworkController.NetworkSignalChangedCallback;

packages/SystemUI/src/com/android/systemui/quicksettings/MobileNetworkTile.java

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ import android.widget.TextView; 
import com.android.systemui.R;

import com.android.systemui.statusbar.phone.QuickSettingsController;

import com.android.systemui.statusbar.phone.QuickSettingsContainerView;

import com.android.systemui.statusbar.policy.MSimNetworkController;

import com.android.systemui.statusbar.policy.NetworkController;

import com.android.systemui.statusbar.policy.NetworkController.NetworkSignalChangedCallback;

packages/SystemUI/src/com/android/systemui/quicksettings/MobileNetworkTypeTile.java

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ import com.android.internal.telephony.Phone; 
import com.android.systemui.R;

import com.android.systemui.statusbar.phone.QuickSettingsContainerView;

import com.android.systemui.statusbar.phone.QuickSettingsController;

import com.android.systemui.statusbar.policy.MSimNetworkController;

import com.android.systemui.statusbar.policy.NetworkController;

import com.android.systemui.statusbar.policy.NetworkController.NetworkSignalChangedCallback;