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

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

Merge "Fix 3482763: Minor layout tweaks and new asset for recents"

parents d7ba1213 9c178582

packages/SystemUI/res/drawable-xlarge-mdpi/recents_thumbnail_bg_press.png

−271 B (2.01 KiB)
Loading image diff...

packages/SystemUI/res/drawable/recents_thumbnail_bg_holo.xml

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

<!--

/* apps/common/assets/default/default/skins/StatusBar.xml

**

** Copyright 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.

*/

-->

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

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

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

</transition>

packages/SystemUI/res/drawable/recents_thumbnail_bg_selector.xml

0 → 100644
+27 −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.

-->



<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>

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

+2 −2
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
        <LinearLayout android:id="@+id/recents_glow"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginBottom="-52dip"

            android:layout_marginBottom="-49dip"

            android:layout_gravity="bottom"

            android:background="@drawable/recents_blue_glow"

            android:orientation="horizontal"
@@ -52,7 +52,7 @@ 
                android:fadingEdge="vertical"

                android:scrollbars="none"

                android:fadingEdgeLength="30dip"

                android:listSelector="@drawable/recents_thumbnail_bg_press"

                android:listSelector="@drawable/recents_thumbnail_bg_selector"

            />



        </LinearLayout>