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

Commit 5656154f authored by Alex Chau's avatar Alex Chau Committed by Android (Google) Code Review
Browse files

Merge "Add back screenshot button to Launcher3" into sc-v2-dev

parents 6c9dbb8d 1bf0fe1b

quickstep/res/drawable/ic_screenshot.xml

+16 −7
Original line number Diff line number Diff line
@@ -13,11 +13,20 @@ 
     limitations under the License.

-->

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

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24">

    android:width="20dp"

    android:height="20dp"

    android:viewportWidth="20"

    android:viewportHeight="20">

  <path

      android:fillColor="#FF000000"

      android:pathData="M17,1.01L7,1c-1.1,0 -2,0.9 -2,2v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2L19,3c0,-1.1 -0.9,-1.99 -2,-1.99zM17,21L7,21v-1h10v1zM17,18L7,18L7,6h10v12zM17,4L7,4L7,3h10v1zM9.5,8.5L12,8.5L12,7L8,7v4h1.5zM12,17h4v-4h-1.5v2.5L12,15.5z"/>

      android:pathData="M5.8334,1.666H8.3334V3.3327H5.8334V6.666H4.1667V3.3327C4.1667,2.4122 4.9129,1.666 5.8334,1.666Z"

      android:fillColor="#000000"/>

  <path

      android:pathData="M4.1667,13.3327V16.666C4.1667,17.5865 4.9129,18.3327 5.8334,18.3327H8.3334V16.666H5.8334V13.3327H4.1667Z"

      android:fillColor="#000000"/>

  <path

      android:pathData="M14.1667,13.3327V16.666H11.6667V18.3327H14.1667C15.0872,18.3327 15.8334,17.5865 15.8334,16.666V13.3327H14.1667Z"

      android:fillColor="#000000"/>

  <path

      android:pathData="M15.8334,6.666V3.3327C15.8334,2.4122 15.0872,1.666 14.1667,1.666H11.6667V3.3327H14.1667V6.666H15.8334Z"

      android:fillColor="#000000"/>

</vector>
 
 No newline at end of file

quickstep/res/layout/overview_actions_container.xml

+5 −7
Original line number Diff line number Diff line
@@ -38,13 +38,13 @@ 
            android:layout_height="wrap_content"

            android:drawableStart="@drawable/ic_screenshot"

            android:text="@string/action_screenshot"

            android:theme="@style/ThemeControlHighlightWorkspaceColor"

            android:visibility="gone" />

            android:theme="@style/ThemeControlHighlightWorkspaceColor" />



        <Space

            android:layout_width="0dp"

            android:id="@+id/action_split_space"

            android:layout_width="@dimen/overview_actions_button_spacing"

            android:layout_height="1dp"

            android:layout_weight="1" />

            android:visibility="gone" />



        <Button

            android:id="@+id/action_split"
@@ -56,11 +56,9 @@ 
            android:visibility="gone" />



        <Space

            android:id="@+id/action_split_space"

            android:layout_width="0dp"

            android:layout_height="1dp"

            android:layout_weight="1"

            android:visibility="gone" />

            android:layout_weight="1" />



        <Space

            android:id="@+id/oav_three_button_space"

quickstep/res/values/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ 


    <!-- Overrideable in overlay that provides the Overview Actions. -->

    <dimen name="overview_actions_height">48dp</dimen>

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

    <dimen name="overview_actions_button_spacing_grid">36dp</dimen>

    <dimen name="overview_actions_margin_gesture">28dp</dimen>

    <dimen name="overview_actions_top_margin_gesture_grid_portrait">19.37dp</dimen>

    <dimen name="overview_actions_bottom_margin_gesture_grid_portrait">22dp</dimen>

quickstep/src/com/android/quickstep/views/OverviewActionsView.java

+9 −0
Original line number Diff line number Diff line
@@ -22,8 +22,10 @@ import android.graphics.Rect; 
import android.util.AttributeSet;

import android.view.View;

import android.view.View.OnClickListener;

import android.view.ViewGroup;

import android.widget.Button;

import android.widget.FrameLayout;

import android.widget.LinearLayout;



import androidx.annotation.IntDef;

import androidx.annotation.Nullable;
@@ -215,6 +217,13 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo 
    public void setDp(DeviceProfile dp) {

        mDp = dp;

        updateVerticalMargin(SysUINavigationMode.getMode(getContext()));



        LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(

                dp.isVerticalBarLayout() ? 0 : dp.overviewActionsButtonSpacing,

                ViewGroup.LayoutParams.MATCH_PARENT);

        params.weight = dp.isVerticalBarLayout() ? 1 : 0;

        findViewById(R.id.action_split_space).setLayoutParams(params);



        requestLayout();



        mSplitButton.setCompoundDrawablesWithIntrinsicBounds(

res/values/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -332,6 +332,8 @@ 
    <dimen name="overview_task_margin">0dp</dimen>

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

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

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

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

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

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

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