Merge "Add accessibility timeout help resources to link to existing help page." into rvc-dev

This commit is contained in:
Jason Hsu
2020-04-06 05:56:18 +00:00
committed by Android (Google) Code Review
2 changed files with 7 additions and 2 deletions

View File

@@ -7185,6 +7185,8 @@
<string name="help_url_autoclick" translatable="false"></string>
<!-- Help URL, Accessibility caption preferences [DO NOT TRANSLATE] -->
<string name="help_url_caption" translatable="false"></string>
<!-- Help URL, Accessibility Timeout [DO NOT TRANSLATE] -->
<string name="help_url_timeout" translatable="false"></string>
<string name="help_url_system_dashboard" translatable="false"></string>
<string name="help_url_double_tap_screen" translatable="false"></string>
<string name="help_url_account_detail" translatable="false"></string>

View File

@@ -19,7 +19,6 @@ package com.android.settings.accessibility;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.res.Resources;
import android.provider.SearchIndexableResource;
import androidx.preference.Preference;
@@ -31,7 +30,6 @@ import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.search.SearchIndexable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@SearchIndexable
@@ -88,6 +86,11 @@ public final class AccessibilityControlTimeoutPreferenceFragment extends Dashboa
return buildPreferenceControllers(context, getSettingsLifecycle());
}
@Override
public int getHelpResource() {
return R.string.help_url_timeout;
}
private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
Lifecycle lifecycle) {
if (sControllers.size() == 0) {