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

Commit 399f4417 authored by haiyangl's avatar haiyangl Committed by Linux Build Service Account
Browse files

SystemUI: Customize StatusBar for Chinese carrier 

1. Add support to show sim status on status bar pull down curtain
   if sim is absent or missing.
2. Add values-w320dp to adapt lower resolution device.
3. Update Chinese roaming string.
4. Optionally, disable BT and Wifi switch on quick setting panel if
   it is under airplane mode as Chinese carrier required.
5. Switch positions of sub1 and sub3 on status bar.
6. Redesign the scheme of selecting icons on signal cluster.
   Customized SigalClusterView and MSimSiganlClusterView to adapt
   requirement from Chinese carriers. The customization is controller
   by config values defined in overlayed config.xml.

Change-Id: I92ad6eabbec3b310c75eb2d41b3345a7169c488c
parent c1e1ac25

core/res/res/values-w320dp/dimens.xml

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

<!--

/*

** Copyright 2011, The Android Open Source Project

** Copyright (c) 2013, The Linux Foundation. All rights reserved.

** Not a Contribution.



** 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.

*/

-->

<resources>



    <dimen name="kg_status_clock_font_size">45dp</dimen>

    <!-- Size of the date font in keyguard's status view -->

    <dimen name="kg_status_date_font_size">10dp</dimen>



</resources>
 
 No newline at end of file

packages/SystemUI/res/layout/msim_signal_cluster_view.xml

+147 −10
Original line number Diff line number Diff line
@@ -37,6 +37,12 @@ 
            android:layout_height="wrap_content"

            android:layout_width="wrap_content"

            />

        <ImageView

            android:id="@+id/wifi_inout"

            android:layout_height="wrap_content"

            android:layout_width="wrap_content"

            android:layout_gravity="center|bottom"

            />

    </FrameLayout>

    <View

        android:layout_height="6dp"
@@ -66,6 +72,23 @@ 
            />

    </FrameLayout>

    -->

    <FrameLayout

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:id="@+id/data_combo"

        android:visibility="gone"

        >

        <View

            android:layout_width="6dp"

            android:layout_height="6dp"

            android:visibility="invisible"

            />

        <ImageView

            android:id="@+id/data_inout"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            />

    </FrameLayout>

    <FrameLayout

        android:layout_height="wrap_content"

        android:layout_width="wrap_content"
@@ -76,30 +99,72 @@ 
            android:visibility="invisible"

            />

        <FrameLayout

            android:id="@+id/mobile_combo_sub3"

            android:id="@+id/mobile_combo"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            >

            <LinearLayout

                android:id="@+id/mobile_signal_cdma"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:orientation="vertical"

                android:visibility="gone"

                >

                <ImageView

                android:id="@+id/mobile_signal_sub3"

                    android:id="@+id/mobile_signal_3g"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    />

                <ImageView

                    android:id="@+id/mobile_signal_1x"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    />

            </LinearLayout>

            <ImageView

                android:id="@+id/mobile_signal_1x_only"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:visibility="gone"

                />

            <LinearLayout

                android:id="@+id/mobile_data_voice"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:orientation="vertical"

                android:visibility="gone"

                >

                <ImageView

                    android:id="@+id/mobile_signal_data"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    />

                <ImageView

                    android:id="@+id/mobile_signal_voice"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    />

            </LinearLayout>

            <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_sub3"

                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_sub3"

                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_slot3"

                android:id="@+id/no_sim"

                android:layout_height="wrap_content"

                android:layout_width="wrap_content"

                />
@@ -108,8 +173,26 @@ 
    <View

        android:layout_height="8dp"

        android:layout_width="8dp"

        android:visibility="gone"

        android:id="@+id/spacer"

        />

    <FrameLayout

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:id="@+id/data_combo_sub2"

        android:visibility="gone"

        >

        <View

            android:layout_width="6dp"

            android:layout_height="6dp"

            android:visibility="invisible"

            />

        <ImageView

            android:id="@+id/data_inout_sub2"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            />

    </FrameLayout>

    <FrameLayout

        android:layout_height="wrap_content"

        android:layout_width="wrap_content"
