Adds search and help icons to system navigation page

Bug: 135042958
Test: Manually verified icons are shown and they work
Change-Id: I1dc9ddd3e3a5a1f76eb6c1f28290e177bb43ba9e
This commit is contained in:
Mehdi Alizadeh
2019-06-14 11:57:11 -07:00
parent 16aac8e2e3
commit 58b02e0ed5

View File

@@ -45,6 +45,9 @@ import com.android.settings.SettingsTutorialDialogWrapperActivity;
import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider; import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
import com.android.settings.overlay.FeatureFactory; import com.android.settings.overlay.FeatureFactory;
import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.actionbar.SearchMenuController;
import com.android.settings.support.actionbar.HelpMenuController;
import com.android.settings.support.actionbar.HelpResourceProvider;
import com.android.settings.utils.CandidateInfoExtra; import com.android.settings.utils.CandidateInfoExtra;
import com.android.settings.widget.RadioButtonPickerFragment; import com.android.settings.widget.RadioButtonPickerFragment;
import com.android.settings.widget.RadioButtonPreferenceWithExtraWidget; import com.android.settings.widget.RadioButtonPreferenceWithExtraWidget;
@@ -57,7 +60,8 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
@SearchIndexable @SearchIndexable
public class SystemNavigationGestureSettings extends RadioButtonPickerFragment { public class SystemNavigationGestureSettings extends RadioButtonPickerFragment implements
HelpResourceProvider {
private static final String TAG = "SystemNavigationGesture"; private static final String TAG = "SystemNavigationGesture";
@@ -102,6 +106,9 @@ public class SystemNavigationGestureSettings extends RadioButtonPickerFragment {
@Override @Override
public void onAttach(Context context) { public void onAttach(Context context) {
super.onAttach(context); super.onAttach(context);
SearchMenuController.init(this /* host */);
HelpMenuController.init(this /* host */);
SuggestionFeatureProvider suggestionFeatureProvider = FeatureFactory.getFactory(context) SuggestionFeatureProvider suggestionFeatureProvider = FeatureFactory.getFactory(context)
.getSuggestionFeatureProvider(context); .getSuggestionFeatureProvider(context);
SharedPreferences prefs = suggestionFeatureProvider.getSharedPrefs(context); SharedPreferences prefs = suggestionFeatureProvider.getSharedPrefs(context);
@@ -330,4 +337,11 @@ public class SystemNavigationGestureSettings extends RadioButtonPickerFragment {
return SystemNavigationPreferenceController.isGestureAvailable(context); return SystemNavigationPreferenceController.isGestureAvailable(context);
} }
}; };
// From HelpResourceProvider
@Override
public int getHelpResource() {
// TODO(b/146001201): Replace with system navigation help page when ready.
return R.string.help_uri_default;
}
} }