Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ib060e01e573bc5551d118fe407f44345e7bcfba2
This commit is contained in:
Flavio Fiszman
2021-06-28 12:52:33 +00:00
committed by Automerger Merge Worker
parent ab17fa366e 17f6df5f03
commit 677d0c0dc9
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/res/layout/people_space_activity_no_conversations.xml
View File

@@ -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>

2
packages/SystemUI/res/values/strings.xml
View File

@@ -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] -->