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

Commit a8624186 authored by Joe Onorato's avatar Joe Onorato Committed by Android Git Automerger
Browse files

am 46fba3b9: am 52e70b25: Add title to recent apps dialog.

Merge commit '46fba3b9' into kraken

* commit '46fba3b9':
  Add title to recent apps dialog.
parents d29eafdb 46fba3b9
Loading
Loading
Loading
Loading
+11 −1
Original line number Diff line number Diff line
@@ -26,6 +26,15 @@
    android:paddingBottom="3dip"
    android:orientation="vertical">

    <!-- Title -->
    <TextView
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        style="?android:attr/windowTitleStyle"
        android:layout_marginTop="5dip"
        android:layout_marginBottom="15dip"
        android:text="@android:string/recent_tasks_title" />

    <!-- This is only intended to be visible when all buttons (below) are invisible -->
    <TextView
        android:id="@+id/no_applications_message"
@@ -44,7 +53,8 @@
    <LinearLayout
        android:layout_width="320dip"
        android:layout_height="wrap_content"
        android:orientation="horizontal" >
        android:orientation="horizontal"
        >

        <include
            layout="@android:layout/recent_apps_icon"
+3 −1
Original line number Diff line number Diff line
@@ -279,7 +279,9 @@
    <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, there will be a confirmation dialog.  This is the message. -->
    <string name="shutdown_confirm">Your phone will shut down.</string>

    <!-- Recent Tasks dialog -->
    <!-- Recent Tasks dialog: title -->
    <string name="recent_tasks_title">Recent</string>
    <!-- Recent Tasks dialog: message when there are no recent applications -->
    <string name="no_recent_tasks">No recent applications.</string>

    <!-- Title of the Global Actions Dialog -->