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

Commit 4b7494e0 authored by Michael Jurka's avatar Michael Jurka Committed by Android (Google) Code Review
Browse files

Merge "Updating recent apps visuals on tablet" into ics-mr1

parents d968670d bfd24acd

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

+13 −23
Original line number Diff line number Diff line
@@ -33,14 +33,6 @@ 
        android:clipToPadding="false"

        android:clipChildren="false">



        <LinearLayout android:id="@+id/recents_glow"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"

            android:layout_gravity="bottom|right"

            android:orientation="horizontal"

            android:clipToPadding="false"

            android:clipChildren="false"

            >

        <com.android.systemui.recent.RecentsHorizontalScrollView android:id="@+id/recents_container"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"
@@ -65,8 +57,6 @@ 


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



        </LinearLayout>



    </FrameLayout>



    <include layout="@layout/status_bar_no_recent_apps"

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

+15 −25
Original line number Diff line number Diff line
@@ -31,14 +31,6 @@ 
        android:layout_height="match_parent"

        android:layout_alignParentBottom="true">



        <LinearLayout android:id="@+id/recents_glow"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_gravity="bottom"

            android:orientation="horizontal"

            android:clipChildren="false"

            android:layout_marginTop="@*android:dimen/status_bar_height">



        <com.android.systemui.recent.RecentsVerticalScrollView

            android:id="@+id/recents_container"

            android:layout_width="match_parent"
@@ -63,8 +55,6 @@ 


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



        </LinearLayout>



    </FrameLayout>



    <include layout="@layout/status_bar_no_recent_apps"

packages/SystemUI/res/layout-sw600dp/status_bar_no_recent_apps.xml

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

*/

-->



<FrameLayout

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

    android:layout_height="match_parent"

    android:layout_width="match_parent"

    >



    <TextView

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:textSize="20dp"

        android:textColor="@android:color/holo_blue_light"

        android:text="@string/status_bar_no_recent_apps"

        android:gravity="left"

        android:layout_gravity="bottom|left"

    />

</FrameLayout>

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

+28 −24
Original line number Diff line number Diff line
@@ -23,11 +23,26 @@ 
    android:layout_height="wrap_content"

    android:layout_width="wrap_content">



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

        android:layout_width="wrap_content"

    <TextView android:id="@+id/app_label"

        android:layout_width="@dimen/status_bar_recents_app_label_width"

        android:layout_height="wrap_content"

        android:textSize="@dimen/status_bar_recents_app_label_text_size"

        android:fadingEdge="horizontal"

        android:fadingEdgeLength="@dimen/status_bar_recents_fading_edge_length"

        android:scrollHorizontally="true"

        android:layout_alignParentLeft="true"

        android:layout_alignParentTop="true"

        android:layout_marginLeft="@dimen/status_bar_recents_app_label_left_margin"

        android:layout_marginTop="32dip"

        android:singleLine="true"

        android:ellipsize="marquee"

        android:textColor="@color/status_bar_recents_app_label_color"

    />



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

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_toRightOf="@id/app_label"

        android:layout_marginLeft="@dimen/status_bar_recents_thumbnail_left_margin"

        android:scaleType="center"

        android:background="@drawable/recents_thumbnail_bg"
@@ -37,32 +52,21 @@ 
            android:layout_width="@dimen/status_bar_recents_thumbnail_width"

            android:layout_height="@dimen/status_bar_recents_thumbnail_height"

        />

    </FrameLayout>





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

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_toRightOf="@id/app_label"

        android:layout_marginLeft="@dimen/status_bar_recents_app_icon_left_margin"

        android:layout_marginTop="@dimen/status_bar_recents_app_icon_top_margin"

        android:maxWidth="@dimen/status_bar_recents_app_icon_max_width"

        android:maxHeight="@dimen/status_bar_recents_app_icon_max_height"

        android:scaleType="centerInside"

        android:adjustViewBounds="true"

    />

    </FrameLayout>



    <TextView android:id="@+id/app_label"

        android:layout_width="@dimen/status_bar_recents_app_label_width"

        android:layout_height="wrap_content"

        android:textSize="@dimen/status_bar_recents_app_label_text_size"

        android:fadingEdge="horizontal"

        android:fadingEdgeLength="@dimen/status_bar_recents_fading_edge_length"

        android:scrollHorizontally="true"

        android:layout_alignParentLeft="true"

        android:layout_alignParentTop="true"

        android:layout_marginLeft="@dimen/status_bar_recents_app_label_left_margin"

        android:layout_marginTop="32dip"

        android:singleLine="true"

        android:ellipsize="marquee"

        android:textColor="@color/status_bar_recents_app_label_color"

    />



    <View android:id="@+id/recents_callout_line"

        android:layout_width="@dimen/status_bar_recents_app_label_width"

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

+22 −25
Original line number Diff line number Diff line
@@ -36,16 +36,6 @@ 
        android:clipToPadding="false"

        android:clipChildren="false">



        <LinearLayout android:id="@+id/recents_glow"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginBottom="-49dip"

            android:layout_gravity="bottom"

            android:background="@drawable/recents_blue_glow"

            android:orientation="horizontal"

            android:clipToPadding="false"

            android:clipChildren="false"

            >

        <com.android.systemui.recent.RecentsVerticalScrollView android:id="@+id/recents_container"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"
@@ -69,7 +59,13 @@ 


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



        </LinearLayout>

        <include layout="@layout/status_bar_no_recent_apps"

            android:id="@+id/recents_no_apps"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:layout_marginLeft="58dip"

            android:layout_marginBottom="36dip"

            android:visibility="invisible" />



    </FrameLayout>
@@ -82,4 +78,5 @@ 
        android:contentDescription="@string/status_bar_accessibility_dismiss_recents"

    />





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