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

Merge "Widget picker closes and reopens when switching orientation on phones when it's not necessary" into tm-qpr-dev am: 5c17f6b901

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

Change-Id: I8fd694a4a9cd1a4eca26cefbb9bf44e846760a09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Federico Baron
2023-03-03 01:45:46 +00:00
committed by Automerger Merge Worker
parent ccb06b0184 5c17f6b901
commit 30b5e78b3a
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
View File

@@ -201,6 +201,7 @@ public class WidgetsFullSheet extends BaseWidgetSheet
private TextView mHeaderTitle;
private FrameLayout mRightPane;
private WidgetsListTableViewHolderBinder mWidgetsListTableViewHolderBinder;
private DeviceProfile mDeviceProfile;
private final boolean mIsTwoPane;
private int mOrientation;
@@ -210,8 +211,10 @@ public class WidgetsFullSheet extends BaseWidgetSheet
public WidgetsFullSheet(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
DeviceProfile dp = Launcher.getLauncher(context).getDeviceProfile();
mIsTwoPane = dp.isTablet && dp.isLandscape && LARGE_SCREEN_WIDGET_PICKER.get();
mDeviceProfile = Launcher.getLauncher(context).getDeviceProfile();
mIsTwoPane = mDeviceProfile.isTablet
&& mDeviceProfile.isLandscape
&& LARGE_SCREEN_WIDGET_PICKER.get();
mHasWorkProfile = context.getSystemService(LauncherApps.class).getProfiles().size() > 1;
mAdapters.put(AdapterHolder.PRIMARY, new AdapterHolder(AdapterHolder.PRIMARY));
mAdapters.put(AdapterHolder.WORK, new AdapterHolder(AdapterHolder.WORK));
@@ -874,7 +877,9 @@ public class WidgetsFullSheet extends BaseWidgetSheet
}
// Checks the orientation of the screen
if (LARGE_SCREEN_WIDGET_PICKER.get() && mOrientation != newConfig.orientation) {
if (LARGE_SCREEN_WIDGET_PICKER.get()
&& mOrientation != newConfig.orientation
&& mDeviceProfile.isTablet) {
mOrientation = newConfig.orientation;
handleClose(false);
show(Launcher.getLauncher(getContext()), false);