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

Commit 5f7cdd35 authored by Chaitanya Saggurthi's avatar Chaitanya Saggurthi Committed by Ricardo Cerqueira
Browse files

MSIM support for Statusbar. 

-Add support for Signal Strength icon display for MultiSim

Display dual subscription info in notification panel
  -Show subscription information for both subscriptions
   relevant to the sim state. if sim state is ready show
   operator name, if card absent, show no sim message,
   if UE is in airplane mode, show airplane mode message.

Clear data activity icon when disconnected
  -If data is disconnected before data activity becomes none,
   then clear up/down arrow icon by reset the data activity icon.

Add support for ro.config.combined_signal
  -Add support for ro.config.combined_signal. This property is being used
   to consider data service state for signal display.
   When ro.config.combined_signal is not set to false, we will display
   CS/PS signal strength whichever is available

Conflicts:
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java
packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java
Change-Id: Iebc9f49334a8a3cf469ea2624f0e1d6eb50b63bc
parent c9b0d8af

core/res/res/values/strings.xml

+5 −0
Original line number Original line Diff line number Diff line
@@ -2575,6 +2575,8 @@ 




    <!-- Shown in the lock screen when there is emergency calls only mode. -->

    <!-- Shown in the lock screen when there is emergency calls only mode. -->

    <string name="emergency_calls_only" msgid="2485604591272668370">Emergency calls only</string>

    <string name="emergency_calls_only" msgid="2485604591272668370">Emergency calls only</string>

    <!-- Shown in the lock screen when there is SIM card IO error. -->

    <string name="lockscreen_sim_error_message_short">Invalid Card.</string>





    <!-- When the user inserts a sim card from an unsupported network, it becomes network

    <!-- When the user inserts a sim card from an unsupported network, it becomes network

         locked -->

         locked -->
@@ -2595,6 +2597,9 @@ 
         progress dialog in the meantime.  this is the emssage. -->

         progress dialog in the meantime.  this is the emssage. -->

    <string name="lockscreen_sim_unlock_progress_dialog_message">Unlocking SIM card\u2026</string>

    <string name="lockscreen_sim_unlock_progress_dialog_message">Unlocking SIM card\u2026</string>





    <!-- Shown in the lock screen to tell the user that phone is in airplane mode-->

    <string name="lockscreen_airplane_mode_on">Airplane Mode</string>



    <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at

    <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at

         drawing the unlock pattern -->

         drawing the unlock pattern -->

    <string name="lockscreen_too_many_failed_attempts_dialog_message">

    <string name="lockscreen_too_many_failed_attempts_dialog_message">

core/res/res/values/symbols.xml

+6 −0
Original line number Original line Diff line number Diff line
@@ -516,6 +516,7 @@ 
  <java-symbol type="string" name="autofill_zip_code_re" />

  <java-symbol type="string" name="autofill_zip_code_re" />

  <java-symbol type="string" name="badPin" />

  <java-symbol type="string" name="badPin" />

  <java-symbol type="string" name="badPuk" />

  <java-symbol type="string" name="badPuk" />

  <java-symbol type="string" name="lockscreen_sim_error_message_short" />

  <java-symbol type="string" name="byteShort" />

  <java-symbol type="string" name="byteShort" />

  <java-symbol type="string" name="capability_desc_canRequestEnhancedWebAccessibility" />

  <java-symbol type="string" name="capability_desc_canRequestEnhancedWebAccessibility" />

  <java-symbol type="string" name="capability_title_canRequestFilterKeyEvents" />

  <java-symbol type="string" name="capability_title_canRequestFilterKeyEvents" />
