Merge "SystemUI: Redesign the scheme of selecting icons on signal cluster" (be707786) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/layout/msim_signal_cluster_view.xml

+76 −1

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@
		<!--
		/* apps/common/assets/default/default/skins/StatusBar.xml
		**
		** Copyright (c) 2012-2013 The Linux Foundation. All rights reserved.
		** Copyright (c) 2012-2014 The Linux Foundation. All rights reserved.
		** Not a Contribution.
		** Copyright 2011 The Android Open Source Project
		**
		@@ -75,6 +75,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"
		@@ -89,6 +106,30 @@
		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"
		/>
		<ImageView
		android:id="@+id/mobile_signal"
		android:layout_height="wrap_content"
		@@ -120,6 +161,23 @@
		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"
		@@ -165,6 +223,23 @@
		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"

packages/SystemUI/res/layout/signal_cluster_view.xml

+47 −1

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@
		<!--
		/* apps/common/assets/default/default/skins/StatusBar.xml
		**
		** Copyright (c) 2012-2013 The Linux Foundation. All rights reserved.
		** Copyright (c) 2012-2014 The Linux Foundation. All rights reserved.
		** Not a Contribution.
		** Copyright 2011, The Android Open Source Project
		**
		@@ -41,6 +41,11 @@
		android:layout_centerVertical="true"
		android:scaleType="center"
		/>
		<ImageView
		android:id="@+id/wifi_inout"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		/>
		</FrameLayout>
		<View
		android:layout_height="6dp"
		@@ -64,6 +69,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"
		@@ -78,6 +100,30 @@
		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"
		/>
		<ImageView
		android:id="@+id/mobile_signal"
		android:layout_height="wrap_content"