From 7113f0d42dc99a2f9fde271bc370d6da1cc39c10 Mon Sep 17 00:00:00 2001 From: Andrew Lee Date: Thu, 26 Feb 2015 14:53:15 -0800 Subject: Rename DisplayOptions to DisplayOptionsSettings. I figured this would be a better naming pattern for the settings. Bug: 19372734 Change-Id: I658b6e364bcdc6b41af2c41a98ecd84f5e64cadf --- .../dialer/settings/DialerSettingsActivity.java | 2 +- .../dialer/settings/DisplayOptionsFragment.java | 31 ---------------------- .../settings/DisplayOptionsSettingsFragment.java | 31 ++++++++++++++++++++++ 3 files changed, 32 insertions(+), 32 deletions(-) delete mode 100644 src/com/android/dialer/settings/DisplayOptionsFragment.java create mode 100644 src/com/android/dialer/settings/DisplayOptionsSettingsFragment.java (limited to 'src') 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
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/DisplayOptionsFragment.java deleted file mode 100644 index 3a932d5fe..000000000 --- a/src/com/android/dialer/settings/DisplayOptionsFragment.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (C) 2015 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License - */ - -package com.android.dialer.settings; - -import android.os.Bundle; -import android.preference.PreferenceFragment; - -import com.android.dialer.R; - -public class DisplayOptionsFragment extends PreferenceFragment { - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - addPreferencesFromResource(R.xml.display_options); - } -} diff --git a/src/com/android/dialer/settings/DisplayOptionsSettingsFragment.java b/src/com/android/dialer/settings/DisplayOptionsSettingsFragment.java new file mode 100644 index 000000000..4b2c8f6db --- /dev/null +++ b/src/com/android/dialer/settings/DisplayOptionsSettingsFragment.java @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License + */ + +package com.android.dialer.settings; + +import android.os.Bundle; +import android.preference.PreferenceFragment; + +import com.android.dialer.R; + +public class DisplayOptionsSettingsFragment extends PreferenceFragment { + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + addPreferencesFromResource(R.xml.display_options_settings); + } +} -- cgit v1.2.3