The dialog should persist after rotation.
1. Use DialogFragment 2. Override onSaveInstanceState 3. Refresh the UI after key remapping Demo: https://screencast.googleplex.com/cast/NjMzMzcxNjc2Mzc3MDg4MHxlMjM0M2FiMi0zOA Bug: 277148566 Test: manual Change-Id: I0dc6678bfa45a4f84f38bf810433dd1e4432ba4a
This commit is contained in:
committed by
Daniel Huang
parent
3f16621b86
commit
94d5d00a1a
@@ -17,12 +17,10 @@
|
||||
package com.android.settings.inputmethod;
|
||||
|
||||
import android.content.Context;
|
||||
import android.hardware.input.InputManager;
|
||||
import android.text.Spannable;
|
||||
import android.text.SpannableString;
|
||||
import android.text.style.ForegroundColorSpan;
|
||||
|
||||
import androidx.fragment.app.DialogFragment;
|
||||
import androidx.fragment.app.Fragment;
|
||||
import androidx.fragment.app.FragmentManager;
|
||||
import androidx.preference.Preference;
|
||||
@@ -34,16 +32,14 @@ import com.android.settingslib.Utils;
|
||||
|
||||
public class ModifierKeysRestorePreferenceController extends BasePreferenceController {
|
||||
|
||||
private static String KEY_TAG = "modifier_keys_dialog_tag";
|
||||
private static final String KEY_TAG = "modifier_keys_restore_dialog_tag";
|
||||
|
||||
private Fragment mParent;
|
||||
private FragmentManager mFragmentManager;
|
||||
private PreferenceScreen mScreen;
|
||||
private final InputManager mIm;
|
||||
|
||||
public ModifierKeysRestorePreferenceController(Context context, String key) {
|
||||
super(context, key);
|
||||
mIm = context.getSystemService(InputManager.class);
|
||||
}
|
||||
|
||||
public void setFragment(Fragment parent) {
|
||||
@@ -57,9 +53,6 @@ public class ModifierKeysRestorePreferenceController extends BasePreferenceContr
|
||||
return;
|
||||
}
|
||||
mScreen = screen;
|
||||
// The dialog screen depends on the previous selected key's fragment.
|
||||
// In the rotation scenario, we should remove the previous dialog first.
|
||||
clearPreviousDialog();
|
||||
setResetKeyColor();
|
||||
}
|
||||
|
||||
@@ -78,8 +71,8 @@ public class ModifierKeysRestorePreferenceController extends BasePreferenceContr
|
||||
}
|
||||
|
||||
private void showResetDialog() {
|
||||
ModifierKeysResetDialogFragment fragment =
|
||||
new ModifierKeysResetDialogFragment(mScreen, mIm);
|
||||
mFragmentManager = mParent.getFragmentManager();
|
||||
ModifierKeysResetDialogFragment fragment = new ModifierKeysResetDialogFragment();
|
||||
fragment.setTargetFragment(mParent, 0);
|
||||
fragment.show(mFragmentManager, KEY_TAG);
|
||||
}
|
||||
@@ -98,13 +91,4 @@ public class ModifierKeysRestorePreferenceController extends BasePreferenceContr
|
||||
return Utils.getColorAttrDefaultColor(
|
||||
mParent.getActivity(), com.android.internal.R.attr.materialColorPrimaryContainer);
|
||||
}
|
||||
|
||||
private void clearPreviousDialog() {
|
||||
mFragmentManager = mParent.getFragmentManager();
|
||||
DialogFragment preResetDialogFragment =
|
||||
(DialogFragment) mFragmentManager.findFragmentByTag(KEY_TAG);
|
||||
if (preResetDialogFragment != null) {
|
||||
preResetDialogFragment.dismiss();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user