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

Commit 1cbbec00 authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Fix marquee on app snippet in InstalledAppDetails" into mnc-dev

parents 5006bf1d b0145999

res/layout/app_item.xml

+15 −8
Original line number Diff line number Diff line
@@ -14,12 +14,13 @@ 
     limitations under the License.

-->



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

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:minHeight="72dp"

    android:paddingTop="16dp"

    android:paddingBottom="16dp"

    android:gravity="top"

    android:columnCount="3">



    <ImageView
@@ -28,15 +29,14 @@ 
        android:layout_height="@dimen/app_icon_size"

        android:layout_gravity="center"

        android:scaleType="fitXY"

        android:layout_rowSpan="3"

        android:layout_marginEnd="16dip"

        android:contentDescription="@null" />



    <TextView

        android:id="@android:id/title"

        android:layout_width="0dip"

        android:layout_gravity="fill_horizontal"

        android:layout_marginTop="2dip"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_toEndOf="@android:id/icon"

        android:singleLine="true"

        android:ellipsize="marquee"

        android:textAppearance="@android:style/TextAppearance.Material.Subhead"
@@ -45,8 +45,12 @@ 


    <TextView

        android:id="@android:id/summary"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_toEndOf="@android:id/title"

        android:layout_alignParentEnd="true"

        android:layout_marginStart="6dip"

        android:layout_marginTop="2dip"

        android:gravity="end"

        android:singleLine="true"

        android:ellipsize="marquee"

        android:textAppearance="@android:style/TextAppearance.Material.Subhead"
@@ -54,8 +58,11 @@ 


    <FrameLayout

        android:id="@android:id/widget_frame"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_columnSpan="2"

        android:layout_toEndOf="@android:id/icon"

        android:layout_below="@android:id/title"

        android:layout_alignParentEnd="true"

        android:layout_gravity="fill_horizontal|top" />



</GridLayout>
 
</RelativeLayout>

src/com/android/settings/applications/InstalledAppDetails.java

+1 −0
Original line number Diff line number Diff line
@@ -763,6 +763,7 @@ public class InstalledAppDetails extends AppInfoBase 
        TextView appVersion = (TextView) appSnippet.findViewById(R.id.widget_text1);



        if (!TextUtils.isEmpty(versionName)) {

            appVersion.setSelected(true);

            appVersion.setVisibility(View.VISIBLE);

            appVersion.setText(appSnippet.getContext().getString(R.string.version_text,

                    String.valueOf(versionName)));