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

Commit 3a8a8f7c authored by Selim Cinek's avatar Selim Cinek Committed by Jorim Jaggi
Browse files

Disable wallpaper in -1 space in GEL and hack around window animations

Bug: 12978354

Change-Id: I8b5602ae434a9151b40d41defb891db1ad78ce81
parent 497ecbd3
Loading
Loading
Loading
Loading
+5 −4
Original line number Diff line number Diff line
@@ -1011,7 +1011,7 @@ public class Launcher extends Activity
            // It is also poassible that onShow will instead be called slightly after first layout
            // if PagedView#setRestorePage was set to the custom content page in onCreate().
            if (mWorkspace.isOnOrMovingToCustomContent()) {
                mWorkspace.getCustomContentCallbacks().onShow();
                mWorkspace.getCustomContentCallbacks().onShow(true);
            }
        }
        mWorkspace.updateInteractionForState();
@@ -1055,8 +1055,9 @@ public class Launcher extends Activity
    }

    public interface CustomContentCallbacks {
        // Custom content is completely shown
        public void onShow();
        // Custom content is completely shown. {@code fromResume} indicates whether this was caused
        // by a onResume or by scrolling otherwise.
        public void onShow(boolean fromResume);

        // Custom content is completely hidden
        public void onHide();
@@ -2927,7 +2928,7 @@ public class Launcher extends Activity
                mWorkspaceBackgroundDrawable : null);
    }

    void updateWallpaperVisibility(boolean visible) {
    protected void changeWallpaperVisiblity(boolean visible) {
        int wpflags = visible ? WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER : 0;
        int curflags = getWindow().getAttributes().flags
                & WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER;
+1 −1
Original line number Diff line number Diff line
@@ -1215,7 +1215,7 @@ public class Workspace extends SmoothPagedView
        if (hasCustomContent() && getNextPage() == 0 && !mCustomContentShowing) {
            mCustomContentShowing = true;
            if (mCustomContentCallbacks != null) {
                mCustomContentCallbacks.onShow();
                mCustomContentCallbacks.onShow(false);
                mCustomContentShowTime = System.currentTimeMillis();
                mLauncher.updateVoiceButtonProxyVisible(false);
            }