Merge "Add a settings icon to restricted profile config header" into jb-mr2-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
00dc15d9da
@@ -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
|
||||
|
@@ -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"
|
||||
|
Reference in New Issue
Block a user