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

Commit de89203f authored by Dave Mankoff's avatar Dave Mankoff Committed by Android (Google) Code Review
Browse files

Merge changes from topic "b162525274-kgd-slice-view" 

* changes:
  Remove ref to Controller from KeyguardSliceView
  Add KeyguardSliceViewController.
parents babd37c8 93dd8838

packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.widget.RelativeLayout; 
import android.widget.TextClock;



import com.android.internal.colorextraction.ColorExtractor;

import com.android.keyguard.dagger.KeyguardStatusViewScope;

import com.android.systemui.Interpolators;

import com.android.systemui.R;

import com.android.systemui.plugins.ClockPlugin;
@@ -36,6 +37,7 @@ import java.util.TimeZone; 
/**

 * Switch to show plugin clock when plugin is connected, otherwise it will show default clock.

 */

@KeyguardStatusViewScope

public class KeyguardClockSwitch extends RelativeLayout {



    private static final String TAG = "KeyguardClockSwitch";

packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java

+18 −8
Original line number Diff line number Diff line
@@ -34,10 +34,11 @@ import javax.inject.Inject; 
public class KeyguardClockSwitchController {

    private static final boolean CUSTOM_CLOCKS_ENABLED = true;



    private final KeyguardClockSwitch mView;

    private final StatusBarStateController mStatusBarStateController;

    private final SysuiColorExtractor mColorExtractor;

    private final ClockManager mClockManager;

    private KeyguardClockSwitch mView;

    private final KeyguardSliceViewController mKeyguardSliceViewController;



    private final StatusBarStateController.StateListener mStateListener =

