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

Commit 6ea08998 authored by Amith Yamasani's avatar Amith Yamasani
Browse files

More preference item visual adjustments for smaller tablets. DO NOT MERGE 

Use medium text size for locale picker.
Hide icon region if there's no icon.

Bug: 4462313

Change-Id: I8062646f31bfec753bcd476f54c8ab5b66375b5e
parent 36ac304c

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>