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

Commit 4bd8a9c8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic... 

Merge changes from topic "am-22b34d0b-71d8-4c8c-93fb-e03ad387dce6-ub-launcher3-edmonton-polish" into ub-launcher3-master

* changes:
  [automerger] Changed the Task Menu to overlay on top of the task view am: 1b9c3d6f
  Changed the Task Menu to overlay on top of the task view
parents f47f51c1 184e9686

quickstep/res/drawable/ic_split_screen.xml

+10 −27
Original line number Diff line number Diff line
@@ -13,33 +13,16 @@ 
     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="88.0dp"

        android:height="88.0dp"

        android:viewportWidth="88.0"

        android:viewportHeight="88.0" >

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24"

        android:viewportHeight="24">



    <path

        android:pathData="M 32,11

           C 32,11 68,11 68,11

             76.74,11.06 76.98,12.76 77,21

             77.01,25.97 78.50,38.23 73.85,40.98

             71.80,42.19 68.35,42 66,42

             66,42 22,42 22,42

             18.82,41.99 14.87,42.38 12.60,39.69

             10.71,37.44 11.01,33.77 11,31

             10.99,25.54 9.53,16.08 13.31,12.02

             18.07,10.21 26.66,11 32,11 Z

           M 32,46

           C 32,46 68,46 68,46

             76.74,46.06 76.98,47.76 77,56

             77.01,60.97 78.50,73.23 73.85,75.98

             71.80,77.19 68.35,77 66,77

             66,77 22,77 22,77

             18.82,76.99 14.87,77.38 12.60,74.69

             10.71,72.44 11.01,68.77 11,66

             10.99,60.54 9.53,51.08 13.31,47.02

             18.07,45.21 26.66,46 32,46 Z"

        android:fillColor="@android:color/white" />

        android:fillColor="@android:color/white"

        android:pathData="M18,4v5H6V4H18 M18,2H6C4.9,2,4,2.9,4,4v5c0,1.1,0.9,2,2,2h12c1.1,0,2-0.9,2-2V4C20,2.9,19.1,2,18,2L18,2z" />

    <path

        android:fillColor="@android:color/white"

        android:pathData="M18,15v5H6v-5H18 M18,13H6c-1.1,0-2,0.9-2,2v5c0,1.1,0.9,2,2,2h12c1.1,0,2-0.9,2-2v-5C20,13.9,19.1,13,18,13L18,13z" />

</vector>

quickstep/res/drawable/task_menu_bg.xml

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

<!--

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

-->

<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:gravity="bottom">

        <!-- Shadow -->

        <shape>

            <gradient android:angle="270"

                android:endColor="@android:color/transparent"

                android:startColor="#26000000" />

            <size android:height="@dimen/task_card_menu_shadow_height" />

        </shape>

    </item>

    <item android:bottom="@dimen/task_card_menu_shadow_height">

        <!-- Background -->

        <shape>

            <corners

                android:topLeftRadius="@dimen/task_corner_radius"

                android:topRightRadius="@dimen/task_corner_radius"

                android:bottomLeftRadius="0dp"

                android:bottomRightRadius="0dp" />

            <solid android:color="?attr/popupColorPrimary" />

        </shape>

    </item>

</layer-list>

quickstep/res/layout/task_menu.xml

+25 −15
Original line number Diff line number Diff line
@@ -16,21 +16,31 @@ 
-->

<com.android.quickstep.views.TaskMenuView

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

    android:layout_width="@dimen/bg_popup_item_width"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:visibility="invisible"

    android:elevation="@dimen/deep_shortcuts_elevation"

    android:animateLayoutChanges="true"

    android:background="@drawable/task_menu_bg"

    android:paddingBottom="@dimen/task_card_menu_shadow_height"

    android:orientation="vertical"

    android:background="?attr/popupColorPrimary"

    android:divider="@drawable/all_apps_divider"

    android:showDividers="middle"

    android:animateLayoutChanges="true">

    android:visibility="invisible">



    <TextView

        android:id="@+id/task_icon_and_name"

        android:layout_width="match_parent"

            android:layout_height="112dp"

            android:textSize="14sp"

            android:paddingTop="18dp"

            android:drawablePadding="8dp"

            android:gravity="center_horizontal"/>

        android:layout_height="wrap_content"

        android:drawablePadding="@dimen/deep_shortcut_drawable_padding"

        android:gravity="center_horizontal"

        android:layout_marginBottom="16dp"

        android:textSize="12sp"/>



    <LinearLayout

        android:id="@+id/menu_option_layout"

        style="@style/TaskMenu"

        android:divider="@drawable/all_apps_divider"

        android:showDividers="beginning"

        android:paddingStart="@dimen/task_card_menu_horizontal_padding"

        android:paddingEnd="@dimen/task_card_menu_horizontal_padding"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"/>



</com.android.quickstep.views.TaskMenuView>
 
 No newline at end of file

quickstep/res/layout/task_view_menu_option.xml

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

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

-->



<LinearLayout

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

    style="@style/TaskMenu.Option"

    android:layout_height="wrap_content"

    android:layout_gravity="center"

    android:orientation="vertical"

    android:paddingTop="@dimen/task_card_menu_option_vertical_padding"

    android:paddingBottom="@dimen/task_card_menu_option_vertical_padding"

    android:background="?android:attr/selectableItemBackground"

    android:theme="@style/PopupItem" >



    <View

      android:id="@+id/icon"

      android:layout_width="@dimen/system_shortcut_icon_size"

      android:layout_height="@dimen/system_shortcut_icon_size"

      android:layout_marginTop="@dimen/system_shortcut_header_icon_padding"

      android:layout_marginBottom="@dimen/deep_shortcut_drawable_padding"

      android:layout_gravity="center_horizontal"

      android:backgroundTint="?android:attr/textColorTertiary"/>



    <TextView

        style="@style/BaseIcon"

        android:id="@+id/text"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingBottom="@dimen/popup_padding_end"

        android:textSize="12sp"

        android:textColor="?android:attr/textColorPrimary"

        android:fontFamily="sans-serif"

        android:gravity="center_horizontal"

        android:layout_gravity="center_horizontal"

        android:focusable="false" />



</LinearLayout>

quickstep/res/values-land/dimens.xml

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

<!--

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

-->

<resources>

    <dimen name="task_card_menu_horizontal_padding">24dp</dimen>

</resources>
 
 No newline at end of file