Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c2ef85c authored by Daniel Sandler's avatar Daniel Sandler Committed by Android Git Automerger
Browse files

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

* commit '8b50bd8c':
  Remove dedicated wimax icon to fix RSSI layout.
parents fcba1b60 8b50bd8c

packages/SystemUI/res/layout/signal_cluster_view.xml

+2 −1
Original line number Original line Diff line number Diff line
@@ -51,7 +51,7 @@ 
        android:visibility="gone"

        android:visibility="gone"

        android:id="@+id/spacer"

        android:id="@+id/spacer"

        />

        />

    <FrameLayout

    <!--<FrameLayout

        android:id="@+id/wimax_combo"

        android:id="@+id/wimax_combo"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        android:layout_width="wrap_content"

        android:layout_width="wrap_content"
@@ -72,6 +72,7 @@ 
            android:layout_gravity="center|bottom"

            android:layout_gravity="center|bottom"

            />

            />

    </FrameLayout>

    </FrameLayout>

    -->

    <FrameLayout

    <FrameLayout

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        android:layout_width="wrap_content"

        android:layout_width="wrap_content"

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

+5 −5
Original line number Original line Diff line number Diff line
@@ -350,11 +350,11 @@ public class PhoneStatusBar extends StatusBar { 
                (SignalClusterView)sb.findViewById(R.id.signal_cluster);

                (SignalClusterView)sb.findViewById(R.id.signal_cluster);

        mNetworkController.addSignalCluster(signalCluster);

        mNetworkController.addSignalCluster(signalCluster);

        signalCluster.setNetworkController(mNetworkController);

        signalCluster.setNetworkController(mNetworkController);

	final ImageView wimaxRSSI = 

//        final ImageView wimaxRSSI = 

                (ImageView)sb.findViewById(R.id.wimax_signal);

//                (ImageView)sb.findViewById(R.id.wimax_signal);

        if (wimaxRSSI != null) {

//        if (wimaxRSSI != null) {

            mNetworkController.addWimaxIconView(wimaxRSSI);

//            mNetworkController.addWimaxIconView(wimaxRSSI);

        }

//        }

        // Recents Panel

        // Recents Panel

        mRecentTasksLoader = new RecentTasksLoader(context);

        mRecentTasksLoader = new RecentTasksLoader(context);

        updateRecentsPanel();

        updateRecentsPanel();