Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c17f6b9 authored by Federico Baron's avatar Federico Baron Committed by Android (Google) Code Review
Browse files

Merge "Widget picker closes and reopens when switching orientation on phones... 

Merge "Widget picker closes and reopens when switching orientation on phones when it's not necessary" into tm-qpr-dev
parents 30425b18 b25d7588

src/com/android/launcher3/widget/picker/WidgetsFullSheet.java

+8 −3
Original line number Original line Diff line number Diff line
@@ -201,6 +201,7 @@ public class WidgetsFullSheet extends BaseWidgetSheet 
    private TextView mHeaderTitle;

    private TextView mHeaderTitle;

    private FrameLayout mRightPane;

    private FrameLayout mRightPane;

    private WidgetsListTableViewHolderBinder mWidgetsListTableViewHolderBinder;

    private WidgetsListTableViewHolderBinder mWidgetsListTableViewHolderBinder;

    private DeviceProfile mDeviceProfile;

    private final boolean mIsTwoPane;

    private final boolean mIsTwoPane;





    private int mOrientation;

    private int mOrientation;
@@ -210,8 +211,10 @@ public class WidgetsFullSheet extends BaseWidgetSheet 




    public WidgetsFullSheet(Context context, AttributeSet attrs, int defStyleAttr) {

    public WidgetsFullSheet(Context context, AttributeSet attrs, int defStyleAttr) {

        super(context, attrs, defStyleAttr);

        super(context, attrs, defStyleAttr);

        DeviceProfile dp = Launcher.getLauncher(context).getDeviceProfile();

        mDeviceProfile = Launcher.getLauncher(context).getDeviceProfile();

        mIsTwoPane = dp.isTablet && dp.isLandscape && LARGE_SCREEN_WIDGET_PICKER.get();

        mIsTwoPane = mDeviceProfile.isTablet

                && mDeviceProfile.isLandscape

                && LARGE_SCREEN_WIDGET_PICKER.get();

        mHasWorkProfile = context.getSystemService(LauncherApps.class).getProfiles().size() > 1;

        mHasWorkProfile = context.getSystemService(LauncherApps.class).getProfiles().size() > 1;

        mAdapters.put(AdapterHolder.PRIMARY, new AdapterHolder(AdapterHolder.PRIMARY));

        mAdapters.put(AdapterHolder.PRIMARY, new AdapterHolder(AdapterHolder.PRIMARY));

        mAdapters.put(AdapterHolder.WORK, new AdapterHolder(AdapterHolder.WORK));

        mAdapters.put(AdapterHolder.WORK, new AdapterHolder(AdapterHolder.WORK));
@@ -874,7 +877,9 @@ public class WidgetsFullSheet extends BaseWidgetSheet 
        }

        }





        // Checks the orientation of the screen

        // 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;

            mOrientation = newConfig.orientation;

            handleClose(false);

            handleClose(false);

            show(Launcher.getLauncher(getContext()), false);

            show(Launcher.getLauncher(getContext()), false);