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

am 5d9e0a1a: am 99a8e1d2: Merge "More preference item visual adjustments for smaller tablets. DO NOT MERGE" into honeycomb-mr2

Browse Source 
* commit '5d9e0a1a867aa5b6162a972288cbef41fd68a29b':
  More preference item visual adjustments for smaller tablets. DO NOT MERGE
This commit is contained in:
Amith Yamasani
2011-05-25 11:08:30 -07:00
committed by Android Git Automerger
parent dd36e1bde1 5d9e0a1a86
commit 361c286d09
3 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
core/java/android/preference/Preference.java
View File

@@ -470,11 +470,15 @@ public class Preference implements Comparable<Preference>, OnDependencyChangeLis
final View layout = layoutInflater.inflate(mLayoutResId, parent, false); final View layout = layoutInflater.inflate(mLayoutResId, parent, false);
if (mWidgetLayoutResId != 0) { final ViewGroup widgetFrame = (ViewGroup) layout
final ViewGroup widgetFrame = (ViewGroup)layout.findViewById(com.android.internal.R.id.widget_frame); .findViewById(com.android.internal.R.id.widget_frame);
layoutInflater.inflate(mWidgetLayoutResId, widgetFrame); if (widgetFrame != null) {
if (mWidgetLayoutResId != 0) {
layoutInflater.inflate(mWidgetLayoutResId, widgetFrame);
} else {
widgetFrame.setVisibility(View.GONE);
}
} }
return layout; return layout;
} }
@@ -510,17 +514,20 @@ public class Preference implements Comparable<Preference>, OnDependencyChangeLis
} }
} }
} }
ImageView imageView = (ImageView) view.findViewById(com.android.internal.R.id.icon); ImageView imageView = (ImageView) view.findViewById(com.android.internal.R.id.icon);
if (imageView != null && (mIconResId != 0 || mIcon != null)) { if (imageView != null) {
if (mIcon == null) { if (mIconResId != 0 || mIcon != null) {
mIcon = getContext().getResources().getDrawable(mIconResId); if (mIcon == null) {
} mIcon = getContext().getResources().getDrawable(mIconResId);
if (mIcon != null) { }
imageView.setImageDrawable(mIcon); if (mIcon != null) {
imageView.setImageDrawable(mIcon);
}
} }
imageView.setVisibility(mIcon != null ? View.VISIBLE : View.GONE); imageView.setVisibility(mIcon != null ? View.VISIBLE : View.GONE);
} }
if (mShouldDisableView) { if (mShouldDisableView) {
setEnabledStateOnViews(view, isEnabled()); setEnabledStateOnViews(view, isEnabled());
} }

7
core/res/res/layout/locale_picker_item.xml
View File

@@ -20,11 +20,14 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:gravity="center_vertical" android:gravity="center_vertical"
android:minHeight="?android:attr/listPreferredItemHeight" android:minHeight="?android:attr/listPreferredItemHeight"
android:padding="5dip"> android:paddingLeft="16dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:paddingRight="16dp">
<TextView android:id="@+id/locale" <TextView android:id="@+id/locale"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceMedium"
/> />
</LinearLayout > </LinearLayout >

1
core/res/res/layout/preference_holo.xml
View File

@@ -35,6 +35,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:minWidth="48dp"
/> />
</LinearLayout> </LinearLayout>