aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-28 15:56:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Unify split options into single option" into tm-qpr-dev am: 6fa1ab9441 am: 4e1c1faa37

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21074650

Change-Id: If7bdd0fe1a72d5e321933eb566e58f20fbfefcf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Vinit Nayak
2023-02-03 07:09:18 +00:00
committed by Automerger Merge Worker
parent 8c373e6f3b 4e1c1faa37
commit a15f39bc6d
13 changed files with 69 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/com/android/launcher3/Utilities.java
View File

@@ -89,7 +89,7 @@ import com.android.launcher3.views.BaseDragLayer;
import com.android.launcher3.widget.PendingAddShortcutInfo;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.regex.Matcher;
@@ -697,37 +697,16 @@ public final class Utilities {
/**
* Returns a list of screen-splitting options depending on the device orientation (split top for
* portrait, split left for landscape, split left and right for landscape tablets, etc.)
* portrait, split right for landscape)
*/
public static List<SplitPositionOption> getSplitPositionOptions(
DeviceProfile dp) {
List<SplitPositionOption> options = new ArrayList<>();
// Add both left and right options if we're in tablet mode
if (dp.isTablet && dp.isLandscape) {
options.add(new SplitPositionOption(
R.drawable.ic_split_left, R.string.split_screen_position_left,
STAGE_POSITION_TOP_OR_LEFT, STAGE_TYPE_MAIN));
options.add(new SplitPositionOption(
R.drawable.ic_split_right, R.string.split_screen_position_right,
STAGE_POSITION_BOTTOM_OR_RIGHT, STAGE_TYPE_MAIN));
} else {
if (dp.isSeascape()) {
// Add left/right options
options.add(new SplitPositionOption(
R.drawable.ic_split_right, R.string.split_screen_position_right,
STAGE_POSITION_BOTTOM_OR_RIGHT, STAGE_TYPE_MAIN));
} else if (dp.isLandscape) {
options.add(new SplitPositionOption(
R.drawable.ic_split_left, R.string.split_screen_position_left,
STAGE_POSITION_TOP_OR_LEFT, STAGE_TYPE_MAIN));
} else {
// Only add top option
options.add(new SplitPositionOption(
R.drawable.ic_split_top, R.string.split_screen_position_top,
STAGE_POSITION_TOP_OR_LEFT, STAGE_TYPE_MAIN));
}
}
return options;
return Collections.singletonList(new SplitPositionOption(
dp.isLandscape ? R.drawable.ic_split_horizontal : R.drawable.ic_split_vertical,
R.string.recent_task_option_split_screen,
dp.isLandscape ? STAGE_POSITION_BOTTOM_OR_RIGHT : STAGE_POSITION_TOP_OR_LEFT,
STAGE_TYPE_MAIN
));
}
public static boolean isTrackpadMotionEvent(MotionEvent event) {