commit 3513b6402476641d88a1f3090f4aa8688c7a408e
author Amin Shaikh <ashaikh@google.com> Tue Mar 28 16:58:21 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Mar 28 16:58:21 2017 +0000
tree 351221f7efe1a1ff3c5864597d748b248cca4532
parent 6e0d19ff1838898a4b713292b077bf00994530fc
parent fe5d2ee9361a127a87bb6d74db3dc4b15b9c7e8d

Use Collator to sort saved networks. am: 32924e2f58
am: fe5d2ee936

Change-Id: I463189b11a896ed9790c4499a9387eee1600034d

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9f77998..8e82c44 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -6032,6 +6032,10 @@
     <string name="help_url_manage_storage" translatable="false"></string>
     <!-- Help URL, Android is upgrading [DO NOT TRANSLATE] -->
     <string name="help_url_upgrading" translatable="false"></string>
+    <!-- Help URL, Font size [DO NOT TRANSLATE] -->
+    <string name="help_url_font_size" translatable="false"></string>
+    <!-- Help URL, Display size [DO NOT TRANSLATE] -->
+    <string name="help_url_display_size" translatable="false"></string>
 
     <!-- User account title [CHAR LIMIT=30] -->
     <string name="user_account_title">Account for content</string>

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

diff --git a/src/com/android/settings/accessibility/ToggleFontSizePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFontSizePreferenceFragment.java
index 293d2bf..c200d17 100644
--- a/src/com/android/settings/accessibility/ToggleFontSizePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleFontSizePreferenceFragment.java
@@ -73,6 +73,11 @@
     }
 
     @Override
+    public int getHelpResource() {
+        return R.string.help_url_font_size;
+    }
+
+    @Override
     public int getMetricsCategory() {
         return MetricsEvent.ACCESSIBILITY_FONT_SIZE;
     }

src/com/android/settings/display/ScreenZoomSettings.java

diff --git a/src/com/android/settings/display/ScreenZoomSettings.java b/src/com/android/settings/display/ScreenZoomSettings.java
index 7538cd3..ec3999b 100644
--- a/src/com/android/settings/display/ScreenZoomSettings.java
+++ b/src/com/android/settings/display/ScreenZoomSettings.java
@@ -94,6 +94,11 @@
     }
 
     @Override
+    public int getHelpResource() {
+        return R.string.help_url_display_size;
+    }
+
+    @Override
     public int getMetricsCategory() {
         return MetricsEvent.DISPLAY_SCREEN_ZOOM;
     }