diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/edit_user_info_dialog_content.xml | 49 | ||||
| -rw-r--r-- | res/layout/edit_user_photo_popup_item.xml | 31 | ||||
| -rwxr-xr-x | res/values/dimens.xml | 4 | ||||
| -rw-r--r-- | res/values/strings.xml | 8 | ||||
| -rw-r--r-- | res/xml/app_restrictions.xml | 7 |
5 files changed, 94 insertions, 5 deletions
diff --git a/res/layout/edit_user_info_dialog_content.xml b/res/layout/edit_user_info_dialog_content.xml new file mode 100644 index 000000000..d23f6f56c --- /dev/null +++ b/res/layout/edit_user_info_dialog_content.xml @@ -0,0 +1,49 @@ +<!-- + Copyright (C) 2013 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:baselineAligned="false" + android:padding="16dip"> + + <ImageView + android:id="@+id/user_photo" + android:layout_width="56dip" + android:layout_height="56dip" + android:layout_gravity="bottom" + android:layout_marginEnd="6dp" + android:contentDescription="@null" + android:background="@*android:drawable/spinner_background_holo_dark" + android:scaleType="fitCenter"/> + + <EditText + android:id="@+id/user_name" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_gravity="bottom" + android:layout_weight="1" + android:layout_marginStart="6dp" + android:ellipsize="end" + android:singleLine="true" + android:textAppearance="?android:attr/textAppearanceMedium" + android:textAlignment="viewStart" + android:labelFor="@id/user_photo" + android:inputType="text|textCapWords" + android:selectAllOnFocus="true" + android:hint="@string/user_nickname"/> + +</LinearLayout> diff --git a/res/layout/edit_user_photo_popup_item.xml b/res/layout/edit_user_photo_popup_item.xml new file mode 100644 index 000000000..11fdfbc33 --- /dev/null +++ b/res/layout/edit_user_photo_popup_item.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 2013, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<TextView xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@android:id/text1" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="?android:attr/listPreferredItemHeightSmall" + android:textAppearance="?android:attr/textAppearanceListItemSmall" + android:textColor="?android:attr/textColorAlertDialogListItem" + android:gravity="center_vertical" + android:paddingStart="16dip" + android:paddingEnd="16dip" + android:ellipsize="marquee" +/> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 759b40773..aa4009668 100755 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -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> diff --git a/res/values/strings.xml b/res/values/strings.xml index 6a54d7a31..bb77a0c5c 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -3202,7 +3202,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> @@ -4498,4 +4498,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> diff --git a/res/xml/app_restrictions.xml b/res/xml/app_restrictions.xml index c99d5e782..ddc911de4 100644 --- a/res/xml/app_restrictions.xml +++ b/res/xml/app_restrictions.xml @@ -18,9 +18,8 @@ android:title="@string/application_restrictions" xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"> - <com.android.settings.SelectableEditTextPreference - android:key="user_info" - android:order="0" - android:widgetLayout="@layout/preference_rename_widget" /> + <Preference + android:key="user_info" + android:order="0"/> </PreferenceScreen> |