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

Commit 1e775c89 authored by Anna Bauza's avatar Anna Bauza Committed by Android (Google) Code Review
Browse files

Merge "Provide user infomation about avatar synchronisation" into main

parents 54f1f1ed 0e8b56d1
Loading
Loading
Loading
Loading
+13 −0
Original line number Diff line number Diff line
@@ -38,6 +38,17 @@
            android:src="@drawable/add_a_photo_circled"
            android:layout_gravity="bottom|right"/>
    </FrameLayout>
    <TextView
        android:id="@+id/edit_user_info_message"
        android:gravity="center"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_marginStart="6dp"
        android:layout_marginEnd="6dp"
        android:layout_marginTop="24dp"
        android:textAppearance="@style/android:TextAppearance.Material.Body1"
        android:text="@string/edit_user_info_message"
        />

    <EditText
        android:id="@+id/user_name"
@@ -46,6 +57,8 @@
        android:layout_gravity="center"
        android:minWidth="200dp"
        android:layout_marginStart="6dp"
        android:layout_marginEnd="6dp"
        android:layout_marginTop="24dp"
        android:minHeight="@dimen/min_tap_target_size"
        android:ellipsize="end"
        android:singleLine="true"
+3 −0
Original line number Diff line number Diff line
@@ -1484,6 +1484,9 @@
    <!-- Title for the preference to enter the nickname of the user to display in the user switcher [CHAR LIMIT=25]-->
    <string name="user_nickname">Nickname</string>

    <!-- Confirmation message on dialog for editing user name and profile picture. Inform user on who will be able to see the changes [CHAR LIMIT=NONE]-->
    <string name="edit_user_info_message">Your name and picture will be visible to anyone that uses this device.</string>

    <!-- Label for adding a new user in the user switcher [CHAR LIMIT=35] -->
    <string name="user_add_user">Add user</string>
    <!-- Label for adding a new guest in the user switcher [CHAR LIMIT=35] -->