am 8b50bd8c: Merge "Remove dedicated wimax icon to fix RSSI layout." into ics-mr1

* commit '8b50bd8c9ba594e2516014fcc4b950b8deb36312':
  Remove dedicated wimax icon to fix RSSI layout.
This commit is contained in:
Daniel Sandler
2011-11-11 11:49:59 -08:00
committed by Android Git Automerger
2 changed files with 7 additions and 6 deletions

View File

@@ -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"

View File

@@ -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();