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
Bug: 70854725
Test: robotests
This commit is contained in:
Fan Zhang
2018-04-05 13:48:55 -07:00
parent 9f2a9e431d
commit 1deac101a0
3 changed files with 15 additions and 8 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] -->

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

@@ -35,7 +35,6 @@ import com.android.settings.search.Indexable;
import com.android.settingslib.search.SearchIndexable; import com.android.settingslib.search.SearchIndexable;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections;
import java.util.List; import java.util.List;
@SearchIndexable @SearchIndexable
@@ -142,13 +141,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<>();