am 5185b8bc: am bf3391f1: Adding UI for editing the name and the picture of a limited user.

* commit '5185b8bc271d17c4ffa9dc50cc9a204f5a74937f':
  Adding UI for editing the name and the picture of a limited user.
This commit is contained in:
Svetoslav
2013-04-23 11:16:49 -07:00
committed by Android Git Automerger
7 changed files with 430 additions and 26 deletions

View File

@@ -65,4 +65,8 @@
<dimen name="circle_avatar_size">48dp</dimen>
<dimen name="circle_avatar_frame_stroke_width">1dp</dimen>
<dimen name="circle_avatar_frame_shadow_radius">3dp</dimen>
<!-- Minimum width for the popup for updating a user's photo. -->
<dimen name="update_user_photo_popup_min_width">300dip</dimen>
</resources>

View File

@@ -3207,7 +3207,7 @@
interacting with an app.</string>
<!-- Title for a warning about disabling an accessibility service. [CHAR LIMIT=NONE] -->
<string name="disable_service_title">Stop<xliff:g id="service" example="TalkBack">%1$s</xliff:g>?</string>
<string name="disable_service_title">Stop <xliff:g id="service" example="TalkBack">%1$s</xliff:g>?</string>
<!-- Message for a warning about disabling accessibility service. [CHAR LIMIT=NONE] -->
<string name="disable_service_message">Touching OK will
stop <xliff:g id="service" example="TalkBack">%1$s</xliff:g>.</string>
@@ -4503,4 +4503,10 @@
<string name="wizard_next">Next</string>
<!-- Wizard next button label [CHAR LIMIT=25] -->
<string name="wizard_finish">Finish</string>
<!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
<string name="user_image_take_photo" msgid="7496128293167402354">Take photo</string>
<!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
<string name="user_image_choose_photo" msgid="3746334626214970837">Choose photo from Gallery</string>
</resources>