Code cleanup from rebase

Bug: 195423591
Change-Id: I623d6ef46458a282e3c63cde0bdc457cb38e4d50
This commit is contained in:
Vinit Nayak
2021-08-27 16:28:12 -07:00
parent 50c19490df
commit cdcaf7a2ed
4 changed files with 0 additions and 77 deletions

View File

@@ -170,20 +170,11 @@ public class LandscapePagedViewHandler implements PagedOrientationHandler {
DeviceProfile dp) {
// Don't use device profile here because we know we're in fake landscape, only split option
// available is top/left
//<<<<<<< HEAD
// if (splitPosition.stagePosition == STAGE_POSITION_TOP_OR_LEFT) {
// // Top (visually left) side
// return SPLIT_TRANSLATE_PRIMARY_NEGATIVE;
// }
// throw new IllegalStateException("Invalid split stage position: " +
// splitPosition.stagePosition);
//=======
if (stagePosition == STAGE_POSITION_TOP_OR_LEFT) {
// Top (visually left) side
return SPLIT_TRANSLATE_PRIMARY_NEGATIVE;
}
throw new IllegalStateException("Invalid split stage position: " + stagePosition);
//>>>>>>> f6769c8532 (Add Split button in OverviewActions)
}
@Override
@@ -394,7 +385,6 @@ public class LandscapePagedViewHandler implements PagedOrientationHandler {
}
@Override
//<<<<<<< HEAD
public void setSplitTaskSwipeRect(DeviceProfile dp, Rect outRect,
SplitConfigurationOptions.StagedSplitBounds splitInfo, int desiredStagePosition) {
float diff;
@@ -435,11 +425,9 @@ public class LandscapePagedViewHandler implements PagedOrientationHandler {
mSnapshotView2.setTranslationY(primaryLp.height + spaceAboveSnapshot + dividerBar);
}
//=======
@Override
public int getDefaultSplitPosition(DeviceProfile deviceProfile) {
throw new IllegalStateException("Default position not available in fake landscape");
//>>>>>>> f6769c8532 (Add Split button in OverviewActions)
}
@Override