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

Commit a8807486 authored by Jernej Virag's avatar Jernej Virag Committed by Automerger Merge Worker
Browse files

Merge "Size restrict right icon size in notification" into tm-qpr-dev am: 9efc9fa3 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18799649



Change-Id: I05ab942f289437951653e49ae779a46dfa541f36
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d4c4f064 9efc9fa3

core/res/res/layout/notification_template_material_base.xml

+3 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ 


        </LinearLayout>



        <ImageView

        <com.android.internal.widget.CachingIconView

            android:id="@+id/right_icon"

            android:layout_width="@dimen/notification_right_icon_size"

            android:layout_height="@dimen/notification_right_icon_size"
@@ -150,6 +150,8 @@ 
            android:clipToOutline="true"

            android:importantForAccessibility="no"

            android:scaleType="centerCrop"

            android:maxDrawableWidth="@dimen/notification_right_icon_size"

            android:maxDrawableHeight="@dimen/notification_right_icon_size"

            />



        <FrameLayout

core/res/res/layout/notification_template_right_icon.xml

+3 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->

<ImageView

<com.android.internal.widget.CachingIconView

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/right_icon"

    android:layout_width="@dimen/notification_right_icon_size"
@@ -25,4 +25,6 @@ 
    android:clipToOutline="true"

    android:importantForAccessibility="no"

    android:scaleType="centerCrop"

    android:maxDrawableWidth="@dimen/notification_right_icon_size"

    android:maxDrawableHeight="@dimen/notification_right_icon_size"

    />