package com.android.settings;
+import com.android.settings.accounts.AccountSyncSettings;
+import com.android.settings.bluetooth.BluetoothEnabler;
+import com.android.settings.fuelgauge.PowerUsageSummary;
+import com.android.settings.wifi.WifiEnabler;
+
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.widget.Switch;
import android.widget.TextView;
-import com.android.settings.accounts.ManageAccountsSettings;
-import com.android.settings.bluetooth.BluetoothEnabler;
-import com.android.settings.fuelgauge.PowerUsageSummary;
-import com.android.settings.wifi.WifiEnabler;
-
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
private static final String META_DATA_KEY_PARENT_FRAGMENT_CLASS =
"com.android.settings.PARENT_FRAGMENT_CLASS";
- private static final String EXTRA_THEME = "settings:theme";
+ private static final String EXTRA_CLEAR_UI_OPTIONS = "settings:remove_ui_options";
private static final String SAVE_KEY_CURRENT_HEADER = "com.android.settings.CURRENT_HEADER";
private static final String SAVE_KEY_PARENT_HEADER = "com.android.settings.PARENT_HEADER";
@Override
protected void onCreate(Bundle savedInstanceState) {
- final int theme = getIntent().getIntExtra(
- EXTRA_THEME, android.R.style.Theme_Holo_SolidActionBar_SplitActionBarWhenNarrow);
- setTheme(theme);
+ if (getIntent().getBooleanExtra(EXTRA_CLEAR_UI_OPTIONS, false)) {
+ getWindow().setUiOptions(0);
+ }
getMetaData();
mInLocalHeaderSwitch = true;
mCurrentHeader = parentHeader;
switchToHeaderLocal(parentHeader);
+ highlightHeader();
mParentHeader = new Header();
mParentHeader.fragment
Integer index = mHeaderIndexMap.get(mTopLevelHeaderId);
if (index != null) {
getListView().setItemChecked(index, true);
+ getListView().smoothScrollToPosition(index);
}
}
}
Intent intent = super.onBuildStartFragmentIntent(fragmentName, args,
titleRes, shortTitleRes);
- // some fragments would like a custom activity theme
+ // some fragments want to avoid split actionbar
if (DataUsageSummary.class.getName().equals(fragmentName) ||
PowerUsageSummary.class.getName().equals(fragmentName) ||
- UserDictionarySettings.class.getName().equals(fragmentName) ||
- ManageAccountsSettings.class.getName().equals(fragmentName)) {
- intent.putExtra(EXTRA_THEME, android.R.style.Theme_Holo_SolidActionBar);
+ AccountSyncSettings.class.getName().equals(fragmentName) ||
+ UserDictionarySettings.class.getName().equals(fragmentName)) {
+ intent.putExtra(EXTRA_CLEAR_UI_OPTIONS, true);
}
intent.setClass(this, SubSettings.class);
@Override
public boolean onPreferenceStartFragment(PreferenceFragment caller, Preference pref) {
// Override the fragment title for Wallpaper settings
- CharSequence title = pref.getTitle();
+ int titleRes = pref.getTitleRes();
if (pref.getFragment().equals(WallpaperTypeSettings.class.getName())) {
- title = getString(R.string.wallpaper_settings_fragment_title);
+ titleRes = R.string.wallpaper_settings_fragment_title;
}
- startPreferencePanel(pref.getFragment(), pref.getExtras(), 0, title, null, 0);
+ startPreferencePanel(pref.getFragment(), pref.getExtras(), titleRes, null, null, 0);
return true;
}
public static class DateTimeSettingsActivity extends Settings { /* empty */ }
public static class StorageSettingsActivity extends Settings { /* empty */ }
public static class WifiSettingsActivity extends Settings { /* empty */ }
+ public static class WifiP2pSettingsActivity extends Settings { /* empty */ }
public static class InputMethodAndLanguageSettingsActivity extends Settings { /* empty */ }
public static class InputMethodAndSubtypeEnablerActivity extends Settings { /* empty */ }
+ public static class SpellCheckersSettingsActivity extends Settings { /* empty */ }
public static class LocalePickerActivity extends Settings { /* empty */ }
public static class UserDictionarySettingsActivity extends Settings { /* empty */ }
public static class SoundSettingsActivity extends Settings { /* empty */ }
public static class DataUsageSummaryActivity extends Settings { /* empty */ }
public static class AdvancedWifiSettingsActivity extends Settings { /* empty */ }
public static class TextToSpeechSettingsActivity extends Settings { /* empty */ }
+ public static class AndroidBeamSettingsActivity extends Settings { /* empty */ }
}