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

Commit ef29f6af authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 4483 into donut 

* changes:
  Fixes #1414069. Display recent activities with two lines of text.
parents 07ca8c71 d2092741

core/res/res/layout/recent_apps_dialog.xml

+54 −58
Original line number Diff line number Diff line
@@ -17,12 +17,9 @@ 
*/

-->



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

    android:layout_width="fill_parent"

    android:layout_height="wrap_content">

    

<LinearLayout

        android:layout_width="wrap_content"

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

    android:layout_width="fill_parent"

    android:layout_height="wrap_content"

    android:padding="3dip"

    android:orientation="vertical">
@@ -80,4 +77,3 @@ 


    </LinearLayout>

</LinearLayout>
 
 No newline at end of file
 
</FrameLayout>

core/res/res/layout/recent_apps_icon.xml

+17 −22
Original line number Diff line number Diff line
@@ -18,27 +18,22 @@ 
-->



<!-- This is not a standalone element - it is imported into recent_apps_dialog.xml -->



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

<TextView

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

    android:id="@+id/label"

    style="?android:attr/buttonStyle"

    android:background="@drawable/btn_application_selector"

    android:layout_width="87dip"

    android:layout_height="78dip"

    android:layout_height="88dip"

    android:layout_margin="3dip"

    android:orientation="vertical"

    android:gravity="center_vertical"

    style="?android:attr/buttonStyle"

    android:background="@drawable/btn_application_selector">

    <ImageView android:id="@+id/icon"

        android:layout_width="@android:dimen/app_icon_size"

        android:layout_height="@android:dimen/app_icon_size"

        android:layout_gravity="center_horizontal"

        android:scaleType="fitCenter" />

    <TextView android:id="@+id/label"

        android:layout_width="fill_parent"

        android:layout_height="wrap_content"

        android:textSize="12dip"

        android:maxLines="1"

        android:ellipsize="end"

        android:duplicateParentState="true"

    android:textColor="@color/primary_text_dark_focused"

        android:gravity="center_horizontal" />

</LinearLayout>
 


    android:paddingTop="5dip"

    android:paddingBottom="2dip"

    android:drawablePadding="0dip"



    android:textSize="13dip"

    android:maxLines="2"

    android:ellipsize="marquee"

    android:fadingEdge="horizontal"

    android:gravity="top|center_horizontal" />