summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2011-08-16 16:14:49 -0700
committerJeff Sharkey <jsharkey@android.com>2011-08-16 16:37:49 -0700
commitdcf8ba9eb233b4dadd1e198b7ec6ba413c6583c1 (patch)
treee0e2e825f08086093700065475aca7391be9eb02 /src
parent96bc0513772d7702440fe9a80a745892b9085cc9 (diff)
downloadpackages_apps_Settings-dcf8ba9eb233b4dadd1e198b7ec6ba413c6583c1.zip
packages_apps_Settings-dcf8ba9eb233b4dadd1e198b7ec6ba413c6583c1.tar.gz
packages_apps_Settings-dcf8ba9eb233b4dadd1e198b7ec6ba413c6583c1.tar.bz2
Follow preferences padding changes in framework.
Change-Id: Ia83237290da035e5ee7a2e92ef56fc02838aac56
Diffstat (limited to 'src')
-rw-r--r--src/com/android/settings/UserDictionarySettings.java10
-rw-r--r--src/com/android/settings/bluetooth/BluetoothSettings.java10
-rw-r--r--src/com/android/settings/wifi/WifiSettings.java10
3 files changed, 3 insertions, 27 deletions
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 b3259e0..a8c3e73 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());