diff options
| author | 2022-07-07 16:06:27 +0000 | |
|---|---|---|
| committer | 2022-07-07 16:06:27 +0000 | |
| commit | 65ad362a1d146fe0f29a2f2ae6b67f9ce6246be7 (patch) | |
| tree | 06af33965ad2f9b7f92488abce4928f81d38b9a3 | |
| parent | 3b2b267be111c5a65462c75ca72463ec984f8540 (diff) | |
| parent | 9ec047d918109da0664ad8af1d19217dd1fcd906 (diff) | |
Merge "Size restrict right icon size in notification" into tm-dev am: 9ec047d918
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19197146
Change-Id: I6d323a0cc6822ce571774ef0fd7976cde64abedb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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" /> |