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

Fix CodeInspectionTest for CaptionPropertiesFragment

Browse Source 
Bug: 146883790
Test: make RunSettingsRoboTests2
Change-Id: I387149fa720c9c98291c00c63f99dc4d838c06aa
This commit is contained in:
menghanli
2019-12-26 20:56:14 +08:00
parent 97dc00392f
commit 4a1617e44f
3 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/accessibility/CaptionAppearanceFragment.java
View File

@@ -35,7 +35,9 @@ import com.android.internal.widget.SubtitleView;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment; import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.accessibility.ListDialogPreference.OnValueChangedListener; import com.android.settings.accessibility.ListDialogPreference.OnValueChangedListener;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.accessibility.AccessibilityUtils; import com.android.settingslib.accessibility.AccessibilityUtils;
import com.android.settingslib.search.SearchIndexable;
import com.android.settingslib.widget.LayoutPreference; import com.android.settingslib.widget.LayoutPreference;
import java.util.ArrayList; import java.util.ArrayList;
@@ -45,6 +47,7 @@ import java.util.Locale;
/** /**
* Settings fragment containing font style of captioning properties. * Settings fragment containing font style of captioning properties.
*/ */
@SearchIndexable
public class CaptionAppearanceFragment extends SettingsPreferenceFragment public class CaptionAppearanceFragment extends SettingsPreferenceFragment
implements OnPreferenceChangeListener, OnValueChangedListener { implements OnPreferenceChangeListener, OnValueChangedListener {
private static final String PREF_CAPTION_PREVIEW = "caption_preview"; private static final String PREF_CAPTION_PREVIEW = "caption_preview";
@@ -407,4 +410,8 @@ public class CaptionAppearanceFragment extends SettingsPreferenceFragment
return true; return true;
} }
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.captioning_appearance);
} }

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

@@ -27,10 +27,13 @@ import androidx.preference.Preference;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment; import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
/** /**
* Settings fragment containing more options of captioning properties. * Settings fragment containing more options of captioning properties.
*/ */
@SearchIndexable
public class CaptionMoreOptionsFragment extends SettingsPreferenceFragment public class CaptionMoreOptionsFragment extends SettingsPreferenceFragment
implements Preference.OnPreferenceChangeListener { implements Preference.OnPreferenceChangeListener {
private static final String PREF_LOCALE = "captioning_locale"; private static final String PREF_LOCALE = "captioning_locale";
@@ -79,4 +82,7 @@ public class CaptionMoreOptionsFragment extends SettingsPreferenceFragment
return true; return true;
} }
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.captioning_more_options);
} }

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

@@ -29,6 +29,8 @@ import androidx.preference.SwitchPreference;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment; import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -36,6 +38,7 @@ import java.util.List;
/** /**
* Settings fragment containing captioning properties. * Settings fragment containing captioning properties.
*/ */
@SearchIndexable
public class CaptionPropertiesFragment extends SettingsPreferenceFragment public class CaptionPropertiesFragment extends SettingsPreferenceFragment
implements OnPreferenceChangeListener { implements OnPreferenceChangeListener {
private static final String PREF_SWITCH = "captioning_preference_switch"; private static final String PREF_SWITCH = "captioning_preference_switch";
@@ -107,4 +110,7 @@ public class CaptionPropertiesFragment extends SettingsPreferenceFragment
return true; return true;
} }
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.captioning_settings);
} }