PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Let WifiPickerActivity show AdvancedSettings correctly.

Browse Source 
- stop overwriting EXTRA_SHOW_FRAGMENT
- Show back/next button when WifiPickerActivity is requested
  to show them.

Bug: 3362641
Change-Id: Ic06af4796acb1edb659fb99eb8c7d76c430c7798
This commit is contained in:
Daisuke Miyakawa
2011-01-20 12:29:29 -08:00
parent 5a813ba7f9
commit ece3bef58d
1 changed files with 46 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/com/android/settings/wifi/WifiPickerActivity.java
View File

@@ -17,19 +17,64 @@ package com.android.settings.wifi;
import com.android.settings.ButtonBarHandler;
import android.app.Fragment;
import android.content.Intent;
import android.os.Bundle;
import android.preference.PreferenceActivity;
import android.widget.Button;
public class WifiPickerActivity extends PreferenceActivity implements ButtonBarHandler {
// Same as what are in PreferenceActivity as private.
private static final String EXTRA_PREFS_SHOW_BUTTON_BAR = "extra_prefs_show_button_bar";
private static final String EXTRA_PREFS_SET_NEXT_TEXT = "extra_prefs_set_next_text";
private static final String EXTRA_PREFS_SET_BACK_TEXT = "extra_prefs_set_back_text";
@Override
public Intent getIntent() {
Intent modIntent = new Intent(super.getIntent());
modIntent.putExtra(EXTRA_SHOW_FRAGMENT, WifiSettings.class.getName());
if (!modIntent.hasExtra(EXTRA_SHOW_FRAGMENT)) {
modIntent.putExtra(EXTRA_SHOW_FRAGMENT, WifiSettings.class.getName());
}
modIntent.putExtra(EXTRA_NO_HEADERS, true);
return modIntent;
}
/**
* Almost dead copy of
* {@link PreferenceActivity#startWithFragment(String, Bundle, Fragment, int)}, except
* this has additional codes for button bar handling.
*/
@Override
public void startWithFragment(String fragmentName, Bundle args,
Fragment resultTo, int resultRequestCode) {
Intent intent = new Intent(Intent.ACTION_MAIN);
intent.setClass(this, getClass());
intent.putExtra(EXTRA_SHOW_FRAGMENT, fragmentName);
intent.putExtra(EXTRA_SHOW_FRAGMENT_ARGUMENTS, args);
intent.putExtra(EXTRA_NO_HEADERS, true);
final Intent orgIntent = getIntent();
if (orgIntent.hasExtra(EXTRA_PREFS_SHOW_BUTTON_BAR)) {
intent.putExtra(EXTRA_PREFS_SHOW_BUTTON_BAR,
orgIntent.getBooleanExtra(EXTRA_PREFS_SHOW_BUTTON_BAR, false));
}
if (orgIntent.hasExtra(EXTRA_PREFS_SET_NEXT_TEXT)) {
intent.putExtra(EXTRA_PREFS_SET_NEXT_TEXT,
orgIntent.getStringExtra(EXTRA_PREFS_SET_NEXT_TEXT));
}
if (orgIntent.hasExtra(EXTRA_PREFS_SET_BACK_TEXT)) {
intent.putExtra(EXTRA_PREFS_SET_BACK_TEXT,
orgIntent.getStringExtra(EXTRA_PREFS_SET_BACK_TEXT));
}
if (resultTo == null) {
startActivity(intent);
} else {
resultTo.startActivityForResult(intent, resultRequestCode);
}
}
@Override
public boolean hasNextButton() {
// PreferenceActivity#hasNextButton() is protected, so we need to expose it here.