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

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

Merge "Recents: apps scale down to thumbnails now" into jb-mr1-dev

parents ed965a2c cb2522c8

packages/SystemUI/AndroidManifest.xml

+11 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 
    <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />



    <application

        android:name="com.android.systemui.SystemUIApplication"

        android:persistent="true"

        android:allowClearUserData="false"

        android:allowBackup="false"
@@ -96,6 +97,16 @@ 
                android:excludeFromRecents="true">

        </activity>



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

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

                android:excludeFromRecents="true"

                android:launchMode="singleInstance"

                android:exported="true">

          <intent-filter>

            <action android:name="com.android.systemui.TOGGLE_RECENTS" />

          </intent-filter>

        </activity>



        <!-- started from UsbDeviceSettingsManager -->

        <activity android:name=".usb.UsbConfirmActivity"

            android:exported="true"

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

+0 −11
Original line number Diff line number Diff line
@@ -26,11 +26,6 @@ 
    android:layout_width="match_parent"

    systemui:recentItemLayout="@layout/status_bar_recent_item"

    >

    <View

        android:id="@+id/recents_transition_background"

        android:layout_height="match_parent"

        android:layout_width="match_parent"

        android:visibility="invisible" />

    <FrameLayout

        android:id="@+id/recents_bg_protect"

        android:background="@drawable/status_bar_recents_background"
@@ -40,12 +35,6 @@ 
        android:clipToPadding="false"

        android:clipChildren="false">



        <ImageView

            android:id="@+id/recents_transition_placeholder_icon"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:visibility="invisible" />



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

            android:layout_width="wrap_content"

            android:layout_height="match_parent"

packages/SystemUI/res/layout/status_bar_recent_panel.xml

+0 −11
Original line number Diff line number Diff line
@@ -26,11 +26,6 @@ 
    android:layout_width="match_parent"

    systemui:recentItemLayout="@layout/status_bar_recent_item"

    >

    <View

        android:id="@+id/recents_transition_background"

        android:layout_height="match_parent"

        android:layout_width="match_parent"

        android:visibility="invisible" />

    <FrameLayout

        android:id="@+id/recents_bg_protect"

        android:background="@drawable/status_bar_recents_background"
@@ -38,12 +33,6 @@ 
        android:layout_height="match_parent"

        android:layout_alignParentBottom="true">



        <ImageView

            android:id="@+id/recents_transition_placeholder_icon"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:visibility="invisible" />



        <com.android.systemui.recent.RecentsVerticalScrollView

            android:id="@+id/recents_container"

            android:layout_width="match_parent"

packages/SystemUI/res/layout/system_bar_recent_panel.xml

+0 −10
Original line number Diff line number Diff line
@@ -28,11 +28,6 @@ 
    android:clipChildren="false"

    systemui:recentItemLayout="@layout/system_bar_recent_item"

    >

    <View

        android:id="@+id/recents_transition_background"

        android:layout_height="match_parent"

        android:layout_width="match_parent"

        android:visibility="invisible" />

    <FrameLayout

        android:id="@+id/recents_bg_protect"

        android:background="@drawable/recents_bg_protect_tile"
@@ -42,11 +37,6 @@ 
        android:layout_marginBottom="@*android:dimen/system_bar_height"

        android:clipToPadding="false"

        android:clipChildren="false">

        <ImageView

            android:id="@+id/recents_transition_placeholder_icon"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:visibility="invisible" />



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

            android:layout_width="wrap_content"

packages/SystemUI/res/values/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
    <!-- Size of application thumbnail -->

    <dimen name="status_bar_recents_thumbnail_width">164dp</dimen>

    <dimen name="status_bar_recents_thumbnail_height">145dp</dimen>

    <dimen name="status_bar_recents_thumbnail_bg_padding">4dp</dimen>



    <!-- Size of application label text -->

    <dimen name="status_bar_recents_app_label_text_size">14dip</dimen>