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

Commit 533b937f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix errorprone warnings that should be errors" am: 35157974 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2254242



Change-Id: I6b47e8706afe05f5fdac403e79c87a533fbcc2c8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6b07d27b 35157974

quickstep/src/com/android/launcher3/QuickstepTransitionManager.java

+1 −1
Original line number Diff line number Diff line
@@ -993,7 +993,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener 
                mAppWindowScale = widgetBackgroundBounds.width() / windowTargetBounds.width();

                // Crop scaled app window to match widget

                appWindowCrop.set(0 /* left */, 0 /* top */,

                        Math.round(windowTargetBounds.width()) /* right */,

                        windowTargetBounds.width() /* right */,

                        Math.round(widgetBackgroundBounds.height() / mAppWindowScale) /* bottom */);

                matrix.setTranslate(widgetBackgroundBounds.left, widgetBackgroundBounds.top);

                matrix.postScale(mAppWindowScale, mAppWindowScale, widgetBackgroundBounds.left,

quickstep/src/com/android/launcher3/taskbar/DesktopTaskbarUIController.java

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ public class DesktopTaskbarUIController extends TaskbarUIController { 
        mLauncher = launcher;

    }



    @SuppressWarnings("MissingSuperCall") // TODO: Fix me

    @Override

    protected void init(TaskbarControllers taskbarControllers) {

        super.init(taskbarControllers);
@@ -37,6 +38,7 @@ public class DesktopTaskbarUIController extends TaskbarUIController { 
        mControllers.taskbarViewController.updateRunningApps();

    }



    @SuppressWarnings("MissingSuperCall") // TODO: Fix me

    @Override

    protected void onDestroy() {

        super.onDestroy();

src/com/android/launcher3/LauncherFiles.java

+8 −5
Original line number Diff line number Diff line
@@ -47,9 +47,12 @@ public class LauncherFiles { 
            DEVICE_PREFERENCES_KEY + XML,

            APP_ICONS_DB));



    public static final List<String> ALL_FILES = Collections.unmodifiableList(

            new ArrayList<String>() {{

                addAll(GRID_DB_FILES);

                addAll(OTHER_FILES);

            }});

    private static List<String> createAllFiles() {

        ArrayList<String> result = new ArrayList<>();

        result.addAll(GRID_DB_FILES);

        result.addAll(OTHER_FILES);

        return Collections.unmodifiableList(result);

    }



    public static final List<String> ALL_FILES = createAllFiles();

}

src/com/android/launcher3/PagedView.java

+1 −1
Original line number Diff line number Diff line
@@ -1607,7 +1607,7 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou 
    }



    private int getDisplacementFromScreenCenter(int childIndex, int screenCenter) {

        int childSize = Math.round(getChildVisibleSize(childIndex));

        int childSize = getChildVisibleSize(childIndex);

        int halfChildSize = (childSize / 2);

        int childCenter = getChildOffset(childIndex) + halfChildSize;

        return childCenter - screenCenter;