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

Merge "Fixed a bug where the image and the text were overlapping" into nyc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-05-02 22:26:38 +00:00
committed by Android (Google) Code Review
parent 599de361cb 37878683ff
commit 33f39a96cb
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,22 +16,19 @@
package com.android.internal.widget;
import com.android.internal.R;
import android.annotation.Nullable;
import android.content.Context;
import android.content.res.Configuration;
import android.content.res.TypedArray;
import android.text.BoringLayout;
import android.text.Layout;
import android.text.StaticLayout;
import android.text.TextUtils;
import android.util.AttributeSet;
import android.util.TypedValue;
import android.view.RemotableViewMethod;
import android.widget.RemoteViews;
import android.widget.TextView;
import com.android.internal.R;
/**
* A TextView that can float around an image on the end.
*
@@ -96,9 +93,7 @@ public class ImageFloatingTextView extends TextView {
@RemotableViewMethod
public void setHasImage(boolean hasImage) {
mIndentLines = hasImage ? 2 : 0;
// The new layout will be automatically created when the text is
// set again by the notification.
setNumIndentLines(hasImage ? 2 : 0);
}
/**