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

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

Merge changes If61a2c1f,I06679897 

* changes:
  Fixing header bar icons.
  Show the correct pointer when dragging task in Recents.
parents 3eaf6c92 edaffc57

packages/SystemUI/res/drawable/recents_move_task_freeform_dark.xml

+26 −8
Original line number Diff line number Diff line
@@ -14,11 +14,29 @@ Copyright (C) 2015 The Android Open Source Project 
    limitations under the License.

-->

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

        android:width="24.0dp"

        android:height="24.0dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24">



    <group

            android:translateX="-286.000000"

            android:translateY="-602.000000">

        <group

                android:translateX="109.000000"

                android:translateY="514.000000">

            <group

                    android:translateX="178.000000"

                    android:translateY="89.000000">

                <path

                    android:strokeColor="@color/recents_task_bar_dark_icon_color"

                    android:strokeWidth="2"

                    android:pathData="M10,12 L10,3 L19,3 L19,5 L19,11 L19,12 L10,12 Z" />

                <path

        android:fillColor="@color/recents_task_bar_dark_icon_color"

        android:pathData="M0.0,0.0l0.0,24.0l24.0,0.0L24.0,0.0L0.0,0.0zM4.0,4.0l10.0,0.0l0.0,10.0L4.0,14.0L4.0,4.0z"/>

                    android:strokeColor="@color/recents_task_bar_dark_icon_color"

                    android:strokeWidth="2"

                    android:pathData="M15,17 L5,17 L5,7 L5,17 Z" />

            </group>

        </group>

    </group>

</vector>
 
 No newline at end of file

packages/SystemUI/res/drawable/recents_move_task_freeform_light.xml

+26 −8
Original line number Diff line number Diff line
@@ -14,11 +14,29 @@ Copyright (C) 2015 The Android Open Source Project 
    limitations under the License.

-->

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

        android:width="24.0dp"

        android:height="24.0dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24">



    <group

            android:translateX="-286.000000"

            android:translateY="-602.000000">

        <group

                android:translateX="109.000000"

                android:translateY="514.000000">

            <group

                    android:translateX="178.000000"

                    android:translateY="89.000000">

                <path

                    android:strokeColor="@color/recents_task_bar_light_icon_color"

                    android:strokeWidth="2"

                    android:pathData="M10,12 L10,3 L19,3 L19,5 L19,11 L19,12 L10,12 Z" />

                <path

        android:fillColor="@color/recents_task_bar_light_icon_color"

        android:pathData="M0.0,0.0l0.0,24.0l24.0,0.0L24.0,0.0L0.0,0.0zM4.0,4.0l10.0,0.0l0.0,10.0L4.0,14.0L4.0,4.0z"/>

                    android:strokeColor="@color/recents_task_bar_light_icon_color"

                    android:strokeWidth="2"

                    android:pathData="M15,17 L5,17 L5,7 L5,17 Z" />

            </group>

        </group>

    </group>

</vector>
 
 No newline at end of file

packages/SystemUI/res/drawable/recents_move_task_fullscreen_dark.xml

+21 −17
Original line number Diff line number Diff line
@@ -14,20 +14,24 @@ Copyright (C) 2015 The Android Open Source Project 
    limitations under the License.

-->

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

        android:width="24.0dp"

        android:height="24.0dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24">

    <group

            android:translateX="-252.000000"

            android:translateY="-602.000000">

        <group

                android:translateX="109.000000"

                android:translateY="514.000000">

            <group

                    android:translateX="144.000000"

                    android:translateY="89.000000">

                <path

        android:fillColor="@color/recents_task_bar_dark_icon_color"

        android:pathData="M0.0,8.0l4.0,0.0 0.0,-4.0 4.0,0.0 0.0,-4.0 -8.0,0.0z"/>

    <path

        android:fillColor="@color/recents_task_bar_dark_icon_color"

        android:pathData="M4.0,16.0l-4.0,0.0 0.0,8.0 8.0,0.0 0.0,-4.0 -4.0,0.0z"/>

    <path

        android:fillColor="@color/recents_task_bar_dark_icon_color"

        android:pathData="M16.0,0.0l0.0,4.0 4.0,0.0 0.0,4.0 4.0,0.0 0.0,-8.0z"/>

    <path

        android:fillColor="@color/recents_task_bar_dark_icon_color"

        android:pathData="M20.0,20.0l-4.0,0.0 0.0,4.0 8.0,0.0 0.0,-8.0 -4.0,0.0z"/>

                    android:strokeColor="@color/recents_task_bar_dark_icon_color"

                    android:strokeWidth="2"

                    android:pathData="M17,17 L5,17 L5,5 L17,5 L17,17 Z" />

            </group>

        </group>

    </group>

