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

Create help link placeholder for Wifi Direct settings.

Browse Source 
Change-Id: Ia22259d191d2663d7ef63438c680826d3fd590fb
Merged-In: Ia22259d191d2663d7ef63438c680826d3fd590fb
Fixes: 70854725
Test: robotests
This commit is contained in:
Fan Zhang
2018-04-05 13:48:55 -07:00
parent 78e2cad8b1
commit 0cd2ccfe30
3 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -6614,6 +6614,8 @@
<!-- Help URL, WiFi [DO NOT TRANSLATE] --> <!-- Help URL, WiFi [DO NOT TRANSLATE] -->
<string name="help_url_wifi" translatable="false"></string> <string name="help_url_wifi" translatable="false"></string>
<!-- Help URL, WiFi Direct [DO NOT TRANSLATE] -->
<string name="help_url_wifi_p2p" translatable="false"></string>
<!-- Help URL, Bluetooth [DO NOT TRANSLATE] --> <!-- Help URL, Bluetooth [DO NOT TRANSLATE] -->
<string name="help_url_bluetooth" translatable="false"></string> <string name="help_url_bluetooth" translatable="false"></string>
<!-- Help URL, Data usage [DO NOT TRANSLATE] --> <!-- Help URL, Data usage [DO NOT TRANSLATE] -->

22
src/com/android/settings/accessibility/MagnificationPreferenceFragment.java
View File

@@ -25,20 +25,15 @@ import android.provider.SearchIndexableResource;
import android.provider.Settings; import android.provider.Settings;
import android.support.v7.preference.Preference; import android.support.v7.preference.Preference;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.View;
import android.view.accessibility.AccessibilityManager; import android.view.accessibility.AccessibilityManager;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment; import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable; import com.android.settings.search.Indexable;
import com.android.settingslib.core.AbstractPreferenceController;
import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections;
import java.util.List; import java.util.List;
public final class MagnificationPreferenceFragment extends DashboardFragment { public final class MagnificationPreferenceFragment extends DashboardFragment {
@@ -144,13 +139,14 @@ public final class MagnificationPreferenceFragment extends DashboardFragment {
@Override @Override
public List<SearchIndexableResource> getXmlResourcesToIndex(Context context, public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
boolean enabled) { boolean enabled) {
if (isApplicable(context.getResources())) { final SearchIndexableResource sir = new SearchIndexableResource(context);
final SearchIndexableResource sir = new SearchIndexableResource(context); sir.xmlResId = R.xml.accessibility_magnification_settings;
sir.xmlResId = R.xml.accessibility_magnification_settings; return Arrays.asList(sir);
return Arrays.asList(sir); }
} else {
return Collections.emptyList(); @Override
} protected boolean isPageSearchEnabled(Context context) {
return isApplicable(context.getResources());
} }
@Override @Override

5
src/com/android/settings/wifi/p2p/WifiP2pSettings.java
View File

@@ -167,6 +167,11 @@ public class WifiP2pSettings extends DashboardFragment
return MetricsEvent.WIFI_P2P; return MetricsEvent.WIFI_P2P;
} }
@Override
public int getHelpResource() {
return R.string.help_url_wifi_p2p;
}
@Override @Override
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
final List<AbstractPreferenceController> controllers = new ArrayList<>(); final List<AbstractPreferenceController> controllers = new ArrayList<>();