Import RadioButtonPreference from SettingsLib

Bug: 138620011
Test: manual, robolectric
Change-Id: I3b8a2be021a1b4a07aae61483f2329b7a5bd4655
This commit is contained in:
Raff Tsai
2019-07-31 15:32:41 +08:00
parent a64c7b2698
commit 71a37d138b
23 changed files with 39 additions and 248 deletions

View File

@@ -27,9 +27,9 @@ import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.widget.RadioButtonPreference;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.widget.RadioButtonPreference;
import com.google.common.primitives.Ints;
@@ -87,7 +87,7 @@ public class AccessibilityTimeoutController extends AbstractPreferenceController
if (mAccessibilityTimeoutKeyToValueMap.size() == 0) {
String[] timeoutKeys = mResources.getStringArray(
R.array.accessibility_timeout_control_selector_keys);
R.array.accessibility_timeout_control_selector_keys);
int[] timeoutValues = mResources.getIntArray(
R.array.accessibility_timeout_selector_values);
@@ -141,7 +141,7 @@ public class AccessibilityTimeoutController extends AbstractPreferenceController
private int getAccessibilityTimeoutValue() {
// get accessibility control timeout value
int timeoutValue = getSecureAccessibilityTimeoutValue(mContentResolver,
CONTROL_TIMEOUT_SETTINGS_SECURE);
CONTROL_TIMEOUT_SETTINGS_SECURE);
return timeoutValue;
}