PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Follow preferences padding changes in framework."

Browse Source
This commit is contained in:
Jeff Sharkey
2011-08-18 10:52:06 -07:00
committed by Android (Google) Code Review
parent 82f92e500f dcf8ba9eb2
commit e1246c5263
4 changed files with 3 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/UserDictionarySettings.java
View File

@@ -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();

10
src/com/android/settings/bluetooth/BluetoothSettings.java
View File

@@ -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);
}

10
src/com/android/settings/wifi/WifiSettings.java
View File

@@ -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());