@@ -1518,7 +1519,12 @@ 
  <java-symbol type="string" name="global_action_toggle_silent_mode" />

  <java-symbol type="string" name="global_action_toggle_silent_mode" />

  <java-symbol type="string" name="global_action_lockdown" />

  <java-symbol type="string" name="global_action_lockdown" />

  <java-symbol type="string" name="invalidPuk" />

  <java-symbol type="string" name="invalidPuk" />

  <java-symbol type="string" name="lockscreen_missing_sim_message_short" />

  <java-symbol type="string" name="lockscreen_permanent_disabled_sim_message_short" />

  <java-symbol type="string" name="lockscreen_carrier_default" />

  <java-symbol type="string" name="lockscreen_carrier_default" />

  <java-symbol type="string" name="lockscreen_sim_locked_message" />

  <java-symbol type="string" name="lockscreen_sim_puk_locked_message" />

  <java-symbol type="string" name="lockscreen_airplane_mode_on" />

  <java-symbol type="style" name="Animation.LockScreen" />

  <java-symbol type="style" name="Animation.LockScreen" />

  <java-symbol type="style" name="Theme.Dialog.RecentApplications" />

  <java-symbol type="style" name="Theme.Dialog.RecentApplications" />

  <java-symbol type="style" name="Theme.ExpandedMenu" />

  <java-symbol type="style" name="Theme.ExpandedMenu" />

packages/SystemUI/res/layout/msim_keyguard_status_bar.xml

0 → 100644
+78 −0
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2014 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->



<!-- Extends RelativeLayout -->

<com.android.systemui.statusbar.phone.KeyguardStatusBarView

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

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

    android:id="@+id/keyguard_header"

    android:layout_width="match_parent"

    android:layout_height="@dimen/status_bar_header_height_keyguard"

    android:baselineAligned="false"

    >



    <com.android.systemui.statusbar.phone.MultiUserSwitch android:id="@+id/multi_user_switch"

        android:layout_width="@dimen/multi_user_switch_width_keyguard"

        android:layout_height="@dimen/status_bar_header_height_keyguard"

        android:layout_alignParentEnd="true"

        android:background="@drawable/ripple_drawable"

        android:layout_marginEnd="@dimen/multi_user_switch_keyguard_margin">

        <ImageView android:id="@+id/multi_user_avatar"

            android:layout_width="@dimen/multi_user_avatar_keyguard_size"

            android:layout_height="@dimen/multi_user_avatar_keyguard_size"

            android:layout_gravity="center"

            android:scaleType="centerInside"/>

    </com.android.systemui.statusbar.phone.MultiUserSwitch>



    <LinearLayout android:id="@+id/system_icons_super_container"

        android:layout_width="wrap_content"

        android:layout_height="@dimen/status_bar_header_height"

        android:layout_toStartOf="@id/multi_user_switch"

        android:layout_alignWithParentIfMissing="true"

        android:layout_marginStart="16dp"

        android:paddingEnd="2dp">

        <FrameLayout android:id="@+id/system_icons_container"

            android:layout_width="wrap_content"

            android:layout_height="@dimen/status_bar_height"

            android:layout_gravity="center_vertical"

            >

            <include layout="@layout/msim_system_icons" />

        </FrameLayout>

        <TextView android:id="@+id/battery_level"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center_vertical"

            android:layout_marginStart="@dimen/header_battery_margin_keyguard"

            android:paddingEnd="@dimen/battery_level_padding_end"

            android:textColor="#ffffff"

            android:visibility="gone"

            android:textSize="12sp"/>

    </LinearLayout>



    <com.android.keyguard.CarrierText

        android:id="@+id/keyguard_carrier_text"

        android:layout_width="match_parent"

        android:layout_height="@dimen/status_bar_header_height_keyguard"

        android:layout_marginStart="@dimen/keyguard_carrier_text_margin"

        android:layout_toStartOf="@id/system_icons_super_container"

        android:gravity="center_vertical"

        android:ellipsize="marquee"

        android:textAppearance="?android:attr/textAppearanceSmall"

        android:textColor="#ffffff"

        android:singleLine="true" />



</com.android.systemui.statusbar.phone.KeyguardStatusBarView>

packages/SystemUI/res/layout/msim_signal_cluster_view.xml

0 → 100644
+201 −0
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/* apps/common/assets/default/default/skins/StatusBar.xml

**

** Copyright (c) 2012-2014 The Linux Foundation. All rights reserved.

** Not a Contribution.

** Copyright 2011 The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License");

** you may not use this file except in compliance with the License.

** You may obtain a copy of the License at

**

**     http://www.apache.org/licenses/LICENSE-2.0

**

** Unless required by applicable law or agreed to in writing, software

** distributed under the License is distributed on an "AS IS" BASIS,

** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

** See the License for the specific language governing permissions and

** limitations under the License.

*/

