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

Commit 5125656b authored by Selim Cinek's avatar Selim Cinek Committed by android-build-merger
Browse files

Merge "Fixed that the bigtext nofitication had slightly different padding" into nyc-dev 

am: cd84059f

* commit 'cd84059f':
  Fixed that the bigtext nofitication had slightly different padding
parents e8bfd221 cd84059f

core/java/com/android/internal/widget/ImageFloatingTextView.java

+2 −0
Original line number Diff line number Diff line
@@ -65,6 +65,8 @@ public class ImageFloatingTextView extends TextView { 
                .setTextDirection(getTextDirectionHeuristic())

                .setLineSpacing(getLineSpacingExtra(), getLineSpacingMultiplier())

                .setIncludePad(getIncludeFontPadding())

                .setEllipsize(shouldEllipsize ? effectiveEllipsize : null)

                .setEllipsizedWidth(ellipsisWidth)

                .setBreakStrategy(Layout.BREAK_STRATEGY_HIGH_QUALITY)

                .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_FULL);

        // we set the endmargin on the first 2 lines. this works just in our case but that's

core/res/res/layout/notification_template_material_big_text.xml

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
        <com.android.internal.widget.ImageFloatingTextView android:id="@+id/big_text"

            android:layout_width="match_parent"

            android:layout_height="0dp"

            android:layout_marginTop="1.5dp"

            android:layout_marginTop="1dp"

            android:paddingBottom="@dimen/notification_content_margin_bottom"

            android:textAppearance="@style/TextAppearance.Material.Notification"

            android:singleLine="false"

core/res/res/layout/notification_template_text.xml

+2 −2
Original line number Diff line number Diff line
@@ -14,12 +14,12 @@ 
  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->

<TextView xmlns:android="http://schemas.android.com/apk/res/android"

<com.android.internal.widget.ImageFloatingTextView xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/text"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_gravity="top"

    android:layout_marginTop="1.5dp"

    android:layout_marginTop="1dp"

    android:ellipsize="marquee"

    android:fadingEdge="horizontal"

    android:gravity="top"