diff options
| -rw-r--r-- | res/layout/custom_preference_list_fragment.xml | 42 | ||||
| -rw-r--r-- | src/com/android/settings/UserDictionarySettings.java | 10 | ||||
| -rw-r--r-- | src/com/android/settings/bluetooth/BluetoothSettings.java | 10 | ||||
| -rw-r--r-- | src/com/android/settings/wifi/WifiSettings.java | 10 |
4 files changed, 3 insertions, 69 deletions
diff --git a/res/layout/custom_preference_list_fragment.xml b/res/layout/custom_preference_list_fragment.xml deleted file mode 100644 index 4803639..0000000 --- a/res/layout/custom_preference_list_fragment.xml +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 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. ---> - -<!-- Based on preference_list_fragment.xml in framework --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_height="match_parent" - android:layout_width="match_parent" - android:background="@android:color/transparent"> - - <ListView android:id="@android:id/list" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:paddingTop="0dip" - android:paddingBottom="@*android:dimen/preference_fragment_padding_bottom" - android:paddingLeft="@*android:dimen/preference_fragment_padding_side" - android:paddingRight="@*android:dimen/preference_fragment_padding_side" - android:clipToPadding="false" - android:drawSelectorOnTop="false" - android:cacheColorHint="@android:color/transparent" - android:scrollbarAlwaysDrawVerticalTrack="true" /> - - <TextView android:id="@+id/empty" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:padding="5dip" - android:gravity="center" - android:visibility="gone" /> -</LinearLayout> diff --git a/src/com/android/settings/UserDictionarySettings.java b/src/com/android/settings/UserDictionarySettings.java index fa4359c..be8f453 100644 --- a/src/com/android/settings/UserDictionarySettings.java +++ b/src/com/android/settings/UserDictionarySettings.java @@ -81,7 +81,6 @@ public class UserDictionarySettings extends ListFragment implements DialogCreata /** The word being edited in the dialog (null means the user is adding a word). */ private String mDialogEditingWord; - private View mView; private Cursor mCursor; protected String mLocale; @@ -97,13 +96,6 @@ public class UserDictionarySettings extends ListFragment implements DialogCreata } @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - mView = inflater.inflate(R.layout.custom_preference_list_fragment, container, false); - return mView; - } - - @Override public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); @@ -126,7 +118,7 @@ public class UserDictionarySettings extends ListFragment implements DialogCreata mLocale = locale; mCursor = createCursor(locale); - TextView emptyView = (TextView)mView.findViewById(R.id.empty); + TextView emptyView = (TextView) getView().findViewById(android.R.id.empty); emptyView.setText(R.string.user_dict_settings_empty_text); final ListView listView = getListView(); diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java index 91bcffd..4b86a74 100644 --- a/src/com/android/settings/bluetooth/BluetoothSettings.java +++ b/src/com/android/settings/bluetooth/BluetoothSettings.java @@ -69,7 +69,6 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment { private PreferenceGroup mAvailableDevicesCategory; private boolean mAvailableDevicesCategoryIsPresent; - private View mView; private TextView mEmptyView; private final IntentFilter mIntentFilter; @@ -98,17 +97,10 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment { } @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - mView = inflater.inflate(R.layout.custom_preference_list_fragment, container, false); - return mView; - } - - @Override public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); - mEmptyView = (TextView) mView.findViewById(R.id.empty); + mEmptyView = (TextView) getView().findViewById(android.R.id.empty); getListView().setEmptyView(mEmptyView); } diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java index dff6d2a..1b24bf7 100644 --- a/src/com/android/settings/wifi/WifiSettings.java +++ b/src/com/android/settings/wifi/WifiSettings.java @@ -114,7 +114,6 @@ public class WifiSettings extends SettingsPreferenceFragment private WifiDialog mDialog; - private View mView; private TextView mEmptyView; /* Used in Wifi Setup context */ @@ -163,13 +162,6 @@ public class WifiSettings extends SettingsPreferenceFragment } @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - mView = inflater.inflate(R.layout.custom_preference_list_fragment, container, false); - return mView; - } - - @Override public void onActivityCreated(Bundle savedInstanceState) { // We don't call super.onActivityCreated() here, since it assumes we already set up // Preference (probably in onCreate()), while WifiSettings exceptionally set it up in @@ -227,7 +219,7 @@ public class WifiSettings extends SettingsPreferenceFragment mWifiEnabler = new WifiEnabler(activity, actionBarSwitch); } - mEmptyView = (TextView) mView.findViewById(R.id.empty); + mEmptyView = (TextView) getView().findViewById(android.R.id.empty); getListView().setEmptyView(mEmptyView); registerForContextMenu(getListView()); |