</vector>
 
 No newline at end of file

packages/SystemUI/res/drawable/recents_move_task_fullscreen_light.xml

+21 −17
Original line number Diff line number Diff line
@@ -14,20 +14,24 @@ Copyright (C) 2015 The Android Open Source Project 
    limitations under the License.

-->

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

        android:width="24.0dp"

        android:height="24.0dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24">

    <group

            android:translateX="-252.000000"

            android:translateY="-602.000000">

        <group

                android:translateX="109.000000"

                android:translateY="514.000000">

            <group

                    android:translateX="144.000000"

                    android:translateY="89.000000">

                <path

        android:fillColor="@color/recents_task_bar_light_icon_color"

        android:pathData="M0.0,8.0l4.0,0.0 0.0,-4.0 4.0,0.0 0.0,-4.0 -8.0,0.0z"/>

    <path

        android:fillColor="@color/recents_task_bar_light_icon_color"

        android:pathData="M4.0,16.0l-4.0,0.0 0.0,8.0 8.0,0.0 0.0,-4.0 -4.0,0.0z"/>

    <path

        android:fillColor="@color/recents_task_bar_light_icon_color"

        android:pathData="M16.0,0.0l0.0,4.0 4.0,0.0 0.0,4.0 4.0,0.0 0.0,-8.0z"/>

    <path

        android:fillColor="@color/recents_task_bar_light_icon_color"

        android:pathData="M20.0,20.0l-4.0,0.0 0.0,4.0 8.0,0.0 0.0,-8.0 -4.0,0.0z"/>

                    android:strokeColor="@color/recents_task_bar_light_icon_color"

                    android:strokeWidth="2"

                    android:pathData="M19,19 L3,19 L3,3 L19,3 L19,5 L19,18 L19,19 Z" />

            </group>

        </group>

    </group>

</vector>
 
 No newline at end of file

packages/SystemUI/src/com/android/systemui/recents/views/RecentsViewTouchHandler.java

+8 −0
Original line number Diff line number Diff line
@@ -20,7 +20,9 @@ import android.app.ActivityManager; 
import android.content.res.Configuration;

import android.graphics.Point;

import android.graphics.Rect;

import android.view.InputDevice;

import android.view.MotionEvent;

import android.view.PointerIcon;

import android.view.ViewConfiguration;

import android.view.ViewDebug;
@@ -81,6 +83,7 @@ public class RecentsViewTouchHandler { 
    @ViewDebug.ExportedProperty(category="recents")

    private boolean mIsDragging;

    private float mDragSlop;

    private int mDeviceId = -1;



    private DropTarget mLastDropTarget;

    private DividerSnapAlgorithm mDividerSnapAlgorithm;
@@ -180,6 +183,9 @@ public class RecentsViewTouchHandler { 
        // Request other drop targets to register themselves

        EventBus.getDefault().send(new DragStartInitializeDropTargetsEvent(event.task,

                event.taskView, this));

        if (mDeviceId != -1) {

            InputDevice.getDevice(mDeviceId).setPointerType(PointerIcon.TYPE_GRABBING);

        }

    }



    public final void onBusEvent(DragEndEvent event) {
@@ -206,6 +212,7 @@ public class RecentsViewTouchHandler { 
        switch (action) {

            case MotionEvent.ACTION_DOWN:

                mDownPos.set((int) ev.getX(), (int) ev.getY());

                mDeviceId = ev.getDeviceId();

                break;

            case MotionEvent.ACTION_MOVE: {

                float evX = ev.getX();
@@ -265,6 +272,7 @@ public class RecentsViewTouchHandler { 
                            !cancelled ? mLastDropTarget : null));

                    break;

                }

                mDeviceId = -1;

            }

        }

    }