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

Add some pages to search index.

Browse Source 
* Notification access page
* VR Listener page
* Feature flags in dev options
* QS Tile developer options
* User dictionary
* Billing cycle
* Some accessibilty pages

Bug: 70720645
Test: robotests
Change-Id: I4f7d3d65b2803cebf178ac345a79721232df707c
This commit is contained in:
Fan Zhang
2018-07-11 09:41:39 -07:00
parent 9848bbd0cf
commit af1552251f
40 changed files with 472 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/com/android/settings/development/featureflags/FeatureFlagsDashboard.java
View File

@@ -17,16 +17,22 @@
package com.android.settings.development.featureflags;
import android.content.Context;
import android.provider.SearchIndexableResource;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.development.DevelopmentSettingsEnabler;
import com.android.settingslib.search.SearchIndexable;
import java.util.ArrayList;
import java.util.List;
@SearchIndexable
public class FeatureFlagsDashboard extends DashboardFragment {
private static final String TAG = "FeatureFlagsDashboard";
@@ -59,13 +65,43 @@ public class FeatureFlagsDashboard extends DashboardFragment {
@Override
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPrefControllers(context, getLifecycle());
}
private static List<AbstractPreferenceController> buildPrefControllers(Context context,
Lifecycle lifecycle) {
final List<AbstractPreferenceController> controllers = new ArrayList<>();
final Lifecycle lifecycle = getLifecycle();
final FeatureFlagFooterPreferenceController footerController =
new FeatureFlagFooterPreferenceController(context);
controllers.add(new FeatureFlagsPreferenceController(context, lifecycle));
if (lifecycle != null) {
lifecycle.addObserver(footerController);
}
controllers.add(footerController);
lifecycle.addObserver(footerController);
return controllers;
}
public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider() {
@Override
public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
boolean enabled) {
final List<SearchIndexableResource> result = new ArrayList<>();
final SearchIndexableResource sir = new SearchIndexableResource(context);
sir.xmlResId = R.xml.feature_flags_settings;
result.add(sir);
return result;
}
@Override
protected boolean isPageSearchEnabled(Context context) {
return DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(context);
}
@Override
public List<AbstractPreferenceController> createPreferenceControllers(
Context context) {
return buildPrefControllers(context, null /* lifecycle */);
}
};
}

37
src/com/android/settings/development/featureflags/FeatureFlagsPreferenceController.java
View File

@@ -19,57 +19,48 @@ package com.android.settings.development.featureflags;
import android.content.Context;
import android.util.FeatureFlagUtils;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart;
import java.util.Map;
import androidx.preference.PreferenceGroup;
import androidx.preference.PreferenceScreen;
public class FeatureFlagsPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin, LifecycleObserver, OnStart {
public class FeatureFlagsPreferenceController extends BasePreferenceController
implements LifecycleObserver, OnStart {
private PreferenceScreen mScreen;
private PreferenceGroup mGroup;
public FeatureFlagsPreferenceController(Context context, Lifecycle lifecycle) {
super(context);
if (lifecycle != null) {
lifecycle.addObserver(this);
}
public FeatureFlagsPreferenceController(Context context, String key) {
super(context, key);
}
@Override
public boolean isAvailable() {
return true;
}
@Override
public String getPreferenceKey() {
return null;
public int getAvailabilityStatus() {
return AVAILABLE;
}
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
mScreen = screen;
mGroup = (PreferenceGroup) screen.findPreference(getPreferenceKey());
}
@Override
public void onStart() {
if (mScreen == null) {
if (mGroup == null) {
return;
}
final Map<String, String> featureMap = FeatureFlagUtils.getAllFeatureFlags();
if (featureMap == null) {
return;
}
mScreen.removeAll();
final Context prefContext = mScreen.getContext();
mGroup.removeAll();
final Context prefContext = mGroup.getContext();
for (String feature : featureMap.keySet()) {
mScreen.addPreference(new FeatureFlagPreference(prefContext, feature));
mGroup.addPreference(new FeatureFlagPreference(prefContext, feature));
}
}
}

33
src/com/android/settings/development/qstile/DevelopmentTileConfigFragment.java
View File

@@ -17,15 +17,20 @@
package com.android.settings.development.qstile;
import android.content.Context;
import android.provider.SearchIndexableResource;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
import com.android.settingslib.development.DevelopmentSettingsEnabler;
import com.android.settingslib.search.SearchIndexable;
import java.util.ArrayList;
import java.util.List;
@SearchIndexable
public class DevelopmentTileConfigFragment extends DashboardFragment {
private static final String TAG = "DevelopmentTileConfig";
@@ -39,15 +44,27 @@ public class DevelopmentTileConfigFragment extends DashboardFragment {
return R.xml.development_tile_settings;
}
@Override
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
final List<AbstractPreferenceController> controllers = new ArrayList<>();
controllers.add(new DevelopmentTilePreferenceController(context));
return controllers;
}
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.DEVELOPMENT_QS_TILE_CONFIG;
}
public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider() {
@Override
public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
boolean enabled) {
final List<SearchIndexableResource> result = new ArrayList<>();
final SearchIndexableResource sir = new SearchIndexableResource(context);
sir.xmlResId = R.xml.development_tile_settings;
result.add(sir);
return result;
}
@Override
protected boolean isPageSearchEnabled(Context context) {
return DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(context);
}
};
}

21
src/com/android/settings/development/qstile/DevelopmentTilePreferenceController.java
View File

@@ -28,7 +28,7 @@ import android.service.quicksettings.TileService;
import android.util.Log;
import com.android.internal.statusbar.IStatusBarService;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settings.core.BasePreferenceController;
import java.util.List;
@@ -37,33 +37,28 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
public class DevelopmentTilePreferenceController extends AbstractPreferenceController {
public class DevelopmentTilePreferenceController extends BasePreferenceController {
private static final String TAG = "DevTilePrefController";
private final OnChangeHandler mOnChangeHandler;
private final PackageManager mPackageManager;
public DevelopmentTilePreferenceController(Context context) {
super(context);
public DevelopmentTilePreferenceController(Context context, String key) {
super(context, key);
mOnChangeHandler = new OnChangeHandler(context);
mPackageManager = context.getPackageManager();
}
@Override
public boolean isAvailable() {
return true;
}
@Override
public String getPreferenceKey() {
return null;
public int getAvailabilityStatus() {
return AVAILABLE;
}
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
Context context = screen.getContext();
Intent intent = new Intent(TileService.ACTION_QS_TILE)
final Context context = screen.getContext();
final Intent intent = new Intent(TileService.ACTION_QS_TILE)
.setPackage(context.getPackageName());
final List<ResolveInfo> resolveInfos = mPackageManager.queryIntentServices(intent,
PackageManager.MATCH_DISABLED_COMPONENTS);