From dd9dc5ae60a991ab7e4203c4b539d1dd4811b59a Mon Sep 17 00:00:00 2001 From: Andrew Lee Date: Thu, 26 Feb 2015 13:46:39 -0800 Subject: Add DisplayOptions PreferenceFragment. - Remove display options from the general settings fragment. + Move display options into their own fragment, and add header in the top-level Dialer settingss which points to them. Bug: 19372734 Change-Id: I3452177ba5c31fd9e86dafbcf22eebd56c2bb091 --- .../dialer/settings/DialerSettingsActivity.java | 5 ++++ .../dialer/settings/DisplayOptionsFragment.java | 31 ++++++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 src/com/android/dialer/settings/DisplayOptionsFragment.java (limited to 'src') diff --git a/src/com/android/dialer/settings/DialerSettingsActivity.java b/src/com/android/dialer/settings/DialerSettingsActivity.java index d6e882684..bdffa93d0 100644 --- a/src/com/android/dialer/settings/DialerSettingsActivity.java +++ b/src/com/android/dialer/settings/DialerSettingsActivity.java @@ -43,6 +43,11 @@ public class DialerSettingsActivity extends PreferenceActivity { @Override public void onBuildHeaders(List
target) { + Header displayOptionsHeader = new Header(); + displayOptionsHeader.titleRes = R.string.display_options_title; + displayOptionsHeader.fragment = DisplayOptionsFragment.class.getName(); + target.add(displayOptionsHeader); + Header generalSettingsHeader = new Header(); generalSettingsHeader.titleRes = R.string.general_settings_label; generalSettingsHeader.fragment = GeneralSettingsFragment.class.getName(); diff --git a/src/com/android/dialer/settings/DisplayOptionsFragment.java b/src/com/android/dialer/settings/DisplayOptionsFragment.java new file mode 100644 index 000000000..3a932d5fe --- /dev/null +++ b/src/com/android/dialer/settings/DisplayOptionsFragment.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 DisplayOptionsFragment extends PreferenceFragment { + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + addPreferencesFromResource(R.xml.display_options); + } +} -- cgit v1.2.3