Merge "Size restrict right icon size in notification" into tm-dev am: 9ec047d918 am: 65ad362a1d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19197146 Change-Id: I275f6f7e66cde79026b0fbafe9baf77fe94763ef Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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
|
||||||
|
|||||||
@@ -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"
|
||||||
/>
|
/>
|
||||||
|
|||||||
Reference in New Issue
Block a user