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

Commit bed00cc4 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Part 2: Adding clear-all to history"

parents cb3308a3 214f0f0d

packages/SystemUI/res/drawable/recents_dismiss_all_history.xml

0 → 100644
+54 −0
Original line number Diff line number Diff line 
<!--

Copyright (C) 2016 The Android Open Source Project



   Licensed under the Apache License, Version 2 (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.

-->

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

    android:height="16dp"

    android:width="28dp"

    android:viewportHeight="48"

    android:viewportWidth="72" >

    <group

        android:name="dismiss_all"

        android:translateX="48"

        android:translateY="6" >

        <group

            android:name="3"

            android:translateX="-24"

            android:translateY="36" >

            <path

                android:name="rectangle_path_1_2"

                android:pathData="M -24.0,-6.0 l 48.0,0 l 0,12.0 l -48.0,0 Z"

                android:fillColor="#FFFFFFFF"

                android:fillAlpha="1" />

        </group>

        <group

            android:name="2"

            android:translateX="-12"

            android:translateY="18" >

            <path

                android:name="rectangle_path_1_1"

                android:pathData="M -24.0,-6.0 l 48.0,0 l 0,12.0 l -48.0,0 Z"

                android:fillColor="#FFFFFFFF"

                android:fillAlpha="1" />

        </group>

        <group

            android:name="1" >

            <path

                android:name="rectangle_path_1"

                android:pathData="M -24.0,-6.0 l 48.0,0 l 0,12.0 l -48.0,0 Z"

                android:fillColor="#FFFFFFFF"

                android:fillAlpha="1" />

        </group>

    </group>

</vector>

packages/SystemUI/res/layout/recents_history_clear_all_button.xml

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

-->

<TextView

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

    android:id="@+id/button"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:gravity="start|center_vertical"

    android:paddingStart="16dp"

    android:paddingEnd="16dp"

    android:paddingTop="14dp"

    android:paddingBottom="14dp"

    android:drawableStart="@drawable/recents_dismiss_all_history"

    android:contentDescription="@string/recents_history_clear_all_button_label"

    android:textSize="14sp"

    android:textColor="#FFFFFF"

    android:textAllCaps="true"

    android:shadowColor="#99000000"

    android:shadowDx="0"

    android:shadowDy="2"

    android:shadowRadius="5"

    android:fontFamily="sans-serif-medium"

    android:background="?android:selectableItemBackground"

    android:visibility="invisible" />

packages/SystemUI/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -716,6 +716,8 @@ 
    <string name="recents_launch_error_message">Could not start <xliff:g id="app" example="Calendar">%s</xliff:g>.</string>

    <!-- Recents: Show history string. [CHAR LIMIT=NONE] -->

    <string name="recents_history_button_label">History</string>

    <!-- Recents: History clear all string. [CHAR LIMIT=NONE] -->

    <string name="recents_history_clear_all_button_label">Clear</string>



    <!-- Recents: MultiStack add stack split horizontal radio button. [CHAR LIMIT=NONE] -->

    <string name="recents_multistack_add_stack_dialog_split_horizontal">Split Horizontal</string>

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

+0 −5
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ import android.provider.Settings; 
import android.util.Log;

import android.view.KeyEvent;

import android.view.View;

import android.view.ViewStub;

import android.view.ViewTreeObserver;

import android.view.WindowManager;
@@ -57,7 +56,6 @@ import com.android.systemui.recents.events.activity.LaunchTaskFailedEvent; 
import com.android.systemui.recents.events.activity.LaunchTaskSucceededEvent;

import com.android.systemui.recents.events.activity.ShowHistoryEvent;

import com.android.systemui.recents.events.activity.TaskStackUpdatedEvent;

import com.android.systemui.recents.events.activity.ToggleHistoryEvent;

import com.android.systemui.recents.events.activity.ToggleRecentsEvent;

import com.android.systemui.recents.events.component.RecentsVisibilityChangedEvent;

import com.android.systemui.recents.events.component.ScreenPinningRequestEvent;
@@ -71,7 +69,6 @@ import com.android.systemui.recents.events.ui.UserInteractionEvent; 
import com.android.systemui.recents.events.ui.focus.DismissFocusedTaskViewEvent;

import com.android.systemui.recents.events.ui.focus.FocusNextTaskViewEvent;

import com.android.systemui.recents.events.ui.focus.FocusPreviousTaskViewEvent;

import com.android.systemui.recents.history.RecentsHistoryView;

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

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

import com.android.systemui.recents.model.RecentsPackageMonitor;
@@ -83,8 +80,6 @@ import com.android.systemui.recents.views.RecentsView; 
import com.android.systemui.recents.views.SystemBarScrimViews;

import com.android.systemui.statusbar.BaseStatusBar;



import java.util.ArrayList;



/**

 * The main Recents activity that is started from AlternateRecentsComponent.

 */

packages/SystemUI/src/com/android/systemui/recents/events/activity/ClearHistoryEvent.java

0 → 100644
+26 −0
Original line number Diff line number Diff line 
/*

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

 */



package com.android.systemui.recents.events.activity;



import com.android.systemui.recents.events.EventBus;



/**

 * This is sent when the history is to be cleared

 */

public class ClearHistoryEvent extends EventBus.AnimatedEvent {

    // Simple event

}