Mode code cleaning: remove obsolete references to EXTRA_NO_HEADERS
- the EXTRA_NO_HEADERS flag as no more meaning as we are showing
the Tiles (previously named "Headers") only in the Dashboard
(which is the main Settings screen)
Change-Id: I55656de0d28ca9c84adbe6647d870838b4ac230b
diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java
index 336a372..0081ad3 100644
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -46,7 +46,6 @@
public Intent getIntent() {
Intent modIntent = new Intent(super.getIntent());
modIntent.putExtra(EXTRA_SHOW_FRAGMENT, ChooseLockGenericFragment.class.getName());
- modIntent.putExtra(EXTRA_NO_HEADERS, true);
return modIntent;
}
diff --git a/src/com/android/settings/ChooseLockPassword.java b/src/com/android/settings/ChooseLockPassword.java
index 4d102a4..90cd251 100644
--- a/src/com/android/settings/ChooseLockPassword.java
+++ b/src/com/android/settings/ChooseLockPassword.java
@@ -58,7 +58,6 @@
public Intent getIntent() {
Intent modIntent = new Intent(super.getIntent());
modIntent.putExtra(EXTRA_SHOW_FRAGMENT, ChooseLockPasswordFragment.class.getName());
- modIntent.putExtra(EXTRA_NO_HEADERS, true);
return modIntent;
}
diff --git a/src/com/android/settings/ChooseLockPattern.java b/src/com/android/settings/ChooseLockPattern.java
index 5a939aa..c13cea2 100644
--- a/src/com/android/settings/ChooseLockPattern.java
+++ b/src/com/android/settings/ChooseLockPattern.java
@@ -63,7 +63,6 @@
public Intent getIntent() {
Intent modIntent = new Intent(super.getIntent());
modIntent.putExtra(EXTRA_SHOW_FRAGMENT, ChooseLockPatternFragment.class.getName());
- modIntent.putExtra(EXTRA_NO_HEADERS, true);
return modIntent;
}
diff --git a/src/com/android/settings/ConfirmLockPassword.java b/src/com/android/settings/ConfirmLockPassword.java
index a2302bb..52aa1d9 100644
--- a/src/com/android/settings/ConfirmLockPassword.java
+++ b/src/com/android/settings/ConfirmLockPassword.java
@@ -48,7 +48,6 @@
public Intent getIntent() {
Intent modIntent = new Intent(super.getIntent());
modIntent.putExtra(EXTRA_SHOW_FRAGMENT, ConfirmLockPasswordFragment.class.getName());
- modIntent.putExtra(EXTRA_NO_HEADERS, true);
return modIntent;
}
diff --git a/src/com/android/settings/ConfirmLockPattern.java b/src/com/android/settings/ConfirmLockPattern.java
index a4b9991..9405f6d 100644
--- a/src/com/android/settings/ConfirmLockPattern.java
+++ b/src/com/android/settings/ConfirmLockPattern.java
@@ -72,7 +72,6 @@
public Intent getIntent() {
Intent modIntent = new Intent(super.getIntent());
modIntent.putExtra(EXTRA_SHOW_FRAGMENT, ConfirmLockPatternFragment.class.getName());
- modIntent.putExtra(EXTRA_NO_HEADERS, true);
return modIntent;
}
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 00368e4..7a9adaf 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -153,15 +153,6 @@
*/
public static final String EXTRA_FRAGMENT_ARG_KEY = ":settings:fragment_args_key";
- /**
- * When starting this activity, the invoking Intent can contain this extra
- * boolean that the header list should not be displayed. This is most often
- * used in conjunction with {@link #EXTRA_SHOW_FRAGMENT} to launch
- * the activity to display a specific fragment that the user has navigated
- * to.
- */
- public static final String EXTRA_NO_HEADERS = ":settings:no_headers";
-
public static final String BACK_STACK_PREFS = ":settings:prefs";
// extras that allow any preference activity to be launched as part of a wizard
@@ -670,17 +661,6 @@
return false;
}
- /**
- * Called to determine whether the header list should be hidden.
- * The default implementation returns the
- * value given in {@link #EXTRA_NO_HEADERS} or false if it is not supplied.
- * This is set to false, for example, when the activity is being re-launched
- * to show a particular preference activity.
- */
- public boolean onIsHidingHeaders() {
- return getIntent().getBooleanExtra(EXTRA_NO_HEADERS, false);
- }
-
@Override
public Intent getIntent() {
Intent superIntent = super.getIntent();
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index f91a986..36e1904 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -555,7 +555,6 @@
intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT, fragmentName);
intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS, args);
intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE, title);
- intent.putExtra(SettingsActivity.EXTRA_NO_HEADERS, true);
return intent;
}
}
diff --git a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
index a6901ad..6558cc7 100644
--- a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
@@ -146,9 +146,7 @@
public void setTitle(String title) {
final SettingsActivity activity = (SettingsActivity) getActivity();
- if (!activity.onIsHidingHeaders()) {
- getActivity().setTitle(title);
- }
+ getActivity().setTitle(title);
}
protected void onProcessArguments(Bundle arguments) {
diff --git a/src/com/android/settings/accounts/SyncSettingsActivity.java b/src/com/android/settings/accounts/SyncSettingsActivity.java
index 9b1bc32..014c24d 100644
--- a/src/com/android/settings/accounts/SyncSettingsActivity.java
+++ b/src/com/android/settings/accounts/SyncSettingsActivity.java
@@ -29,7 +29,6 @@
public Intent getIntent() {
Intent modIntent = new Intent(super.getIntent());
modIntent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT, SyncSettings.class.getName());
- modIntent.putExtra(SettingsActivity.EXTRA_NO_HEADERS, true);
return modIntent;
}
diff --git a/src/com/android/settings/applications/InstalledAppDetailsTop.java b/src/com/android/settings/applications/InstalledAppDetailsTop.java
index e731c1c..e078729 100644
--- a/src/com/android/settings/applications/InstalledAppDetailsTop.java
+++ b/src/com/android/settings/applications/InstalledAppDetailsTop.java
@@ -25,7 +25,6 @@
public Intent getIntent() {
Intent modIntent = new Intent(super.getIntent());
modIntent.putExtra(EXTRA_SHOW_FRAGMENT, InstalledAppDetails.class.getName());
- modIntent.putExtra(EXTRA_NO_HEADERS, true);
return modIntent;
}
diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java
index b505a3f..5f5b1f8 100755
--- a/src/com/android/settings/bluetooth/BluetoothSettings.java
+++ b/src/com/android/settings/bluetooth/BluetoothSettings.java
@@ -141,10 +141,8 @@
public void onStop() {
super.onStop();
final SettingsActivity activity = (SettingsActivity) getActivity();
- if (!activity.onIsHidingHeaders()) {
- activity.getActionBar().setDisplayOptions(0, ActionBar.DISPLAY_SHOW_CUSTOM);
- activity.getActionBar().setCustomView(null);
- }
+ activity.getActionBar().setDisplayOptions(0, ActionBar.DISPLAY_SHOW_CUSTOM);
+ activity.getActionBar().setCustomView(null);
}
@Override
diff --git a/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnablerActivity.java b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnablerActivity.java
index 67e32ab..da95b47 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnablerActivity.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnablerActivity.java
@@ -25,7 +25,6 @@
final Intent modIntent = new Intent(super.getIntent());
if (!modIntent.hasExtra(EXTRA_SHOW_FRAGMENT)) {
modIntent.putExtra(EXTRA_SHOW_FRAGMENT, InputMethodAndSubtypeEnabler.class.getName());
- modIntent.putExtra(EXTRA_NO_HEADERS, true);
}
return modIntent;
}
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 9a2180e..4e702b5 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -416,24 +416,17 @@
final Activity activity = getActivity();
mSwitch = new Switch(activity.getActionBar().getThemedContext());
- boolean addSwitch = true;
- if (activity instanceof WifiPickerActivity) {
- PreferenceActivity pa = (PreferenceActivity) activity;
- addSwitch = pa.onIsHidingHeaders();
- }
+ final int padding = activity.getResources().getDimensionPixelSize(
+ R.dimen.action_bar_switch_padding);
+ mSwitch.setPaddingRelative(0, 0, padding, 0);
- if (addSwitch) {
- final int padding = activity.getResources().getDimensionPixelSize(
- R.dimen.action_bar_switch_padding);
- mSwitch.setPaddingRelative(0, 0, padding, 0);
- activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
- ActionBar.DISPLAY_SHOW_CUSTOM);
- activity.getActionBar().setCustomView(mSwitch, new ActionBar.LayoutParams(
- ActionBar.LayoutParams.WRAP_CONTENT,
- ActionBar.LayoutParams.WRAP_CONTENT,
- Gravity.CENTER_VERTICAL | Gravity.END));
- }
+ activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
+ ActionBar.DISPLAY_SHOW_CUSTOM);
+ activity.getActionBar().setCustomView(mSwitch, new ActionBar.LayoutParams(
+ ActionBar.LayoutParams.WRAP_CONTENT,
+ ActionBar.LayoutParams.WRAP_CONTENT,
+ Gravity.CENTER_VERTICAL | Gravity.END));
mWifiEnabler = new WifiEnabler(activity, mSwitch);
}
@@ -442,19 +435,9 @@
@Override
public void onStop() {
super.onStop();
- Activity activity = getActivity();
- boolean onIsHidingHeaders = true;
- if (activity instanceof SettingsActivity){
- SettingsActivity sa = (SettingsActivity) activity;
- onIsHidingHeaders = sa.onIsHidingHeaders();
- } else if (activity instanceof PreferenceActivity) {
- PreferenceActivity pa = (PreferenceActivity) activity;
- onIsHidingHeaders = pa.onIsHidingHeaders();
- }
- if (!onIsHidingHeaders) {
- activity.getActionBar().setDisplayOptions(0, ActionBar.DISPLAY_SHOW_CUSTOM);
- activity.getActionBar().setCustomView(null);
- }
+ final Activity activity = getActivity();
+ activity.getActionBar().setDisplayOptions(0, ActionBar.DISPLAY_SHOW_CUSTOM);
+ activity.getActionBar().setCustomView(null);
}
@Override