Revert resize of the right notification icon
CTS tests are for some reason checking for the size of that icon and it breaks NotificationTemplateTest. Will resubmit with fixed tests.
Reverts this change from ag/17217925
Bug: 226293312
Test: atest NotificationTemplateTest
Change-Id: I82afff2cdf339e1fe68c8bc68b479dfdd0ef5ac6
diff --git a/core/res/res/layout/notification_template_material_base.xml b/core/res/res/layout/notification_template_material_base.xml
index fd787f6..0756d68 100644
--- a/core/res/res/layout/notification_template_material_base.xml
+++ b/core/res/res/layout/notification_template_material_base.xml
@@ -138,7 +138,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 +150,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
diff --git a/core/res/res/layout/notification_template_right_icon.xml b/core/res/res/layout/notification_template_right_icon.xml
index 8b3b795..f163ed5 100644
--- a/core/res/res/layout/notification_template_right_icon.xml
+++ b/core/res/res/layout/notification_template_right_icon.xml
@@ -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"
/>