PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add split placeholder view above OverviewScrim" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-04-06 02:34:19 +00:00
committed by Android (Google) Code Review
parent 2e0eee4d63 e3f7d0d1b4
commit e77fc9cc25
8 changed files with 34 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/graphics/OverviewScrim.java
+7
View File
@@ -66,6 +66,13 @@ public class OverviewScrim extends Scrim {
mStableScrimmedView = mCurrentScrimmedView = mLauncher.getOverviewPanel();
}
/**
* @param view The view we want the scrim to be behind
*/
public void updateStableScrimmedView(View view) {
mStableScrimmedView = view;
}
public void updateCurrentScrimmedView(ViewGroup root) {
// Find the lowest view that is at or above the view we want to show the scrim behind.
mCurrentScrimmedView = mStableScrimmedView;
src/com/android/launcher3/touch/LandscapePagedViewHandler.java
+3 -9
View File
@@ -24,7 +24,6 @@ import static com.android.launcher3.touch.SingleAxisSwipeDetector.HORIZONTAL;
import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_BOTTOM_OR_RIGHT;
import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_TOP_OR_LEFT;
import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_TYPE_MAIN;
import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_TYPE_SIDE;
import android.content.res.Resources;
import android.graphics.PointF;
@@ -45,7 +44,7 @@ import com.android.launcher3.Utilities;
import com.android.launcher3.util.OverScroller;
import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
public class LandscapePagedViewHandler implements PagedOrientationHandler {
@@ -308,15 +307,10 @@ public class LandscapePagedViewHandler implements PagedOrientationHandler {
@Override
public List<SplitPositionOption> getSplitPositionOptions(DeviceProfile dp) {
List<SplitPositionOption> options = new ArrayList<>(2);
// Add left/right options where left => position top, right => position bottom
options.add(new SplitPositionOption(
// Add "left" side of phone which is actually the top
return Collections.singletonList(new SplitPositionOption(
R.drawable.ic_split_screen, R.string.split_screen_position_left,
STAGE_POSITION_TOP_OR_LEFT, STAGE_TYPE_MAIN));
options.add(new SplitPositionOption(
R.drawable.ic_split_screen, R.string.split_screen_position_right,
STAGE_POSITION_BOTTOM_OR_RIGHT, STAGE_TYPE_SIDE));
return options;
}
@Override
src/com/android/launcher3/touch/PortraitPagedViewHandler.java
+6 -5
View File
@@ -306,16 +306,17 @@ public class PortraitPagedViewHandler implements PagedOrientationHandler {
@Override
public List<SplitPositionOption> getSplitPositionOptions(DeviceProfile dp) {
List<SplitPositionOption> options = new ArrayList<>(2);
List<SplitPositionOption> options = new ArrayList<>(1);
// TODO: Add in correct icons
if (dp.isLandscape) { // or seascape
if (dp.isSeascape()) { // or seascape
// Add left/right options
options.add(new SplitPositionOption(
R.drawable.ic_split_screen, R.string.split_screen_position_right,
STAGE_POSITION_TOP_OR_LEFT, STAGE_TYPE_MAIN));
} else if (dp.isLandscape) {
options.add(new SplitPositionOption(
R.drawable.ic_split_screen, R.string.split_screen_position_left,
STAGE_POSITION_TOP_OR_LEFT, STAGE_TYPE_MAIN));
options.add(new SplitPositionOption(
R.drawable.ic_split_screen, R.string.split_screen_position_right,
STAGE_POSITION_BOTTOM_OR_RIGHT, STAGE_TYPE_SIDE));
} else {
// Only add top option
options.add(new SplitPositionOption(
src/com/android/launcher3/touch/SeascapePagedViewHandler.java
+3 -9
View File
@@ -20,7 +20,6 @@ import static com.android.launcher3.touch.SingleAxisSwipeDetector.HORIZONTAL;
import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_BOTTOM_OR_RIGHT;
import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_TOP_OR_LEFT;
import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_TYPE_MAIN;
import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_TYPE_SIDE;
import android.content.res.Resources;
import android.graphics.PointF;
@@ -33,7 +32,7 @@ import com.android.launcher3.R;
import com.android.launcher3.Utilities;
import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
public class SeascapePagedViewHandler extends LandscapePagedViewHandler {
@@ -96,15 +95,10 @@ public class SeascapePagedViewHandler extends LandscapePagedViewHandler {
@Override
public List<SplitPositionOption> getSplitPositionOptions(DeviceProfile dp) {
List<SplitPositionOption> options = new ArrayList<>(2);
// Add left/right options where left => position bottom, right => position top
options.add(new SplitPositionOption(
R.drawable.ic_split_screen, R.string.split_screen_position_left,
STAGE_POSITION_BOTTOM_OR_RIGHT, STAGE_TYPE_SIDE));
options.add(new SplitPositionOption(
// Add "right" option which is actually the top
return Collections.singletonList(new SplitPositionOption(
R.drawable.ic_split_screen, R.string.split_screen_position_right,
STAGE_POSITION_TOP_OR_LEFT, STAGE_TYPE_MAIN));
return options;
}
/* ---------- The following are only used by TaskViewTouchHandler. ---------- */