Merge "Update preference screen title."

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

@@ -17,6 +17,7 @@
 package com.android.settings.display;
 
 import android.annotation.Nullable;
+import android.annotation.StringRes;
 import android.content.Context;
 import android.content.res.Configuration;
 import android.content.res.Resources;
@@ -98,6 +99,12 @@ public class ScreenZoomSettings extends PreviewSeekBarPreferenceFragment impleme
         return R.string.help_url_display_size;
     }
 
+    @Override
+    @StringRes
+    protected int getTitle() {
+        return R.string.screen_zoom_title;
+    }
+
     @Override
     public int getMetricsCategory() {
         return MetricsEvent.DISPLAY_SCREEN_ZOOM;

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

@@ -32,6 +32,11 @@ public class VrDisplayPreferencePicker extends RadioButtonPickerFragment {
 
     static final String PREF_KEY_PREFIX = "vr_display_pref_";
 
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.vr_display_settings;
+    }
+
     @Override
     public int getMetricsCategory() {
         return MetricsProto.MetricsEvent.VR_DISPLAY_PREFERENCE;