diff options
| author | Romain Guy <romainguy@google.com> | 2011-01-16 15:14:39 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-16 15:14:39 -0800 |
| commit | 94677083ab4c56ffef4a8a68d011d19333ab46c2 (patch) | |
| tree | 789dbddd41fcd337cd9b121ad868dd34e259ed4c /core | |
| parent | 6e72ff9082f82885d738f637d40bfe43d267107a (diff) | |
| parent | fb13abd800cd610c7f46815848545feff83e5748 (diff) | |
| download | frameworks_base-94677083ab4c56ffef4a8a68d011d19333ab46c2.zip frameworks_base-94677083ab4c56ffef4a8a68d011d19333ab46c2.tar.gz frameworks_base-94677083ab4c56ffef4a8a68d011d19333ab46c2.tar.bz2 | |
Merge "Fix 9patch rendering in ExpandableListView." into honeycomb
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/widget/ExpandableListView.java | 4 | ||||
| -rw-r--r-- | core/res/res/values/themes.xml | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/core/java/android/widget/ExpandableListView.java b/core/java/android/widget/ExpandableListView.java index 3d21048..472a335 100644 --- a/core/java/android/widget/ExpandableListView.java +++ b/core/java/android/widget/ExpandableListView.java @@ -22,7 +22,6 @@ import android.content.Context; import android.content.res.TypedArray; import android.graphics.Canvas; import android.graphics.Rect; -import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.os.Parcel; import android.os.Parcelable; @@ -212,6 +211,9 @@ public class ExpandableListView extends ListView { .getDimensionPixelSize(com.android.internal.R.styleable.ExpandableListView_indicatorLeft, 0); mIndicatorRight = a .getDimensionPixelSize(com.android.internal.R.styleable.ExpandableListView_indicatorRight, 0); + if (mIndicatorRight == 0) { + mIndicatorRight = mIndicatorLeft + mGroupIndicator.getIntrinsicWidth(); + } mChildIndicatorLeft = a.getDimensionPixelSize( com.android.internal.R.styleable.ExpandableListView_childIndicatorLeft, CHILD_INDICATOR_INHERIT); mChildIndicatorRight = a.getDimensionPixelSize( diff --git a/core/res/res/values/themes.xml b/core/res/res/values/themes.xml index f65b1f2..744d0d8 100644 --- a/core/res/res/values/themes.xml +++ b/core/res/res/values/themes.xml @@ -114,7 +114,7 @@ ?android:attr/expandableListPreferredItemPaddingLeft</item> <item name="expandableListPreferredItemIndicatorLeft">3dip</item> - <item name="expandableListPreferredItemIndicatorRight">33dip</item> + <item name="expandableListPreferredItemIndicatorRight">0dip</item> <item name="expandableListPreferredChildIndicatorLeft"> ?android:attr/expandableListPreferredItemIndicatorLeft</item> <item name="expandableListPreferredChildIndicatorRight"> @@ -816,7 +816,7 @@ ?android:attr/expandableListPreferredItemPaddingLeft</item> <item name="expandableListPreferredItemIndicatorLeft">3dip</item> - <item name="expandableListPreferredItemIndicatorRight">33dip</item> + <item name="expandableListPreferredItemIndicatorRight">0dip</item> <item name="expandableListPreferredChildIndicatorLeft"> ?android:attr/expandableListPreferredItemIndicatorLeft</item> <item name="expandableListPreferredChildIndicatorRight"> @@ -1075,7 +1075,7 @@ ?android:attr/expandableListPreferredItemPaddingLeft</item> <item name="expandableListPreferredItemIndicatorLeft">3dip</item> - <item name="expandableListPreferredItemIndicatorRight">33dip</item> + <item name="expandableListPreferredItemIndicatorRight">0dip</item> <item name="expandableListPreferredChildIndicatorLeft"> ?android:attr/expandableListPreferredItemIndicatorLeft</item> <item name="expandableListPreferredChildIndicatorRight"> |