From c4cbe4ec43d08205e801452d62c8003c08ec87b8 Mon Sep 17 00:00:00 2001 From: menghanli Date: Wed, 19 Feb 2020 10:53:44 +0800 Subject: [PATCH] =?UTF-8?q?Fix=20=E2=80=9CSelect=20to=20Speak=20&=20TalkBa?= =?UTF-8?q?ck=20=E2=80=9D=20Functionalities=20broken=20from=20Vision=20Set?= =?UTF-8?q?tings.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit getArguments() order to cause the mToggleServiceDividerSwitchPreference is null. Bug: 149663592 Test: Manual test Change-Id: I2d4a229f9386cf5c223056b39174c0e4bd891bdc --- ...cyToggleScreenReaderPreferenceFragmentForSetupWizard.java | 5 +++-- ...yToggleSelectToSpeakPreferenceFragmentForSetupWizard.java | 5 +++-- .../ToggleScreenReaderPreferenceFragmentForSetupWizard.java | 5 +++-- .../ToggleSelectToSpeakPreferenceFragmentForSetupWizard.java | 5 +++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/com/android/settings/accessibility/LegacyToggleScreenReaderPreferenceFragmentForSetupWizard.java b/src/com/android/settings/accessibility/LegacyToggleScreenReaderPreferenceFragmentForSetupWizard.java index 82d80e08325..1b37a42afb0 100644 --- a/src/com/android/settings/accessibility/LegacyToggleScreenReaderPreferenceFragmentForSetupWizard.java +++ b/src/com/android/settings/accessibility/LegacyToggleScreenReaderPreferenceFragmentForSetupWizard.java @@ -18,6 +18,7 @@ package com.android.settings.accessibility; import android.app.settings.SettingsEnums; import android.os.Bundle; +import android.view.View; /** For accessibility services that target SDK <= Q in setup wizard. */ public class LegacyToggleScreenReaderPreferenceFragmentForSetupWizard @@ -26,8 +27,8 @@ public class LegacyToggleScreenReaderPreferenceFragmentForSetupWizard private boolean mToggleSwitchWasInitiallyChecked; @Override - protected void onProcessArguments(Bundle arguments) { - super.onProcessArguments(arguments); + public void onViewCreated(View view, Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); mToggleSwitchWasInitiallyChecked = mToggleServiceDividerSwitchPreference.isChecked(); } diff --git a/src/com/android/settings/accessibility/LegacyToggleSelectToSpeakPreferenceFragmentForSetupWizard.java b/src/com/android/settings/accessibility/LegacyToggleSelectToSpeakPreferenceFragmentForSetupWizard.java index 9953faf27a9..ffb363cd154 100644 --- a/src/com/android/settings/accessibility/LegacyToggleSelectToSpeakPreferenceFragmentForSetupWizard.java +++ b/src/com/android/settings/accessibility/LegacyToggleSelectToSpeakPreferenceFragmentForSetupWizard.java @@ -18,6 +18,7 @@ package com.android.settings.accessibility; import android.app.settings.SettingsEnums; import android.os.Bundle; +import android.view.View; /** For accessibility services that target SDK <= Q in setup wizard. */ public class LegacyToggleSelectToSpeakPreferenceFragmentForSetupWizard @@ -26,8 +27,8 @@ public class LegacyToggleSelectToSpeakPreferenceFragmentForSetupWizard private boolean mToggleSwitchWasInitiallyChecked; @Override - protected void onProcessArguments(Bundle arguments) { - super.onProcessArguments(arguments); + public void onViewCreated(View view, Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); mToggleSwitchWasInitiallyChecked = mToggleServiceDividerSwitchPreference.isChecked(); } diff --git a/src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizard.java b/src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizard.java index 0f114fdc5ca..4d7b65359bb 100644 --- a/src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizard.java +++ b/src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizard.java @@ -18,6 +18,7 @@ package com.android.settings.accessibility; import android.app.settings.SettingsEnums; import android.os.Bundle; +import android.view.View; public class ToggleScreenReaderPreferenceFragmentForSetupWizard extends ToggleAccessibilityServicePreferenceFragment { @@ -25,8 +26,8 @@ public class ToggleScreenReaderPreferenceFragmentForSetupWizard private boolean mToggleSwitchWasInitiallyChecked; @Override - protected void onProcessArguments(Bundle arguments) { - super.onProcessArguments(arguments); + public void onViewCreated(View view, Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); mToggleSwitchWasInitiallyChecked = mToggleServiceDividerSwitchPreference.isChecked(); } diff --git a/src/com/android/settings/accessibility/ToggleSelectToSpeakPreferenceFragmentForSetupWizard.java b/src/com/android/settings/accessibility/ToggleSelectToSpeakPreferenceFragmentForSetupWizard.java index 09598f6fcfc..87b846945a7 100644 --- a/src/com/android/settings/accessibility/ToggleSelectToSpeakPreferenceFragmentForSetupWizard.java +++ b/src/com/android/settings/accessibility/ToggleSelectToSpeakPreferenceFragmentForSetupWizard.java @@ -18,6 +18,7 @@ package com.android.settings.accessibility; import android.app.settings.SettingsEnums; import android.os.Bundle; +import android.view.View; public class ToggleSelectToSpeakPreferenceFragmentForSetupWizard extends InvisibleToggleAccessibilityServicePreferenceFragment { @@ -25,8 +26,8 @@ public class ToggleSelectToSpeakPreferenceFragmentForSetupWizard private boolean mToggleSwitchWasInitiallyChecked; @Override - protected void onProcessArguments(Bundle arguments) { - super.onProcessArguments(arguments); + public void onViewCreated(View view, Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); mToggleSwitchWasInitiallyChecked = mToggleServiceDividerSwitchPreference.isChecked(); }