Merge "Rename DisplayOptions to DisplayOptionsSettings."

3 files changed, 3 insertions, 3 deletions

diff --git a/res/xml/display_options.xml b/res/xml/display_options_settings.xml
index 07aadf758..07aadf758 100644
--- a/res/xml/display_options.xml
+++ b/res/xml/display_options_settings.xml
diff --git a/src/com/android/dialer/settings/DialerSettingsActivity.java b/src/com/android/dialer/settings/DialerSettingsActivity.java
index 935b6c7fd..b45bce404 100644
--- a/src/com/android/dialer/settings/DialerSettingsActivity.java
+++ b/src/com/android/dialer/settings/DialerSettingsActivity.java
@@ -38,7 +38,7 @@ public class DialerSettingsActivity extends PreferenceActivity {
     public void onBuildHeaders(List<Header> target) {
         Header displayOptionsHeader = new Header();
         displayOptionsHeader.titleRes = R.string.display_options_title;
-        displayOptionsHeader.fragment = DisplayOptionsFragment.class.getName();
+        displayOptionsHeader.fragment = DisplayOptionsSettingsFragment.class.getName();
         target.add(displayOptionsHeader);
 
         Header generalSettingsHeader = new Header();
diff --git a/src/com/android/dialer/settings/DisplayOptionsFragment.java b/src/com/android/dialer/settings/DisplayOptionsSettingsFragment.java
index 3a932d5fe..4b2c8f6db 100644
--- a/src/com/android/dialer/settings/DisplayOptionsFragment.java
+++ b/src/com/android/dialer/settings/DisplayOptionsSettingsFragment.java
@@ -21,11 +21,11 @@ import android.preference.PreferenceFragment;
 
 import com.android.dialer.R;
 
-public class DisplayOptionsFragment extends PreferenceFragment {
+public class DisplayOptionsSettingsFragment extends PreferenceFragment {
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        addPreferencesFromResource(R.xml.display_options);
+        addPreferencesFromResource(R.xml.display_options_settings);
     }
 }