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

Commit cfcbf118 authored by Manu Cornet's avatar Manu Cornet Committed by Android (Google) Code Review
Browse files

Merge "Delete the separate grid recents activity and related code"

parents 7062f3be 8e173426

packages/SystemUI/AndroidManifest.xml

+0 −16
Original line number Diff line number Diff line
@@ -287,22 +287,6 @@ 
            </intent-filter>

        </activity>



        <activity android:name=".recents.grid.RecentsGridActivity"

                  android:label="@string/accessibility_desc_recent_apps"

                  android:exported="false"

                  android:launchMode="singleInstance"

                  android:excludeFromRecents="true"

                  android:stateNotNeeded="true"

                  android:resumeWhilePausing="true"

                  android:screenOrientation="behind"

                  android:resizeableActivity="true"

                  android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"

                  android:theme="@style/RecentsTheme.Grid">

            <intent-filter>

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

            </intent-filter>

        </activity>



        <activity android:name=".recents.tv.RecentsTvActivity"

                  android:label="@string/accessibility_desc_recent_apps"

                  android:exported="false"

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

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

<!-- Copyright (C) 2016 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_width="match_parent"

    android:layout_height="match_parent"

    android:id="@+id/recents_view"

    android:gravity="center"

    android:background="#99000000">

    <include layout="@layout/recents_stack_action_button" />

</FrameLayout>
 
 No newline at end of file

packages/SystemUI/res/values/dimens.xml

+0 −14
Original line number Diff line number Diff line
@@ -720,18 +720,4 @@ 
    <!-- The size of a PIP menu action icon. -->

    <dimen name="pip_menu_action_icon_size">32dp</dimen>



    <!-- Values specific to grid-based recents. -->

    <!-- Margins around recent tasks. -->

    <dimen name="recents_grid_margin_left">15dp</dimen>

    <dimen name="recents_grid_margin_top">70dp</dimen>

    <dimen name="recents_grid_margin_right">15dp</dimen>

    <dimen name="recents_grid_margin_bottom">90dp</dimen>

    <!-- Margins around the "Clear all" button. -->

    <dimen name="recents_grid_clear_all_margin_left">0dp</dimen>

    <dimen name="recents_grid_clear_all_margin_top">30dp</dimen>

    <dimen name="recents_grid_clear_all_margin_right">15dp</dimen>

    <dimen name="recents_grid_clear_all_margin_bottom">0dp</dimen>

    <!-- Padding in between task views. -->

    <dimen name="recents_grid_inter_task_padding">15dp</dimen>



</resources>

packages/SystemUI/res/values/styles.xml

+0 −16
Original line number Diff line number Diff line
@@ -44,22 +44,6 @@ 
        <item name="android:layout_marginBottom">0dp</item>

    </style>



    <!-- Grid-based Recents theme. -->

    <style name="RecentsTheme.Grid">

        <item name="android:windowBackground">@color/transparent</item>

        <item name="android:colorBackgroundCacheHint">@null</item>

        <item name="android:windowShowWallpaper">true</item>

        <item name="android:windowDisablePreview">true</item>

        <item name="clearAllStyle">@style/ClearAllButtonLargeMargins</item>

    </style>



    <style name="ClearAllButtonLargeMargins">

        <item name="android:layout_marginStart">@dimen/recents_grid_clear_all_margin_left</item>

        <item name="android:layout_marginTop">@dimen/recents_grid_clear_all_margin_top</item>

        <item name="android:layout_marginEnd">@dimen/recents_grid_clear_all_margin_right</item>

        <item name="android:layout_marginBottom">@dimen/recents_grid_clear_all_margin_bottom</item>

    </style>



    <!-- Performance optimized Recents theme (no wallpaper) -->

    <style name="RecentsTheme.NoWallpaper">

        <item name="android:windowBackground">@android:color/black</item>

packages/SystemUI/src/com/android/systemui/recents/Recents.java

+0 −2
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ import com.android.systemui.recents.events.component.ShowUserToastEvent; 
import com.android.systemui.recents.events.ui.RecentsDrawnEvent;

import com.android.systemui.recents.misc.SystemServicesProxy;

import com.android.systemui.recents.model.RecentsTaskLoader;

import com.android.systemui.recents.grid.RecentsGridImpl;

import com.android.systemui.recents.tv.RecentsTvImpl;

import com.android.systemui.stackdivider.Divider;
@@ -84,7 +83,6 @@ public class Recents extends SystemUI 
    static {

        RECENTS_ACTIVITIES.add(RecentsImpl.RECENTS_ACTIVITY);

        RECENTS_ACTIVITIES.add(RecentsTvImpl.RECENTS_TV_ACTIVITY);

        RECENTS_ACTIVITIES.add(RecentsGridImpl.RECENTS_MOSAIC_ACTIVITY);

    }



    // Purely for experimentation