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

Commit ff3c4707 authored by Joe Onorato's avatar Joe Onorato Committed by Android (Google) Code Review
Browse files

Merge "make the wifi button go where it's supposed to."

parents cbcce922 64eb5d29

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

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ 
        <TextView

                android:id="@+id/network_label"

                style="@style/StatusBarPanelSettingsContents"

                android:text="@string/status_bar_settings_wifi_button"

                />

        <ImageView

            android:layout_width="wrap_content"

packages/SystemUI/res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -74,6 +74,9 @@ 
    <!-- Name of the button that links to the Settings app. [CHAR LIMIT=NONE] -->

    <string name="status_bar_settings_settings_button">Settings</string>



    <!-- Name of the button that links to the Wifi settings screen. [CHAR LIMIT=NONE] -->

    <string name="status_bar_settings_wifi_button">Wi-Fi</string>



    <!-- Label in the system panel for airplane mode (all radios are turned off)[CHAR LIMIT=30] -->

    <string name="status_bar_settings_airplane">Airplane mode</string>

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

+3 −0
Original line number Diff line number Diff line
@@ -99,6 +99,9 @@ public class SettingsView extends LinearLayout implements View.OnClickListener { 
    // ----------------------------

    private void onClickNetwork() {

        Slog.d(TAG, "onClickNetwork");

        getContext().startActivity(new Intent(Settings.ACTION_WIFI_SETTINGS)

                .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK));

        getStatusBarManager().collapse();

    }



    // Settings