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

Commit b5d4f971 authored by Jim Miller's avatar Jim Miller Committed by Android (Google) Code Review
Browse files

Merge "Fix 5023708,4689527: Add popups and overlays to recents. Misc bug fixes."

parents b44f8f4e c0d27310

packages/SystemUI/res/drawable/recents_thumbnail_layers.xml

0 → 100644
+19 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2011 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >

    <item android:drawable="@drawable/recents_thumbnail_bg" android:id="@+id/base_layer"/>

    <item android:drawable="@drawable/recents_thumbnail_overlay" android:id="@+id/overlay_layer"/>

</layer-list>
 
 No newline at end of file

packages/SystemUI/res/drawable/recents_thumbnail_bg_selector.xml→packages/SystemUI/res/drawable/recents_thumbnail_overlay.xml

+19 −0
Original line number Diff line number Diff line
@@ -13,15 +13,7 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->



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

	android:exitFadeDuration="@android:integer/config_mediumAnimTime">



    <item android:state_window_focused="false" android:drawable="@android:color/transparent" />



    <!-- Even though these two point to the same resource, have two states so the drawable will invalidate itself when coming out of pressed state. -->

    <item android:state_focused="true"                                android:state_pressed="true" android:drawable="@drawable/recents_thumbnail_bg_holo" />

    <item android:state_focused="false"                               android:state_pressed="true" android:drawable="@drawable/recents_thumbnail_bg_holo" />

    <item android:state_focused="true"                                                             android:drawable="@drawable/recents_thumbnail_bg_holo" />

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

    <item android:drawable="@drawable/recents_thumbnail_bg_press" android:state_pressed="true" />

    <item android:drawable="@*android:color/transparent"/>

</selector>

packages/SystemUI/res/layout-land/status_bar_recent_item.xml

+3 −2
Original line number Diff line number Diff line
@@ -24,14 +24,15 @@ 
    android:layout_height="wrap_content"

    android:layout_width="@dimen/status_bar_recents_thumbnail_view_width">



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

    <FrameLayout android:id="@+id/app_thumbnail"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_alignParentLeft="true"

        android:layout_alignParentTop="true"

        android:layout_marginLeft="@dimen/status_bar_recents_thumbnail_left_margin"

        android:scaleType="center"

        android:background="@drawable/recents_thumbnail_bg_selector"

        android:clickable="true"

        android:background="@drawable/recents_thumbnail_layers"

    />



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

packages/SystemUI/res/layout-land/status_bar_recent_panel.xml

+0 −1
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ 
                android:fadingEdge="horizontal"

                android:scrollbars="none"

                android:fadingEdgeLength="@dimen/status_bar_recents_fading_edge_length"

                android:listSelector="@drawable/recents_thumbnail_bg_selector"

                android:layout_gravity="bottom|left"

                android:orientation="horizontal"

                android:clipToPadding="false"

packages/SystemUI/res/layout-port/status_bar_recent_item.xml

+3 −1
Original line number Diff line number Diff line
@@ -24,13 +24,15 @@ 
    android:layout_height="wrap_content"

    android:layout_width="@dimen/status_bar_recents_thumbnail_view_width">



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

    <FrameLayout android:id="@+id/app_thumbnail"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_alignParentLeft="true"

        android:layout_alignParentTop="true"

        android:clickable="true"

        android:layout_marginLeft="@dimen/status_bar_recents_thumbnail_left_margin"

        android:scaleType="center"

        android:background="@drawable/recents_thumbnail_layers"

    />



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