aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-18 18:28:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Treehugger Robot
2022-10-20 22:45:27 +00:00
committed by Automerger Merge Worker
parent 6b07d27bbf 35157974d4
commit 533b937fd3
4 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
View File

@@ -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,

2
quickstep/src/com/android/launcher3/taskbar/DesktopTaskbarUIController.java
View File

@@ -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();

13
src/com/android/launcher3/LauncherFiles.java
View File

@@ -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();
}

2
src/com/android/launcher3/PagedView.java
View File

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