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

Merge "Fix LTR & conversation updates on main thread" into sc-dev

Browse Source
This commit is contained in:
Anna Zappone
2021-06-09 17:58:12 +00:00
committed by Android (Google) Code Review
parent fd4a4a3ee5 4a6e13f465
commit d8b5c05ff1
4 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/res/layout/people_space_placeholder_layout.xml
View File

@@ -34,7 +34,7 @@
<LinearLayout <LinearLayout
android:orientation="vertical" android:orientation="vertical"
android:paddingEnd="20dp" android:paddingEnd="20dp"
android:gravity="bottom" android:gravity="start|bottom"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"> android:layout_height="wrap_content">

6
packages/SystemUI/res/layout/people_tile_medium_with_content.xml
View File

@@ -113,7 +113,6 @@
android:id="@+id/name" android:id="@+id/name"
android:layout_gravity="start|center_vertical" android:layout_gravity="start|center_vertical"
android:gravity="start|center_vertical" android:gravity="start|center_vertical"
android:layout_weight="1"
android:text="@string/empty_user_name" android:text="@string/empty_user_name"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.ListItem" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.ListItem"
android:textColor="?android:attr/textColorPrimary" android:textColor="?android:attr/textColorPrimary"
@@ -123,9 +122,14 @@
android:paddingEnd="8dp" android:paddingEnd="8dp"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<TextView
android:layout_weight="1"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView <TextView
android:id="@+id/messages_count" android:id="@+id/messages_count"
android:gravity="end" android:gravity="end"
android:layout_weight="1"
android:paddingStart="8dp" android:paddingStart="8dp"
android:paddingEnd="8dp" android:paddingEnd="8dp"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.ListItem" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.ListItem"

8
packages/SystemUI/src/com/android/systemui/people/PeopleTileViewHelper.java
View File

@@ -348,7 +348,7 @@ public class PeopleTileViewHelper {
if (mWidth >= getSizeInDp(R.dimen.required_width_for_medium)) { if (mWidth >= getSizeInDp(R.dimen.required_width_for_medium)) {
int spaceAvailableForPadding = int spaceAvailableForPadding =
mHeight - (getSizeInDp(R.dimen.avatar_size_for_medium) mHeight - (getSizeInDp(R.dimen.avatar_size_for_medium)
+ getLineHeightFromResource( + 4 + getLineHeightFromResource(
R.dimen.name_text_size_for_content)); R.dimen.name_text_size_for_content));
if (DEBUG) { if (DEBUG) {
Log.d(TAG, "Medium view for mWidth: " + mWidth + " mHeight: " + mHeight Log.d(TAG, "Medium view for mWidth: " + mWidth + " mHeight: " + mHeight
@@ -558,9 +558,6 @@ public class PeopleTileViewHelper {
} }
views.setViewVisibility(R.id.predefined_icon, View.VISIBLE); views.setViewVisibility(R.id.predefined_icon, View.VISIBLE);
views.setTextViewText(R.id.text_content, statusText); views.setTextViewText(R.id.text_content, statusText);
if (mLayoutSize == LAYOUT_LARGE) {
views.setInt(R.id.content, "setGravity", Gravity.BOTTOM);
}
Icon statusIcon = status.getIcon(); Icon statusIcon = status.getIcon();
if (statusIcon != null) { if (statusIcon != null) {
@@ -570,6 +567,7 @@ public class PeopleTileViewHelper {
// Show 1-line subtext on large layout with status images. // Show 1-line subtext on large layout with status images.
if (mLayoutSize == LAYOUT_LARGE) { if (mLayoutSize == LAYOUT_LARGE) {
if (DEBUG) Log.d(TAG, "Remove name for large"); if (DEBUG) Log.d(TAG, "Remove name for large");
views.setInt(R.id.content, "setGravity", Gravity.BOTTOM);
views.setViewVisibility(R.id.name, View.GONE); views.setViewVisibility(R.id.name, View.GONE);
views.setColorAttr(R.id.text_content, "setTextColor", views.setColorAttr(R.id.text_content, "setTextColor",
android.R.attr.textColorPrimary); android.R.attr.textColorPrimary);
@@ -830,6 +828,8 @@ public class PeopleTileViewHelper {
views.setViewPadding(R.id.name, 0, 0, 0, views.setViewPadding(R.id.name, 0, 0, 0,
mContext.getResources().getDimensionPixelSize( mContext.getResources().getDimensionPixelSize(
R.dimen.below_name_text_padding)); R.dimen.below_name_text_padding));
// All large layouts besides missed calls & statuses with images, have gravity top.
views.setInt(R.id.content, "setGravity", Gravity.TOP);
} }
// For all layouts except Missed Calls, ensure predefined icon is regular sized. // For all layouts except Missed Calls, ensure predefined icon is regular sized.

3
packages/SystemUI/src/com/android/systemui/people/widget/PeopleSpaceWidgetManager.java
View File

@@ -199,7 +199,8 @@ public class PeopleSpaceWidgetManager {
"Received updated conversation: " "Received updated conversation: "
+ conversation.getShortcutInfo().getLabel()); + conversation.getShortcutInfo().getLabel());
} }
updateWidgetsWithConversationChanged(conversation); mBgExecutor.execute(() ->
updateWidgetsWithConversationChanged(conversation));
} }
} }