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

Commit aa5c3b26 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android (Google) Code Review
Browse files

Merge changes I619be025,I126765a3,I0307c191,I9425785f,I623bd48d, ... 

* changes:
  Restore changes lost during merge
  Fix flicker at the end of docked stack divider animation
  Implement divider UX interactions
  Immediately start resizing when touching docked divider
  Fix black holes and flickering in docked resizing
  Migrate docked divider drawing to SysUI
  Supply app transition specs with a future
parents d5010c7d e48f428b

Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -259,6 +259,7 @@ LOCAL_SRC_FILES += \ 
	core/java/android/view/accessibility/IAccessibilityManager.aidl \

	core/java/android/view/accessibility/IAccessibilityManagerClient.aidl \

	core/java/android/view/IApplicationToken.aidl \

	core/java/android/view/IAppTransitionAnimationSpecsFuture.aidl \

	core/java/android/view/IAssetAtlas.aidl \

	core/java/android/view/IGraphicsStats.aidl \

	core/java/android/view/IInputFilter.aidl \

core/java/android/app/ActivityManagerNative.java

+11 −2
Original line number Diff line number Diff line
@@ -769,7 +769,11 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM 
        case RESIZE_STACK_TRANSACTION: {

            data.enforceInterface(IActivityManager.descriptor);

            final int stackId = data.readInt();

            Rect r = Rect.CREATOR.createFromParcel(data);

            final boolean hasRect = data.readInt() != 0;

            Rect r = null;

            if (hasRect) {

                r = Rect.CREATOR.createFromParcel(data);

            }

            final boolean allowResizeInDockedMode = data.readInt() == 1;

            resizeStack(stackId, r, allowResizeInDockedMode);

            reply.writeNoException();
@@ -3590,7 +3594,12 @@ class ActivityManagerProxy implements IActivityManager 
        Parcel reply = Parcel.obtain();

        data.writeInterfaceToken(IActivityManager.descriptor);

        data.writeInt(stackId);

        if (r != null) {

            data.writeInt(1);

            r.writeToParcel(data, 0);

        } else {

            data.writeInt(0);

        }

        data.writeInt(allowResizeInDockedMode ? 1 : 0);

        mRemote.transact(RESIZE_STACK_TRANSACTION, data, reply, 0);

        reply.readException();

core/java/android/service/wallpaper/WallpaperService.java

+1 −1
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ public abstract class WallpaperService extends Service { 
            @Override

            public void resized(Rect frame, Rect overscanInsets, Rect contentInsets,

                    Rect visibleInsets, Rect stableInsets, Rect outsets, boolean reportDraw,

                    Configuration newConfig) {

                    Configuration newConfig, Rect backDropRect) {

                Message msg = mCaller.obtainMessageIO(MSG_WINDOW_RESIZED,

                        reportDraw ? 1 : 0, outsets);

                mCaller.sendMessage(msg);

core/java/android/view/IAppTransitionAnimationSpecsFuture.aidl

0 → 100644
+28 −0
Original line number Diff line number Diff line 
/*

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

 */



package android.view;



import android.view.AppTransitionAnimationSpec;



/**

 * A cross-process future to fetch the specifications for app transitions.

 *

 * {@hide}

 */

interface IAppTransitionAnimationSpecsFuture {

    AppTransitionAnimationSpec[] get();

}

core/java/android/view/IWindow.aidl

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ oneway interface IWindow { 


    void resized(in Rect frame, in Rect overscanInsets, in Rect contentInsets,

            in Rect visibleInsets, in Rect stableInsets, in Rect outsets, boolean reportDraw,

            in Configuration newConfig);

            in Configuration newConfig, in Rect backDropFrame);

    void moved(int newX, int newY);

    void dispatchAppVisibility(boolean visible);

    void dispatchGetNewSurface();