diff --git a/res/layout/custom_preference_list_fragment.xml b/res/layout/custom_preference_list_fragment.xml deleted file mode 100644 index 4803639cae0..00000000000 --- a/res/layout/custom_preference_list_fragment.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - diff --git a/src/com/android/settings/UserDictionarySettings.java b/src/com/android/settings/UserDictionarySettings.java index fa4359c694d..be8f453e513 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; @@ -96,13 +95,6 @@ public class UserDictionarySettings extends ListFragment implements DialogCreata super.onCreate(savedInstanceState); } - @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 91bcffd4351..4b86a7412fd 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; @@ -97,18 +96,11 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment { mIntentFilter = new IntentFilter(BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED); } - @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 dff6d2a19e4..1b24bf74330 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 */ @@ -162,13 +161,6 @@ public class WifiSettings extends SettingsPreferenceFragment mInXlSetupWizard = (activity instanceof WifiSettingsForSetupWizardXL); } - @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 @@ -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());