diff options
Diffstat (limited to 'packages')
3 files changed, 32 insertions, 7 deletions
diff --git a/packages/SystemUI/res/layout-xlarge/status_bar.xml b/packages/SystemUI/res/layout-xlarge/status_bar.xml index d4e9c53..758377b 100644 --- a/packages/SystemUI/res/layout-xlarge/status_bar.xml +++ b/packages/SystemUI/res/layout-xlarge/status_bar.xml @@ -82,14 +82,24 @@ android:orientation="horizontal" android:gravity="center" > - <ImageView - android:id="@+id/network" + <FrameLayout android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_gravity="top" android:layout_marginTop="19dp" 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 android:id="@+id/battery" android:layout_height="wrap_content" diff --git a/packages/SystemUI/res/layout-xlarge/status_bar_notification_panel.xml b/packages/SystemUI/res/layout-xlarge/status_bar_notification_panel.xml index c0612c8..1d98458 100644 --- a/packages/SystemUI/res/layout-xlarge/status_bar_notification_panel.xml +++ b/packages/SystemUI/res/layout-xlarge/status_bar_notification_panel.xml @@ -95,7 +95,17 @@ /> <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_width="wrap_content" android:layout_toRightOf="@id/battery_text" @@ -109,7 +119,7 @@ style="@style/StatusBarNotificationText" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_toRightOf="@id/network" + android:layout_toRightOf="@id/network_signal" android:layout_alignBaseline="@id/battery" android:singleLine="true" android:text="@string/status_bar_settings_settings_button" diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java index 5f4d542..c55c87e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java @@ -159,7 +159,9 @@ public class TabletStatusBar extends StatusBar { mBatteryController.addLabelView( (TextView)mNotificationPanel.findViewById(R.id.battery_text)); 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( (TextView)mNotificationPanel.findViewById(R.id.network_text)); @@ -283,7 +285,10 @@ public class TabletStatusBar extends StatusBar { mBatteryController = new BatteryController(mContext); mBatteryController.addIconView((ImageView)sb.findViewById(R.id.battery)); 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 mNavigationArea = sb.findViewById(R.id.navigationArea); |