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

Misc tweaks to Indexable usage and tests.

Browse Source 
- Make SettingsPreferenceFragment implement Indexable directly
- Add existing fragments that are SettingsPrefFragment but not Indexable
  to grandfather list.
- Fix "font size" fragment so it shows up in search properly.
- Remove duplicates for "lock screen display", "Screen saver".

Bug: 70720645
Test: robotests
Change-Id: I44ce0cac0fdf5e882b315861bb4bebc45dbe01e6
This commit is contained in:
Fan Zhang
2018-07-02 13:44:57 -07:00
parent 6acf0510fb
commit 78ea7da54c
25 changed files with 170 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/settings/DisplaySettings.java
View File

@@ -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";

4
src/com/android/settings/PreviewSeekBarPreferenceFragment.java
View File

@@ -97,9 +97,9 @@ public abstract class PreviewSeekBarPreferenceFragment extends SettingsPreferenc
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
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);

3
src/com/android/settings/SettingsPreferenceFragment.java
View File

@@ -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";

3
src/com/android/settings/accessibility/AccessibilitySettings.java
View File

@@ -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;

39
src/com/android/settings/accessibility/ToggleFontSizePreferenceFragment.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.accessibility;
import android.annotation.Nullable;
import android.content.ContentResolver;
import android.content.Context;
import android.content.res.Configuration;
import android.content.res.Resources;
import android.os.Bundle;
@@ -26,10 +27,18 @@ import android.provider.Settings;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.PreviewSeekBarPreferenceFragment;
import com.android.settings.R;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
import com.android.settings.search.SearchIndexableRaw;
import com.android.settingslib.search.SearchIndexable;
import java.util.ArrayList;
import java.util.List;
/**
* Preference fragment used to control font size.
*/
@SearchIndexable
public class ToggleFontSizePreferenceFragment extends PreviewSeekBarPreferenceFragment {
private float[] mValues;
@@ -39,7 +48,7 @@ public class ToggleFontSizePreferenceFragment extends PreviewSeekBarPreferenceFr
super.onCreate(savedInstanceState);
mActivityLayoutResId = R.layout.font_size_activity;
mPreviewSampleResIds = new int[]{R.layout.font_size_preview};
mPreviewSampleResIds = new int[] {R.layout.font_size_preview};
Resources res = getContext().getResources();
final ContentResolver resolver = getContext().getContentResolver();
@@ -85,19 +94,35 @@ public class ToggleFontSizePreferenceFragment extends PreviewSeekBarPreferenceFr
}
/**
* Utility function that returns the index in a string array with which the represented value is
* the closest to a given float value.
* Utility function that returns the index in a string array with which the represented value is
* the closest to a given float value.
*/
public static int fontSizeValueToIndex(float val, String[] indices) {
float lastVal = Float.parseFloat(indices[0]);
for (int i=1; i<indices.length; i++) {
for (int i = 1; i < indices.length; i++) {
float thisVal = Float.parseFloat(indices[i]);
if (val < (lastVal + (thisVal-lastVal)*.5f)) {
return i-1;
if (val < (lastVal + (thisVal - lastVal) * .5f)) {
return i - 1;
}
lastVal = thisVal;
}
return indices.length-1;
return indices.length - 1;
}
public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider() {
@Override
public List<SearchIndexableRaw> getRawDataToIndex(Context context,
boolean enabled) {
final ArrayList<SearchIndexableRaw> result = new ArrayList<>();
final SearchIndexableRaw data = new SearchIndexableRaw(context);
data.title = context.getString(R.string.title_font_size);
data.screenTitle = context.getString(R.string.title_font_size);
data.key = "font_size_setting_screen";
data.keywords = context.getString(R.string.keywords_display_font_size);
result.add(data);
return result;
}
};
}

2
src/com/android/settings/display/FontSizePreferenceController.java
View File

@@ -29,7 +29,7 @@ public class FontSizePreferenceController extends BasePreferenceController {
@Override
public int getAvailabilityStatus() {
return AVAILABLE;
return AVAILABLE_UNSEARCHABLE;
}
@Override

2
src/com/android/settings/display/NightDisplaySettings.java
View File

@@ -42,7 +42,7 @@ import androidx.preference.Preference;
*/
@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
public class NightDisplaySettings extends DashboardFragment
implements ColorDisplayController.Callback, Indexable {
implements ColorDisplayController.Callback {
private static final String TAG = "NightDisplaySettings";

3
src/com/android/settings/display/ScreenZoomSettings.java
View File

@@ -27,7 +27,6 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.PreviewSeekBarPreferenceFragment;
import com.android.settings.R;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
import com.android.settings.search.SearchIndexableRaw;
import com.android.settingslib.display.DisplayDensityUtils;
import com.android.settingslib.search.SearchIndexable;
@@ -39,7 +38,7 @@ import java.util.List;
* Preference fragment used to control screen zoom.
*/
@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
public class ScreenZoomSettings extends PreviewSeekBarPreferenceFragment implements Indexable {
public class ScreenZoomSettings extends PreviewSeekBarPreferenceFragment {
private int mDefaultDensity;
private int[] mValues;

33
src/com/android/settings/dream/DreamEntryPreferenceController.java Normal file
View File

@@ -0,0 +1,33 @@
/*
* Copyright (C) 2018 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.dream;
import android.content.Context;
import com.android.settings.core.BasePreferenceController;
public class DreamEntryPreferenceController extends BasePreferenceController {
public DreamEntryPreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey);
}
@Override
public int getAvailabilityStatus() {
return AVAILABLE_UNSEARCHABLE;
}
}

3
src/com/android/settings/inputmethod/AvailableVirtualKeyboardFragment.java
View File

@@ -38,7 +38,6 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
import com.android.settingslib.inputmethod.InputMethodAndSubtypeUtil;
import com.android.settingslib.inputmethod.InputMethodPreference;
import com.android.settingslib.inputmethod.InputMethodSettingValuesWrapper;
@@ -50,7 +49,7 @@ import java.util.List;
@SearchIndexable
public final class AvailableVirtualKeyboardFragment extends SettingsPreferenceFragment
implements InputMethodPreference.OnSavePreferenceListener, Indexable {
implements InputMethodPreference.OnSavePreferenceListener {
private final ArrayList<InputMethodPreference> mInputMethodPreferenceList = new ArrayList<>();
private InputMethodSettingValuesWrapper mInputMethodSettingValues;

2
src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java
View File

@@ -58,7 +58,7 @@ import androidx.preference.SwitchPreference;
@SearchIndexable
public final class PhysicalKeyboardFragment extends SettingsPreferenceFragment
implements InputManager.InputDeviceListener,
KeyboardLayoutDialogFragment.OnSetupKeyboardLayoutsListener, Indexable {
KeyboardLayoutDialogFragment.OnSetupKeyboardLayoutsListener {
private static final String KEYBOARD_ASSISTANCE_CATEGORY = "keyboard_assistance_category";
private static final String SHOW_VIRTUAL_KEYBOARD_SWITCH = "show_virtual_keyboard_switch";

3
src/com/android/settings/security/ScreenPinningSettings.java
View File

@@ -34,7 +34,6 @@ import com.android.settings.SettingsActivity;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.password.ChooseLockGeneric;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
import com.android.settings.widget.SwitchBar;
import com.android.settingslib.search.SearchIndexable;
@@ -51,7 +50,7 @@ import androidx.preference.SwitchPreference;
*/
@SearchIndexable
public class ScreenPinningSettings extends SettingsPreferenceFragment
implements SwitchBar.OnSwitchChangeListener, Indexable {
implements SwitchBar.OnSwitchChangeListener {
private static final CharSequence KEY_USE_SCREEN_LOCK = "use_screen_lock";
private static final int CHANGE_LOCK_METHOD_REQUEST = 43;

4
src/com/android/settings/security/screenlock/LockScreenPreferenceController.java
View File

@@ -54,11 +54,11 @@ public class LockScreenPreferenceController extends BasePreferenceController imp
public int getAvailabilityStatus() {
if (!mLockPatternUtils.isSecure(MY_USER_ID)) {
return mLockPatternUtils.isLockScreenDisabled(MY_USER_ID)
? DISABLED_FOR_USER : AVAILABLE;
? DISABLED_FOR_USER : AVAILABLE_UNSEARCHABLE;
} else {
return mLockPatternUtils.getKeyguardStoredPasswordQuality(MY_USER_ID)
== PASSWORD_QUALITY_UNSPECIFIED
? DISABLED_FOR_USER : AVAILABLE;
? DISABLED_FOR_USER : AVAILABLE_UNSEARCHABLE;
}
}

4
src/com/android/settings/slices/SliceBuilderUtils.java
View File

@@ -32,7 +32,6 @@ import android.text.TextUtils;
import android.util.Log;
import android.util.Pair;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
@@ -230,8 +229,7 @@ public class SliceBuilderUtils {
return searchDestination;
}
@VisibleForTesting
static Intent getContentIntent(Context context, SliceData sliceData) {
public static Intent getContentIntent(Context context, SliceData sliceData) {
final Uri contentUri = new Uri.Builder().appendPath(sliceData.getKey()).build();
final Intent intent = buildSearchResultPageIntent(context,
sliceData.getFragmentClassName(), sliceData.getKey(),

2
src/com/android/settings/tts/TextToSpeechSettings.java
View File

@@ -63,7 +63,7 @@ import androidx.preference.Preference;
@SearchIndexable
public class TextToSpeechSettings extends SettingsPreferenceFragment
implements Preference.OnPreferenceChangeListener,
GearPreference.OnGearClickListener, Indexable {
GearPreference.OnGearClickListener {
private static final String STATE_KEY_LOCALE_ENTRIES = "locale_entries";
private static final String STATE_KEY_LOCALE_ENTRY_VALUES = "locale_entry_values";

4
src/com/android/settings/tts/TtsEnginePreferenceFragment.java
View File

@@ -26,8 +26,8 @@ import java.util.List;
import androidx.preference.PreferenceCategory;
@SearchIndexable
public class TtsEnginePreferenceFragment extends SettingsPreferenceFragment //implements
implements RadioButtonGroupState, Indexable {
public class TtsEnginePreferenceFragment extends SettingsPreferenceFragment
implements RadioButtonGroupState {
private static final String TAG = "TtsEnginePrefFragment";
private static final int VOICE_DATA_INTEGRITY_CHECK = 1977;

2
src/com/android/settings/users/UserSettings.java
View File

@@ -96,7 +96,7 @@ public class UserSettings extends SettingsPreferenceFragment
implements Preference.OnPreferenceClickListener, View.OnClickListener,
MultiUserSwitchBarController.OnMultiUserSwitchChangedListener,
DialogInterface.OnDismissListener,
EditUserInfoController.OnContentChangedCallback, Indexable {
EditUserInfoController.OnContentChangedCallback {
private static final String TAG = "UserSettings";