PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import RadioButtonPreference from SettingsLib

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/accessibility/AccessibilityTimeoutController.java
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;
}

6
src/com/android/settings/accessibility/ShortcutServicePickerFragment.java
View File

@@ -33,8 +33,8 @@ import android.os.IBinder;
import android.os.UserHandle;
import android.provider.Settings;
import android.text.TextUtils;
import android.view.accessibility.AccessibilityManager;
import android.view.View;
import android.view.accessibility.AccessibilityManager;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
@@ -44,9 +44,9 @@ import com.android.internal.accessibility.AccessibilityShortcutController.Toggle
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.widget.RadioButtonPickerFragment;
import com.android.settings.widget.RadioButtonPreference;
import com.android.settingslib.accessibility.AccessibilityUtils;
import com.android.settingslib.widget.CandidateInfo;
import com.android.settingslib.widget.RadioButtonPreference;
import java.util.ArrayList;
import java.util.List;
@@ -183,7 +183,7 @@ public class ShortcutServicePickerFragment extends RadioButtonPickerFragment {
public void onClick(View view) {
final Fragment fragment = getTargetFragment();
if ((view.getId() == R.id.permission_enable_allow_button)
&& (fragment instanceof ShortcutServicePickerFragment)) {
&& (fragment instanceof ShortcutServicePickerFragment)) {
final Bundle bundle = getArguments();
((ShortcutServicePickerFragment) fragment).onServiceConfirmed(
bundle.getString(EXTRA_KEY));