Removes TimeoutPreferenceController in Settings.

Test: unit tests
Bug: 173450342
Change-Id: I16470192fc41afe83cf601baa79fea360e8dc1d1

1 files changed, 17 insertions, 1 deletions

diff --git a/src/com/android/settings/display/ScreenTimeoutPreferenceController.java b/src/com/android/settings/display/ScreenTimeoutPreferenceController.java
index 77955ff3a9..c44376cc52 100644
--- a/src/com/android/settings/display/ScreenTimeoutPreferenceController.java
+++ b/src/com/android/settings/display/ScreenTimeoutPreferenceController.java
@@ -65,7 +65,7 @@ public class ScreenTimeoutPreferenceController extends BasePreferenceController
                 R.array.screen_timeout_entries);
         final CharSequence[] timeoutValues = mContext.getResources().getStringArray(
                 R.array.screen_timeout_values);
-        final CharSequence description = TimeoutPreferenceController.getTimeoutDescription(
+        final CharSequence description = getTimeoutDescription(
                 currentTimeout, timeoutEntries, timeoutValues);
         return mContext.getString(R.string.screen_timeout_summary, description);
     }
@@ -84,4 +84,20 @@ public class ScreenTimeoutPreferenceController extends BasePreferenceController
         return Settings.System.getLong(mContext.getContentResolver(),
                 SCREEN_OFF_TIMEOUT, FALLBACK_SCREEN_TIMEOUT_VALUE);
     }
+
+    private static CharSequence getTimeoutDescription(
+            long currentTimeout, CharSequence[] entries, CharSequence[] values) {
+        if (currentTimeout < 0 || entries == null || values == null
+                || values.length != entries.length) {
+            return null;
+        }
+
+        for (int i = 0; i < values.length; i++) {
+            long timeout = Long.parseLong(values[i].toString());
+            if (currentTimeout == timeout) {
+                return entries[i];
+            }
+        }
+        return null;
+    }
 }