Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixes PreferenceScreen padding and scrollbar position." into jb-dev

Browse Source
This commit is contained in:
Amith Yamasani
2012-05-01 10:22:01 -07:00
committed by Android (Google) Code Review
parent 91901aeb66 f9638a4aee
commit 2d25d467e6
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/preference/PreferenceScreen.java
View File

@@ -24,6 +24,7 @@ import android.os.Parcel;
import android.os.Parcelable;
import android.text.TextUtils;
import android.util.AttributeSet;
import android.view.LayoutInflater;
import android.view.View;
import android.view.Window;
import android.widget.AbsListView;
@@ -153,7 +154,12 @@ public final class PreferenceScreen extends PreferenceGroup implements AdapterVi
if (mListView != null) {
mListView.setAdapter(null);
}
mListView = new ListView(context);
LayoutInflater inflater = (LayoutInflater)
context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
View childPrefScreen = inflater.inflate(
com.android.internal.R.layout.preference_list_fragment, null);
mListView = (ListView) childPrefScreen.findViewById(android.R.id.list);
bind(mListView);
// Set the title bar if title is available, else no title bar
@@ -164,7 +170,7 @@ public final class PreferenceScreen extends PreferenceGroup implements AdapterVi
} else {
dialog.setTitle(title);
}
dialog.setContentView(mListView);
dialog.setContentView(childPrefScreen);
dialog.setOnDismissListener(this);
if (state != null) {
dialog.onRestoreInstanceState(state);

2
core/res/res/values-h720dp/dimens.xml
View File

@@ -25,6 +25,6 @@
<dimen name="preference_screen_header_padding_side">0dip</dimen>
<integer name="preference_screen_header_scrollbarStyle">0x0</integer> <!-- insideOverlay -->
<integer name="preference_fragment_scrollbarStyle">0x0</integer> <!-- insideOverlay -->
<integer name="preference_fragment_scrollbarStyle">0x02000000</integer> <!-- outsideOverlay -->
</resources>

2
core/res/res/values-w720dp/dimens.xml
View File

@@ -33,5 +33,5 @@
<dimen name="preference_screen_header_padding_side">0dip</dimen>
<integer name="preference_screen_header_scrollbarStyle">0x0</integer> <!-- insideOverlay -->
<integer name="preference_fragment_scrollbarStyle">0x0</integer> <!-- insideOverlay -->
<integer name="preference_fragment_scrollbarStyle">0x02000000</integer> <!-- outsideOverlay -->
</resources>