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

Commit 0e3b5a79 authored by Alan Viverette's avatar Alan Viverette Committed by Android Git Automerger
Browse files

am 4ecec44c: am b55ced84: am 13527b41: am 14932619: Merge "Correctly apply max... 

am 4ecec44c: am b55ced84: am 13527b41: am 14932619: Merge "Correctly apply max width/height to preference icons" into lmp-dev

* commit '4ecec44cf37c7df41295eb5897d04c32f7806b73':
  Correctly apply max width/height to preference icons
parents 5648b12d fd6f5bb3

core/java/com/android/internal/widget/PreferenceImageView.java

0 → 100644
+69 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2014 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.internal.widget;



import android.content.Context;

import android.util.AttributeSet;

import android.widget.ImageView;



/**

 * Extension of ImageView that correctly applies maxWidth and maxHeight.

 */

public class PreferenceImageView extends ImageView {



    public PreferenceImageView(Context context) {

        this(context, null);

    }



    public PreferenceImageView(Context context, AttributeSet attrs) {

        this(context, attrs, 0);

    }



    public PreferenceImageView(Context context, AttributeSet attrs, int defStyleAttr) {

        this(context, attrs, defStyleAttr, 0);

    }



    public PreferenceImageView(Context context, AttributeSet attrs, int defStyleAttr,

            int defStyleRes) {

        super(context, attrs, defStyleAttr, defStyleRes);

    }



    @Override

    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {

        final int widthMode = MeasureSpec.getMode(widthMeasureSpec);

        if (widthMode == MeasureSpec.AT_MOST || widthMode == MeasureSpec.UNSPECIFIED) {

            final int widthSize = MeasureSpec.getSize(widthMeasureSpec);

            final int maxWidth = getMaxWidth();

            if (maxWidth != Integer.MAX_VALUE

                    && (maxWidth < widthSize || widthMode == MeasureSpec.UNSPECIFIED)) {

                widthMeasureSpec = MeasureSpec.makeMeasureSpec(maxWidth, MeasureSpec.AT_MOST);

            }

        }



        final int heightMode = MeasureSpec.getMode(heightMeasureSpec);

        if (heightMode == MeasureSpec.AT_MOST || heightMode == MeasureSpec.UNSPECIFIED) {

            final int heightSize = MeasureSpec.getSize(heightMeasureSpec);

            final int maxHeight = getMaxHeight();

            if (maxHeight != Integer.MAX_VALUE

                    && (maxHeight < heightSize || heightMode == MeasureSpec.UNSPECIFIED)) {

                heightMeasureSpec = MeasureSpec.makeMeasureSpec(maxHeight, MeasureSpec.AT_MOST);

            }

        }



        super.onMeasure(widthMeasureSpec, heightMeasureSpec);

    }

}

core/res/res/layout/preference_material.xml

+2 −3
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
    <LinearLayout

        android:id="@+id/icon_frame"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginStart="-4dp"

        android:minWidth="60dp"

        android:gravity="start|center_vertical"
@@ -38,11 +38,10 @@ 
        android:paddingEnd="12dp"

        android:paddingTop="4dp"

        android:paddingBottom="4dp">

        <ImageView

        <com.android.internal.widget.PreferenceImageView

            android:id="@+id/icon"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:adjustViewBounds="true"

            android:maxWidth="48dp"

            android:maxHeight="48dp" />

    </LinearLayout>