aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-04 01:46:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Create new logic for grid migration

Browse Source 
Fixes 217564863
Test: manual, changing grids from Wallpaper & Style and checking against spec

Change-Id: I94cf77111b37810282527f1a212b6e4126d3eba1
This commit is contained in:
Thales Lima
2022-02-10 13:45:02 +00:00
parent e424f57dcb
commit 0a7ff8780f
5 changed files with 552 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/com/android/launcher3/model/DeviceGridState.java
View File

@@ -38,7 +38,7 @@ import java.util.Objects;
/**
* Utility class representing persisted grid properties.
*/
public class DeviceGridState {
public class DeviceGridState implements Comparable<DeviceGridState> {
public static final String KEY_WORKSPACE_SIZE = "migration_src_workspace_size";
public static final String KEY_HOTSEAT_COUNT = "migration_src_hotseat_count";
@@ -84,16 +84,16 @@ public class DeviceGridState {
*/
public LauncherEvent getWorkspaceSizeEvent() {
if (!TextUtils.isEmpty(mGridSizeString)) {
switch (mGridSizeString.charAt(0)) {
case '6':
switch (getColumns()) {
case 6:
return LAUNCHER_GRID_SIZE_6;
case '5':
case 5:
return LAUNCHER_GRID_SIZE_5;
case '4':
case 4:
return LAUNCHER_GRID_SIZE_4;
case '3':
case 3:
return LAUNCHER_GRID_SIZE_3;
case '2':
case 2:
return LAUNCHER_GRID_SIZE_2;
}
}
@@ -119,4 +119,21 @@ public class DeviceGridState {
return mNumHotseat == other.mNumHotseat
&& Objects.equals(mGridSizeString, other.mGridSizeString);
}
public Integer getColumns() {
return Integer.parseInt(String.valueOf(mGridSizeString.charAt(0)));
}
public Integer getRows() {
return Integer.parseInt(String.valueOf(mGridSizeString.charAt(2)));
}
@Override
public int compareTo(DeviceGridState other) {
Integer size = getColumns() * getRows();
Integer otherSize = other.getColumns() * other.getRows();
return size.compareTo(otherSize);
}
}