Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d9e0a1a authored by Amith Yamasani's avatar Amith Yamasani Committed by Android Git Automerger
Browse files

am 99a8e1d2: Merge "More preference item visual adjustments for smaller... 

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

* commit '99a8e1d2':
  More preference item visual adjustments for smaller tablets. DO NOT MERGE
parents 8b98284b 99a8e1d2

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

        }

core/res/res/layout/locale_picker_item.xml

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

core/res/res/layout/preference_holo.xml

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