Merge "More preference item visual adjustments for smaller tablets. DO NOT... (99a8e1d2) · Commits · e / os / android_frameworks_base

core/java/android/preference/Preference.java

+18 −11

Original line number	Diff line number	Diff line
		@@ -470,11 +470,15 @@ public class Preference implements Comparable<Preference>, OnDependencyChangeLis

		final View layout = layoutInflater.inflate(mLayoutResId, parent, false);

		final ViewGroup widgetFrame = (ViewGroup) layout
		.findViewById(com.android.internal.R.id.widget_frame);
		if (widgetFrame != null) {
		if (mWidgetLayoutResId != 0) {
		final ViewGroup widgetFrame = (ViewGroup)layout.findViewById(com.android.internal.R.id.widget_frame);
		layoutInflater.inflate(mWidgetLayoutResId, widgetFrame);
		} else {
		widgetFrame.setVisibility(View.GONE);
		}
		}

		return layout;
		}

		@@ -512,15 +516,18 @@ public class Preference implements Comparable<Preference>, OnDependencyChangeLis
		}

		ImageView imageView = (ImageView) view.findViewById(com.android.internal.R.id.icon);
		if (imageView != null && (mIconResId != 0 \|\| mIcon != null)) {
		if (imageView != null) {
		if (mIconResId != 0 \|\| mIcon != null) {
		if (mIcon == null) {
		mIcon = getContext().getResources().getDrawable(mIconResId);
		}
		if (mIcon != null) {
		imageView.setImageDrawable(mIcon);
		}
		}
		imageView.setVisibility(mIcon != null ? View.VISIBLE : View.GONE);
		}

		if (mShouldDisableView) {
		setEnabledStateOnViews(view, isEnabled());
		}

+5 −2

Original line number	Diff line number	Diff line
		@@ -20,11 +20,14 @@
		android:layout_width="match_parent"
		android:gravity="center_vertical"
		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"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:textAppearance="?android:attr/textAppearanceLarge"
		android:textAppearance="?android:attr/textAppearanceMedium"
		/>
		</LinearLayout >

+1 −0

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