Merge "Assign default adaptive icon background color" into ub-launcher3-master
diff --git a/Android.bp b/Android.bp
index c583244..5688407 100644
--- a/Android.bp
+++ b/Android.bp
@@ -13,19 +13,54 @@
// limitations under the License.
java_library_static {
+ name: "launcher-log-proto-nano",
+ proto: {
+ type: "nano",
+ output_params: [
+ "store_unknown_fields=true",
+ "enum_style=java",
+ ],
+ local_include_dirs: [
+ "protos",
+ "proto_overrides",
+ ],
+ },
+ srcs: [
+ "protos/**/*.proto",
+ "proto_overrides/**/*.proto",
+ ],
+}
+
+android_library{
name: "launcher-aosp-tapl",
static_libs: [
"androidx.annotation_annotation",
+ "androidx.dynamicanimation_dynamicanimation",
+ "androidx.recyclerview_recyclerview",
+ "androidx.preference_preference",
"androidx.test.runner",
"androidx.test.rules",
"androidx.test.uiautomator_uiautomator",
+ "iconloader_base",
+ "launcher-log-proto-nano",
+ "launcherprotosnano",
"SystemUISharedLib",
],
srcs: [
"tests/tapl/**/*.java",
- "quickstep/src/com/android/quickstep/SwipeUpSetting.java",
- "src/com/android/launcher3/util/SecureSettingsObserver.java",
- "src/com/android/launcher3/TestProtocol.java",
+ "quickstep/src/**/*.java",
+ "quickstep/recents_ui_overrides/src/**/*.java",
+ "src/**/*.java",
+ "src_build_config/**/*.java",
+ "src_flags/**/*.java",
+ "src_plugins/**/*.java",
+ "src_shortcuts_overrides/**/*.java",
+ ],
+ dxflags: ["--multi-dex"],
+ resource_dirs: [
+ "res",
+ "quickstep/res",
+ "quickstep/recents_ui_overrides/res",
],
platform_apis: true,
}
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java
index 408b749..9650a53 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java
@@ -100,10 +100,14 @@
public HomeAnimationFactory prepareHomeUI(Launcher activity) {
final DeviceProfile dp = activity.getDeviceProfile();
final RecentsView recentsView = activity.getOverviewPanel();
- final ComponentName component = recentsView.getRunningTaskView().getTask().key
- .sourceComponent;
-
- final View workspaceView = activity.getWorkspace().getFirstMatchForAppClose(component);
+ final TaskView runningTaskView = recentsView.getRunningTaskView();
+ final View workspaceView;
+ if (runningTaskView != null) {
+ ComponentName component = runningTaskView.getTask().key.sourceComponent;
+ workspaceView = activity.getWorkspace().getFirstMatchForAppClose(component);
+ } else {
+ workspaceView = null;
+ }
final Rect iconLocation = new Rect();
final FloatingIconView floatingView = workspaceView == null ? null
: FloatingIconView.getFloatingIconView(activity, workspaceView,
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
index a7bf2c3..3e0e8ae 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
@@ -773,7 +773,7 @@
setCurrentTask(runningTaskId);
}
- public TaskView getRunningTaskView() {
+ public @Nullable TaskView getRunningTaskView() {
return getTaskView(mRunningTaskId);
}
diff --git a/src/com/android/launcher3/states/InternalStateHandler.java b/src/com/android/launcher3/states/InternalStateHandler.java
index d326ff3..c6370c5 100644
--- a/src/com/android/launcher3/states/InternalStateHandler.java
+++ b/src/com/android/launcher3/states/InternalStateHandler.java
@@ -36,7 +36,6 @@
public abstract class InternalStateHandler extends Binder {
public static final String EXTRA_STATE_HANDLER = "launcher.state_handler";
- public static final String EXTRA_FROM_HOME_KEY = "android.intent.extra.FROM_HOME_KEY";
private static final Scheduler sScheduler = new Scheduler();
@@ -77,10 +76,6 @@
Launcher launcher, Intent intent, boolean alreadyOnHome, boolean explicitIntent) {
boolean result = false;
if (intent != null && intent.getExtras() != null) {
- // If we know that this the intent comes from pressing Home, defer to the default
- // processing.
- if (intent.hasExtra(EXTRA_FROM_HOME_KEY)) return false;
-
IBinder stateBinder = intent.getExtras().getBinder(EXTRA_STATE_HANDLER);
if (stateBinder instanceof InternalStateHandler) {
InternalStateHandler handler = (InternalStateHandler) stateBinder;