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

Fix crash when rotating the device on magnification mode dialog

Browse Source 
Root Cause:
1. onActivityCreated() has been deprecated
2. mCapabilities will be 0 when updateAlertDialogEnableState(),
   because onCreateDialog() will get mCapabilities
   but it will be called after onCreate() and before onCreateView();
   onActivityCreated() will set mCapabilities but it will be called after onCreateView()

Solution:
Move deprecated flow onActivityCreated() into onCreate() to set mCapabilities first

Bug: 172171402
Bug: 168567356
Test: atest MagnificationSettingsFragmentTest
Change-Id: Id9f861d59fa23f5cb77aac55b87152e921246135
This commit is contained in:
jasonwshsu
2020-11-02 09:56:59 +08:00
parent 2e01c93c45
commit bab448a610
2 changed files with 204 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
src/com/android/settings/accessibility/MagnificationSettingsFragment.java
View File

@@ -30,6 +30,9 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.CheckBox;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import com.android.settings.R;
@@ -45,20 +48,41 @@ public class MagnificationSettingsFragment extends DashboardFragment {
private static final String TAG = "MagnificationSettingsFragment";
private static final String PREF_KEY_MODE = "magnification_mode";
private static final int DIALOG_MAGNIFICATION_CAPABILITY = 1;
private static final int DIALOG_MAGNIFICATION_SWITCH_SHORTCUT = 2;
private static final String EXTRA_CAPABILITY = "capability";
@VisibleForTesting
static final int DIALOG_MAGNIFICATION_CAPABILITY = 1;
@VisibleForTesting
static final int DIALOG_MAGNIFICATION_SWITCH_SHORTCUT = 2;
@VisibleForTesting
static final String EXTRA_CAPABILITY = "capability";
private static final int NONE = 0;
private static final char COMPONENT_NAME_SEPARATOR = ':';
private Preference mModePreference;
@VisibleForTesting
Dialog mDialog;
@VisibleForTesting
CheckBox mMagnifyFullScreenCheckBox;
@VisibleForTesting
CheckBox mMagnifyWindowCheckBox;
private int mCapabilities = NONE;
private CheckBox mMagnifyFullScreenCheckBox;
private CheckBox mMagnifyWindowCheckBox;
private Dialog mDialog;
@Override
public int getMetricsCategory() {
return SettingsEnums.ACCESSIBILITY_MAGNIFICATION_SETTINGS;
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (savedInstanceState != null) {
mCapabilities = savedInstanceState.getInt(EXTRA_CAPABILITY, NONE);
}
if (mCapabilities == NONE) {
mCapabilities = MagnificationCapabilities.getCapabilities(getPrefContext());
}
}
@Override
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
initModePreference();
}
@Override
@@ -68,14 +92,8 @@ public class MagnificationSettingsFragment extends DashboardFragment {
}
@Override
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
if (savedInstanceState != null) {
mCapabilities = savedInstanceState.getInt(EXTRA_CAPABILITY, NONE);
}
if (mCapabilities == NONE) {
mCapabilities = MagnificationCapabilities.getCapabilities(getPrefContext());
}
public int getMetricsCategory() {
return SettingsEnums.ACCESSIBILITY_MAGNIFICATION_SETTINGS;
}
@Override
@@ -95,17 +113,6 @@ public class MagnificationSettingsFragment extends DashboardFragment {
return TAG;
}
@Override
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
mModePreference = findPreference(PREF_KEY_MODE);
mModePreference.setOnPreferenceClickListener(preference -> {
mCapabilities = MagnificationCapabilities.getCapabilities(getPrefContext());
showDialog(DIALOG_MAGNIFICATION_CAPABILITY);
return true;
});
}
@Override
protected int getPreferenceScreenResId() {
return R.xml.accessibility_magnification_service_settings;
@@ -133,6 +140,15 @@ public class MagnificationSettingsFragment extends DashboardFragment {
throw new IllegalArgumentException("Unsupported dialogId " + dialogId);
}
private void initModePreference() {
mModePreference = findPreference(PREF_KEY_MODE);
mModePreference.setOnPreferenceClickListener(preference -> {
mCapabilities = MagnificationCapabilities.getCapabilities(getPrefContext());
showDialog(DIALOG_MAGNIFICATION_CAPABILITY);
return true;
});
}
private void callOnAlertDialogCheckboxClicked(DialogInterface dialog, int which) {
updateCapabilities(true);
mModePreference.setSummary(
@@ -181,11 +197,11 @@ public class MagnificationSettingsFragment extends DashboardFragment {
final View dialogWindowTextArea = dialogWidowView.findViewById(R.id.container);
mMagnifyWindowCheckBox = dialogWidowView.findViewById(R.id.checkbox);
setTextAreasClickListener(dialogFullScreenTextArea, mMagnifyFullScreenCheckBox,
dialogWindowTextArea, mMagnifyWindowCheckBox);
updateAlertDialogCheckState();
updateAlertDialogEnableState(dialogFullScreenTextArea, dialogWindowTextArea);
setTextAreasClickListener(dialogFullScreenTextArea, mMagnifyFullScreenCheckBox,
dialogWindowTextArea, mMagnifyWindowCheckBox);
}
private void setTextAreasClickListener(View fullScreenTextArea, CheckBox fullScreenCheckBox,