From 2c37f45a3573cd64f5c74b17b24b920a3c55363d Mon Sep 17 00:00:00 2001
From: ChenJean <chenjean@google.com>
Date: Thu, 9 Jan 2020 14:45:54 +0800
Subject: [PATCH] Support caption second UI structure (3/n)

Removed unenable behovior when turn off Show captions.

Bug: 143502915
Test: Manual
Change-Id: Idb59172967872f4c8ba76e6cdcb83ba0a7faeadd
---
 .../accessibility/CaptionAppearanceFragment.java    |  7 -------
 .../accessibility/CaptionPropertiesFragment.java    | 13 -------------
 2 files changed, 20 deletions(-)

diff --git a/src/com/android/settings/accessibility/CaptionAppearanceFragment.java b/src/com/android/settings/accessibility/CaptionAppearanceFragment.java
index 5771ffecdc3..0e5d9191bc7 100644
--- a/src/com/android/settings/accessibility/CaptionAppearanceFragment.java
+++ b/src/com/android/settings/accessibility/CaptionAppearanceFragment.java
@@ -111,14 +111,7 @@ public class CaptionAppearanceFragment extends SettingsPreferenceFragment
         refreshPreviewText();
     }
 
-    private void setPreferenceViewEnabled(boolean enabled) {
-        for (Preference preference : mPreferenceList) {
-            preference.setEnabled(enabled);
-        }
-    }
-
     private void refreshPreferenceViewEnabled(boolean enabled) {
-        setPreferenceViewEnabled(enabled);
         mPreviewText.setVisibility(enabled ? View.VISIBLE : View.INVISIBLE);
     }
 
diff --git a/src/com/android/settings/accessibility/CaptionPropertiesFragment.java b/src/com/android/settings/accessibility/CaptionPropertiesFragment.java
index fe90845979d..0034fe676a2 100644
--- a/src/com/android/settings/accessibility/CaptionPropertiesFragment.java
+++ b/src/com/android/settings/accessibility/CaptionPropertiesFragment.java
@@ -70,16 +70,6 @@ public class CaptionPropertiesFragment extends SettingsPreferenceFragment
         installUpdateListeners();
     }
 
-    private void setPreferenceViewEnabled(boolean enabled) {
-        for (Preference preference : mPreferenceList) {
-            preference.setEnabled(enabled);
-        }
-    }
-
-    private void refreshPreferenceViewEnabled(boolean enabled) {
-        setPreferenceViewEnabled(enabled);
-    }
-
     private void initializeAllPreferences() {
         mSwitch = (SwitchPreference) findPreference(PREF_SWITCH);
         mTextAppearance = (Preference) findPreference(PREF_TEXT);
@@ -87,8 +77,6 @@ public class CaptionPropertiesFragment extends SettingsPreferenceFragment
 
         mPreferenceList.add(mTextAppearance);
         mPreferenceList.add(mMoreOptions);
-
-        refreshPreferenceViewEnabled(mCaptioningManager.isEnabled());
     }
 
     private void installUpdateListeners() {
@@ -105,7 +93,6 @@ public class CaptionPropertiesFragment extends SettingsPreferenceFragment
         if (mSwitch == preference) {
             Settings.Secure.putInt(
                     cr, Settings.Secure.ACCESSIBILITY_CAPTIONING_ENABLED, (boolean) value ? 1 : 0);
-            refreshPreferenceViewEnabled((boolean) value);
         }
 
         return true;