diff options
| author | Daniel Sandler <dsandler@android.com> | 2011-11-10 20:16:38 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-10 20:16:38 -0800 |
| commit | 8b50bd8c9ba594e2516014fcc4b950b8deb36312 (patch) | |
| tree | 6dd576ec14d29bb62ac9277b3d057c6931e0d30f /packages | |
| parent | 0ddcad0b4e203fe56aeca74547b13f6063ccb13b (diff) | |
| parent | 633eabe56d3126fa92eb56636019e5792e20a5da (diff) | |
| download | frameworks_base-8b50bd8c9ba594e2516014fcc4b950b8deb36312.zip frameworks_base-8b50bd8c9ba594e2516014fcc4b950b8deb36312.tar.gz frameworks_base-8b50bd8c9ba594e2516014fcc4b950b8deb36312.tar.bz2 | |
Merge "Remove dedicated wimax icon to fix RSSI layout." into ics-mr1
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/res/layout/signal_cluster_view.xml | 3 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java | 10 |
2 files changed, 7 insertions, 6 deletions
diff --git a/packages/SystemUI/res/layout/signal_cluster_view.xml b/packages/SystemUI/res/layout/signal_cluster_view.xml index 93ac22e..9be9041 100644 --- a/packages/SystemUI/res/layout/signal_cluster_view.xml +++ b/packages/SystemUI/res/layout/signal_cluster_view.xml @@ -51,7 +51,7 @@ android:visibility="gone" android:id="@+id/spacer" /> - <FrameLayout + <!--<FrameLayout android:id="@+id/wimax_combo" android:layout_height="wrap_content" android:layout_width="wrap_content" @@ -72,6 +72,7 @@ android:layout_gravity="center|bottom" /> </FrameLayout> + --> <FrameLayout android:layout_height="wrap_content" android:layout_width="wrap_content" diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java index b0e6968..51fb262 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -350,11 +350,11 @@ public class PhoneStatusBar extends StatusBar { (SignalClusterView)sb.findViewById(R.id.signal_cluster); mNetworkController.addSignalCluster(signalCluster); signalCluster.setNetworkController(mNetworkController); - final ImageView wimaxRSSI = - (ImageView)sb.findViewById(R.id.wimax_signal); - if (wimaxRSSI != null) { - mNetworkController.addWimaxIconView(wimaxRSSI); - } +// final ImageView wimaxRSSI = +// (ImageView)sb.findViewById(R.id.wimax_signal); +// if (wimaxRSSI != null) { +// mNetworkController.addWimaxIconView(wimaxRSSI); +// } // Recents Panel mRecentTasksLoader = new RecentTasksLoader(context); updateRecentsPanel(); |