diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-07-08 00:19:42 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-07-08 00:19:42 +0000 |
| commit | 0d3ff311e6e80dee7fe88a2a2cfa272ce231c3c6 (patch) | |
| tree | 5734bee295a9a6d24b54b8fefd8d9d07bfc509fc | |
| parent | a6d0f6e5f28429d18aed25938c1926e59eb4970a (diff) | |
| parent | a07cc7613785458436d3b70576881abdbacaf284 (diff) | |
| download | base-0d3ff311e6e80dee7fe88a2a2cfa272ce231c3c6.tar.gz | |
Merge cherrypicks of [19197146] into tm-release.android-security-13.0.0_r1android-13.0.0_r1
Change-Id: Ie7db4368ca393c49f57354842ad8fbb4a7ea7a30
| -rw-r--r-- | core/res/res/layout/notification_template_material_base.xml | 4 | ||||
| -rw-r--r-- | core/res/res/layout/notification_template_right_icon.xml | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/core/res/res/layout/notification_template_material_base.xml b/core/res/res/layout/notification_template_material_base.xml index 0756d68063f5..fd787f6ea470 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> - <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 diff --git a/core/res/res/layout/notification_template_right_icon.xml b/core/res/res/layout/notification_template_right_icon.xml index f163ed5f955a..8b3b795f7473 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 --> -<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" /> |