-->



<com.android.systemui.statusbar.MSimSignalClusterView

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

    android:layout_height="match_parent"

    android:layout_width="wrap_content"

    android:gravity="center_vertical"

    android:orientation="horizontal"

    >

    <FrameLayout

        android:id="@+id/wifi_combo"

        android:layout_height="wrap_content"

        android:layout_width="wrap_content"

        >

        <ImageView

            android:id="@+id/wifi_signal"

            android:layout_height="wrap_content"

            android:layout_width="wrap_content"

            />

    </FrameLayout>

    <View

        android:layout_height="6dp"

        android:layout_width="6dp"

        android:visibility="gone"

        android:id="@+id/spacer"

        />

    <!--<FrameLayout

        android:id="@+id/wimax_combo"

        android:layout_height="wrap_content"

        android:layout_width="wrap_content"

        android:layout_marginRight="-6dp"

        >

        <ImageView

            android:id="@+id/wimax_signal"

            android:layout_height="wrap_content"

            android:layout_width="wrap_content"

            android:layout_alignParentRight="true"

            android:layout_centerVertical="true"

            android:scaleType="center"

            />

        <ImageView

            android:id="@+id/wimax_inout"

            android:layout_height="wrap_content"

            android:layout_width="wrap_content"

            android:layout_gravity="center|bottom"

            />

    </FrameLayout>

    -->

    <FrameLayout

        android:layout_height="wrap_content"

        android:layout_width="wrap_content"

        >

        <View

            android:layout_height="6dp"

            android:layout_width="6dp"

            android:visibility="invisible"

            />

        <FrameLayout

            android:id="@+id/mobile_combo_sub3"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            >

            <ImageView

                android:id="@+id/mobile_signal_sub3"

                android:layout_height="wrap_content"

                android:layout_width="wrap_content"

                android:layout_gravity="center|bottom"

                />

            <ImageView

                android:id="@+id/mobile_type_sub3"

                android:layout_height="wrap_content"

                android:layout_width="wrap_content"

                android:layout_gravity="center|bottom"

                />

            <ImageView

                android:id="@+id/mobile_inout_sub3"

                android:layout_height="wrap_content"

                android:layout_width="wrap_content"

                android:layout_gravity="right|bottom"

                />

            <ImageView

                android:id="@+id/no_sim_slot3"

                android:layout_height="wrap_content"

                android:layout_width="wrap_content"

                />

        </FrameLayout>

    </FrameLayout>

    <View

        android:layout_height="8dp"

        android:layout_width="8dp"

        android:id="@+id/spacer"

        />

    <FrameLayout

        android:layout_height="wrap_content"

        android:layout_width="wrap_content"

        >

        <View

            android:layout_height="6dp"

            android:layout_width="6dp"

            android:visibility="invisible"

            />

        <FrameLayout

            android:id="@+id/mobile_combo_sub2"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            >

            <ImageView

                android:id="@+id/mobile_signal_sub2"

                android:layout_height="wrap_content"

                android:layout_width="wrap_content"

                android:layout_gravity="center|bottom"

                />

            <ImageView

                android:id="@+id/mobile_type_sub2"

                android:layout_height="wrap_content"

                android:layout_width="wrap_content"

                android:layout_gravity="center|bottom"

                />

            <ImageView

                android:id="@+id/mobile_inout_sub2"

                android:layout_height="wrap_content"

                android:layout_width="wrap_content"

                android:layout_gravity="right|bottom"

                />

            <ImageView

                android:id="@+id/no_sim_slot2"

                android:layout_height="wrap_content"

                android:layout_width="wrap_content"

                />

        </FrameLayout>

    </FrameLayout>

    <View

        android:layout_height="8dp"

        android:layout_width="8dp"

        android:id="@+id/spacer"

        />

    <FrameLayout

        android:layout_height="wrap_content"

        android:layout_width="wrap_content"

        >

        <View

            android:layout_height="6dp"

            android:layout_width="6dp"

            android:visibility="invisible"

            />

        <FrameLayout

            android:id="@+id/mobile_combo"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            >

            <ImageView

                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"

                />

            <ImageView

                android:id="@+id/no_sim"

                android:layout_height="wrap_content"

                android:layout_width="wrap_content"

                />

        </FrameLayout>

    </FrameLayout>

    <ImageView

        android:id="@+id/airplane"

        android:layout_height="wrap_content"

        android:layout_width="wrap_content"

        />

