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

Merge changes If8d5b906,I861d6ef7 into rvc-dev am: 70f970f80b

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

Change-Id: I79003668ce462426271eb80720397b03563f3c1b
This commit is contained in:
Steve Elliott
2020-06-17 17:49:14 +00:00
committed by Automerger Merge Worker
parent 86366e59cb 70f970f80b
commit e02dc982ff
3 changed files with 39 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/com/android/internal/widget/ConversationLayout.java
View File

@@ -233,13 +233,20 @@ public class ConversationLayout extends FrameLayout
oldVisibility = mImportanceRingView.getVisibility();
wasGone = oldVisibility == GONE;
visibility = !mImportantConversation ? GONE : visibility;
isGone = visibility == GONE;
if (wasGone != isGone) {
boolean isRingGone = visibility == GONE;
if (wasGone != isRingGone) {
// Keep the badge visibility in sync with the icon. This is necessary in cases
// Where the icon is being hidden externally like in group children.
mImportanceRingView.animate().cancel();
mImportanceRingView.setVisibility(visibility);
}
oldVisibility = mConversationIconBadge.getVisibility();
wasGone = oldVisibility == GONE;
if (wasGone != isGone) {
mConversationIconBadge.animate().cancel();
mConversationIconBadge.setVisibility(visibility);
}
});
// When the small icon is gone, hide the rest of the badge
mIcon.setOnForceHiddenChangedListener((forceHidden) -> {

4
core/java/com/android/internal/widget/MessagingGroup.java
View File

@@ -42,6 +42,7 @@ import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.ProgressBar;
import android.widget.RemoteViews;
import android.widget.TextView;
import com.android.internal.R;
@@ -612,7 +613,7 @@ public class MessagingGroup extends LinearLayout implements MessagingLinearLayou
return 0;
}
public View getSenderView() {
public TextView getSenderView() {
return mSenderView;
}
@@ -668,6 +669,7 @@ public class MessagingGroup extends LinearLayout implements MessagingLinearLayou
singleLine ? LinearLayout.HORIZONTAL : LinearLayout.VERTICAL);
MarginLayoutParams layoutParams = (MarginLayoutParams) mSenderView.getLayoutParams();
layoutParams.setMarginEnd(singleLine ? mSenderTextPaddingSingleLine : 0);
mSenderView.setSingleLine(singleLine);
updateMaxDisplayedLines();
updateClipRect();
updateSenderVisibility();