Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing gradle build for SystemUI

Browse Source 
Test: Verified build locally
Change-Id: If850fd6381f1453814653c4feec85059cf788598
This commit is contained in:
Sunny Goyal
2020-09-14 17:03:13 -07:00
parent b461a4f3da
commit f709bd25d8
3 changed files with 44 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedController.java
View File

@@ -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();
}
/**

2
packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseDialog.java
View File

@@ -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;
/**

19
packages/SystemUI/src/com/android/systemui/pip/phone/PipController.java
View File

@@ -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();