Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b009e89e authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by Android (Google) Code Review
Browse files

Merge "Make Settings use system-api restricted icon."

parents be04ed9e a5918a6a

res/layout/admin_support_details_dialog.xml

+2 −1
Original line number Diff line number Diff line
@@ -27,7 +27,8 @@ 
        <ImageView android:id="@+id/admin_support_icon"

                android:layout_width="@dimen/admin_details_dialog_icon_size"

                android:layout_height="@dimen/admin_details_dialog_icon_size"

                android:src="@drawable/ic_info"

                android:tint="?android:attr/colorAccent"

                android:src="@*android:drawable/ic_info"

                android:scaleType="fitCenter"

                android:contentDescription="@null" />

        <TextView android:id="@+id/admin_support_dialog_title"

res/layout/lockscreen_remote_input.xml

+5 −4
Original line number Diff line number Diff line
@@ -36,9 +36,10 @@ 


    <ImageView

            android:id="@+id/restricted_lock_icon_remote_input"

            android:layout_width="@dimen/restricted_icon_size"

            android:layout_height="@dimen/restricted_icon_size"

            android:src="@drawable/ic_info"

            android:layout_width="@*android:dimen/config_restricted_icon_size"

            android:layout_height="@*android:dimen/config_restricted_icon_size"

            android:tint="?android:attr/colorAccent"

            android:src="@*android:drawable/ic_info"

            android:layout_marginEnd="?android:attr/dialogPreferredPadding"

            android:layout_gravity="center_vertical"

            android:scaleType="centerInside" />

res/layout/printer_dropdown_item.xml

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ 
            android:layout_gravity="center_vertical"

            android:paddingLeft="16dip"

            android:contentDescription="@string/printer_info_desc"

            android:src="@drawable/ic_info"

            android:src="@*android:drawable/ic_info"

            android:tint="?android:attr/colorControlNormal"

            android:tintMode="src_in" />

res/layout/restricted_dialog_singlechoice.xml

+5 −4
Original line number Diff line number Diff line
@@ -37,9 +37,10 @@ 
            android:ellipsize="marquee" />

    <ImageView

            android:id="@+id/restricted_lock_icon"

            android:layout_width="@dimen/restricted_icon_size"

            android:layout_height="@dimen/restricted_icon_size"

            android:src="@drawable/ic_info"

            android:layout_width="@*android:dimen/config_restricted_icon_size"

            android:layout_height="@*android:dimen/config_restricted_icon_size"

            android:tint="?android:attr/colorAccent"

            android:src="@*android:drawable/ic_info"

            android:layout_marginLeft="@dimen/restricted_icon_padding"

            android:baselineAlignBottom="true"

            android:scaleType="centerInside"

res/layout/restricted_popup_menu_item.xml

+5 −4
Original line number Diff line number Diff line
@@ -34,10 +34,11 @@ 
        android:layout_alignParentLeft="true" />

    <ImageView

        android:id="@+id/restricted_icon"

        android:layout_width="@dimen/restricted_icon_size"

        android:layout_height="@dimen/restricted_icon_size"

        android:layout_width="@*android:dimen/config_restricted_icon_size"

        android:layout_height="@*android:dimen/config_restricted_icon_size"

        android:scaleType="centerInside"

        android:src="@drawable/ic_info"

        android:tint="?android:attr/colorAccent"

        android:src="@*android:drawable/ic_info"

        android:layout_alignParentRight="true"

        android:visibility="gone" />

</RelativeLayout>