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

Commit 9b994c43 authored by Flavio Fiszman's avatar Flavio Fiszman Committed by Automerger Merge Worker
Browse files

Merge "Polish Conversations widget Configuration Activity strings" into sc-dev am: 17f6df5f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15109570

Change-Id: I8fa3ab429bf2de671cad0754099f2f71f4f3038c
parents 849af2a9 17f6df5f
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -48,13 +48,13 @@

    <Button
        style="?android:attr/buttonBarButtonStyle"
        android:id="@+id/okay_button"
        android:id="@+id/got_it_button"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_gravity="center"
        android:background="@drawable/rounded_bg_full_large_radius"
        android:onClick="dismissActivity"
        android:text="@string/okay"
        android:text="@string/got_it"
        android:textColor="?android:attr/textColorPrimary"
        android:layout_marginBottom="60dp"
        android:layout_alignParentBottom="true" />
@@ -62,7 +62,7 @@
    <LinearLayout
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_above="@id/okay_button"
        android:layout_above="@id/got_it_button"
        android:layout_below="@id/select_conversation"
        android:layout_centerInParent="true"
        android:clipToOutline="true">
@@ -72,7 +72,7 @@
            android:layout_height="100dp"
            android:layout_gravity="center"
            android:background="@drawable/rounded_bg_full_large_radius"
            android:layout_above="@id/okay_button">
            android:layout_above="@id/got_it_button">
            <include layout="@layout/people_space_placeholder_layout" />
        </LinearLayout>
    </LinearLayout>
+1 −1
Original line number Diff line number Diff line
@@ -2889,7 +2889,7 @@
    <!--Text explaining to tap a conversation to select it show in their Conversation widget [CHAR LIMIT=180] -->
    <string name="select_conversation_text">Tap a conversation to add it to your Home screen</string>
    <!--Text explaining there are no existing conversations to show in their Conversation widget [CHAR LIMIT=100] -->
    <string name="no_conversations_text">Check back here once you get some messages</string>
    <string name="no_conversations_text">Your recent conversations will show up here</string>
    <!--Text header for priority conversation tiles available to be added to the home screen [CHAR LIMIT=100] -->
    <string name="priority_conversations">Priority conversations</string>
    <!--Text header for recent conversation tiles available to be added to the home screen [CHAR LIMIT=100] -->