Merge "Update the restricted icon usage." into nyc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
ca069a91c4
@@ -27,7 +27,7 @@
|
|||||||
<ImageView android:id="@+id/admin_support_icon"
|
<ImageView android:id="@+id/admin_support_icon"
|
||||||
android:layout_width="@dimen/admin_details_dialog_icon_size"
|
android:layout_width="@dimen/admin_details_dialog_icon_size"
|
||||||
android:layout_height="@dimen/admin_details_dialog_icon_size"
|
android:layout_height="@dimen/admin_details_dialog_icon_size"
|
||||||
android:src="@drawable/ic_settings_lock_outline"
|
android:src="@drawable/ic_info"
|
||||||
android:scaleType="fitCenter"
|
android:scaleType="fitCenter"
|
||||||
android:contentDescription="@null" />
|
android:contentDescription="@null" />
|
||||||
<TextView
|
<TextView
|
||||||
|
@@ -84,7 +84,7 @@
|
|||||||
android:layout_gravity="center_vertical"
|
android:layout_gravity="center_vertical"
|
||||||
android:paddingLeft="16dip"
|
android:paddingLeft="16dip"
|
||||||
android:contentDescription="@string/printer_info_desc"
|
android:contentDescription="@string/printer_info_desc"
|
||||||
android:src="@drawable/ic_info"
|
android:src="@drawable/ic_info_outline"
|
||||||
android:tint="?android:attr/colorControlNormal"
|
android:tint="?android:attr/colorControlNormal"
|
||||||
android:tintMode="src_in"
|
android:tintMode="src_in"
|
||||||
android:visibility="gone">
|
android:visibility="gone">
|
||||||
|
@@ -35,10 +35,10 @@
|
|||||||
android:ellipsize="marquee" />
|
android:ellipsize="marquee" />
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/restricted_lock_icon"
|
android:id="@+id/restricted_lock_icon"
|
||||||
android:layout_width="@dimen/restricted_lock_icon_size"
|
android:layout_width="@dimen/restricted_icon_size"
|
||||||
android:layout_height="@dimen/restricted_lock_icon_size"
|
android:layout_height="@dimen/restricted_icon_size"
|
||||||
android:src="@drawable/ic_settings_lock_outline"
|
android:src="@drawable/ic_info"
|
||||||
android:layout_marginLeft="@dimen/restricted_lock_icon_padding"
|
android:layout_marginLeft="@dimen/restricted_icon_padding"
|
||||||
android:baselineAlignBottom="true"
|
android:baselineAlignBottom="true"
|
||||||
android:scaleType="centerInside"
|
android:scaleType="centerInside"
|
||||||
android:visibility="gone" />
|
android:visibility="gone" />
|
||||||
|
Reference in New Issue
Block a user