</com.android.systemui.statusbar.MSimSignalClusterView>

packages/SystemUI/res/layout/msim_status_bar.xml

0 → 100644
+110 −0
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/* apps/common/assets/default/default/skins/StatusBar.xml

**

** Copyright (c) 2012-2014 The Linux Foundation. All rights reserved.

** Not a Contribution.

** Copyright 2006, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License"); 

** you may not use this file except in compliance with the License. 

** You may obtain a copy of the License at 

**

**     http://www.apache.org/licenses/LICENSE-2.0 

**

** Unless required by applicable law or agreed to in writing, software 

** distributed under the License is distributed on an "AS IS" BASIS, 

** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 

** See the License for the specific language governing permissions and 

** limitations under the License.

*/

-->



<!--    android:background="@drawable/status_bar_closed_default_background" -->

<com.android.systemui.statusbar.phone.PhoneStatusBarView

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

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

    android:id="@+id/msim_status_bar"

    android:background="@drawable/system_bar_background"

    android:orientation="vertical"

    android:focusable="true"

    android:descendantFocusability="afterDescendants"

    >



    <ImageView

        android:id="@+id/notification_lights_out"

        android:layout_width="@dimen/status_bar_icon_size"

        android:layout_height="match_parent"

        android:paddingStart="6dip"

        android:paddingBottom="2dip"

        android:src="@drawable/ic_sysbar_lights_out_dot_small"

        android:scaleType="center"

        android:visibility="gone"

        />



    <LinearLayout android:id="@+id/status_bar_contents"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:paddingStart="6dip"

        android:paddingEnd="6dip"

        android:orientation="horizontal"

        >



        <com.android.systemui.statusbar.AlphaOptimizedFrameLayout

            android:id="@+id/notification_icon_area"

            android:layout_width="0dip"

            android:layout_height="match_parent"

            android:layout_weight="1"

            android:orientation="horizontal"

            >

            <!-- The alpha of this area is both controlled from PhoneStatusBarTransitions and

                 PhoneStatusBar (DISABLE_NOTIFICATION_ICONS), so we need two views here. -->

            <com.android.systemui.statusbar.AlphaOptimizedLinearLayout

                android:id="@+id/notification_icon_area_inner"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                >

                <com.android.systemui.statusbar.StatusBarIconView android:id="@+id/moreIcon"

                    android:layout_width="@dimen/status_bar_icon_size"

                    android:layout_height="match_parent"

                    android:src="@drawable/stat_notify_more"

                    android:visibility="gone"

                    />

                <com.android.systemui.statusbar.phone.IconMerger android:id="@+id/notificationIcons"

                    android:layout_width="match_parent"

                    android:layout_height="match_parent"

                    android:layout_alignParentStart="true"

                    android:gravity="center_vertical"

                    android:orientation="horizontal"/>

            </com.android.systemui.statusbar.AlphaOptimizedLinearLayout>

        </com.android.systemui.statusbar.AlphaOptimizedFrameLayout>



        <com.android.systemui.statusbar.AlphaOptimizedLinearLayout android:id="@+id/system_icon_area"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"

            android:orientation="horizontal"

            >



            <include layout="@layout/msim_system_icons" />



            <com.android.systemui.statusbar.policy.Clock

                android:id="@+id/clock"

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

                android:layout_width="wrap_content"

                android:layout_height="match_parent"

                android:singleLine="true"

                android:paddingStart="6dip"

                android:gravity="center_vertical|start"

                />

        </com.android.systemui.statusbar.AlphaOptimizedLinearLayout>

    </LinearLayout>



    <ViewStub

        android:id="@+id/ticker_stub"

        android:inflatedId="@+id/ticker"

        android:layout="@layout/status_bar_ticker"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        />



</com.android.systemui.statusbar.phone.PhoneStatusBarView>