diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml
index 1f9d0c4eddf..fc54a09e312 100644
--- a/res/xml/accessibility_settings.xml
+++ b/res/xml/accessibility_settings.xml
@@ -112,10 +112,11 @@
             android:persistent="false"/>
 
         <Preference
-            android:fragment="com.android.settings.accessibility.AccessibilityControlTimeoutPreferenceFragment"
             android:key="accessibility_control_timeout_preference_fragment"
             android:title="@string/accessibility_setting_item_control_timeout_title"
-            android:persistent="false"/>
+            android:persistent="false"
+            android:fragment="com.android.settings.accessibility.AccessibilityControlTimeoutPreferenceFragment"
+            settings:controller="com.android.settings.accessibility.AccessibilityTimeoutPreferenceController"/>
 
         <Preference
             android:fragment="com.android.settings.accessibility.VibrationSettings"
diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java
index 5cf93eb8ae5..c6fc46fa5cb 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettings.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettings.java
@@ -24,7 +24,6 @@ import android.accessibilityservice.AccessibilityServiceInfo;
 import android.app.admin.DevicePolicyManager;
 import android.app.settings.SettingsEnums;
 import android.content.ComponentName;
-import android.content.ContentResolver;
 import android.content.Context;
 import android.content.pm.ResolveInfo;
 import android.content.pm.ServiceInfo;
@@ -65,8 +64,6 @@ import com.android.settingslib.RestrictedPreference;
 import com.android.settingslib.accessibility.AccessibilityUtils;
 import com.android.settingslib.search.SearchIndexable;
 
-import com.google.common.primitives.Ints;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -127,8 +124,6 @@ public class AccessibilitySettings extends DashboardFragment implements
             "vibration_preference_screen";
     private static final String DISPLAY_DALTONIZER_PREFERENCE_SCREEN =
             "daltonizer_preference";
-    private static final String ACCESSIBILITY_CONTROL_TIMEOUT_PREFERENCE =
-            "accessibility_control_timeout_preference_fragment";
     private static final String DARK_UI_MODE_PREFERENCE =
             "dark_ui_mode_accessibility";
     private static final String LIVE_CAPTION_PREFERENCE_KEY =
@@ -277,7 +272,6 @@ public class AccessibilitySettings extends DashboardFragment implements
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
-        addPreferencesFromResource(R.xml.accessibility_settings);
         initializeAllPreferences();
         mDpm = (DevicePolicyManager) (getActivity()
                 .getSystemService(Context.DEVICE_POLICY_SERVICE));
@@ -754,22 +748,6 @@ public class AccessibilitySettings extends DashboardFragment implements
         updateAutoclickSummary(mAutoclickPreferenceScreen);
 
         updateAccessibilityShortcut(mAccessibilityShortcutPreferenceScreen);
