commit 533b937fd334f3c48447f9e22a989dfa23fff785
author Treehugger Robot <treehugger-gerrit@google.com> Thu Oct 20 22:45:27 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Oct 20 22:45:27 2022 +0000
tree ed17d66c4d44cc4f0f3a95f64fafb6294677e87c
parent 6b07d27bbf3523b0592bae77a2ec1edb1a781a85
parent 35157974d49e70f03687edb9408e5897d04ff845

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

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

Change-Id: I6b47e8706afe05f5fdac403e79c87a533fbcc2c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
index 9a1ed4d..2d6b6c3 100644
--- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
+++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
@@ -993,7 +993,7 @@
                 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

diff --git a/quickstep/src/com/android/launcher3/taskbar/DesktopTaskbarUIController.java b/quickstep/src/com/android/launcher3/taskbar/DesktopTaskbarUIController.java
index 9393b0f..633325b 100644
--- a/quickstep/src/com/android/launcher3/taskbar/DesktopTaskbarUIController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/DesktopTaskbarUIController.java
@@ -30,6 +30,7 @@
         mLauncher = launcher;
     }
 
+    @SuppressWarnings("MissingSuperCall") // TODO: Fix me
     @Override
     protected void init(TaskbarControllers taskbarControllers) {
         super.init(taskbarControllers);
@@ -37,6 +38,7 @@
         mControllers.taskbarViewController.updateRunningApps();
     }
 
+    @SuppressWarnings("MissingSuperCall") // TODO: Fix me
     @Override
     protected void onDestroy() {
         super.onDestroy();

src/com/android/launcher3/LauncherFiles.java

diff --git a/src/com/android/launcher3/LauncherFiles.java b/src/com/android/launcher3/LauncherFiles.java
index e59eac8..d730cea 100644
--- a/src/com/android/launcher3/LauncherFiles.java
+++ b/src/com/android/launcher3/LauncherFiles.java
@@ -47,9 +47,12 @@
             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

diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index 68c54c7..1c77025 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -1607,7 +1607,7 @@
     }
 
     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;