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

Commit 0543804e authored by Jared Duke's avatar Jared Duke
Browse files

Revert "Size restrict right notification icon size" 

Revert submission 17083643-large-icons-tm

Reason for revert: Speculative revert for android.app.cts.NotificationManagerTest breakage.
Reverted Changes:
Ib66933a8f:Size restrict right notification icon size
If3d871e78:Downscale large bitmaps in CachingIconView
I504694cb2:Support downscaling of Drawable icons in LocalImag...

Bug: 224768026
Change-Id: I9accb93f78c83b231ba7ce28e0026781fb698c9f
parent 593bdad0

core/res/res/layout/notification_template_header.xml

+0 −2
Original line number Diff line number Diff line
@@ -49,8 +49,6 @@ 
        android:layout_marginStart="@dimen/notification_icon_circle_start"

        android:background="@drawable/notification_icon_circle"

        android:padding="@dimen/notification_icon_circle_padding"

        android:maxDrawableWidth="@dimen/notification_icon_circle_size"

        android:maxDrawableHeight="@dimen/notification_icon_circle_size"

        />



    <!-- extends ViewGroup -->

core/res/res/layout/notification_template_material_base.xml

+1 −5
Original line number Diff line number Diff line
@@ -45,8 +45,6 @@ 
        android:layout_marginStart="@dimen/notification_icon_circle_start"

        android:background="@drawable/notification_icon_circle"

        android:padding="@dimen/notification_icon_circle_padding"

        android:maxDrawableWidth="@dimen/notification_icon_circle_size"

        android:maxDrawableHeight="@dimen/notification_icon_circle_size"

        />



    <FrameLayout
@@ -138,7 +136,7 @@ 


        </LinearLayout>



        <com.android.internal.widget.CachingIconView

        <ImageView

            android:id="@+id/right_icon"

            android:layout_width="@dimen/notification_right_icon_size"

            android:layout_height="@dimen/notification_right_icon_size"
@@ -150,8 +148,6 @@ 
            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

+1 −3
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

  -->

<com.android.internal.widget.CachingIconView

<ImageView

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

    android:id="@+id/right_icon"

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

    android:importantForAccessibility="no"

    android:scaleType="centerCrop"

    android:maxDrawableWidth="@dimen/notification_right_icon_size"

    android:maxDrawableHeight="@dimen/notification_right_icon_size"

    />