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

Commit df5bf614 authored by Selim Cinek's avatar Selim Cinek
Browse files

Decorated media notifications now also animate their actions

Bug: 24866646
Change-Id: I271be0d55270043dfc41c621911d802b37d4690f
parent b88b9847
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ public interface TransformableView {
    int TRANSFORMING_VIEW_TEXT = 2;
    int TRANSFORMING_VIEW_IMAGE = 3;
    int TRANSFORMING_VIEW_PROGRESS = 4;
    int TRANSFORMING_VIEW_ACTIONS = 5;

    /**
     * Get the current state of a view in a transform animation
+57 −0
Original line number Diff line number Diff line
/*
 * Copyright (C) 2016 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 android.content.Context;
import android.service.notification.StatusBarNotification;
import android.view.View;

import com.android.systemui.statusbar.TransformableView;

/**
 * Wraps a notification containing a media template
 */
public class NotificationMediaTemplateViewWrapper extends NotificationTemplateViewWrapper {

    protected NotificationMediaTemplateViewWrapper(Context ctx, View view) {
        super(ctx, view);
    }

    View mActions;

    private void resolveViews(StatusBarNotification notification) {
        mActions = mView.findViewById(com.android.internal.R.id.media_actions);
    }

    @Override
    public void notifyContentUpdated(StatusBarNotification notification) {
        // Reinspect the notification. Before the super call, because the super call also updates
        // the transformation types and we need to have our values set by then.
        resolveViews(notification);
        super.notifyContentUpdated(notification);
    }

    @Override
    protected void updateTransformedTypes() {
        // This also clears the existing types
        super.updateTransformedTypes();
        if (mActions != null) {
            mTransformationHelper.addTransformedView(TransformableView.TRANSFORMING_VIEW_TEXT,
                    mActions);
        }
    }
}
+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@ public abstract class NotificationViewWrapper implements TransformableView {
                return new NotificationBigPictureTemplateViewWrapper(ctx, v);
            } else if ("bigText".equals(v.getTag())) {
                return new NotificationBigTextTemplateViewWrapper(ctx, v);
            } else if ("media".equals(v.getTag()) || "bigMediaNarrow".equals(v.getTag())) {
                return new NotificationMediaTemplateViewWrapper(ctx, v);
            }
            return new NotificationTemplateViewWrapper(ctx, v);
        } else if (v instanceof NotificationHeaderView) {