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

Commit 824fcb3a authored by Adam Cohen's avatar Adam Cohen
Browse files

Revert "Debugging wallpaper stuff on production device (to be reverted once built)"

This reverts commit f8dc557c.

Change-Id: I2a2ce9a067ec6df829eb23997661bb090daa64ff
parent f8dc557c
Loading
Loading
Loading
Loading
+0 −4
Original line number Diff line number Diff line
@@ -2490,15 +2490,11 @@ public class Launcher extends Activity
     */
    protected void onClickAllAppsButton(View v) {
        if (LOGD) Log.d(TAG, "onClickAllAppsButton");

        mWorkspace.setWallpaperDimension();
        /*
        if (isAllAppsVisible()) {
            showWorkspace(true);
        } else {
            showAllApps(true, AppsCustomizePagedView.ContentType.Applications, false);
        }
        */
    }

    /**
+3 −3
Original line number Diff line number Diff line
@@ -460,7 +460,7 @@ public class Workspace extends SmoothPagedView
        mFlingThresholdVelocity = (int) (FLING_THRESHOLD_VELOCITY * mDensity);

        // Set the wallpaper dimensions when Launcher starts up
        //setWallpaperDimension();
        setWallpaperDimension();
    }

    private void setupLayoutTransition() {
@@ -1269,7 +1269,7 @@ public class Workspace extends SmoothPagedView
        return mCustomContentCallbacks;
    }

    public void setWallpaperDimension() {
    protected void setWallpaperDimension() {
        new AsyncTask<Void, Void, Void>() {
            public Void doInBackground(Void ... args) {
                String spKey = WallpaperCropActivity.getSharedPreferencesKey();
@@ -1764,7 +1764,7 @@ public class Workspace extends SmoothPagedView
        // Update wallpaper dimensions if they were changed since last onResume
        // (we also always set the wallpaper dimensions in the constructor)
        if (LauncherAppState.getInstance().hasWallpaperChangedSinceLastCheck()) {
            //setWallpaperDimension();
            setWallpaperDimension();
        }
        mWallpaperIsLiveWallpaper = mWallpaperManager.getWallpaperInfo() != null;
        // Force the wallpaper offset steps to be set again, because another app might have changed