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

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

Merge "Misc tweaks to Indexable usage and tests."

parents 8746d226 78ea7da5

res/xml/display_settings.xml

+5 −5
Original line number Diff line number Diff line
@@ -82,8 +82,7 @@ 
        android:key="font_size"

        android:title="@string/title_font_size"

        android:fragment="com.android.settings.accessibility.ToggleFontSizePreferenceFragment"

        settings:controller="com.android.settings.display.FontSizePreferenceController"

        settings:keywords="@string/keywords_display_font_size" />

        settings:controller="com.android.settings.display.FontSizePreferenceController" />



    <com.android.settings.display.ScreenZoomPreference

        android:key="display_settings_screen_zoom"
@@ -99,7 +98,8 @@ 
    <Preference

        android:key="screensaver"

        android:title="@string/screensaver_settings_title"

        android:fragment="com.android.settings.dream.DreamSettings" />

        android:fragment="com.android.settings.dream.DreamSettings"

        settings:controller="com.android.settings.dream.DreamEntryPreferenceController" />



    <com.android.settingslib.RestrictedPreference

        android:key="lockscreen_from_display_settings"

src/com/android/settings/DisplaySettings.java

+0 −1
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ public class DisplaySettings extends DashboardFragment { 
    public static final String KEY_DISPLAY_SIZE = "display_settings_screen_zoom";



    private static final String KEY_SCREEN_TIMEOUT = "screen_timeout";

    private static final String KEY_AMBIENT_DISPLAY = "ambient_display";

    private static final String KEY_AUTO_BRIGHTNESS = "auto_brightness_entry";

    private static final String KEY_NIGHT_DISPLAY = "night_display";

src/com/android/settings/PreviewSeekBarPreferenceFragment.java

+2 −2
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ public abstract class PreviewSeekBarPreferenceFragment extends SettingsPreferenc 
    public View onCreateView(LayoutInflater inflater, ViewGroup container,

            Bundle savedInstanceState) {

        final View root = super.onCreateView(inflater, container, savedInstanceState);

        final ViewGroup listContainer = (ViewGroup) root.findViewById(android.R.id.list_container);

        final ViewGroup listContainer = root.findViewById(android.R.id.list_container);

        listContainer.removeAllViews();



        final View content = inflater.inflate(mActivityLayoutResId, listContainer, false);

src/com/android/settings/SettingsPreferenceFragment.java

+2 −1
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import android.widget.Button; 
import com.android.settings.applications.LayoutPreference;

import com.android.settings.core.InstrumentedPreferenceFragment;

import com.android.settings.core.instrumentation.InstrumentedDialogFragment;

import com.android.settings.search.Indexable;

import com.android.settings.search.actionbar.SearchMenuController;

import com.android.settings.support.actionbar.HelpMenuController;

import com.android.settings.support.actionbar.HelpResourceProvider;
@@ -61,7 +62,7 @@ import androidx.recyclerview.widget.RecyclerView; 
 * Base class for Settings fragments, with some helper functions and dialog management.

 */

public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceFragment

        implements DialogCreatable, HelpResourceProvider {

        implements DialogCreatable, HelpResourceProvider, Indexable {



    private static final String TAG = "SettingsPreference";

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

+1 −2
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ import com.android.settings.R; 
import com.android.settings.SettingsPreferenceFragment;

import com.android.settings.Utils;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.search.Indexable;

import com.android.settingslib.RestrictedLockUtils;

import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;

import com.android.settingslib.RestrictedPreference;
@@ -75,7 +74,7 @@ import androidx.preference.SwitchPreference; 
 */

@SearchIndexable

public class AccessibilitySettings extends SettingsPreferenceFragment implements

        Preference.OnPreferenceChangeListener, Indexable {

        Preference.OnPreferenceChangeListener {



    // Index of the first preference in a preference category.

    private static final int FIRST_PREFERENCE_IN_CATEGORY_INDEX = -1;