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

Commit 00dc15d9 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android (Google) Code Review
Browse files

Merge "Add a settings icon to restricted profile config header" into jb-mr2-dev

parents d5d61a0a 1d432963

res/layout/preference_user_delete_widget.xml

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
        android:paddingStart="16dip"

        android:paddingEnd="16dip"

        android:src="@drawable/ic_sysbar_quicksettings"

        android:contentDescription="@string/user_delete_user_description"

        android:contentDescription="@string/settings_label"

        android:layout_gravity="center"

        android:background="?android:attr/selectableItemBackground" />

    <View

res/layout/user_info_header.xml

+8 −0
Original line number Diff line number Diff line
@@ -79,6 +79,14 @@ 
                android:text="@string/user_summary_restricted_profile"

                android:maxLines="4" />

        </RelativeLayout>

        <ImageView

                android:layout_width="wrap_content"

                android:layout_height="fill_parent"

                android:paddingStart="16dip"

                android:paddingEnd="16dip"

                android:src="@drawable/ic_sysbar_quicksettings"

                android:contentDescription="@string/settings_label"

                android:layout_gravity="center"/>

    </LinearLayout>

    <View android:layout_width="match_parent"

          android:layout_height="2dp"