Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aeb33b72 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Create help link placeholder for Wifi Direct settings." into pi-dev

parents 2d925f45 0cd2ccfe

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -6614,6 +6614,8 @@ 














    <!-- Help URL, WiFi [DO NOT TRANSLATE] -->















    <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] -->















    <string name="help_url_bluetooth" translatable="false"></string>















    <!-- Help URL, Data usage [DO NOT TRANSLATE] -->

























src/com/android/settings/accessibility/MagnificationPreferenceFragment.java



+9
−13






























Original line number
Diff line number
Diff line








@@ -25,20 +25,15 @@ import android.provider.SearchIndexableResource;













import android.provider.Settings;















import android.support.v7.preference.Preference;















import android.text.TextUtils;













import android.view.View;















import android.view.accessibility.AccessibilityManager;































import com.android.internal.logging.nano.MetricsProto.MetricsEvent;













import com.android.settings.dashboard.DashboardFragment;















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.Indexable;













import com.android.settingslib.core.AbstractPreferenceController;





























import java.util.ArrayList;















import java.util.Arrays;













import java.util.Collections;















import java.util.List;































public final class MagnificationPreferenceFragment extends DashboardFragment {










@@ -144,13 +139,14 @@ public final class MagnificationPreferenceFragment extends DashboardFragment {













                @Override















                public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,















                        boolean enabled) {













                    if (isApplicable(context.getResources())) {















                    final SearchIndexableResource sir = new SearchIndexableResource(context);















                    sir.xmlResId = R.xml.accessibility_magnification_settings;















                    return Arrays.asList(sir);













                    } else {













                        return Collections.emptyList();















                }



























                @Override













                protected boolean isPageSearchEnabled(Context context) {













                    return isApplicable(context.getResources());















                }































                @Override

































src/com/android/settings/wifi/p2p/WifiP2pSettings.java



+5
−0






























Original line number
Diff line number
Diff line








@@ -167,6 +167,11 @@ public class WifiP2pSettings extends DashboardFragment













        return MetricsEvent.WIFI_P2P;















    }





























    @Override













    public int getHelpResource() {













        return R.string.help_url_wifi_p2p;













    }





























    @Override















    protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {















        final List<AbstractPreferenceController> controllers = new ArrayList<>();