diff options
author | Andrew Lee <anwlee@google.com> | 2015-02-26 14:53:15 -0800 |
---|---|---|
committer | Andrew Lee <anwlee@google.com> | 2015-02-26 14:55:39 -0800 |
commit | 7113f0d42dc99a2f9fde271bc370d6da1cc39c10 (patch) | |
tree | 4cdd76a90a5ba1fdda6e16f4b62a52d25a6046d8 | |
parent | eb2097d840ac4e2f8709041cb7c9282697a309af (diff) |
Rename DisplayOptions to DisplayOptionsSettings.
I figured this would be a better naming pattern for the settings.
Bug: 19372734
Change-Id: I658b6e364bcdc6b41af2c41a98ecd84f5e64cadf
-rw-r--r-- | res/xml/display_options_settings.xml (renamed from res/xml/display_options.xml) | 0 | ||||
-rw-r--r-- | src/com/android/dialer/settings/DialerSettingsActivity.java | 2 | ||||
-rw-r--r-- | src/com/android/dialer/settings/DisplayOptionsSettingsFragment.java (renamed from src/com/android/dialer/settings/DisplayOptionsFragment.java) | 4 |
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); } } |