diff options
author | Shufeng Hou <shou@codeaurora.org> | 2015-10-28 17:30:24 +0800 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-11-02 18:32:26 -0800 |
commit | d473d0b22ac8704c39d5eedd0d7b12f60a2fa215 (patch) | |
tree | 5f3c9f58fe992ef50ae729da37c73d159261ef30 /packages/SystemUI/res/layout | |
parent | a73c9bcc3737c1adfd1e2a847eba5605416ad46b (diff) | |
download | frameworks_base-d473d0b22ac8704c39d5eedd0d7b12f60a2fa215.zip frameworks_base-d473d0b22ac8704c39d5eedd0d7b12f60a2fa215.tar.gz frameworks_base-d473d0b22ac8704c39d5eedd0d7b12f60a2fa215.tar.bz2 |
SystemUI: Customize StatusBar for Chinese carrier
1. Show carrier label in notification panel.
2. Add values-w320dp to adapt lower resolution device.
3. Update Chinese roaming string.
4. Show wifi activity in status bar.
5. Show indicator for Wifi on but not connected.
6. Show rsrp level for LTE.
7. Redesign the scheme of selecting icons on signal cluster.
Customized SigalClusterView and MobileSignalController to adapt
requirement from Chinese carriers. The customization is controller
by config values defined in overlayed config.xml.
CRs-Fixed: 653747
Change-Id: I4b228cc4afa552b348a96302a4858a0ab0c7e7f0
Diffstat (limited to 'packages/SystemUI/res/layout')
-rw-r--r-- | packages/SystemUI/res/layout/mobile_signal_group.xml | 82 | ||||
-rw-r--r-- | packages/SystemUI/res/layout/signal_cluster_view.xml | 8 | ||||
-rw-r--r-- | packages/SystemUI/res/layout/status_bar_expanded.xml | 14 |
3 files changed, 86 insertions, 18 deletions
diff --git a/packages/SystemUI/res/layout/mobile_signal_group.xml b/packages/SystemUI/res/layout/mobile_signal_group.xml index 6ae5cf3..3d25f9f 100644 --- a/packages/SystemUI/res/layout/mobile_signal_group.xml +++ b/packages/SystemUI/res/layout/mobile_signal_group.xml @@ -1,5 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <!-- +/* + * Copyright (c) 2015 The Linux Foundation. All rights reserved. + * Not a Contribution. +*/ /* apps/common/assets/default/default/skins/StatusBar.xml ** ** Copyright 2011, The Android Open Source Project @@ -17,31 +21,73 @@ ** limitations under the License. */ --> -<FrameLayout +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:systemui="http://schemas.android.com/apk/res-auto" android:id="@+id/mobile_combo" android:layout_width="wrap_content" android:layout_height="wrap_content" > - <com.android.systemui.statusbar.AnimatedImageView - android:theme="@style/DualToneLightTheme" - android:id="@+id/mobile_signal" - android:layout_height="wrap_content" + <ImageView android:layout_width="wrap_content" - systemui:hasOverlappingRendering="false" - /> - <com.android.systemui.statusbar.AnimatedImageView - android:theme="@style/DualToneDarkTheme" - android:id="@+id/mobile_signal_dark" android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:alpha="0.0" - systemui:hasOverlappingRendering="false" + android:layout_marginStart="2dp" + android:id="@+id/data_inout" + android:visibility="gone" /> - <ImageView - android:id="@+id/mobile_type" - android:layout_height="wrap_content" + <FrameLayout android:layout_width="wrap_content" - /> -</FrameLayout> + android:layout_height="wrap_content" + > + <FrameLayout + android:id="@+id/mobile_signal_single" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + > + <com.android.systemui.statusbar.AnimatedImageView + android:theme="@style/DualToneLightTheme" + android:id="@+id/mobile_signal" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + systemui:hasOverlappingRendering="false" + /> + <com.android.systemui.statusbar.AnimatedImageView + android:theme="@style/DualToneDarkTheme" + android:id="@+id/mobile_signal_dark" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:alpha="0.0" + systemui:hasOverlappingRendering="false" + /> + <ImageView + android:id="@+id/mobile_type" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + /> + <ImageView + android:id="@+id/mobile_inout" + android:layout_height="17dp" + android:layout_width="17dp" + android:layout_gravity="end|bottom" + /> + </FrameLayout> + <LinearLayout + android:id="@+id/mobile_signal_stacked" + 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> + </FrameLayout> +</LinearLayout> diff --git a/packages/SystemUI/res/layout/signal_cluster_view.xml b/packages/SystemUI/res/layout/signal_cluster_view.xml index f8bd6fd..621a739 100644 --- a/packages/SystemUI/res/layout/signal_cluster_view.xml +++ b/packages/SystemUI/res/layout/signal_cluster_view.xml @@ -75,6 +75,14 @@ android:alpha="0.0" systemui:hasOverlappingRendering="false" /> + <com.android.systemui.statusbar.AlphaOptimizedImageView + android:theme="@style/DualToneLightTheme" + android:id="@+id/wifi_inout" + android:layout_height="17dp" + android:layout_width="18.41dp" + android:layout_gravity="center|bottom" + systemui:hasOverlappingRendering="false" + /> </FrameLayout> <View android:id="@+id/wifi_signal_spacer" diff --git a/packages/SystemUI/res/layout/status_bar_expanded.xml b/packages/SystemUI/res/layout/status_bar_expanded.xml index f7bbce0..148212e 100644 --- a/packages/SystemUI/res/layout/status_bar_expanded.xml +++ b/packages/SystemUI/res/layout/status_bar_expanded.xml @@ -20,6 +20,7 @@ <com.android.systemui.statusbar.phone.NotificationPanelView xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:androidprv="http://schemas.android.com/apk/res-auto" xmlns:systemui="http://schemas.android.com/apk/res/com.android.systemui" android:id="@+id/notification_panel" android:layout_width="match_parent" @@ -27,6 +28,19 @@ android:background="@android:color/transparent" > + <com.android.keyguard.CarrierText + android:id="@+id/carrier_label" + android:layout_height="@dimen/carrier_label_height" + android:layout_width="match_parent" + android:layout_marginBottom="@dimen/close_handle_height" + android:layout_gravity="bottom" + android:gravity="center" + android:ellipsize="marquee" + android:singleLine="true" + android:visibility="invisible" + android:textAppearance="?android:attr/textAppearanceSmall" + android:textColor="#999999" /> + <include layout="@layout/keyguard_status_view" android:layout_height="wrap_content" |