fix: Conflict incoming changes from 15-dev

systemUI/plugin/src/com/android/systemui/plugins/ActivityStarter.java

@@ -177,6 +177,13 @@ public interface ActivityStarter {
             boolean dismissShade,
             @Nullable String customMessage);
 
+    /** Starts an activity and dismisses keyguard. */
+    void startActivityDismissingKeyguard(Intent intent,
+            boolean onlyProvisioned,
+            boolean dismissShade,
+            @Nullable String customMessage,
+            Callback callback);
+
     /** Starts an activity and dismisses keyguard. */
     void startActivityDismissingKeyguard(Intent intent,
             boolean onlyProvisioned,

systemUI/plugin/src/com/android/systemui/plugins/NavigationEdgeBackPlugin.java

@@ -36,9 +36,6 @@ public interface NavigationEdgeBackPlugin extends Plugin {
     /** Specifies if the UI should be rendered on the left side of the screen. */
     void setIsLeftPanel(boolean isLeftPanel);
 
-    /** Sets the insets for the gesture handling area. */
-    void setInsets(int leftInset, int rightInset);
-
     /** Sets the display size. */
     void setDisplaySize(Point displaySize);
 
@@ -52,7 +49,7 @@ public interface NavigationEdgeBackPlugin extends Plugin {
     void onMotionEvent(MotionEvent motionEvent);
 
     /** Dumps info about the back gesture plugin. */
-    void dump(PrintWriter pw);
+    void dump(String prefix, PrintWriter pw);
 
     /** Callback to let the system react to the detected back gestures. */
     interface BackCallback {

systemUI/plugin/src/com/android/systemui/plugins/VolumeDialogController.java

@@ -41,8 +41,8 @@ import com.android.systemui.plugins.annotations.ProvidesInterface;
 public interface VolumeDialogController {
     int VERSION = 1;
 
-    void setActiveStream(int stream);
-    void setStreamVolume(int stream, int userLevel);
+    void setActiveStream(int stream, boolean sync);
+    void setStreamVolume(int stream, int userLevel, boolean sync);
     void setRingerMode(int ringerModeNormal, boolean external);
 
     boolean hasVibrator();

systemUI/plugin/src/com/android/systemui/plugins/qs/QS.java

@@ -203,6 +203,12 @@ public interface QS extends FragmentBase {
      */
     void setIsNotificationPanelFullWidth(boolean isFullWidth);
 
+    default void setPanelExpanded(boolean panelExpanded) {}
+
+    default void setQqsHeightListener(QqsHeightListener listener) {}
+
+    default void setQSContentPaddingBottom(int padding) {}
+
     /**
      * Callback for when QSPanel container is scrolled
      */
@@ -218,4 +224,10 @@ public interface QS extends FragmentBase {
         void onQsHeightChanged();
     }
 
+    @ProvidesInterface(version = HeightListener.VERSION)
+    interface QqsHeightListener {
+        int VERSION = 1;
+        void onQqsHeightChanged();
+    }
+
 }

systemUI/plugin/src/com/android/systemui/plugins/statusbar/NotificationMenuRowPlugin.java

@@ -17,7 +17,6 @@ package com.android.systemui.plugins.statusbar;
 import android.annotation.Nullable;
 import android.content.Context;
 import android.graphics.Point;
-import android.service.notification.StatusBarNotification;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
@@ -59,9 +58,22 @@ public interface NotificationMenuRowPlugin extends Plugin {
 
         public View getMenuView();
 
-        public View getGutsView();
+        /**
+         * The guts content that provides the [View] to be displayed.
+         *
+         * @return Object of type [NotificationGuts.GutsContent]. The interface is not known in this
+         *          module, therefore only the implementation returns the proper type.
+         */
+        Object getGutsContent();
 
         public String getContentDescription();
+
+        /**
+         * Set the name of the app for this menuitem.
+         *
+         * @param appName App name.
+         */
+        void setAppName(String appName);
     }
 
     /**