Merge "Add screen resource for Colors setting."

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

@@ -44,6 +44,11 @@ public class ColorModePreferenceFragment extends RadioButtonPickerFragment {
         mController = new NightDisplayController(context);
     }
 
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.color_mode_settings;
+    }
+
     @Override
     protected List<? extends CandidateInfo> getCandidates() {
         Context c = getContext();

src/com/android/settings/widget/RadioButtonPickerFragment.java

@@ -82,6 +82,9 @@ public abstract class RadioButtonPickerFragment extends InstrumentedPreferenceFr
         return view;
     }
 
+    @Override
+    protected abstract int getPreferenceScreenResId();
+
     @Override
     public void onRadioButtonClicked(RadioButtonPreference selected) {
         final String selectedKey = selected.getKey();