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

Commit e817a66e authored by Fabrice Di Meglio's avatar Fabrice Di Meglio
Browse files

Fix bug #15702424 add-wifi setting screen has no title 

- pass the missing EXTRA_SHOW_FRAGMENT_TITLE_RESID
- define a new string for the Activity title
- code cleaning: remove a non needed call to getIntent()

Change-Id: I430d59c0225c6e7f23e78edf5644d07ef33a9d98
parent a874180f

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -1421,6 +1421,8 @@ 
    <string name="wifi_settings_summary">Set up &amp; manage wireless access points</string>

    <!-- Used in the 1st-level settings screen to turn on Wi-Fi  [CHAR LIMIT=60] -->

    <string name="wifi_setup_wizard_title">Select Wi\u2011Fi</string>

    <!-- Used by Account creation for turning on Wi-Fi  [CHAR LIMIT=60] -->

    <string name="wifi_select_network">Select Wi\u2011Fi</string>

    <!-- Summary text when turning Wi-Fi or bluetooth on -->

    <string name="wifi_starting">Turning Wi\u2011Fi on\u2026</string>

    <!-- Summary text when turning Wi-Fi or bluetooth off -->

src/com/android/settings/SettingsActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -476,7 +476,7 @@ public class SettingsActivity extends Activity 
        mIsShortcut = isShortCutIntent(intent) || isLikeShortCutIntent(intent) ||

                intent.getBooleanExtra(EXTRA_SHOW_FRAGMENT_AS_SHORTCUT, false);



        final ComponentName cn = getIntent().getComponent();

        final ComponentName cn = intent.getComponent();

        final String className = cn.getClassName();



        mIsShowingDashboard = className.equals(Settings.class.getName());

src/com/android/settings/wifi/WifiPickerActivity.java

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.settings.wifi; 
import com.android.settings.ButtonBarHandler;

import com.android.settings.SettingsActivity;

import com.android.settings.wifi.p2p.WifiP2pSettings;

import com.android.settings.R;



import android.content.Intent;

import android.preference.PreferenceFragment;
@@ -31,6 +32,7 @@ public class WifiPickerActivity extends SettingsActivity implements ButtonBarHan 
        Intent modIntent = new Intent(super.getIntent());

        if (!modIntent.hasExtra(EXTRA_SHOW_FRAGMENT)) {

            modIntent.putExtra(EXTRA_SHOW_FRAGMENT, getWifiSettingsClass().getName());

            modIntent.putExtra(EXTRA_SHOW_FRAGMENT_TITLE_RESID, R.string.wifi_select_network);

        }

        return modIntent;

    }