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

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

Merge "Adding dismiss method on the top cards, and disabling the app info pane."

parents 2417f7e0 54e297a5

packages/SystemUI/res/drawable/recents_dismiss_dark.xml

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

<!-- Copyright (C) 2014 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.

-->

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

    android:versionCode="1" >



    <size

        android:height="16dp"

        android:width="16dp" />



    <viewport

        android:viewportHeight="100"

        android:viewportWidth="100" />



    <group>

        <path

            android:name="x"

            android:pathData="M0,0L100,100M0,100L100,0z"

            android:stroke="@color/recents_task_bar_dark_dismiss_color"

            android:strokeWidth="8.0"

            android:strokeLineCap="square" />

    </group>

</vector>
 
 No newline at end of file

packages/SystemUI/res/drawable/recents_dismiss_light.xml

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

<!-- Copyright (C) 2014 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.

-->

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

    android:versionCode="1" >



    <size

        android:height="16dp"

        android:width="16dp" />



    <viewport

        android:viewportHeight="100"

        android:viewportWidth="100" />



    <group>

        <path

            android:name="x"

            android:pathData="M0,0L100,100M0,100L100,0z"

            android:stroke="@color/recents_task_bar_light_dismiss_color"

            android:strokeWidth="8.0"

            android:strokeLineCap="square" />

    </group>

</vector>
 
 No newline at end of file

packages/SystemUI/res/layout/recents_task_view.xml

+7 −0
Original line number Diff line number Diff line
@@ -63,6 +63,13 @@ 
            android:maxLines="2"

            android:ellipsize="marquee"

            android:fadingEdge="horizontal" />

        <ImageView

            android:id="@+id/dismiss_task"

            android:layout_width="@dimen/recents_task_view_application_icon_size"

            android:layout_height="@dimen/recents_task_view_application_icon_size"

            android:layout_gravity="center_vertical|end"

            android:padding="23dp"

            android:src="@drawable/recents_dismiss_dark" />

    </com.android.systemui.recents.views.TaskBarView>

</com.android.systemui.recents.views.TaskView>

packages/SystemUI/res/values/colors.xml

+6 −2
Original line number Diff line number Diff line
@@ -52,10 +52,14 @@ 
    <!-- The default recents task bar background color. -->

    <color name="recents_task_bar_default_background_color">#e6444444</color>

    <!-- The default recents task bar text color. -->

    <color name="recents_task_bar_default_text_color">#ffffffff</color>

    <color name="recents_task_bar_default_text_color">#ffeeeeee</color>

    <!-- The recents task bar light text color to be drawn on top of dark backgrounds. -->

    <color name="recents_task_bar_light_text_color">#ffffffff</color>

    <color name="recents_task_bar_light_text_color">#ffeeeeee</color>

    <!-- The recents task bar dark text color to be drawn on top of light backgrounds. -->

    <color name="recents_task_bar_dark_text_color">#ff222222</color>

    <!-- The recents task bar light dismiss icon color to be drawn on top of dark backgrounds. -->

    <color name="recents_task_bar_light_dismiss_color">#ffeeeeee</color>

    <!-- The recents task bar dark dismiss icon color to be drawn on top of light backgrounds. -->

    <color name="recents_task_bar_dark_dismiss_color">#ff333333</color>



</resources>

packages/SystemUI/res/values/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ 
    <!-- The animation duration for animating in the info pane. -->

    <integer name="recents_animate_task_view_info_pane_duration">150</integer>

    <!-- The animation duration for animating the removal of a task view. -->

    <integer name="recents_animate_task_view_remove_duration">150</integer>

    <integer name="recents_animate_task_view_remove_duration">250</integer>

    <!-- The minimum alpha for the dim applied to cards that go deeper into the stack. -->

    <integer name="recents_max_task_stack_view_dim">96</integer>

    <!-- Transposes the search bar layout in landscape -->