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

Commit 9ec047d9 authored by Lucas Dupin's avatar Lucas Dupin Committed by Android (Google) Code Review
Browse files

Merge "Size restrict right icon size in notification" into tm-dev

parents 9b6a9578 d6842211

core/res/res/layout/notification_template_material_base.xml

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




        </LinearLayout>

        </LinearLayout>





        <ImageView

        <com.android.internal.widget.CachingIconView

            android:id="@+id/right_icon"

            android:id="@+id/right_icon"

            android:layout_width="@dimen/notification_right_icon_size"

            android:layout_width="@dimen/notification_right_icon_size"

            android:layout_height="@dimen/notification_right_icon_size"

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

            android:clipToOutline="true"

            android:importantForAccessibility="no"

            android:importantForAccessibility="no"

            android:scaleType="centerCrop"

            android:scaleType="centerCrop"

            android:maxDrawableWidth="@dimen/notification_right_icon_size"

            android:maxDrawableHeight="@dimen/notification_right_icon_size"

            />

            />





        <FrameLayout

        <FrameLayout

core/res/res/layout/notification_template_right_icon.xml

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

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  ~ limitations under the License

  -->

  -->

<ImageView

<com.android.internal.widget.CachingIconView

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

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

    android:id="@+id/right_icon"

    android:id="@+id/right_icon"

    android:layout_width="@dimen/notification_right_icon_size"

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

    android:clipToOutline="true"

    android:importantForAccessibility="no"

    android:importantForAccessibility="no"

    android:scaleType="centerCrop"

    android:scaleType="centerCrop"

    android:maxDrawableWidth="@dimen/notification_right_icon_size"

    android:maxDrawableHeight="@dimen/notification_right_icon_size"

    />
 
    />