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

Commit 049247ba authored by Jeff DeCew's avatar Jeff DeCew Committed by Automerger Merge Worker
Browse files

Merge "Remove ShadeViewRefactor annotation and uses" into udc-dev am:...

Merge "Remove ShadeViewRefactor annotation and uses" into udc-dev am: cd142ed8 am: a0154a45 am: 0e447a9c

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



Change-Id: I1af0fb72943989c4efa1d42131fdc14a8cfd6bb9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 89c070af 0e447a9c
Loading
Loading
Loading
Loading
+0 −39
Original line number Diff line number Diff line
/*
 * Copyright (C) 2018 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.systemui.statusbar.notification;

import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;

@Retention(RetentionPolicy.SOURCE)
public @interface ShadeViewRefactor {
  /**
   * Returns the refactor component.
   * @return the refactor component.
   */
  RefactorComponent value();

  public enum RefactorComponent {
    ADAPTER,
    LAYOUT_ALGORITHM,
    STATE_RESOLVER,
    DECORATOR,
    INPUT,
    COORDINATOR,
    SHADE_VIEW
  }
}
+0 −5
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import android.view.View;
import android.view.animation.Interpolator;

import com.android.app.animation.Interpolators;
import com.android.systemui.statusbar.notification.ShadeViewRefactor;
import com.android.systemui.statusbar.notification.row.ExpandableView;

/**
@@ -90,7 +89,6 @@ public class NotificationSection {
    }


    @ShadeViewRefactor(ShadeViewRefactor.RefactorComponent.STATE_RESOLVER)
    private void startTopAnimation(boolean animate) {
        int previousEndValue = mEndAnimationRect.top;
        int newEndValue = mBounds.top;
@@ -139,7 +137,6 @@ public class NotificationSection {
        mTopAnimator = animator;
    }

    @ShadeViewRefactor(ShadeViewRefactor.RefactorComponent.STATE_RESOLVER)
    private void startBottomAnimation(boolean animate) {
        int previousStartValue = mStartAnimationRect.bottom;
        int previousEndValue = mEndAnimationRect.bottom;
@@ -188,13 +185,11 @@ public class NotificationSection {
        mBottomAnimator = animator;
    }

    @ShadeViewRefactor(ShadeViewRefactor.RefactorComponent.SHADE_VIEW)
    private void setBackgroundTop(int top) {
        mCurrentBounds.top = top;
        mOwningView.invalidate();
    }

    @ShadeViewRefactor(ShadeViewRefactor.RefactorComponent.SHADE_VIEW)
    private void setBackgroundBottom(int bottom) {
        mCurrentBounds.bottom = bottom;
        mOwningView.invalidate();
+0 −266

File changed.

Preview size limit exceeded, changes collapsed.