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

Merge "add kotlin support for launcher" into sc-v2-dev am: 33f9de0225

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

Change-Id: I9fc3755ff0755512c871e64a632d553b61a65041
This commit is contained in:
Thales Lima
2021-11-01 16:37:38 +00:00
committed by Automerger Merge Worker
parent e8dd2e16b8 33f9de0225
commit 997bee0c73
5 changed files with 35 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Android.bp
View File

@@ -152,9 +152,13 @@ android_app {
],
srcs: [
"src/**/*.java",
"src/**/*.kt",
"src_shortcuts_overrides/**/*.java",
"src_shortcuts_overrides/**/*.kt",
"src_ui_overrides/**/*.java",
"src_ui_overrides/**/*.kt",
"ext_tests/src/**/*.java",
"ext_tests/src/**/*.kt",
],
resource_dirs: [
"ext_tests/res",
@@ -211,7 +215,10 @@ android_library {
// Source code used for test helpers
filegroup {
name: "launcher-src-ext-tests",
srcs: ["ext_tests/src/**/*.java"],
srcs: [
"ext_tests/src/**/*.java",
"ext_tests/src/**/*.kt",
],
}
// Common source files used to build launcher
@@ -219,8 +226,11 @@ filegroup {
name: "launcher-src-no-build-config",
srcs: [
"src/**/*.java",
"src/**/*.kt",
"src_shortcuts_overrides/**/*.java",
"src_shortcuts_overrides/**/*.kt",
"quickstep/src/**/*.java",
"quickstep/src/**/*.kt",
],
}
@@ -235,9 +245,13 @@ android_library {
name: "LauncherGoResLib",
srcs: [
"src/**/*.java",
"src/**/*.kt",
"quickstep/src/**/*.java",
"quickstep/src/**/*.kt",
"go/src/**/*.java",
"go/src/**/*.kt",
"go/quickstep/src/**/*.java",
"go/quickstep/src/**/*.kt",
],
resource_dirs: [
"go/res",

2
Android.mk
View File

@@ -105,7 +105,7 @@ else
LOCAL_SDK_VERSION := system_current
LOCAL_MIN_SDK_VERSION := 26
endif
LOCAL_STATIC_ANDROID_LIBRARIES := Launcher3CommonDepsLib
LOCAL_STATIC_ANDROID_LIBRARIES := LauncherGoResLib
LOCAL_SRC_FILES := \
$(call all-java-files-under, src) \

3
quickstep/src/com/android/quickstep/util/TaskKeyLruCache.java
View File

@@ -20,6 +20,7 @@ import android.util.Log;
import com.android.systemui.shared.recents.model.Task.TaskKey;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.function.Predicate;
/**
@@ -117,7 +118,7 @@ public class TaskKeyLruCache<V> {
}
@Override
protected boolean removeEldestEntry(Entry<Integer, TaskKeyLruCache.Entry<V>> eldest) {
protected boolean removeEldestEntry(Map.Entry<Integer, TaskKeyLruCache.Entry<V>> eldest) {
return size() > mMaxSize;
}
}

14
quickstep/src/com/android/quickstep/views/TaskMenuViewWithArrow.kt Normal file
View File

@@ -0,0 +1,14 @@
package com.android.quickstep.views
import android.util.Log
// TODO(http://b/193432925)
class TaskMenuViewWithArrow {
companion object {
const val TAG = "TaskMenuViewWithArrow"
fun logSomething() {
Log.d(TAG, "It worked!")
}
}
}

3
quickstep/src/com/android/quickstep/views/TaskView.java
View File

@@ -115,6 +115,7 @@ import java.util.stream.Stream;
public class TaskView extends FrameLayout implements Reusable {
private static final String TAG = TaskView.class.getSimpleName();
private static final boolean DEBUG = false;
public static final int FLAG_UPDATE_ICON = 1;
public static final int FLAG_UPDATE_THUMBNAIL = FLAG_UPDATE_ICON << 1;
@@ -808,6 +809,8 @@ public class TaskView extends FrameLayout implements Reusable {
}
protected boolean showTaskMenuWithContainer(IconView iconView) {
// TODO(http://b/193432925)
if (DEBUG) TaskMenuViewWithArrow.Companion.logSomething();
return TaskMenuView.showForTask(mTaskIdAttributeContainer[0]);
}