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

Commit fbdc668f authored by Tony Huang's avatar Tony Huang Committed by Automerger Merge Worker
Browse files

Merge "Make AppTransition animations sharable (1/n)" into sc-dev am: d346ee53 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13406093

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2fd0c7320832c012bb8a2f9405e2d3bd4717db21
parents c49cf542 d346ee53

services/core/java/com/android/server/AttributeCache.java→core/java/com/android/internal/policy/AttributeCache.java

+30 −26
Original line number Diff line number Diff line 
/*

**

** Copyright 2007, 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.

 * Copyright (C) 2007 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 com.android.server;

package com.android.internal.policy;



import android.content.Context;

import android.content.pm.ActivityInfo;
@@ -34,6 +33,7 @@ import com.android.internal.annotations.GuardedBy; 
 * TODO: This should be better integrated into the system so it doesn't need

 * special calls from the activity manager to clear it.

 */

/** @hide */

public final class AttributeCache {

    private static final int CACHE_SIZE = 4;

    private static AttributeCache sInstance = null;
@@ -116,6 +116,10 @@ public final class AttributeCache { 
        }

    }



    public Entry get(String packageName, int resId, int[] styleable) {

        return get(packageName, resId, styleable, UserHandle.USER_CURRENT);

    }



    public Entry get(String packageName, int resId, int[] styleable, int userId) {

        synchronized (this) {

            Package pkg = mPackages.get(packageName);

services/core/java/com/android/server/wm/animation/ClipRectLRAnimation.java→core/java/com/android/internal/policy/ClipRectLRAnimation.java

+2 −2
Original line number Diff line number Diff line
@@ -11,10 +11,10 @@ 
 * 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

 * limitations under the License.

 */



package com.android.server.wm.animation;

package com.android.internal.policy;



import android.graphics.Rect;

import android.view.animation.ClipRectAnimation;

services/core/java/com/android/server/wm/animation/ClipRectTBAnimation.java→core/java/com/android/internal/policy/ClipRectTBAnimation.java

+2 −3
Original line number Diff line number Diff line
@@ -11,16 +11,15 @@ 
 * 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

 * limitations under the License.

 */



package com.android.server.wm.animation;

package com.android.internal.policy;



import android.graphics.Rect;

import android.view.animation.ClipRectAnimation;

import android.view.animation.Interpolator;

import android.view.animation.Transformation;

import android.view.animation.TranslateAnimation;



/**

 * Special case of ClipRectAnimation that animates only the top/bottom

services/core/java/com/android/server/policy/LogDecelerateInterpolator.java→core/java/com/android/internal/policy/LogDecelerateInterpolator.java

+3 −2
Original line number Diff line number Diff line
@@ -11,13 +11,14 @@ 
 * 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

 * limitations under the License.

 */



package com.android.server.policy;

package com.android.internal.policy;



import android.view.animation.Interpolator;



/** @hide */

public class LogDecelerateInterpolator implements Interpolator {



    private int mBase;

core/java/com/android/internal/policy/TransitionAnimation.java

0 → 100644
+960 −0

File added.

Preview size limit exceeded, changes collapsed.