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

42
res/layout/custom_preference_list_fragment.xml
View File

@@ -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>

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