Show the network type. (42f8e130) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/layout-xlarge/status_bar.xml

+13 −3

Original line number	Original line	Diff line number	Diff line
	@@ -82,14 +82,24 @@
	android:orientation="horizontal"		android:orientation="horizontal"
	android:gravity="center"		android:gravity="center"
	>		>
	<ImageView		<FrameLayout
	android:id="@+id/network"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:layout_width="wrap_content"		android:layout_width="wrap_content"
	android:layout_gravity="top"		android:layout_gravity="top"
	android:layout_marginTop="19dp"		android:layout_marginTop="19dp"
	android:layout_marginRight="4dp"		android:layout_marginRight="4dp"
			>
			<ImageView
			android:id="@+id/network_signal"
			android:layout_height="wrap_content"
			android:layout_width="wrap_content"
			/>
			<ImageView
			android:id="@+id/network_type"
			android:layout_height="wrap_content"
			android:layout_width="wrap_content"
	/>		/>
			</FrameLayout>
	<ImageView		<ImageView
	android:id="@+id/battery"		android:id="@+id/battery"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"

packages/SystemUI/res/layout-xlarge/status_bar_notification_panel.xml

+12 −2

Original line number	Original line	Diff line number	Diff line
	@@ -95,7 +95,17 @@
	/>		/>

	<ImageView		<ImageView
	android:id="@+id/network"		android:id="@+id/network_signal"
			android:layout_height="wrap_content"
			android:layout_width="wrap_content"
			android:layout_toRightOf="@id/battery_text"
			android:layout_alignBaseline="@id/battery"
			android:layout_marginRight="8dp"
			android:baseline="15dp"
			/>

			<ImageView
			android:id="@+id/network_type"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:layout_width="wrap_content"		android:layout_width="wrap_content"
	android:layout_toRightOf="@id/battery_text"		android:layout_toRightOf="@id/battery_text"
	@@ -109,7 +119,7 @@
	style="@style/StatusBarNotificationText"		style="@style/StatusBarNotificationText"
	android:layout_width="wrap_content"		android:layout_width="wrap_content"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:layout_toRightOf="@id/network"		android:layout_toRightOf="@id/network_signal"
	android:layout_alignBaseline="@id/battery"		android:layout_alignBaseline="@id/battery"
	android:singleLine="true"		android:singleLine="true"
	android:text="@string/status_bar_settings_settings_button"		android:text="@string/status_bar_settings_settings_button"

packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java

+7 −2

Original line number	Original line	Diff line number	Diff line
	@@ -159,7 +159,9 @@ public class TabletStatusBar extends StatusBar {
	mBatteryController.addLabelView(		mBatteryController.addLabelView(
	(TextView)mNotificationPanel.findViewById(R.id.battery_text));		(TextView)mNotificationPanel.findViewById(R.id.battery_text));
	mNetworkController.addCombinedSignalIconView(		mNetworkController.addCombinedSignalIconView(
	(ImageView)mNotificationPanel.findViewById(R.id.network));		(ImageView)mNotificationPanel.findViewById(R.id.network_signal));
			mNetworkController.addDataTypeIconView(
			(ImageView)mNotificationPanel.findViewById(R.id.network_type));
	mNetworkController.addLabelView(		mNetworkController.addLabelView(
	(TextView)mNotificationPanel.findViewById(R.id.network_text));		(TextView)mNotificationPanel.findViewById(R.id.network_text));

	@@ -283,7 +285,10 @@ public class TabletStatusBar extends StatusBar {
	mBatteryController = new BatteryController(mContext);		mBatteryController = new BatteryController(mContext);
	mBatteryController.addIconView((ImageView)sb.findViewById(R.id.battery));		mBatteryController.addIconView((ImageView)sb.findViewById(R.id.battery));
	mNetworkController = new NetworkController(mContext);		mNetworkController = new NetworkController(mContext);
	mNetworkController.addCombinedSignalIconView((ImageView)sb.findViewById(R.id.network));		mNetworkController.addCombinedSignalIconView(
			(ImageView)sb.findViewById(R.id.network_signal));
			mNetworkController.addDataTypeIconView(
			(ImageView)sb.findViewById(R.id.network_type));

	// The navigation buttons		// The navigation buttons
	mNavigationArea = sb.findViewById(R.id.navigationArea);		mNavigationArea = sb.findViewById(R.id.navigationArea);