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

Commit d2194850 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Clean up most Shade package warnings" into tm-qpr-dev

parents 32013bb0 ef03db05

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+4 −9
Original line number Original line Diff line number Diff line
@@ -44,7 +44,6 @@ import android.animation.Animator; 
import android.animation.AnimatorListenerAdapter;

import android.animation.AnimatorListenerAdapter;

import android.animation.ValueAnimator;

import android.animation.ValueAnimator;

import android.annotation.NonNull;

import android.annotation.NonNull;

import android.app.ActivityManager;

import android.app.Fragment;

import android.app.Fragment;

import android.app.StatusBarManager;

import android.app.StatusBarManager;

import android.content.ContentResolver;

import android.content.ContentResolver;
@@ -288,7 +287,6 @@ public final class NotificationPanelViewController extends PanelViewController { 
    private final NotificationPanelView mView;

    private final NotificationPanelView mView;

    private final VibratorHelper mVibratorHelper;

    private final VibratorHelper mVibratorHelper;

    private final MetricsLogger mMetricsLogger;

    private final MetricsLogger mMetricsLogger;

    private final ActivityManager mActivityManager;

    private final ConfigurationController mConfigurationController;

    private final ConfigurationController mConfigurationController;

    private final Provider<FlingAnimationUtils.Builder> mFlingAnimationUtilsBuilder;

    private final Provider<FlingAnimationUtils.Builder> mFlingAnimationUtilsBuilder;

    private final NotificationStackScrollLayoutController mNotificationStackScrollLayoutController;

    private final NotificationStackScrollLayoutController mNotificationStackScrollLayoutController;
@@ -341,14 +339,14 @@ public final class NotificationPanelViewController extends PanelViewController { 
    private final RecordingController mRecordingController;

    private final RecordingController mRecordingController;

    private final PanelEventsEmitter mPanelEventsEmitter;

    private final PanelEventsEmitter mPanelEventsEmitter;

    private boolean mSplitShadeEnabled;

    private boolean mSplitShadeEnabled;

    // The bottom padding reserved for elements of the keyguard measuring notifications

    /** The bottom padding reserved for elements of the keyguard measuring notifications. */

    private float mKeyguardNotificationBottomPadding;

    private float mKeyguardNotificationBottomPadding;

    /**

    /**

     * The top padding from where notification should start in lockscreen.

     * The top padding from where notification should start in lockscreen.

     * Should be static also during animations and should match the Y of the first notification.

     * Should be static also during animations and should match the Y of the first notification.

     */

     */

    private float mKeyguardNotificationTopPadding;

    private float mKeyguardNotificationTopPadding;

    // Current max allowed keyguard notifications determined by measuring the panel

    /** Current max allowed keyguard notifications determined by measuring the panel. */

    private int mMaxAllowedKeyguardNotifications;

    private int mMaxAllowedKeyguardNotifications;





    private KeyguardQsUserSwitchController mKeyguardQsUserSwitchController;

    private KeyguardQsUserSwitchController mKeyguardQsUserSwitchController;
@@ -728,7 +726,6 @@ public final class NotificationPanelViewController extends PanelViewController { 
            AccessibilityManager accessibilityManager, @DisplayId int displayId,

            AccessibilityManager accessibilityManager, @DisplayId int displayId,

            KeyguardUpdateMonitor keyguardUpdateMonitor,

            KeyguardUpdateMonitor keyguardUpdateMonitor,

            MetricsLogger metricsLogger,

            MetricsLogger metricsLogger,

            ActivityManager activityManager,

            ConfigurationController configurationController,

            ConfigurationController configurationController,

            Provider<FlingAnimationUtils.Builder> flingAnimationUtilsBuilder,

            Provider<FlingAnimationUtils.Builder> flingAnimationUtilsBuilder,

            StatusBarTouchableRegionManager statusBarTouchableRegionManager,

            StatusBarTouchableRegionManager statusBarTouchableRegionManager,
@@ -798,7 +795,6 @@ public final class NotificationPanelViewController extends PanelViewController { 
                panelExpansionStateManager,

                panelExpansionStateManager,

                ambientState,

                ambientState,

                interactionJankMonitor,

                interactionJankMonitor,

                keyguardUnlockAnimationController,

                systemClock);

                systemClock);

        mView = view;

        mView = view;

        mVibratorHelper = vibratorHelper;

        mVibratorHelper = vibratorHelper;
@@ -808,7 +804,6 @@ public final class NotificationPanelViewController extends PanelViewController { 
        mQRCodeScannerController = qrCodeScannerController;

        mQRCodeScannerController = qrCodeScannerController;

        mControlsComponent = controlsComponent;

        mControlsComponent = controlsComponent;

        mMetricsLogger = metricsLogger;

        mMetricsLogger = metricsLogger;

        mActivityManager = activityManager;

        mConfigurationController = configurationController;

        mConfigurationController = configurationController;

        mFlingAnimationUtilsBuilder = flingAnimationUtilsBuilder;

        mFlingAnimationUtilsBuilder = flingAnimationUtilsBuilder;

        mMediaHierarchyManager = mediaHierarchyManager;

        mMediaHierarchyManager = mediaHierarchyManager;
@@ -3969,7 +3964,7 @@ public final class NotificationPanelViewController extends PanelViewController { 
     * notification data being displayed. In the new notification pipeline, this is handled in

     * notification data being displayed. In the new notification pipeline, this is handled in

     * {@link ShadeViewManager}.

     * {@link ShadeViewManager}.

     */

     */

    public void updateNotificationViews(String reason) {

    public void updateNotificationViews() {

        mNotificationStackScrollLayoutController.updateFooter();

        mNotificationStackScrollLayoutController.updateFooter();





        mNotificationIconAreaController.updateNotificationIcons(createVisibleEntriesList());

        mNotificationIconAreaController.updateNotificationIcons(createVisibleEntriesList());
@@ -4426,7 +4421,7 @@ public final class NotificationPanelViewController extends PanelViewController { 
            NotificationStackScrollLayout.OnEmptySpaceClickListener {

            NotificationStackScrollLayout.OnEmptySpaceClickListener {

        @Override

        @Override

        public void onEmptySpaceClicked(float x, float y) {

        public void onEmptySpaceClicked(float x, float y) {

            onEmptySpaceClick(x);

            onEmptySpaceClick();

        }

        }

    }

    }

packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java

+1 −2
Original line number Original line Diff line number Diff line
@@ -89,7 +89,6 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW 
        Dumpable, ConfigurationListener {

        Dumpable, ConfigurationListener {





    private static final String TAG = "NotificationShadeWindowController";

    private static final String TAG = "NotificationShadeWindowController";

    private static final boolean DEBUG = false;





    private final Context mContext;

    private final Context mContext;

    private final WindowManager mWindowManager;

    private final WindowManager mWindowManager;
@@ -190,7 +189,7 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW 
                return;

                return;

            }

            }

        }

        }

        mCallbacks.add(new WeakReference<StatusBarWindowCallback>(callback));

        mCallbacks.add(new WeakReference<>(callback));

    }

    }





    @Override

    @Override

packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowView.java

+11 −15
Original line number Original line Diff line number Diff line
@@ -18,6 +18,8 @@ package com.android.systemui.shade; 




import static android.view.WindowInsets.Type.systemBars;

import static android.view.WindowInsets.Type.systemBars;





import static com.android.systemui.statusbar.phone.CentralSurfaces.DEBUG;



import android.annotation.ColorInt;

import android.annotation.ColorInt;

import android.annotation.DrawableRes;

import android.annotation.DrawableRes;

import android.annotation.LayoutRes;

import android.annotation.LayoutRes;
@@ -52,14 +54,12 @@ import android.widget.FrameLayout; 
import com.android.internal.view.FloatingActionMode;

import com.android.internal.view.FloatingActionMode;

import com.android.internal.widget.floatingtoolbar.FloatingToolbar;

import com.android.internal.widget.floatingtoolbar.FloatingToolbar;

import com.android.systemui.R;

import com.android.systemui.R;

import com.android.systemui.statusbar.phone.CentralSurfaces;





/**

/**

 * Combined keyguard and notification panel view. Also holding backdrop and scrims.

 * Combined keyguard and notification panel view. Also holding backdrop and scrims.

 */

 */

public class NotificationShadeWindowView extends FrameLayout {

public class NotificationShadeWindowView extends FrameLayout {

    public static final String TAG = "NotificationShadeWindowView";

    public static final String TAG = "NotificationShadeWindowView";

    public static final boolean DEBUG = CentralSurfaces.DEBUG;





    private int mRightInset = 0;

    private int mRightInset = 0;

    private int mLeftInset = 0;

    private int mLeftInset = 0;
@@ -221,7 +221,7 @@ public class NotificationShadeWindowView extends FrameLayout { 
        }

        }

    }

    }





    class LayoutParams extends FrameLayout.LayoutParams {

    private static class LayoutParams extends FrameLayout.LayoutParams {





        public boolean ignoreRightInset;

        public boolean ignoreRightInset;
@@ -243,7 +243,7 @@ public class NotificationShadeWindowView extends FrameLayout { 
    public ActionMode startActionModeForChild(View originalView, ActionMode.Callback callback,

    public ActionMode startActionModeForChild(View originalView, ActionMode.Callback callback,

            int type) {

            int type) {

        if (type == ActionMode.TYPE_FLOATING) {

        if (type == ActionMode.TYPE_FLOATING) {

            return startActionMode(originalView, callback, type);

            return startActionMode(originalView, callback);

        }

        }

        return super.startActionModeForChild(originalView, callback, type);

        return super.startActionModeForChild(originalView, callback, type);

    }

    }
@@ -258,13 +258,9 @@ public class NotificationShadeWindowView extends FrameLayout { 
        final FloatingActionMode mode =

        final FloatingActionMode mode =

                new FloatingActionMode(mContext, callback, originatingView, mFloatingToolbar);

                new FloatingActionMode(mContext, callback, originatingView, mFloatingToolbar);

        mFloatingActionModeOriginatingView = originatingView;

        mFloatingActionModeOriginatingView = originatingView;

        mFloatingToolbarPreDrawListener =

        mFloatingToolbarPreDrawListener = () -> {

                new ViewTreeObserver.OnPreDrawListener() {

                    @Override

                    public boolean onPreDraw() {

            mode.updateViewLocationInWindow();

            mode.updateViewLocationInWindow();

            return true;

            return true;

                    }

        };

        };

        return mode;

        return mode;

    }

    }
@@ -292,10 +288,10 @@ public class NotificationShadeWindowView extends FrameLayout { 
    }

    }





    private ActionMode startActionMode(

    private ActionMode startActionMode(

            View originatingView, ActionMode.Callback callback, int type) {

            View originatingView, ActionMode.Callback callback) {

        ActionMode.Callback2 wrappedCallback = new ActionModeCallback2Wrapper(callback);

        ActionMode.Callback2 wrappedCallback = new ActionModeCallback2Wrapper(callback);

        ActionMode mode = createFloatingActionMode(originatingView, wrappedCallback);

        ActionMode mode = createFloatingActionMode(originatingView, wrappedCallback);

        if (mode != null && wrappedCallback.onCreateActionMode(mode, mode.getMenu())) {

        if (wrappedCallback.onCreateActionMode(mode, mode.getMenu())) {

            setHandledFloatingActionMode(mode);

            setHandledFloatingActionMode(mode);

        } else {

        } else {

            mode = null;

            mode = null;
@@ -382,7 +378,7 @@ public class NotificationShadeWindowView extends FrameLayout { 
    /**

    /**

     * Minimal window to satisfy FloatingToolbar.

     * Minimal window to satisfy FloatingToolbar.

     */

     */

    private Window mFakeWindow = new Window(mContext) {

    private final Window mFakeWindow = new Window(mContext) {

        @Override

        @Override

        public void takeSurface(SurfaceHolder.Callback2 callback) {

        public void takeSurface(SurfaceHolder.Callback2 callback) {

        }

        }

packages/SystemUI/src/com/android/systemui/shade/NotificationsQuickSettingsContainer.java

+2 −4
Original line number Original line Diff line number Diff line
@@ -48,13 +48,12 @@ public class NotificationsQuickSettingsContainer extends ConstraintLayout 
    private View mStackScroller;

    private View mStackScroller;

    private View mKeyguardStatusBar;

    private View mKeyguardStatusBar;





    private ArrayList<View> mDrawingOrderedChildren = new ArrayList<>();

    private final ArrayList<View> mDrawingOrderedChildren = new ArrayList<>();

    private ArrayList<View> mLayoutDrawingOrder = new ArrayList<>();

    private final ArrayList<View> mLayoutDrawingOrder = new ArrayList<>();

    private final Comparator<View> mIndexComparator = Comparator.comparingInt(this::indexOfChild);

    private final Comparator<View> mIndexComparator = Comparator.comparingInt(this::indexOfChild);

    private Consumer<WindowInsets> mInsetsChangedListener = insets -> {};

    private Consumer<WindowInsets> mInsetsChangedListener = insets -> {};

    private Consumer<QS> mQSFragmentAttachedListener = qs -> {};

    private Consumer<QS> mQSFragmentAttachedListener = qs -> {};

    private QS mQs;

    private QS mQs;

    private View mQSScrollView;

    private View mQSContainer;

    private View mQSContainer;





    @Nullable

    @Nullable
@@ -76,7 +75,6 @@ public class NotificationsQuickSettingsContainer extends ConstraintLayout 
    public void onFragmentViewCreated(String tag, Fragment fragment) {

    public void onFragmentViewCreated(String tag, Fragment fragment) {

        mQs = (QS) fragment;

        mQs = (QS) fragment;

        mQSFragmentAttachedListener.accept(mQs);

        mQSFragmentAttachedListener.accept(mQs);

        mQSScrollView = mQs.getView().findViewById(R.id.expanded_qs_scroll_view);

        mQSContainer = mQs.getView().findViewById(R.id.quick_settings_container);

        mQSContainer = mQs.getView().findViewById(R.id.quick_settings_container);

    }

    }

packages/SystemUI/src/com/android/systemui/shade/PanelView.java

+0 −4
Original line number Original line Diff line number Diff line
@@ -49,10 +49,6 @@ public abstract class PanelView extends FrameLayout { 
        super(context, attrs, defStyleAttr);

        super(context, attrs, defStyleAttr);

    }

    }





    public PanelView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {

        super(context, attrs, defStyleAttr, defStyleRes);

    }



    public void setOnTouchListener(PanelViewController.TouchHandler touchHandler) {

    public void setOnTouchListener(PanelViewController.TouchHandler touchHandler) {

        super.setOnTouchListener(touchHandler);

        super.setOnTouchListener(touchHandler);

        mTouchHandler = touchHandler;

        mTouchHandler = touchHandler;