From f709bd25d80627c6aff8e448a49ffd86fb2f3c95 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Mon, 14 Sep 2020 17:03:13 -0700
Subject: [PATCH] Fixing gradle build for SystemUI

Test: Verified build locally
Change-Id: If850fd6381f1453814653c4feec85059cf788598
---
 .../shell/onehanded/OneHandedController.java  | 51 ++++++++++---------
 .../media/dialog/MediaOutputBaseDialog.java   |  2 +-
 .../systemui/pip/phone/PipController.java     | 19 ++++++-
 3 files changed, 44 insertions(+), 28 deletions(-)

diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedController.java
index c84b4781d19d5..f4b4f374bdc59 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedController.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedController.java
@@ -194,32 +194,33 @@ public class OneHandedController implements OneHanded {
             mGestureHandler = null;
             mTimeoutHandler = null;
             mOverlayManager = null;
-            return;
+        } else {
+            mContext = context;
+            mDisplayAreaOrganizer = displayAreaOrganizer;
+            mDisplayController = displayController;
+            mTouchHandler = touchHandler;
+            mTutorialHandler = tutorialHandler;
+            mGestureHandler = gestureHandler;
+
+            mOverlayManager = IOverlayManager.Stub.asInterface(
+                    ServiceManager.getService(Context.OVERLAY_SERVICE));
+            mOffSetFraction = SystemProperties.getInt(ONE_HANDED_MODE_OFFSET_PERCENTAGE, 50)
+                    / 100.0f;
+            mIsOneHandedEnabled = OneHandedSettingsUtil.getSettingsOneHandedModeEnabled(
+                    context.getContentResolver());
+            mIsSwipeToNotificationEnabled =
+                    OneHandedSettingsUtil.getSettingsSwipeToNotificationEnabled(
+                            context.getContentResolver());
+            mTimeoutHandler = OneHandedTimeoutHandler.get();
+
+            mDisplayController.addDisplayChangingController(mRotationController);
+
+            setupCallback();
+            setupSettingObservers();
+            setupTimeoutListener();
+            setupGesturalOverlay();
+            updateSettings();
         }
-
-        mContext = context;
-        mDisplayAreaOrganizer = displayAreaOrganizer;
-        mDisplayController = displayController;
-        mTouchHandler = touchHandler;
-        mTutorialHandler = tutorialHandler;
-        mGestureHandler = gestureHandler;
-
-        mOverlayManager = IOverlayManager.Stub.asInterface(
-                ServiceManager.getService(Context.OVERLAY_SERVICE));
-        mOffSetFraction = SystemProperties.getInt(ONE_HANDED_MODE_OFFSET_PERCENTAGE, 50) / 100.0f;
-        mIsOneHandedEnabled = OneHandedSettingsUtil.getSettingsOneHandedModeEnabled(
-                context.getContentResolver());
-        mIsSwipeToNotificationEnabled = OneHandedSettingsUtil.getSettingsSwipeToNotificationEnabled(
-                context.getContentResolver());
-        mTimeoutHandler = OneHandedTimeoutHandler.get();
-
-        mDisplayController.addDisplayChangingController(mRotationController);
-
-        setupCallback();
-        setupSettingObservers();
-        setupTimeoutListener();
-        setupGesturalOverlay();
-        updateSettings();
     }
 
     /**
diff --git a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseDialog.java b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseDialog.java
index 781bf8d74d88a..f8f4f4df58bca 100644
--- a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseDialog.java
+++ b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseDialog.java
@@ -43,7 +43,7 @@ import androidx.core.graphics.drawable.IconCompat;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.android.settingslib.R;
+import com.android.systemui.R;
 import com.android.systemui.statusbar.phone.SystemUIDialog;
 
 /**
diff --git a/packages/SystemUI/src/com/android/systemui/pip/phone/PipController.java b/packages/SystemUI/src/com/android/systemui/pip/phone/PipController.java
index 4f225e2f95902..5bb179484e5d9 100644
--- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipController.java
+++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipController.java
@@ -280,10 +280,25 @@ public class PipController implements Pip, PipTaskOrganizer.PipTransitionCallbac
 
         PackageManager pm = context.getPackageManager();
         boolean supportsPip = pm.hasSystemFeature(FEATURE_PICTURE_IN_PICTURE);
-        if (!supportsPip) {
+        if (supportsPip) {
+            initController(context, broadcastDispatcher, configController, deviceConfig,
+                    displayController, floatingContentCoordinator, sysUiState, pipBoundsHandler,
+                    pipSurfaceTransactionHelper, pipTaskOrganizer, pipUiEventLogger);
+        } else {
             Log.w(TAG, "Device not support PIP feature");
-            return;
         }
+    }
+
+    private void initController(Context context, BroadcastDispatcher broadcastDispatcher,
+            ConfigurationController configController,
+            DeviceConfigProxy deviceConfig,
+            DisplayController displayController,
+            FloatingContentCoordinator floatingContentCoordinator,
+            SysUiState sysUiState,
+            PipBoundsHandler pipBoundsHandler,
+            PipSurfaceTransactionHelper pipSurfaceTransactionHelper,
+            PipTaskOrganizer pipTaskOrganizer,
+            PipUiEventLogger pipUiEventLogger) {
 
         // Ensure that we are the primary user's SystemUI.
         final int processUser = UserManager.get(context).getUserHandle();