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

Fix crash when rotating screen in a few screens.

Browse Source 
Bug: 26946312

Fixed in the following screens:
Apps > Gear > Special Access > Modify system settings
Apps > Gear > Special Access > Draw over other apps
Apps > Gear > Special Access > Apps with usage access
Language & input > Personal dictionary
Wireless & networks (More) > Android Beam

Change-Id: I0b9bd6c19f710302625dd87989e9d4ce3c96a9a2
This commit is contained in:
Fan Zhang
2016-05-06 15:39:52 -07:00
parent 04b25af149
commit 016f875ae7
4 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/UserDictionarySettings.java
View File

@@ -71,12 +71,6 @@ public class UserDictionarySettings extends ListFragment {
protected String mLocale; protected String mLocale;
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
getActivity().getActionBar().setTitle(R.string.user_dict_settings_title);
}
@Override @Override
public View onCreateView( public View onCreateView(
LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
@@ -87,6 +81,7 @@ public class UserDictionarySettings extends ListFragment {
@Override @Override
public void onActivityCreated(Bundle savedInstanceState) { public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState); super.onActivityCreated(savedInstanceState);
getActivity().getActionBar().setTitle(R.string.user_dict_settings_title);
final Intent intent = getActivity().getIntent(); final Intent intent = getActivity().getIntent();
final String localeFromIntent = final String localeFromIntent =

3
src/com/android/settings/applications/ManageApplications.java
View File

@@ -260,17 +260,14 @@ public class ManageApplications extends InstrumentedFragment
mSortOrder = R.id.sort_order_size; mSortOrder = R.id.sort_order_size;
} else if (className.equals(UsageAccessSettingsActivity.class.getName())) { } else if (className.equals(UsageAccessSettingsActivity.class.getName())) {
mListType = LIST_TYPE_USAGE_ACCESS; mListType = LIST_TYPE_USAGE_ACCESS;
getActivity().getActionBar().setTitle(R.string.usage_access_title);
} else if (className.equals(HighPowerApplicationsActivity.class.getName())) { } else if (className.equals(HighPowerApplicationsActivity.class.getName())) {
mListType = LIST_TYPE_HIGH_POWER; mListType = LIST_TYPE_HIGH_POWER;
// Default to showing system. // Default to showing system.
mShowSystem = true; mShowSystem = true;
} else if (className.equals(OverlaySettingsActivity.class.getName())) { } else if (className.equals(OverlaySettingsActivity.class.getName())) {
mListType = LIST_TYPE_OVERLAY; mListType = LIST_TYPE_OVERLAY;
getActivity().getActionBar().setTitle(R.string.system_alert_window_access_title);
} else if (className.equals(WriteSettingsActivity.class.getName())) { } else if (className.equals(WriteSettingsActivity.class.getName())) {
mListType = LIST_TYPE_WRITE_SETTINGS; mListType = LIST_TYPE_WRITE_SETTINGS;
getActivity().getActionBar().setTitle(R.string.write_settings_title);
} else { } else {
mListType = LIST_TYPE_MAIN; mListType = LIST_TYPE_MAIN;
} }

2
src/com/android/settings/inputmethod/UserDictionaryList.java
View File

@@ -52,12 +52,12 @@ public class UserDictionaryList extends SettingsPreferenceFragment {
public void onCreate(Bundle icicle) { public void onCreate(Bundle icicle) {
super.onCreate(icicle); super.onCreate(icicle);
setPreferenceScreen(getPreferenceManager().createPreferenceScreen(getActivity())); setPreferenceScreen(getPreferenceManager().createPreferenceScreen(getActivity()));
getActivity().getActionBar().setTitle(R.string.user_dict_settings_title);
} }
@Override @Override
public void onActivityCreated(Bundle savedInstanceState) { public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState); super.onActivityCreated(savedInstanceState);
getActivity().getActionBar().setTitle(R.string.user_dict_settings_title);
final Intent intent = getActivity().getIntent(); final Intent intent = getActivity().getIntent();
final String localeFromIntent = final String localeFromIntent =

8
src/com/android/settings/nfc/AndroidBeam.java
View File

@@ -52,12 +52,6 @@ public class AndroidBeam extends InstrumentedFragment
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
final ActionBar actionBar = getActivity().getActionBar();
mOldActivityTitle = actionBar.getTitle();
actionBar.setTitle(R.string.android_beam_settings_title);
mNfcAdapter = NfcAdapter.getDefaultAdapter(getActivity()); mNfcAdapter = NfcAdapter.getDefaultAdapter(getActivity());
setHasOptionsMenu(true); setHasOptionsMenu(true);
} }
@@ -94,6 +88,8 @@ public class AndroidBeam extends InstrumentedFragment
SettingsActivity activity = (SettingsActivity) getActivity(); SettingsActivity activity = (SettingsActivity) getActivity();
mOldActivityTitle = activity.getActionBar().getTitle();
mSwitchBar = activity.getSwitchBar(); mSwitchBar = activity.getSwitchBar();
if (mBeamDisallowedByOnlyAdmin) { if (mBeamDisallowedByOnlyAdmin) {
mSwitchBar.hide(); mSwitchBar.hide();