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

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

Merge changes I91c58397,I7243f30b,I0f6e9dbf,I1eb0864a 

* changes:
  Adding reveal transition to show app-overlay.
  Fixing issue with multiple focus timer animations running.
  Fixing several regressions with affiliated tasks.
  Starting the dismiss animation in parallel with the gesture.
parents d96761b3 c5ef63f4

packages/SystemUI/res/drawable/recents_info_dark.xml

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

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:width="48.0dp"

        android:height="48.0dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="@color/recents_task_bar_dark_icon_color"

        android:pathData="M12.000000,2.000000C6.500000,2.000000 2.000000,6.500000 2.000000,12.000000s4.500000,10.000000 10.000000,10.000000c5.500000,0.000000 10.000000,-4.500000 10.000000,-10.000000S17.500000,2.000000 12.000000,2.000000zM13.000000,17.000000l-2.000000,0.000000l0.000000,-6.000000l2.000000,0.000000L13.000000,17.000000zM13.000000,9.000000l-2.000000,0.000000L11.000000,7.000000l2.000000,0.000000L13.000000,9.000000z"/>

</vector>

packages/SystemUI/res/drawable/recents_info_light.xml

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

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:width="48.0dp"

        android:height="48.0dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:pathData="M12.000000,2.000000C6.500000,2.000000 2.000000,6.500000 2.000000,12.000000s4.500000,10.000000 10.000000,10.000000c5.500000,0.000000 10.000000,-4.500000 10.000000,-10.000000S17.500000,2.000000 12.000000,2.000000zM13.000000,17.000000l-2.000000,0.000000l0.000000,-6.000000l2.000000,0.000000L13.000000,17.000000zM13.000000,9.000000l-2.000000,0.000000L11.000000,7.000000l2.000000,0.000000L13.000000,9.000000z"

        android:fillColor="#FFFFFF"/>

</vector>

packages/SystemUI/res/layout/recents_task_view_header.xml

+15 −8
Original line number Diff line number Diff line
@@ -64,12 +64,19 @@ 
        android:background="@drawable/recents_button_bg"

        android:visibility="invisible"

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

    <ProgressBar

        android:id="@+id/focus_timer_indicator"

        style="?android:attr/progressBarStyleHorizontal"



    <!-- The progress indicator shows if auto-paging is enabled -->

    <ViewStub android:id="@+id/focus_timer_indicator_stub"

               android:inflatedId="@+id/focus_timer_indicator"

               android:layout="@layout/recents_task_view_header_progress_bar"

               android:layout_width="match_parent"

               android:layout_height="5dp"

        android:layout_gravity="bottom"

        android:indeterminateOnly="false"

        android:visibility="invisible" />

               android:layout_gravity="bottom" />



    <!-- The app overlay shows as the user long-presses on the app icon -->

    <ViewStub android:id="@+id/app_overlay_stub"

               android:inflatedId="@+id/app_overlay"

               android:layout="@layout/recents_task_view_header_overlay"

               android:layout_width="match_parent"

               android:layout_height="match_parent" />

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

packages/SystemUI/res/layout/recents_task_view_header_overlay.xml

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

-->

<FrameLayout

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:visibility="gone">

    <com.android.systemui.recents.views.FixedSizeImageView

        android:id="@+id/app_icon"

        android:contentDescription="@string/recents_app_info_button_label"

        android:layout_width="@dimen/recents_task_view_application_icon_size"

        android:layout_height="@dimen/recents_task_view_application_icon_size"

        android:layout_marginStart="8dp"

        android:layout_gravity="center_vertical|start"

        android:padding="8dp" />

    <TextView

        android:id="@+id/app_title"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical|start"

        android:layout_marginStart="64dp"

        android:layout_marginEnd="112dp"

        android:textSize="16sp"

        android:textColor="#ffffffff"

        android:text="@string/recents_empty_message"

        android:fontFamily="sans-serif-medium"

        android:singleLine="true"

        android:maxLines="2"

        android:ellipsize="marquee"

        android:fadingEdge="horizontal" />

    <com.android.systemui.recents.views.FixedSizeImageView

        android:id="@+id/app_info"

        android:layout_width="48dp"

        android:layout_height="48dp"

        android:layout_marginEnd="4dp"

        android:layout_gravity="center_vertical|end"

        android:padding="12dp"

        android:background="@drawable/recents_button_bg"

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

</FrameLayout>
 
 No newline at end of file

packages/SystemUI/res/layout/recents_task_view_header_progress_bar.xml

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

-->

<ProgressBar

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

    style="?android:attr/progressBarStyleHorizontal"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:indeterminateOnly="false"

    android:visibility="gone" />
 
 No newline at end of file