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

Allow restore between TYPE_PHONE AND TYPE_MULTI_DISPLAY

Browse Source 
Bug: 199407109
Test: manual
Change-Id: I6eb982a79f4130925a9d7e0972faf0f01a6aac20
This commit is contained in:
Alex Chau
2021-09-09 18:24:51 +01:00
parent 9874b5d68b
commit fef4d0e081
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,6 +28,7 @@ import android.text.TextUtils;
import com.android.launcher3.InvariantDeviceProfile;
import com.android.launcher3.Utilities;
import com.android.launcher3.logging.StatsLogManager.LauncherEvent;
import com.android.launcher3.util.IntSet;
import java.util.Locale;
import java.util.Objects;
@@ -44,6 +45,7 @@ public class DeviceGridState {
public static final int TYPE_PHONE = 0;
public static final int TYPE_MULTI_DISPLAY = 1;
public static final int TYPE_TABLET = 2;
public static final IntSet COMPATIBLE_TYPES = IntSet.wrap(TYPE_PHONE, TYPE_MULTI_DISPLAY);
private final String mGridSizeString;
private final int mNumHotseat;
@@ -109,7 +111,9 @@ public class DeviceGridState {
if (o == null || getClass() != o.getClass()) return false;
DeviceGridState that = (DeviceGridState) o;
return mNumHotseat == that.mNumHotseat
&& mDeviceType == that.mDeviceType
&& (mDeviceType == that.mDeviceType
|| (COMPATIBLE_TYPES.contains(mDeviceType)
&& COMPATIBLE_TYPES.contains(that.mDeviceType)))
&& Objects.equals(mGridSizeString, that.mGridSizeString);
}
}