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

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

Merge "Add icons for staged split" into sc-v2-dev

parents b31176c8 455197bf

quickstep/res/layout/overview_actions_container.xml

+0 −1
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ 
            style="@style/OverviewActionButton"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:drawableStart="@drawable/ic_split_screen"

            android:text="@string/action_split"

            android:theme="@style/ThemeControlHighlightWorkspaceColor"

            android:visibility="gone" />

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

+6 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.graphics.Rect; 
import android.util.AttributeSet;

import android.view.View;

import android.view.View.OnClickListener;

import android.widget.Button;

import android.widget.FrameLayout;



import androidx.annotation.IntDef;
@@ -80,7 +81,7 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo 
    private static final int INDEX_HIDDEN_FLAGS_ALPHA = 3;



    private final MultiValueAlpha mMultiValueAlpha;

    private View mSplitButton;

    private Button mSplitButton;



    @ActionsHiddenFlags

    private int mHiddenFlags;
@@ -215,6 +216,10 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo 
        mDp = dp;

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

        requestLayout();



        mSplitButton.setCompoundDrawablesWithIntrinsicBounds(

                (dp.isLandscape ? R.drawable.ic_split_horizontal : R.drawable.ic_split_vertical),

                0, 0, 0);

    }



    public void setSplitButtonVisible(boolean visible) {

res/drawable/ic_split_horizontal.xml

0 → 100644
+9 −0
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="20dp"

    android:height="16dp"

    android:viewportWidth="20"

    android:viewportHeight="16">

  <path

      android:pathData="M18,14L13,14L13,2L18,2L18,14ZM20,14L20,2C20,0.9 19.1,-0 18,-0L13,-0C11.9,-0 11,0.9 11,2L11,14C11,15.1 11.9,16 13,16L18,16C19.1,16 20,15.1 20,14ZM7,14L2,14L2,2L7,2L7,14ZM9,14L9,2C9,0.9 8.1,-0 7,-0L2,-0C0.9,-0 -0,0.9 -0,2L-0,14C-0,15.1 0.9,16 2,16L7,16C8.1,16 9,15.1 9,14Z"

      android:fillColor="#000000"/>

</vector>

res/drawable/ic_split_left.xml

0 → 100644
+9 −0
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="20dp"

    android:height="16dp"

    android:viewportWidth="20"

    android:viewportHeight="16">

  <path

      android:pathData="M-0,2L-0,14C-0,15.1 0.9,16 2,16L7,16C8.1,16 9,15.1 9,14L9,2C9,0.9 8.1,-0 7,-0L2,-0C0.9,-0 -0,0.9 -0,2ZM13,2L18,2L18,14L13,14L13,2ZM11,2L11,14C11,15.1 11.9,16 13,16L18,16C19.1,16 20,15.1 20,14L20,2C20,0.9 19.1,-0 18,-0L13,-0C11.9,-0 11,0.9 11,2Z"

      android:fillColor="#000000"/>

</vector>

res/drawable/ic_split_right.xml

0 → 100644
+9 −0
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="20dp"

    android:height="16dp"

    android:viewportWidth="20"

    android:viewportHeight="16">

  <path

      android:pathData="M20,14L20,2C20,0.9 19.1,-0 18,-0L13,-0C11.9,-0 11,0.9 11,2L11,14C11,15.1 11.9,16 13,16L18,16C19.1,16 20,15.1 20,14ZM7,14L2,14L2,2L7,2L7,14ZM9,14L9,2C9,0.9 8.1,-0 7,-0L2,-0C0.9,-0 -0,0.9 -0,2L-0,14C-0,15.1 0.9,16 2,16L7,16C8.1,16 9,15.1 9,14Z"

      android:fillColor="#000000"/>

</vector>