Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87ecb5de authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Import RadioButtonPreference from SettingsLib"

parents d68802cf 71a37d13

res/xml/accessibility_control_timeout_settings.xml

+5 −5
Original line number Diff line number Diff line
@@ -30,28 +30,28 @@ 
        settings:controller="com.android.settings.widget.VideoPreferenceController"

        android:persistent="false" />



    <com.android.settings.widget.RadioButtonPreference

    <com.android.settingslib.widget.RadioButtonPreference

        android:key="accessibility_control_timeout_default"

        android:title="@string/accessibility_timeout_default"

        settings:allowDividerAbove="true"

        android:persistent="false" />



    <com.android.settings.widget.RadioButtonPreference

    <com.android.settingslib.widget.RadioButtonPreference

        android:key="accessibility_control_timeout_10secs"

        android:title="@string/accessibility_timeout_10secs"

        android:persistent="false" />



    <com.android.settings.widget.RadioButtonPreference

    <com.android.settingslib.widget.RadioButtonPreference

        android:key="accessibility_control_timeout_30secs"

        android:title="@string/accessibility_timeout_30secs"

        android:persistent="false" />



    <com.android.settings.widget.RadioButtonPreference

    <com.android.settingslib.widget.RadioButtonPreference

        android:key="accessibility_control_timeout_1min"

        android:title="@string/accessibility_timeout_1min"

        android:persistent="false" />



    <com.android.settings.widget.RadioButtonPreference

    <com.android.settingslib.widget.RadioButtonPreference

        android:key="accessibility_control_timeout_2mins"

        android:title="@string/accessibility_timeout_2mins"

        android:persistent="false" />

res/xml/notification_importance.xml

+4 −4
Original line number Diff line number Diff line
@@ -17,16 +17,16 @@ 
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"

        android:title="@string/notification_importance_title">



        <com.android.settings.widget.RadioButtonPreference

        <com.android.settingslib.widget.RadioButtonPreference

            android:key="importance_high"

            android:title="@string/notification_importance_high" />

        <com.android.settings.widget.RadioButtonPreference

        <com.android.settingslib.widget.RadioButtonPreference

            android:key="importance_default"

            android:title="@string/notification_importance_default" />

        <com.android.settings.widget.RadioButtonPreference

        <com.android.settingslib.widget.RadioButtonPreference

            android:key="importance_low"

            android:title="@string/notification_importance_low" />

        <com.android.settings.widget.RadioButtonPreference

        <com.android.settingslib.widget.RadioButtonPreference

            android:key="importance_min"

            android:title="@string/notification_importance_min" />

src/com/android/settings/accessibility/AccessibilityTimeoutController.java

+3 −3
Original line number Diff line number Diff line
@@ -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;

src/com/android/settings/accessibility/ShortcutServicePickerFragment.java

+3 −3
Original line number Diff line number Diff line
@@ -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;

src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java

+2 −2
Original line number Diff line number Diff line
@@ -33,9 +33,9 @@ import com.android.settings.R; 
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;

import com.android.settings.fuelgauge.BatteryUtils;

import com.android.settings.widget.RadioButtonPickerFragment;

import com.android.settings.widget.RadioButtonPreference;

import com.android.settingslib.applications.DefaultAppInfo;

import com.android.settingslib.widget.CandidateInfo;

import com.android.settingslib.widget.RadioButtonPreference;



/**

 * A generic app picker fragment that shows a list of app as radio button group.