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

Merge "Fix the problem of the TalkBack function can not be turned on." into sc-dev

Browse Source
This commit is contained in:
Stanley Wang
2021-06-09 06:37:29 +00:00
committed by Android (Google) Code Review
parent 426e2cb3e3 fab609f892
commit bbab97c955
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
View File

@@ -50,7 +50,6 @@ import android.view.accessibility.AccessibilityManager;
import android.widget.Switch; import android.widget.Switch;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.preference.Preference;
import com.android.internal.widget.LockPatternUtils; import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R; import com.android.settings.R;
@@ -233,14 +232,18 @@ public class ToggleAccessibilityServicePreferenceFragment extends
@Override @Override
protected void updateSwitchBarToggleSwitch() { protected void updateSwitchBarToggleSwitch() {
final boolean checked = AccessibilityUtils.getEnabledServicesFromSettings(getPrefContext()) final boolean checked = isAccessibilityServiceEnabled();
.contains(mComponentName);
if (mToggleServiceSwitchPreference.isChecked() == checked) { if (mToggleServiceSwitchPreference.isChecked() == checked) {
return; return;
} }
mToggleServiceSwitchPreference.setChecked(checked); mToggleServiceSwitchPreference.setChecked(checked);
} }
private boolean isAccessibilityServiceEnabled() {
return AccessibilityUtils.getEnabledServicesFromSettings(getPrefContext())
.contains(mComponentName);
}
/** /**
* Return whether the device is encrypted with legacy full disk encryption. Newer devices * Return whether the device is encrypted with legacy full disk encryption. Newer devices
* should be using File Based Encryption. * should be using File Based Encryption.
@@ -315,7 +318,6 @@ public class ToggleAccessibilityServicePreferenceFragment extends
} }
private void handleConfirmServiceEnabled(boolean confirmed) { private void handleConfirmServiceEnabled(boolean confirmed) {
mToggleServiceSwitchPreference.setChecked(confirmed);
getArguments().putBoolean(AccessibilitySettings.EXTRA_CHECKED, confirmed); getArguments().putBoolean(AccessibilitySettings.EXTRA_CHECKED, confirmed);
onPreferenceToggled(mPreferenceKey, confirmed); onPreferenceToggled(mPreferenceKey, confirmed);
} }
@@ -339,8 +341,8 @@ public class ToggleAccessibilityServicePreferenceFragment extends
@Override @Override
public void onSwitchChanged(Switch switchView, boolean isChecked) { public void onSwitchChanged(Switch switchView, boolean isChecked) {
if (isChecked != mToggleServiceSwitchPreference.isChecked()) { if (isChecked != isAccessibilityServiceEnabled()) {
onPreferenceClick(mToggleServiceSwitchPreference); onPreferenceClick(isChecked);
} }
} }
@@ -534,14 +536,8 @@ public class ToggleAccessibilityServicePreferenceFragment extends
mDialog.dismiss(); mDialog.dismiss();
} }
private boolean onPreferenceClick(Preference preference) { private boolean onPreferenceClick(boolean isChecked) {
boolean checked = ((SettingsMainSwitchPreference) preference).isChecked(); if (isChecked) {
if (checked) {
mToggleServiceSwitchPreference.setChecked(true);
getArguments().putBoolean(AccessibilitySettings.EXTRA_CHECKED,
/* enableService */ true);
showDialog(DialogEnums.DISABLE_WARNING_FROM_TOGGLE);
} else {
mToggleServiceSwitchPreference.setChecked(false); mToggleServiceSwitchPreference.setChecked(false);
getArguments().putBoolean(AccessibilitySettings.EXTRA_CHECKED, getArguments().putBoolean(AccessibilitySettings.EXTRA_CHECKED,
/* disableService */ false); /* disableService */ false);
@@ -553,6 +549,11 @@ public class ToggleAccessibilityServicePreferenceFragment extends
showPopupDialog(DialogEnums.LAUNCH_ACCESSIBILITY_TUTORIAL); showPopupDialog(DialogEnums.LAUNCH_ACCESSIBILITY_TUTORIAL);
} }
} }
} else {
mToggleServiceSwitchPreference.setChecked(true);
getArguments().putBoolean(AccessibilitySettings.EXTRA_CHECKED,
/* enableService */ true);
showDialog(DialogEnums.DISABLE_WARNING_FROM_TOGGLE);
} }
return true; return true;
} }