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

This commit is contained in:
Amith Yamasani
2013-05-14 21:54:27 +00:00
committed by Android (Google) Code Review
2 changed files with 9 additions and 1 deletions

View File

@@ -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

View File

@@ -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"