            new StatusBarStateController.StateListener() {
@@ -52,10 +53,14 @@ public class KeyguardClockSwitchController { 
     *

     * The color palette changes when the wallpaper is changed.

     */

    private final ColorExtractor.OnColorsChangedListener mColorsListener = (extractor, which) -> {

    private final ColorExtractor.OnColorsChangedListener mColorsListener =

            new ColorExtractor.OnColorsChangedListener() {

        @Override

        public void onColorsChanged(ColorExtractor extractor, int which) {

            if ((which & WallpaperManager.FLAG_LOCK) != 0) {

                mView.updateColors(getGradientColors());

            }

        }

    };



    private ClockManager.ClockChangedListener mClockChangedListener = this::setClockPlugin;
@@ -84,22 +89,27 @@ public class KeyguardClockSwitchController { 
    };



    @Inject

    public KeyguardClockSwitchController(StatusBarStateController statusBarStateController,

            SysuiColorExtractor colorExtractor, ClockManager clockManager) {

    public KeyguardClockSwitchController(KeyguardClockSwitch keyguardClockSwitch,

            StatusBarStateController statusBarStateController,

            SysuiColorExtractor colorExtractor, ClockManager clockManager,

            KeyguardSliceViewController keyguardSliceViewController) {

        mView = keyguardClockSwitch;

        mStatusBarStateController = statusBarStateController;

        mColorExtractor = colorExtractor;

        mClockManager = clockManager;

        mKeyguardSliceViewController = keyguardSliceViewController;

    }



    /**

     * Attach the controller to the view it relates to.

     */

    public void attach(KeyguardClockSwitch view) {

        mView = view;

    public void init() {

        if (mView.isAttachedToWindow()) {

            mOnAttachStateChangeListener.onViewAttachedToWindow(mView);

        }

        mView.addOnAttachStateChangeListener(mOnAttachStateChangeListener);



        mKeyguardSliceViewController.init();

    }



    /**

packages/SystemUI/src/com/android/keyguard/KeyguardDisplayManager.java

+19 −1
Original line number Diff line number Diff line
@@ -34,12 +34,15 @@ import android.view.View; 
import android.view.WindowManager;



import com.android.internal.annotations.VisibleForTesting;

import com.android.keyguard.dagger.KeyguardStatusViewComponent;

import com.android.systemui.Dependency;

import com.android.systemui.R;

import com.android.systemui.navigationbar.NavigationBarController;

import com.android.systemui.navigationbar.NavigationBarView;

import com.android.systemui.util.InjectionInflationController;



import javax.inject.Inject;



public class KeyguardDisplayManager {

    protected static final String TAG = "KeyguardDisplayManager";

    private static boolean DEBUG = KeyguardConstants.DEBUG;
@@ -47,6 +50,7 @@ public class KeyguardDisplayManager { 
    private final MediaRouter mMediaRouter;

    private final DisplayManager mDisplayService;

    private final InjectionInflationController mInjectableInflater;

    private final KeyguardStatusViewComponent.Factory mKeyguardStatusViewComponentFactory;

    private final Context mContext;



    private boolean mShowing;
@@ -86,10 +90,13 @@ public class KeyguardDisplayManager { 
        }

    };



    @Inject

    public KeyguardDisplayManager(Context context,

            InjectionInflationController injectableInflater) {

            InjectionInflationController injectableInflater,

            KeyguardStatusViewComponent.Factory keyguardStatusViewComponentFactory) {

        mContext = context;

        mInjectableInflater = injectableInflater;

        mKeyguardStatusViewComponentFactory = keyguardStatusViewComponentFactory;

        mMediaRouter = mContext.getSystemService(MediaRouter.class);

        mDisplayService = mContext.getSystemService(DisplayManager.class);

        mDisplayService.registerDisplayListener(mDisplayListener, null /* handler */);
@@ -124,6 +131,7 @@ public class KeyguardDisplayManager { 
        Presentation presentation = mPresentations.get(displayId);

        if (presentation == null) {

            final Presentation newPresentation = new KeyguardPresentation(mContext, display,

                    mKeyguardStatusViewComponentFactory,

                    mInjectableInflater.injectable(LayoutInflater.from(mContext)));

            newPresentation.setOnDismissListener(dialog -> {

                if (newPresentation.equals(mPresentations.get(displayId))) {
@@ -241,7 +249,9 @@ public class KeyguardDisplayManager { 
    static final class KeyguardPresentation extends Presentation {

        private static final int VIDEO_SAFE_REGION = 80; // Percentage of display width & height

        private static final int MOVE_CLOCK_TIMEOUT = 10000; // 10s

        private final KeyguardStatusViewComponent.Factory mKeyguardStatusViewComponentFactory;

        private final LayoutInflater mInjectableLayoutInflater;

        private KeyguardClockSwitchController mKeyguardClockSwitchController;

        private View mClock;

        private int mUsableWidth;

        private int mUsableHeight;
@@ -259,8 +269,10 @@ public class KeyguardDisplayManager { 
        };



        KeyguardPresentation(Context context, Display display,

                KeyguardStatusViewComponent.Factory keyguardStatusViewComponentFactory,

                LayoutInflater injectionLayoutInflater) {

            super(context, display, R.style.Theme_SystemUI_KeyguardPresentation);

            mKeyguardStatusViewComponentFactory = keyguardStatusViewComponentFactory;

            mInjectableLayoutInflater = injectionLayoutInflater;

            getWindow().setType(WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG);

            setCancelable(false);
@@ -302,6 +314,12 @@ public class KeyguardDisplayManager { 


            // Avoid screen burn in

            mClock.post(mMoveTextRunnable);



            mKeyguardClockSwitchController = mKeyguardStatusViewComponentFactory

                    .build(findViewById(R.id.clock))

                    .getKeyguardClockSwitchController();



            mKeyguardClockSwitchController.init();

        }

    }

}

packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java

+31 −169
Original line number Diff line number Diff line
@@ -16,12 +16,6 @@ 


package com.android.keyguard;



import static android.app.slice.Slice.HINT_LIST_ITEM;

import static android.view.Display.DEFAULT_DISPLAY;

import static android.view.Display.INVALID_DISPLAY;



import static com.android.systemui.util.InjectionInflationController.VIEW_CONTEXT;



import android.animation.LayoutTransition;

import android.animation.ObjectAnimator;

import android.animation.PropertyValuesHolder;
@@ -35,28 +29,19 @@ import android.graphics.drawable.Drawable; 
import android.graphics.text.LineBreaker;

import android.net.Uri;

import android.os.Trace;

import android.provider.Settings;

import android.text.TextUtils;

import android.text.TextUtils.TruncateAt;

import android.util.AttributeSet;

import android.util.Log;

import android.util.TypedValue;

import android.view.Display;

import android.view.View;

import android.view.animation.Animation;

import android.widget.LinearLayout;

import android.widget.TextView;



import androidx.lifecycle.LiveData;

import androidx.lifecycle.Observer;

import androidx.slice.Slice;

import androidx.slice.SliceItem;

import androidx.slice.SliceViewManager;

import androidx.slice.core.SliceQuery;

import androidx.slice.widget.ListContent;

import androidx.slice.widget.RowContent;

import androidx.slice.widget.SliceContent;

import androidx.slice.widget.SliceLiveData;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.graphics.ColorUtils;
@@ -64,70 +49,49 @@ import com.android.settingslib.Utils; 
import com.android.systemui.Dependency;

import com.android.systemui.Interpolators;

import com.android.systemui.R;

import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.keyguard.KeyguardSliceProvider;

import com.android.systemui.plugins.ActivityStarter;

import com.android.systemui.statusbar.policy.ConfigurationController;

import com.android.systemui.tuner.TunerService;

import com.android.systemui.util.wakelock.KeepAwakeAnimationListener;



import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.HashMap;

import java.util.List;



import javax.inject.Inject;

import javax.inject.Named;

import java.util.Map;



/**

 * View visible under the clock on the lock screen and AoD.

 */

public class KeyguardSliceView extends LinearLayout implements View.OnClickListener,

        Observer<Slice>, TunerService.Tunable, ConfigurationController.ConfigurationListener {

public class KeyguardSliceView extends LinearLayout {



    private static final String TAG = "KeyguardSliceView";

    public static final int DEFAULT_ANIM_DURATION = 550;



    private final HashMap<View, PendingIntent> mClickActions;

    private final ActivityStarter mActivityStarter;

    private final ConfigurationController mConfigurationController;

    private final LayoutTransition mLayoutTransition;

    private final TunerService mTunerService;

    private Uri mKeyguardSliceUri;

    @VisibleForTesting

    TextView mTitle;

    private Row mRow;

    private int mTextColor;

    private float mDarkAmount = 0;



    private LiveData<Slice> mLiveData;

    private int mDisplayId = INVALID_DISPLAY;

    private int mIconSize;

    private int mIconSizeWithHeader;

    /**

     * Runnable called whenever the view contents change.

     */

    private Runnable mContentChangeListener;

    private Slice mSlice;

    private boolean mHasHeader;

    private final int mRowWithHeaderPadding;

    private final int mRowPadding;

    private float mRowTextSize;

    private float mRowWithHeaderTextSize;

    private View.OnClickListener mOnClickListener;



    @Inject

    public KeyguardSliceView(@Named(VIEW_CONTEXT) Context context, AttributeSet attrs,

            ActivityStarter activityStarter, ConfigurationController configurationController,

            TunerService tunerService, @Main Resources resources) {

    public KeyguardSliceView(Context context, AttributeSet attrs) {

        super(context, attrs);



        mTunerService = tunerService;

        mClickActions = new HashMap<>();

        Resources resources = context.getResources();

        mRowPadding = resources.getDimensionPixelSize(R.dimen.subtitle_clock_padding);

        mRowWithHeaderPadding = resources.getDimensionPixelSize(R.dimen.header_subtitle_padding);

        mActivityStarter = activityStarter;

        mConfigurationController = configurationController;



        mLayoutTransition = new LayoutTransition();

        mLayoutTransition.setStagger(LayoutTransition.CHANGE_APPEARING, DEFAULT_ANIM_DURATION / 2);
@@ -153,38 +117,9 @@ public class KeyguardSliceView extends LinearLayout implements View.OnClickListe 
                R.dimen.widget_label_font_size);

        mRowWithHeaderTextSize = mContext.getResources().getDimensionPixelSize(

                R.dimen.header_row_font_size);

        mTitle.setOnClickListener(this);

        mTitle.setBreakStrategy(LineBreaker.BREAK_STRATEGY_BALANCED);

    }



    @Override

    protected void onAttachedToWindow() {

        super.onAttachedToWindow();



        Display display = getDisplay();

        if (display != null) {

            mDisplayId = display.getDisplayId();

        }

        mTunerService.addTunable(this, Settings.Secure.KEYGUARD_SLICE_URI);

        // Make sure we always have the most current slice

        if (mDisplayId == DEFAULT_DISPLAY) {

            mLiveData.observeForever(this);

        }

        mConfigurationController.addCallback(this);

    }



    @Override

    protected void onDetachedFromWindow() {

        super.onDetachedFromWindow();



        // TODO(b/117344873) Remove below work around after this issue be fixed.

        if (mDisplayId == DEFAULT_DISPLAY) {

            mLiveData.removeObserver(this);

        }

        mTunerService.removeTunable(this);

        mConfigurationController.removeCallback(this);

    }



    @Override

    public void onVisibilityAggregated(boolean isVisible) {

        super.onVisibilityAggregated(isVisible);
@@ -198,44 +133,31 @@ public class KeyguardSliceView extends LinearLayout implements View.OnClickListe 
        return mHasHeader;

    }



    private void showSlice() {

        Trace.beginSection("KeyguardSliceView#showSlice");

        if (mSlice == null) {

    void hideSlice() {

        mTitle.setVisibility(GONE);

        mRow.setVisibility(GONE);

        mHasHeader = false;

        if (mContentChangeListener != null) {

            mContentChangeListener.run();

        }

            Trace.endSection();

            return;

    }

        mClickActions.clear();



        ListContent lc = new ListContent(getContext(), mSlice);

        SliceContent headerContent = lc.getHeader();

        mHasHeader = headerContent != null && !headerContent.getSliceItem().hasHint(HINT_LIST_ITEM);

        List<SliceContent> subItems = new ArrayList<>();

        for (int i = 0; i < lc.getRowItems().size(); i++) {

            SliceContent subItem = lc.getRowItems().get(i);

            String itemUri = subItem.getSliceItem().getSlice().getUri().toString();

            // Filter out the action row

            if (!KeyguardSliceProvider.KEYGUARD_ACTION_URI.equals(itemUri)) {

                subItems.add(subItem);

            }

        }

    Map<View, PendingIntent> showSlice(RowContent header, List<SliceContent> subItems) {

        Trace.beginSection("KeyguardSliceView#showSlice");

        mHasHeader = header != null;

        Map<View, PendingIntent> clickActions = new HashMap<>();



        if (!mHasHeader) {

            mTitle.setVisibility(GONE);

        } else {

            mTitle.setVisibility(VISIBLE);



            RowContent header = lc.getHeader();

            SliceItem mainTitle = header.getTitleItem();

            CharSequence title = mainTitle != null ? mainTitle.getText() : null;

            mTitle.setText(title);

            if (header.getPrimaryAction() != null

                    && header.getPrimaryAction().getAction() != null) {

                mClickActions.put(mTitle, header.getPrimaryAction().getAction());

                clickActions.put(mTitle, header.getPrimaryAction().getAction());

            }

        }
@@ -265,7 +187,7 @@ public class KeyguardSliceView extends LinearLayout implements View.OnClickListe 
            if (rc.getPrimaryAction() != null) {

                pendingIntent = rc.getPrimaryAction().getAction();

            }

            mClickActions.put(button, pendingIntent);

            clickActions.put(button, pendingIntent);



            final SliceItem titleItem = rc.getTitleItem();

            button.setText(titleItem == null ? null : titleItem.getText());
@@ -286,14 +208,14 @@ public class KeyguardSliceView extends LinearLayout implements View.OnClickListe 
                }

            }

            button.setCompoundDrawables(iconDrawable, null, null, null);

            button.setOnClickListener(this);

            button.setOnClickListener(mOnClickListener);

            button.setClickable(pendingIntent != null);

        }



        // Removing old views

        for (int i = 0; i < mRow.getChildCount(); i++) {

            View child = mRow.getChildAt(i);

            if (!mClickActions.containsKey(child)) {

            if (!clickActions.containsKey(child)) {

                mRow.removeView(child);

                i--;

            }
@@ -303,6 +225,8 @@ public class KeyguardSliceView extends LinearLayout implements View.OnClickListe 
            mContentChangeListener.run();

        }

        Trace.endSection();



        return clickActions;

    }



    public void setDarkAmount(float darkAmount) {
@@ -323,14 +247,6 @@ public class KeyguardSliceView extends LinearLayout implements View.OnClickListe 
        }

    }



    @Override

    public void onClick(View v) {

        final PendingIntent action = mClickActions.get(v);

        if (action != null) {

            mActivityStarter.startPendingIntentDismissingKeyguard(action);

        }

    }



    /**

     * Runnable that gets invoked every time the title or the row visibility changes.

     * @param contentChangeListener The listener.
@@ -339,43 +255,6 @@ public class KeyguardSliceView extends LinearLayout implements View.OnClickListe 
        mContentChangeListener = contentChangeListener;

    }



    /**

     * LiveData observer lifecycle.

     * @param slice the new slice content.

     */

    @Override

    public void onChanged(Slice slice) {

        mSlice = slice;

        showSlice();

    }



    @Override

    public void onTuningChanged(String key, String newValue) {

        setupUri(newValue);

    }



    /**

     * Sets the slice provider Uri.

     */

    public void setupUri(String uriString) {

        if (uriString == null) {

            uriString = KeyguardSliceProvider.KEYGUARD_SLICE_URI;

        }



        boolean wasObserving = false;

        if (mLiveData != null && mLiveData.hasActiveObservers()) {

            wasObserving = true;

            mLiveData.removeObserver(this);

        }



        mKeyguardSliceUri = Uri.parse(uriString);

        mLiveData = SliceLiveData.fromUri(mContext, mKeyguardSliceUri);



        if (wasObserving) {

            mLiveData.observeForever(this);

        }

    }



    @VisibleForTesting

    int getTextColor() {

        return ColorUtils.blendARGB(mTextColor, Color.WHITE, mDarkAmount);
@@ -387,8 +266,7 @@ public class KeyguardSliceView extends LinearLayout implements View.OnClickListe 
        updateTextColors();

    }



    @Override

    public void onDensityOrFontScaleChanged() {

    void onDensityOrFontScaleChanged() {

        mIconSize = mContext.getResources().getDimensionPixelSize(R.dimen.widget_icon_size);

        mIconSizeWithHeader = (int) mContext.getResources().getDimension(R.dimen.header_icon_size);

        mRowTextSize = mContext.getResources().getDimensionPixelSize(
@@ -397,37 +275,21 @@ public class KeyguardSliceView extends LinearLayout implements View.OnClickListe 
                R.dimen.header_row_font_size);

    }



    public void refresh() {

        Slice slice;

        Trace.beginSection("KeyguardSliceView#refresh");

        // We can optimize performance and avoid binder calls when we know that we're bound

        // to a Slice on the same process.

        if (KeyguardSliceProvider.KEYGUARD_SLICE_URI.equals(mKeyguardSliceUri.toString())) {

            KeyguardSliceProvider instance = KeyguardSliceProvider.getAttachedInstance();

            if (instance != null) {

                slice = instance.onBindSlice(mKeyguardSliceUri);

            } else {

                Log.w(TAG, "Keyguard slice not bound yet?");

                slice = null;

            }

        } else {

            slice = SliceViewManager.getInstance(getContext()).bindSlice(mKeyguardSliceUri);

        }

        onChanged(slice);

        Trace.endSection();

    }



    public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

        pw.println("KeyguardSliceView:");

        pw.println("  mClickActions: " + mClickActions);

        pw.println("  mTitle: " + (mTitle == null ? "null" : mTitle.getVisibility() == VISIBLE));

        pw.println("  mRow: " + (mRow == null ? "null" : mRow.getVisibility() == VISIBLE));

        pw.println("  mTextColor: " + Integer.toHexString(mTextColor));

        pw.println("  mDarkAmount: " + mDarkAmount);

        pw.println("  mSlice: " + mSlice);

        pw.println("  mHasHeader: " + mHasHeader);

    }



    @Override

    public void setOnClickListener(View.OnClickListener onClickListener) {

        mOnClickListener = onClickListener;

        mTitle.setOnClickListener(onClickListener);

    }



    public static class Row extends LinearLayout {



        /**

packages/SystemUI/src/com/android/keyguard/KeyguardSliceViewController.java

0 → 100644
+234 −0

File added.

Preview size limit exceeded, changes collapsed.