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

Commit de6386b8 authored by Joe Onorato's avatar Joe Onorato Committed by Android (Google) Code Review
Browse files

Merge "move recent apps around, attempting to make it not crash."

parents d5948d23 013cfc11

core/res/res/values/strings.xml

+8 −2
Original line number Diff line number Diff line
@@ -283,9 +283,15 @@ 
    <!-- 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: title -->

    <!-- Recent Tasks dialog: title

     TODO: this should move to SystemUI.apk, but the code for the old 

            recent dialog is still in the framework

     -->

    <string name="recent_tasks_title">Recent</string>

    <!-- Recent Tasks dialog: message when there are no recent applications -->

    <!-- Recent Tasks dialog: message when there are no recent applications

     TODO: this should move to SystemUI.apk, but the code for the old 

            recent dialog is still in the framework

     -->

    <string name="no_recent_tasks">No recent applications.</string>



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

packages/SystemUI/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
                android:excludeFromRecents="true">

        </activity>



        <activity android:name=".statusbar.RecentApplicationsActivity"

        <activity android:name=".recent.RecentApplicationsActivity"

            android:theme="@android:style/Theme.NoTitleBar"

            android:excludeFromRecents="true"

            android:exported="true">

core/res/res/layout/recent_apps_activity.xml→packages/SystemUI/res/layout/recent_apps_activity.xml

+4 −4
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
        android:textColor="#80FFFFFF"

        android:textStyle="bold"

        android:singleLine="true"

        android:text="@android:string/recent_tasks_title"

        android:text="@string/recent_tasks_title"

        android:visibility="gone"/>



    <!-- This is only intended to be visible when carousel is invisible -->
@@ -42,14 +42,14 @@ 
        android:layout_height="wrap_content"

        android:layout_gravity="center"

        android:textAppearance="?android:attr/textAppearanceSmall"

        android:text="@android:string/no_recent_tasks"

        android:text="@string/recent_tasks_empty"

        android:visibility="gone"/>



    <com.android.systemui.statusbar.RecentApplicationsCarouselView

    <com.android.systemui.recent.RecentApplicationsCarouselView

        android:id="@+id/carousel"

        android:layout_width="match_parent"

        android:layout_height="0dip"

        android:layout_weight="1">

    </com.android.systemui.statusbar.RecentApplicationsCarouselView>

    </com.android.systemui.recent.RecentApplicationsCarouselView>



</LinearLayout>

packages/SystemUI/res/values/strings.xml

+13 −0
Original line number Diff line number Diff line
@@ -54,4 +54,17 @@ 
    <!-- Name of the button that links to the Settings app. [MAXCHARS=NONE] -->

    <string name="system_panel_settings_button">Settings</string>





    <!-- Recent Tasks dialog: title

     TODO: this should move to SystemUI.apk, but the code for the old 

            recent dialog is still in the framework

     -->

    <string name="recent_tasks_title">Recent</string>

    <!-- Recent Tasks dialog: message when there are no recent applications

     TODO: this should move to SystemUI.apk, but the code for the old 

            recent dialog is still in the framework

     -->

    <string name="recent_tasks_empty">No recent applications.</string>



    

</resources>

packages/SystemUI/src/com/android/systemui/statusbar/RecentApplicationsActivity.java→packages/SystemUI/src/com/android/systemui/recent/RecentApplicationsActivity.java

+3 −2
Original line number Diff line number Diff line
@@ -15,11 +15,12 @@ 
 */





package com.android.systemui.statusbar;

package com.android.systemui.recent;



import com.android.systemui.R;



import com.android.ex.carousel.CarouselView;

import com.android.ex.carousel.CarouselRS.CarouselCallback;

import com.android.internal.R;



import java.util.ArrayList;

import java.util.List;