@@ -124,6 +207,24 @@ 
            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            >

            <LinearLayout

                android:id="@+id/mobile_data_voice_sub2"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:orientation="vertical"

                android:visibility="gone"

                >

                <ImageView

                    android:id="@+id/mobile_signal_data_sub2"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    />

                <ImageView

                    android:id="@+id/mobile_signal_voice_sub2"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    />

            </LinearLayout>

            <ImageView

                android:id="@+id/mobile_signal_sub2"

                android:layout_height="wrap_content"
@@ -152,8 +253,26 @@ 
    <View

        android:layout_height="8dp"

        android:layout_width="8dp"

        android:visibility="gone"

        android:id="@+id/spacer"

        />

    <FrameLayout

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:id="@+id/data_combo_sub3"

        android:visibility="gone"

        >

        <View

            android:layout_width="6dp"

            android:layout_height="6dp"

            android:visibility="invisible"

            />

        <ImageView

            android:id="@+id/data_inout_sub3"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            />

    </FrameLayout>

    <FrameLayout

        android:layout_height="wrap_content"

        android:layout_width="wrap_content"
@@ -164,30 +283,48 @@ 
            android:visibility="invisible"

            />

        <FrameLayout

            android:id="@+id/mobile_combo"

            android:id="@+id/mobile_combo_sub3"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            >

            <LinearLayout

                android:id="@+id/mobile_data_voice_sub3"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:orientation="vertical"

                android:visibility="gone"

                >

                <ImageView

                android:id="@+id/mobile_signal"

                    android:id="@+id/mobile_signal_data_sub3"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    />

                <ImageView

                    android:id="@+id/mobile_signal_voice_sub3"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    />

            </LinearLayout>

            <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"

                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"

                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"

                android:id="@+id/no_sim_slot3"

                android:layout_height="wrap_content"

                android:layout_width="wrap_content"

                />

packages/SystemUI/res/layout/signal_cluster_view.xml

+61 −0
Original line number Diff line number Diff line
@@ -2,6 +2,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");
@@ -55,6 +57,23 @@ 
        android:layout_height="4dp"

        android:visibility="gone"

        />

    <FrameLayout

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:id="@+id/data_combo"

        android:visibility="gone"

        >

        <View

            android:layout_width="6dp"

            android:layout_height="6dp"

            android:visibility="invisible"

            />

        <ImageView

            android:id="@+id/data_inout"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            />

    </FrameLayout>

    <FrameLayout

        android:layout_height="wrap_content"

        android:layout_width="wrap_content"
@@ -64,6 +83,48 @@ 
            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            >

            <LinearLayout

                android:id="@+id/mobile_signal_cdma"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:orientation="vertical"

                android:visibility="gone"

                >

                <ImageView

                    android:id="@+id/mobile_signal_3g"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    />

                <ImageView

                    android:id="@+id/mobile_signal_1x"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    />

            </LinearLayout>

            <ImageView

                android:id="@+id/mobile_signal_1x_only"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:visibility="gone"

            />

            <LinearLayout

                android:id="@+id/mobile_data_voice"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:orientation="vertical"

                android:visibility="gone"

                >

                <ImageView

                    android:id="@+id/mobile_signal_data"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    />

                <ImageView

                    android:id="@+id/mobile_signal_voice"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    />

            </LinearLayout>

            <ImageView

                android:id="@+id/mobile_signal"

                android:layout_height="wrap_content"

packages/SystemUI/res/values-zh-rCN/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ 
    <string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>

    <string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>

    <string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>

    <string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"漫游中"</string>

    <string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"数据漫游"</string>

    <string name="accessibility_data_connection_edge" msgid="4477457051631979278">"EDGE"</string>

    <string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"WLAN"</string>

    <string name="accessibility_no_sim" msgid="8274017118472455155">"无SIM卡。"</string>

packages/SystemUI/res/values-zh-rTW/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ 
    <string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>

    <string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>

    <string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>

    <string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"漫遊中"</string>

    <string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"數據漫遊"</string>

    <string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>

    <string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>

    <string name="accessibility_no_sim" msgid="8274017118472455155">"沒有 SIM 卡。"</string>