-
-        updateAccessibilityTimeoutSummary(getContentResolver(),
-                findPreference(ACCESSIBILITY_CONTROL_TIMEOUT_PREFERENCE));
-    }
-
-    void updateAccessibilityTimeoutSummary(ContentResolver resolver, Preference pref) {
-        String[] timeoutSummarys = getResources().getStringArray(
-                R.array.accessibility_timeout_summaries);
-        int[] timeoutValues = getResources().getIntArray(
-                R.array.accessibility_timeout_selector_values);
-
-        int timeoutValue = AccessibilityTimeoutController.getSecureAccessibilityTimeoutValue(
-                    resolver, AccessibilityTimeoutController.CONTROL_TIMEOUT_SETTINGS_SECURE);
-
-        int idx = Ints.indexOf(timeoutValues, timeoutValue);
-        pref.setSummary(timeoutSummarys[idx == -1 ? 0 : idx]);
     }
 
     private void updateFeatureSummary(String prefKey, Preference pref) {
diff --git a/src/com/android/settings/accessibility/AccessibilityTimeoutPreferenceController.java b/src/com/android/settings/accessibility/AccessibilityTimeoutPreferenceController.java
new file mode 100644
index 00000000000..e7b0e3ca203
--- /dev/null
+++ b/src/com/android/settings/accessibility/AccessibilityTimeoutPreferenceController.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import android.content.Context;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+
+import com.google.common.primitives.Ints;
+
+public class AccessibilityTimeoutPreferenceController extends BasePreferenceController {
+
+    public AccessibilityTimeoutPreferenceController(Context context, String preferenceKey) {
+        super(context, preferenceKey);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return AVAILABLE;
+    }
+
+    @Override
+    public CharSequence getSummary() {
+        final String[] timeoutSummarys = mContext.getResources().getStringArray(
+                R.array.accessibility_timeout_summaries);
+        final int[] timeoutValues = mContext.getResources().getIntArray(
+                R.array.accessibility_timeout_selector_values);
+        final int timeoutValue = AccessibilityTimeoutController.getSecureAccessibilityTimeoutValue(
+                mContext.getContentResolver(),
+                AccessibilityTimeoutController.CONTROL_TIMEOUT_SETTINGS_SECURE);
+        final int idx = Ints.indexOf(timeoutValues, timeoutValue);
+        return timeoutSummarys[idx == -1 ? 0 : idx];
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
index 5813bd8db5f..7e33bb6fba5 100644
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
@@ -21,8 +21,6 @@ import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
 
-import android.app.UiModeManager;
-import android.content.ContentResolver;
 import android.content.Context;
 import android.os.Vibrator;
 import android.provider.DeviceConfig;
@@ -47,24 +45,16 @@ import java.util.List;
 @RunWith(RobolectricTestRunner.class)
 public class AccessibilitySettingsTest {
     private static final String VIBRATION_PREFERENCE_SCREEN = "vibration_preference_screen";
-    private static final String ACCESSIBILITY_CONTROL_TIMEOUT_PREFERENCE =
-            "accessibility_control_timeout_preference_fragment";
-    private static final String DARK_UI_MODE_PREFERENCE =
-            "dark_ui_mode_accessibility";
 
     private Context mContext;
-    private ContentResolver mContentResolver;
     private AccessibilitySettings mSettings;
-    private UiModeManager mUiModeManager;
 
     @Before
     public void setup() {
         MockitoAnnotations.initMocks(this);
         mContext = RuntimeEnvironment.application;
-        mContentResolver = mContext.getContentResolver();
         mSettings = spy(new AccessibilitySettings());
         doReturn(mContext).when(mSettings).getContext();
-        mUiModeManager = mContext.getSystemService(UiModeManager.class);
     }
 
     @Test
@@ -99,45 +89,6 @@ public class AccessibilitySettingsTest {
                         Vibrator.VIBRATION_INTENSITY_OFF));
     }
 
-    @Test
-    public void testUpdateAccessibilityTimeoutSummary_shouldUpdateSummary() {
-        String[] testingValues = {null, "0", "10000", "30000", "60000", "120000"};
-        int[] exceptedResIds = {R.string.accessibility_timeout_default,
-                R.string.accessibility_timeout_default,
-                R.string.accessibility_timeout_10secs,
-                R.string.accessibility_timeout_30secs,
-                R.string.accessibility_timeout_1min,
-                R.string.accessibility_timeout_2mins
-        };
-
-        for (int i = 0; i < testingValues.length; i++) {
-            Settings.Secure.putString(mContentResolver,
-                    Settings.Secure.ACCESSIBILITY_INTERACTIVE_UI_TIMEOUT_MS, testingValues[i]);
-
-            verifyAccessibilityTimeoutSummary(ACCESSIBILITY_CONTROL_TIMEOUT_PREFERENCE,
-                    exceptedResIds[i]);
-        }
-    }
-
-    @Test
-    public void testUpdateAccessibilityControlTimeoutSummary_invalidData_shouldUpdateSummary() {
-        String[] testingValues = {"-9009", "98277466643738977979666555536362343", "Hello,a prank"};
-
-        for (String value : testingValues) {
-            Settings.Secure.putString(mContentResolver,
-                    Settings.Secure.ACCESSIBILITY_NON_INTERACTIVE_UI_TIMEOUT_MS, value);
-
-            verifyAccessibilityTimeoutSummary(ACCESSIBILITY_CONTROL_TIMEOUT_PREFERENCE,
-                    R.string.accessibility_timeout_default);
-
-            Settings.Secure.putString(mContentResolver,
-                    Settings.Secure.ACCESSIBILITY_INTERACTIVE_UI_TIMEOUT_MS, value);
-
-            verifyAccessibilityTimeoutSummary(ACCESSIBILITY_CONTROL_TIMEOUT_PREFERENCE,
-                    R.string.accessibility_timeout_default);
-        }
-    }
-
     @Test
     @Config(shadows = {ShadowDeviceConfig.class})
     public void testIsRampingRingerEnabled_bothFlagsOn_Enabled() {
@@ -145,7 +96,7 @@ public class AccessibilitySettingsTest {
                 mContext.getContentResolver(), Settings.Global.APPLY_RAMPING_RINGER, 1 /* ON */);
         DeviceConfig.setProperty(DeviceConfig.NAMESPACE_TELEPHONY,
                 AccessibilitySettings.RAMPING_RINGER_ENABLED, "true", false /* makeDefault*/);
-      assertThat(AccessibilitySettings.isRampingRingerEnabled(mContext)).isTrue();
+        assertThat(AccessibilitySettings.isRampingRingerEnabled(mContext)).isTrue();
     }
 
     @Test
@@ -153,7 +104,7 @@ public class AccessibilitySettingsTest {
     public void testIsRampingRingerEnabled_settingsFlagOff_Disabled() {
         Settings.Global.putInt(
                 mContext.getContentResolver(), Settings.Global.APPLY_RAMPING_RINGER, 0 /* OFF */);
-      assertThat(AccessibilitySettings.isRampingRingerEnabled(mContext)).isFalse();
+        assertThat(AccessibilitySettings.isRampingRingerEnabled(mContext)).isFalse();
     }
 
     @Test
@@ -161,27 +112,6 @@ public class AccessibilitySettingsTest {
     public void testIsRampingRingerEnabled_deviceConfigFlagOff_Disabled() {
         DeviceConfig.setProperty(DeviceConfig.NAMESPACE_TELEPHONY,
                 AccessibilitySettings.RAMPING_RINGER_ENABLED, "false", false /* makeDefault*/);
-      assertThat(AccessibilitySettings.isRampingRingerEnabled(mContext)).isFalse();
-    }
-
-    private void verifyAccessibilityTimeoutSummary(String preferenceKey, int resId) {
-        final Preference preference = new Preference(mContext);
-        doReturn(preference).when(mSettings).findPreference(preferenceKey);
-        preference.setKey(preferenceKey);
-        mSettings.updateAccessibilityTimeoutSummary(mContentResolver, preference);
-
-        assertThat(preference.getSummary()).isEqualTo(mContext.getResources().getString(resId));
-    }
-
-    private String modeToDescription(int mode) {
-        String[] values = mContext.getResources().getStringArray(R.array.dark_ui_mode_entries);
-        switch (mode) {
-            case UiModeManager.MODE_NIGHT_YES:
-                return values[0];
-            case UiModeManager.MODE_NIGHT_NO:
-            case UiModeManager.MODE_NIGHT_AUTO:
-            default:
-                return values[1];
-        }
+        assertThat(AccessibilitySettings.isRampingRingerEnabled(mContext)).isFalse();
     }
 }
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityTimeoutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityTimeoutPreferenceControllerTest.java
new file mode 100644
index 00000000000..50f311e95ca
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityTimeoutPreferenceControllerTest.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(RobolectricTestRunner.class)
+public class AccessibilityTimeoutPreferenceControllerTest {
+
+    private Context mContext;
+    private AccessibilityTimeoutPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        mContext = RuntimeEnvironment.application;
+        mController = new AccessibilityTimeoutPreferenceController(mContext, "control_timeout");
+    }
+
+    @Test
+    public void getAvailabilityStatus_shouldReturnAvailable() {
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(
+                BasePreferenceController.AVAILABLE);
+    }
+
+    @Test
+    public void getSummary_byDefault_shouldReturnDefaultSummary() {
+        final String[] timeoutSummarys = mContext.getResources().getStringArray(
+                R.array.accessibility_timeout_summaries);
+        Settings.Secure.putString(mContext.getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_INTERACTIVE_UI_TIMEOUT_MS, "0");
+
+        assertThat(mController.getSummary()).isEqualTo(timeoutSummarys[0]);
+    }
+
+    @Test
+    public void getSummary_invalidTimeout_shouldReturnDefaultSummary() {
+        final String[] timeoutSummarys = mContext.getResources().getStringArray(
+                R.array.accessibility_timeout_summaries);
+        Settings.Secure.putString(mContext.getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_INTERACTIVE_UI_TIMEOUT_MS, "invalid_timeout");
+
+        assertThat(mController.getSummary()).isEqualTo(timeoutSummarys[0]);
+    }
+
+    @Test
+    public void getSummary_validTimeout_shouldReturnValidSummary() {
+        final String[] timeoutSummarys = mContext.getResources().getStringArray(
+                R.array.accessibility_timeout_summaries);
+        Settings.Secure.putString(mContext.getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_INTERACTIVE_UI_TIMEOUT_MS, "60000");
+
+        assertThat(mController.getSummary()).isEqualTo(timeoutSummarys[3]);
+    }
+}