Merge "Use renamed restricted icon size config-value"

This commit is contained in:
Philip P. Moltmann
2018-10-15 17:16:55 +00:00
committed by Android (Google) Code Review
6 changed files with 10 additions and 10 deletions

View File

@@ -36,8 +36,8 @@
<ImageView <ImageView
android:id="@+id/restricted_lock_icon_remote_input" android:id="@+id/restricted_lock_icon_remote_input"
android:layout_width="@*android:dimen/config_restricted_icon_size" android:layout_width="@*android:dimen/config_restrictedIconSize"
android:layout_height="@*android:dimen/config_restricted_icon_size" android:layout_height="@*android:dimen/config_restrictedIconSize"
android:tint="?android:attr/colorAccent" android:tint="?android:attr/colorAccent"
android:src="@*android:drawable/ic_info" android:src="@*android:drawable/ic_info"
android:layout_marginEnd="?android:attr/dialogPreferredPadding" android:layout_marginEnd="?android:attr/dialogPreferredPadding"

View File

@@ -37,8 +37,8 @@
android:ellipsize="marquee" /> android:ellipsize="marquee" />
<ImageView <ImageView
android:id="@+id/restricted_lock_icon" android:id="@+id/restricted_lock_icon"
android:layout_width="@*android:dimen/config_restricted_icon_size" android:layout_width="@*android:dimen/config_restrictedIconSize"
android:layout_height="@*android:dimen/config_restricted_icon_size" android:layout_height="@*android:dimen/config_restrictedIconSize"
android:tint="?android:attr/colorAccent" android:tint="?android:attr/colorAccent"
android:src="@*android:drawable/ic_info" android:src="@*android:drawable/ic_info"
android:layout_marginLeft="@dimen/restricted_icon_padding" android:layout_marginLeft="@dimen/restricted_icon_padding"

View File

@@ -34,8 +34,8 @@
android:layout_alignParentLeft="true" /> android:layout_alignParentLeft="true" />
<ImageView <ImageView
android:id="@+id/restricted_icon" android:id="@+id/restricted_icon"
android:layout_width="@*android:dimen/config_restricted_icon_size" android:layout_width="@*android:dimen/config_restrictedIconSize"
android:layout_height="@*android:dimen/config_restricted_icon_size" android:layout_height="@*android:dimen/config_restrictedIconSize"
android:scaleType="centerInside" android:scaleType="centerInside"
android:tint="?android:attr/colorAccent" android:tint="?android:attr/colorAccent"
android:src="@*android:drawable/ic_info" android:src="@*android:drawable/ic_info"

View File

@@ -41,7 +41,7 @@
android:ellipsize="marquee" /> android:ellipsize="marquee" />
<ImageView <ImageView
android:id="@+id/restricted_icon" android:id="@+id/restricted_icon"
android:layout_width="@*android:dimen/config_restricted_icon_size" android:layout_width="@*android:dimen/config_restrictedIconSize"
android:layout_height="match_parent" android:layout_height="match_parent"
android:scaleType="centerInside" android:scaleType="centerInside"
android:tint="?android:attr/colorAccent" android:tint="?android:attr/colorAccent"

View File

@@ -26,8 +26,8 @@
android:layout_height="?android:attr/listPreferredItemHeightSmall" android:layout_height="?android:attr/listPreferredItemHeightSmall"
android:ellipsize="marquee" /> android:ellipsize="marquee" />
<ImageView android:id="@+id/restricted_icon" <ImageView android:id="@+id/restricted_icon"
android:layout_width="@*android:dimen/config_restricted_icon_size" android:layout_width="@*android:dimen/config_restrictedIconSize"
android:layout_height="@*android:dimen/config_restricted_icon_size" android:layout_height="@*android:dimen/config_restrictedIconSize"
android:tint="?android:attr/colorAccent" android:tint="?android:attr/colorAccent"
android:src="@*android:drawable/ic_info" android:src="@*android:drawable/ic_info"
android:baselineAlignBottom="true" android:baselineAlignBottom="true"

View File

@@ -267,7 +267,7 @@
<!-- Restricted icon in switch bar --> <!-- Restricted icon in switch bar -->
<dimen name="restricted_icon_margin_end">16dp</dimen> <dimen name="restricted_icon_margin_end">16dp</dimen>
<!-- Restricted icon size in switch bar --> <!-- Restricted icon size in switch bar -->
<dimen name="restricted_icon_size">@*android:dimen/config_restricted_icon_size</dimen> <dimen name="restricted_icon_size">@*android:dimen/config_restrictedIconSize</dimen>
<!-- Display Size and Font Size preview screen --> <!-- Display Size and Font Size preview screen -->
<dimen name="preview_pager_padding">8dp</dimen> <dimen name="preview_pager_padding">8dp</dimen>