diff options
author | Andrew Lee <anwlee@google.com> | 2015-02-26 22:57:48 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-26 22:57:49 +0000 |
commit | 25b32a9e2d1dc60d1687b774fd08f1adfc06939c (patch) | |
tree | 46f20cec773df4341ee4c23f30535cd1d855bade /src | |
parent | 0531a915a1078b67f9ceec7db9910a9f7f54f94b (diff) | |
parent | 7113f0d42dc99a2f9fde271bc370d6da1cc39c10 (diff) |
Merge "Rename DisplayOptions to DisplayOptionsSettings."
Diffstat (limited to 'src')
-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 |
2 files changed, 3 insertions, 3 deletions
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); } } |