PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix errorprone warnings that should be errors" am: 35157974d4 am: 533b937fd3 am: 14946c1fa3

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

Change-Id: Id765742b2e4767888137a01116f2bad1bba859a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-10-20 23:32:40 +00:00
committed by Automerger Merge Worker
parent eba71a1c8f 14946c1fa3
commit 5f65096bfe
4 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/LauncherFiles.java
+8 -5
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();
}
src/com/android/launcher3/PagedView.java
+1 -1
View File
@@ -1614,7 +1614,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;