Snap for 8650624 from 6cc3a7b311 to udc-release
Change-Id: I63ad3c6e77f29b24fc2214d2b5b94a271a0e330b
This commit is contained in:
commit
1080c7679c
7 files changed
+150
-170
No files matched your search
+135
@@ -313,3 +313,138 @@ android_library {
|
||||
baseline_filename: "lint-baseline-launcher3.xml",
|
||||
},
|
||||
}
|
||||
|
||||
// Build rule for Launcher3 Go app for Android Go devices.
|
||||
android_app {
|
||||
name: "Launcher3Go",
|
||||
|
||||
static_libs: ["Launcher3CommonDepsLib"],
|
||||
|
||||
srcs: [
|
||||
"src/**/*.java",
|
||||
"src_ui_overrides/**/*.java",
|
||||
"go/src/**/*.java",
|
||||
],
|
||||
|
||||
resource_dirs: ["go/res"],
|
||||
|
||||
optimize: {
|
||||
proguard_flags_files: ["proguard.flags"],
|
||||
},
|
||||
|
||||
sdk_version: "current",
|
||||
min_sdk_version: "current",
|
||||
target_sdk_version: "current",
|
||||
privileged: true,
|
||||
system_ext_specific: true,
|
||||
overrides: [
|
||||
"Home",
|
||||
"Launcher2",
|
||||
"Launcher3",
|
||||
"Launcher3QuickStep",
|
||||
],
|
||||
required: ["privapp_whitelist_com.android.launcher3"],
|
||||
|
||||
additional_manifests: [
|
||||
"AndroidManifest.xml",
|
||||
"AndroidManifest-common.xml",
|
||||
],
|
||||
|
||||
manifest: "go/AndroidManifest.xml",
|
||||
jacoco: {
|
||||
include_filter: ["com.android.launcher3.*"],
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// Build rule for Quickstep app.
|
||||
android_app {
|
||||
name: "Launcher3QuickStep",
|
||||
|
||||
static_libs: ["Launcher3QuickStepLib"],
|
||||
optimize: {
|
||||
enabled: false,
|
||||
},
|
||||
|
||||
platform_apis: true,
|
||||
min_sdk_version: "current",
|
||||
target_sdk_version: "current",
|
||||
|
||||
privileged: true,
|
||||
system_ext_specific: true,
|
||||
overrides: [
|
||||
"Home",
|
||||
"Launcher2",
|
||||
"Launcher3",
|
||||
],
|
||||
required: ["privapp_whitelist_com.android.launcher3"],
|
||||
|
||||
resource_dirs: ["quickstep/res"],
|
||||
|
||||
additional_manifests: [
|
||||
"quickstep/AndroidManifest-launcher.xml",
|
||||
"AndroidManifest-common.xml",
|
||||
],
|
||||
|
||||
manifest: "quickstep/AndroidManifest.xml",
|
||||
jacoco: {
|
||||
include_filter: ["com.android.launcher3.*"],
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// Build rule for Launcher3 Go app with quickstep for Android Go devices.
|
||||
android_app {
|
||||
name: "Launcher3QuickStepGo",
|
||||
|
||||
static_libs: [
|
||||
"SystemUI-statsd",
|
||||
"SystemUISharedLib",
|
||||
"LauncherGoResLib",
|
||||
],
|
||||
|
||||
platform_apis: true,
|
||||
min_sdk_version: "current",
|
||||
target_sdk_version: "current",
|
||||
|
||||
srcs: [
|
||||
"src/**/*.java",
|
||||
"quickstep/src/**/*.java",
|
||||
"go/src/**/*.java",
|
||||
"go/quickstep/src/**/*.java",
|
||||
],
|
||||
|
||||
resource_dirs: [
|
||||
"go/quickstep/res",
|
||||
"go/res",
|
||||
"quickstep/res",
|
||||
],
|
||||
|
||||
optimize: {
|
||||
proguard_flags_files: ["proguard.flags"],
|
||||
enabled: true,
|
||||
},
|
||||
|
||||
privileged: true,
|
||||
system_ext_specific: true,
|
||||
overrides: [
|
||||
"Home",
|
||||
"Launcher2",
|
||||
"Launcher3",
|
||||
"Launcher3QuickStep",
|
||||
],
|
||||
required: ["privapp_whitelist_com.android.launcher3"],
|
||||
|
||||
additional_manifests: [
|
||||
"go/AndroidManifest.xml",
|
||||
"go/AndroidManifest-launcher.xml",
|
||||
"AndroidManifest-common.xml",
|
||||
],
|
||||
|
||||
manifest: "quickstep/AndroidManifest.xml",
|
||||
jacoco: {
|
||||
include_filter: ["com.android.launcher3.*"],
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
-147
@@ -1,147 +0,0 @@
|
||||
#
|
||||
# Copyright (C) 2013 The Android Open Source Project
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
|
||||
LOCAL_PATH := $(call my-dir)
|
||||
|
||||
#
|
||||
# Build rule for Launcher3 Go app for Android Go devices.
|
||||
#
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_USE_AAPT2 := true
|
||||
LOCAL_MODULE_TAGS := optional
|
||||
LOCAL_STATIC_ANDROID_LIBRARIES := Launcher3CommonDepsLib
|
||||
|
||||
LOCAL_SRC_FILES := \
|
||||
$(call all-java-files-under, src) \
|
||||
$(call all-java-files-under, src_ui_overrides) \
|
||||
$(call all-java-files-under, go/src)
|
||||
|
||||
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/go/res
|
||||
|
||||
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
|
||||
|
||||
LOCAL_SDK_VERSION := current
|
||||
LOCAL_MIN_SDK_VERSION := 26
|
||||
LOCAL_PACKAGE_NAME := Launcher3Go
|
||||
LOCAL_PRIVILEGED_MODULE := true
|
||||
LOCAL_SYSTEM_EXT_MODULE := true
|
||||
LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3 Launcher3QuickStep
|
||||
LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.launcher3
|
||||
|
||||
LOCAL_FULL_LIBS_MANIFEST_FILES := \
|
||||
$(LOCAL_PATH)/AndroidManifest.xml \
|
||||
$(LOCAL_PATH)/AndroidManifest-common.xml
|
||||
|
||||
LOCAL_MANIFEST_FILE := go/AndroidManifest.xml
|
||||
LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.launcher3.*
|
||||
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
|
||||
LOCAL_LICENSE_CONDITIONS := notice
|
||||
LOCAL_LICENSE_PACKAGE_NAME := Android Launcher3
|
||||
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
|
||||
include $(BUILD_PACKAGE)
|
||||
|
||||
#
|
||||
# Build rule for Quickstep app.
|
||||
#
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_USE_AAPT2 := true
|
||||
LOCAL_MODULE_TAGS := optional
|
||||
|
||||
LOCAL_STATIC_ANDROID_LIBRARIES := Launcher3QuickStepLib
|
||||
LOCAL_PROGUARD_ENABLED := disabled
|
||||
|
||||
ifneq (,$(wildcard frameworks/base))
|
||||
LOCAL_PRIVATE_PLATFORM_APIS := true
|
||||
else
|
||||
LOCAL_SDK_VERSION := system_current
|
||||
LOCAL_MIN_SDK_VERSION := 26
|
||||
endif
|
||||
LOCAL_PACKAGE_NAME := Launcher3QuickStep
|
||||
LOCAL_PRIVILEGED_MODULE := true
|
||||
LOCAL_SYSTEM_EXT_MODULE := true
|
||||
LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3
|
||||
LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.launcher3
|
||||
|
||||
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/quickstep/res
|
||||
|
||||
LOCAL_FULL_LIBS_MANIFEST_FILES := \
|
||||
$(LOCAL_PATH)/quickstep/AndroidManifest-launcher.xml \
|
||||
$(LOCAL_PATH)/AndroidManifest-common.xml
|
||||
|
||||
LOCAL_MANIFEST_FILE := quickstep/AndroidManifest.xml
|
||||
LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.launcher3.*
|
||||
|
||||
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
|
||||
LOCAL_LICENSE_CONDITIONS := notice
|
||||
LOCAL_LICENSE_PACKAGE_NAME := Android Launcher3
|
||||
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
|
||||
include $(BUILD_PACKAGE)
|
||||
|
||||
|
||||
#
|
||||
# Build rule for Launcher3 Go app with quickstep for Android Go devices.
|
||||
#
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_USE_AAPT2 := true
|
||||
LOCAL_MODULE_TAGS := optional
|
||||
|
||||
LOCAL_STATIC_JAVA_LIBRARIES := \
|
||||
SystemUI-statsd \
|
||||
SystemUISharedLib
|
||||
ifneq (,$(wildcard frameworks/base))
|
||||
LOCAL_PRIVATE_PLATFORM_APIS := true
|
||||
else
|
||||
LOCAL_SDK_VERSION := system_current
|
||||
LOCAL_MIN_SDK_VERSION := 26
|
||||
endif
|
||||
LOCAL_STATIC_ANDROID_LIBRARIES := LauncherGoResLib
|
||||
|
||||
LOCAL_SRC_FILES := \
|
||||
$(call all-java-files-under, src) \
|
||||
$(call all-java-files-under, quickstep/src) \
|
||||
$(call all-java-files-under, go/src) \
|
||||
$(call all-java-files-under, go/quickstep/src)
|
||||
|
||||
LOCAL_RESOURCE_DIR := \
|
||||
$(LOCAL_PATH)/go/quickstep/res \
|
||||
$(LOCAL_PATH)/go/res \
|
||||
$(LOCAL_PATH)/quickstep/res
|
||||
|
||||
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
|
||||
LOCAL_PROGUARD_ENABLED := full
|
||||
|
||||
LOCAL_PACKAGE_NAME := Launcher3QuickStepGo
|
||||
LOCAL_PRIVILEGED_MODULE := true
|
||||
LOCAL_SYSTEM_EXT_MODULE := true
|
||||
LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3 Launcher3QuickStep
|
||||
LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.launcher3
|
||||
|
||||
LOCAL_FULL_LIBS_MANIFEST_FILES := \
|
||||
$(LOCAL_PATH)/go/AndroidManifest.xml \
|
||||
$(LOCAL_PATH)/go/AndroidManifest-launcher.xml \
|
||||
$(LOCAL_PATH)/AndroidManifest-common.xml
|
||||
|
||||
LOCAL_MANIFEST_FILE := quickstep/AndroidManifest.xml
|
||||
LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.launcher3.*
|
||||
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
|
||||
LOCAL_LICENSE_CONDITIONS := notice
|
||||
LOCAL_LICENSE_PACKAGE_NAME := Android Launcher3
|
||||
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
|
||||
include $(BUILD_PACKAGE)
|
||||
|
||||
|
||||
# ==================================================
|
||||
include $(call all-makefiles-under,$(LOCAL_PATH))
|
||||
@@ -75,6 +75,13 @@ public class SurfaceTransactionApplier extends ReleaseCheck {
|
||||
if (view == null) {
|
||||
return;
|
||||
}
|
||||
Transaction t = new Transaction();
|
||||
for (int i = params.length - 1; i >= 0; i--) {
|
||||
SurfaceParams surfaceParams = params[i];
|
||||
if (surfaceParams.surface.isValid()) {
|
||||
surfaceParams.applyTo(t);
|
||||
}
|
||||
}
|
||||
|
||||
mLastSequenceNumber++;
|
||||
final int toApplySeqNo = mLastSequenceNumber;
|
||||
@@ -85,13 +92,6 @@ public class SurfaceTransactionApplier extends ReleaseCheck {
|
||||
.sendToTarget();
|
||||
return;
|
||||
}
|
||||
Transaction t = new Transaction();
|
||||
for (int i = params.length - 1; i >= 0; i--) {
|
||||
SurfaceParams surfaceParams = params[i];
|
||||
if (surfaceParams.surface.isValid()) {
|
||||
surfaceParams.applyTo(t);
|
||||
}
|
||||
}
|
||||
mTargetViewRootImpl.mergeWithNextTransaction(t, frame);
|
||||
Message.obtain(mApplyHandler, MSG_UPDATE_SEQUENCE_NUMBER, toApplySeqNo, 0)
|
||||
.sendToTarget();
|
||||
|
||||
@@ -16,7 +16,6 @@
|
||||
|
||||
package com.android.quickstep.views;
|
||||
|
||||
import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
|
||||
import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_BOTTOM_OR_RIGHT;
|
||||
import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_UNDEFINED;
|
||||
import static com.android.quickstep.views.TaskThumbnailView.DIM_ALPHA;
|
||||
@@ -245,17 +244,9 @@ public class TaskMenuView extends AbstractFloatingView implements OnScrollChange
|
||||
LayoutParams lp = (LayoutParams) menuOptionView.getLayoutParams();
|
||||
mTaskView.getPagedOrientationHandler().setLayoutParamsForTaskMenuOptionItem(lp,
|
||||
menuOptionView, mActivity.getDeviceProfile());
|
||||
menuOptionView.setOnClickListener(view -> {
|
||||
if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
|
||||
RecentsView recentsView = mTaskView.getRecentsView();
|
||||
recentsView.switchToScreenshot(null,
|
||||
() -> recentsView.finishRecentsAnimation(true /* toRecents */,
|
||||
false /* shouldPip */,
|
||||
() -> menuOption.onClick(view)));
|
||||
} else {
|
||||
menuOption.onClick(view);
|
||||
}
|
||||
});
|
||||
// Set an onClick listener on each menu option. The onClick method is responsible for
|
||||
// ending LiveTile mode on the thumbnail if needed.
|
||||
menuOptionView.setOnClickListener(menuOption::onClick);
|
||||
mOptionLayout.addView(menuOptionView);
|
||||
}
|
||||
|
||||
|
||||
@@ -16,8 +16,8 @@
|
||||
<com.android.launcher3.allapps.WorkEduCard xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/work_edu_card_margin"
|
||||
android:layout_marginBottom="@dimen/work_edu_card_bottom_margin"
|
||||
android:paddingTop="@dimen/work_edu_card_margin"
|
||||
android:paddingBottom="@dimen/work_edu_card_bottom_margin"
|
||||
android:gravity="center">
|
||||
<RelativeLayout
|
||||
android:layout_width="match_parent"
|
||||
|
||||
@@ -805,9 +805,9 @@ public class DeviceProfile {
|
||||
allAppsCellWidthPx = pxFromDp(inv.allAppsCellSize[mTypeIndex].x, mMetrics, scale);
|
||||
if (isScalableGrid) {
|
||||
allAppsIconSizePx =
|
||||
pxFromDp(inv.allAppsIconSize[mTypeIndex], mMetrics);
|
||||
pxFromDp(inv.allAppsIconSize[mTypeIndex], mMetrics, scale);
|
||||
allAppsIconTextSizePx =
|
||||
pxFromSp(inv.allAppsIconTextSize[mTypeIndex], mMetrics);
|
||||
pxFromSp(inv.allAppsIconTextSize[mTypeIndex], mMetrics, scale);
|
||||
allAppsIconDrawablePaddingPx = iconDrawablePaddingOriginalPx;
|
||||
} else {
|
||||
float invIconSizeDp = inv.allAppsIconSize[mTypeIndex];
|
||||
|
||||
@@ -375,6 +375,7 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest {
|
||||
|
||||
@Test
|
||||
@PortraitLandscape
|
||||
@ScreenRecord
|
||||
public void testDragToFolder() {
|
||||
// TODO: add the use case to drag an icon to an existing folder. Currently it either fails
|
||||
// on tablets or phones due to difference in resolution.
|
||||
|
||||
Reference in new issue
Block a user