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

Commit 628f8966 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Fixing crash in SystemServicesProxy getting activity label (Bug. 14260718)"

parents 717f39c7 80693f9f
Loading
Loading
Loading
Loading
+15 −15
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:visibility="invisible"
        android:background="#e6444444">
        android:background="@color/recents_task_bar_default_background_color">
        <Button
            android:id="@+id/task_view_app_info_button"
            android:layout_width="match_parent"
@@ -41,7 +41,7 @@
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_gravity="top|center_horizontal"
        android:background="#e6444444">
        android:background="@color/recents_task_bar_default_background_color">
        <ImageView
            android:id="@+id/application_icon"
            android:layout_width="@dimen/recents_task_view_application_icon_size"
@@ -54,8 +54,8 @@
            android:layout_height="wrap_content"
            android:layout_gravity="center_vertical|left"
            android:layout_marginStart="@dimen/recents_task_view_application_icon_size"
            android:layout_marginEnd="@dimen/recents_task_view_activity_icon_size"
            android:textSize="24sp"
            android:layout_marginEnd="8dp"
            android:textSize="22sp"
            android:textColor="#ffffffff"
            android:text="@string/recents_empty_message"
            android:fontFamily="sans-serif-thin"
+10 −0
Original line number Diff line number Diff line
@@ -49,4 +49,14 @@

    <!-- Tint color for the content on the notification overflow card. -->
    <color name="keyguard_overflow_content_color">#ff666666</color>

    <!-- The default recents task bar background color. -->
    <color name="recents_task_bar_default_background_color">#e6444444</color>
    <!-- The default recents task bar text color. -->
    <color name="recents_task_bar_default_text_color">#ffffffff</color>
    <!-- The recents task bar light text color to be drawn on top of dark backgrounds. -->
    <color name="recents_task_bar_light_text_color">#ffffffff</color>
    <!-- The recents task bar dark text color to be drawn on top of light backgrounds. -->
    <color name="recents_task_bar_dark_text_color">#ff222222</color>

</resources>
+2 −0
Original line number Diff line number Diff line
@@ -413,6 +413,8 @@ public class RecentsTaskLoader {
        for (int i = 0; i < taskCount; i++) {
            ActivityManager.RecentTaskInfo t = tasks.get(i);
            ActivityInfo info = ssp.getActivityInfo(t.baseIntent.getComponent(), t.userId);
            if (info == null) continue;

            String activityLabel = (t.activityLabel == null ? ssp.getActivityLabel(info) :
                    t.activityLabel.toString());
            BitmapDrawable activityIcon = null;