From 5a8b62b38f87a718a9489fc67d72a6ffbd9951b4 Mon Sep 17 00:00:00 2001 From: Jon Miranda Date: Tue, 25 Jan 2022 18:06:10 -0800 Subject: [PATCH 1/5] Avoid sending FirstScreenBroadcast if there is nothing to send. Bug: 216389279 Test: manual Change-Id: I1c30f02cbb287c25a140cb4801d6b66b07cec3a7 --- src/com/android/launcher3/model/FirstScreenBroadcast.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/com/android/launcher3/model/FirstScreenBroadcast.java b/src/com/android/launcher3/model/FirstScreenBroadcast.java index e391d37938..5fac7cfcec 100644 --- a/src/com/android/launcher3/model/FirstScreenBroadcast.java +++ b/src/com/android/launcher3/model/FirstScreenBroadcast.java @@ -135,6 +135,13 @@ public class FirstScreenBroadcast { printList(installerPackageName, "Widget item", widgetItems); } + if (folderItems.isEmpty() + && workspaceItems.isEmpty() + && hotseatItems.isEmpty() + && widgetItems.isEmpty()) { + // Avoid sending broadcast if there is nothing to send. + return; + } context.sendBroadcast(new Intent(ACTION_FIRST_SCREEN_ACTIVE_INSTALLS) .setPackage(installerPackageName) .putStringArrayListExtra(FOLDER_ITEM_EXTRA, new ArrayList<>(folderItems)) From 5f0a5eb87782432dbec3fbd04ff2dd373b2bc88b Mon Sep 17 00:00:00 2001 From: Andy Wickham Date: Tue, 18 Jan 2022 09:13:43 -0800 Subject: [PATCH 2/5] Utilities.trim never returns null. This fixes a crash loop I was seeing on my device and also preemptively fixes similar NullPointerExceptions. Bug: 213931730 Test: Manually verified crash loop stopped with this change. Change-Id: I8d2fc8475d42ac60b7fdc9219421a8c9733c7b9f (cherry picked from commit 56be73be80a81df05e34999c42df9203c276b0af) --- src/com/android/launcher3/BubbleTextView.java | 3 ++- src/com/android/launcher3/Utilities.java | 3 ++- src/com/android/launcher3/model/LoaderCursor.java | 3 +-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java index 1f1d57adc9..163b442b6e 100644 --- a/src/com/android/launcher3/BubbleTextView.java +++ b/src/com/android/launcher3/BubbleTextView.java @@ -35,6 +35,7 @@ import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.icu.text.MessageFormat; import android.text.TextPaint; +import android.text.TextUtils; import android.text.TextUtils.TruncateAt; import android.util.AttributeSet; import android.util.Property; @@ -785,7 +786,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver, invalidate(); } } - if (itemInfo.contentDescription != null) { + if (!TextUtils.isEmpty(itemInfo.contentDescription)) { if (itemInfo.isDisabled()) { setContentDescription(getContext().getString(R.string.disabled_app_label, itemInfo.contentDescription)); diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java index d2fe483c96..63313f770f 100644 --- a/src/com/android/launcher3/Utilities.java +++ b/src/com/android/launcher3/Utilities.java @@ -460,9 +460,10 @@ public final class Utilities { * Trims the string, removing all whitespace at the beginning and end of the string. * Non-breaking whitespaces are also removed. */ + @NonNull public static String trim(CharSequence s) { if (s == null) { - return null; + return ""; } // Just strip any sequence of whitespace or java space characters from the beginning and end diff --git a/src/com/android/launcher3/model/LoaderCursor.java b/src/com/android/launcher3/model/LoaderCursor.java index 08b38e88ac..178fbdb7b8 100644 --- a/src/com/android/launcher3/model/LoaderCursor.java +++ b/src/com/android/launcher3/model/LoaderCursor.java @@ -202,8 +202,7 @@ public class LoaderCursor extends CursorWrapper { * Returns the title or empty string */ private String getTitle() { - String title = getString(titleIndex); - return TextUtils.isEmpty(title) ? "" : Utilities.trim(title); + return Utilities.trim(getString(titleIndex)); } /** From 30c28a0a227d747852a4e17baf0107bc9a3987c9 Mon Sep 17 00:00:00 2001 From: Pat Manning Date: Mon, 31 Jan 2022 16:01:51 +0000 Subject: [PATCH 3/5] Reenable tablet tests for OOP TAPL tests. Bug: 210158657 Test: TaplTestsQuickstep.java Change-Id: Ib604642be6819065cde4167f3705d43ced3b2fda --- .../src/com/android/quickstep/TaplTestsQuickstep.java | 8 +++----- tests/Android.bp | 1 + 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java index b4917f351b..e3198a819a 100644 --- a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java +++ b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java @@ -21,6 +21,7 @@ import static com.android.launcher3.ui.TaplTestsLauncher3.getAppPackageName; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; +import static org.junit.Assume.assumeTrue; import android.content.Intent; @@ -37,7 +38,6 @@ import com.android.launcher3.tapl.LauncherInstrumentation.NavigationModel; import com.android.launcher3.tapl.Overview; import com.android.launcher3.tapl.OverviewActions; import com.android.launcher3.tapl.OverviewTask; -import com.android.launcher3.tapl.TestHelpers; import com.android.launcher3.ui.TaplTestsLauncher3; import com.android.launcher3.util.rule.ScreenRecordRule.ScreenRecord; import com.android.quickstep.NavigationModeSwitchRule.NavigationModeSwitch; @@ -322,10 +322,8 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { @Test @PortraitLandscape public void testOverviewForTablet() throws Exception { - // TODO(b/210158657): Re-enable for OOP - if (!mLauncher.isTablet() || !TestHelpers.isInLauncherProcess()) { - return; - } + assumeTrue(mLauncher.isTablet()); + for (int i = 2; i <= 14; i++) { startTestActivity(i); } diff --git a/tests/Android.bp b/tests/Android.bp index f3e0500701..32595617b3 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -46,6 +46,7 @@ filegroup { "src/com/android/launcher3/util/rule/TestStabilityRule.java", "src/com/android/launcher3/ui/TaplTestsLauncher3.java", "src/com/android/launcher3/testcomponent/BaseTestingActivity.java", + "src/com/android/launcher3/testcomponent/OtherBaseTestingActivity.java", "src/com/android/launcher3/testcomponent/CustomShortcutConfigActivity.java", "src/com/android/launcher3/testcomponent/TestCommandReceiver.java", "src/com/android/launcher3/testcomponent/TestLauncherActivity.java", From fd48b0c988eda8e801ab3417a2b117bd741e2963 Mon Sep 17 00:00:00 2001 From: Jon Miranda Date: Mon, 31 Jan 2022 16:25:22 -0800 Subject: [PATCH 4/5] Add All Apps entry button to Taskbar. - Opens All Apps when clicked - Fades button in/out when transitioning b/w Hotseat & Taskbar Bug: 205803230 Test: manual ensures alpha gets reset properly clicking button opens all apps Change-Id: I1b96bae734aa9fd9308931d6312e3d65559d4284 --- .../taskbar/TaskbarAllAppsViewController.java | 4 -- .../launcher3/taskbar/TaskbarView.java | 25 ++++++++++ .../taskbar/TaskbarViewController.java | 34 ++++++++++++-- res/drawable/ic_all_apps_button.xml | 43 +++++++++++++++++ .../launcher3/InvariantDeviceProfile.java | 2 +- .../launcher3/views/AllAppsButton.java | 47 +++++++++++++++++++ 6 files changed, 145 insertions(+), 10 deletions(-) create mode 100644 res/drawable/ic_all_apps_button.xml create mode 100644 src/com/android/launcher3/views/AllAppsButton.java diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarAllAppsViewController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarAllAppsViewController.java index 0b53cc2c84..62125feae6 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarAllAppsViewController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarAllAppsViewController.java @@ -15,7 +15,6 @@ */ package com.android.launcher3.taskbar; -import com.android.launcher3.R; import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.model.data.AppInfo; @@ -41,9 +40,6 @@ public final class TaskbarAllAppsViewController { mAppsView.setOnIconLongClickListener( controllers.taskbarDragController::startDragOnLongClick); - - // TODO(b/205803230): Remove once entry point button is implemented. - mContext.getDragLayer().findViewById(R.id.taskbar_view).setOnClickListener(v -> show()); } /** Binds the current {@link AppInfo} instances to the {@link TaskbarAllAppsContainerView}. */ diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java index c8d9fca947..fddd1ed6fb 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java @@ -22,6 +22,7 @@ import android.graphics.Rect; import android.util.AttributeSet; import android.view.MotionEvent; import android.view.View; +import android.view.ViewGroup; import android.widget.FrameLayout; import androidx.annotation.LayoutRes; @@ -31,6 +32,7 @@ import androidx.annotation.Nullable; import com.android.launcher3.BubbleTextView; import com.android.launcher3.Insettable; import com.android.launcher3.R; +import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.folder.FolderIcon; import com.android.launcher3.model.data.FolderInfo; import com.android.launcher3.model.data.ItemInfo; @@ -38,6 +40,7 @@ import com.android.launcher3.model.data.WorkspaceItemInfo; import com.android.launcher3.uioverrides.ApiWrapper; import com.android.launcher3.util.LauncherBindableItemsContainer; import com.android.launcher3.views.ActivityContext; +import com.android.launcher3.views.AllAppsButton; /** * Hosts the Taskbar content such as Hotseat and Recent Apps. Drawn on top of other apps. @@ -64,6 +67,9 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar // Only non-null when the corresponding Folder is open. private @Nullable FolderIcon mLeaveBehindFolderIcon; + // Only non-null when device supports having an All Apps button. + private @Nullable AllAppsButton mAllAppsButton; + public TaskbarView(@NonNull Context context) { this(context, null); } @@ -94,6 +100,13 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar // Needed to draw folder leave-behind when opening one. setWillNotDraw(false); + + if (FeatureFlags.ENABLE_ALL_APPS_IN_TASKBAR.get()) { + mAllAppsButton = new AllAppsButton(context); + mAllAppsButton.setLayoutParams( + new ViewGroup.LayoutParams(mIconTouchSize, mIconTouchSize)); + mAllAppsButton.setPadding(mItemPadding, mItemPadding, mItemPadding, mItemPadding); + } } protected void init(TaskbarViewController.TaskbarViewCallbacks callbacks) { @@ -102,6 +115,10 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar mIconLongClickListener = mControllerCallbacks.getIconOnLongClickListener(); setOnLongClickListener(mControllerCallbacks.getBackgroundOnLongClickListener()); + + if (mAllAppsButton != null) { + mAllAppsButton.setOnClickListener(mControllerCallbacks.getAllAppsButtonClickListener()); + } } private void removeAndRecycle(View view) { @@ -121,6 +138,10 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar int nextViewIndex = 0; int numViewsAnimated = 0; + if (mAllAppsButton != null) { + removeView(mAllAppsButton); + } + for (int i = 0; i < hotseatItemInfos.length; i++) { ItemInfo hotseatItemInfo = hotseatItemInfos[i]; if (hotseatItemInfo == null) { @@ -191,6 +212,10 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar while (nextViewIndex < getChildCount()) { removeAndRecycle(getChildAt(nextViewIndex)); } + + if (mAllAppsButton != null) { + addView(mAllAppsButton); + } } /** diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java index 0508994eac..778040dbc1 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java @@ -22,6 +22,7 @@ import static com.android.quickstep.AnimatedFloat.VALUE; import android.graphics.Rect; import android.util.FloatProperty; +import android.util.Log; import android.view.MotionEvent; import android.view.View; import android.view.ViewTreeObserver; @@ -33,6 +34,7 @@ import com.android.launcher3.LauncherAppState; import com.android.launcher3.Utilities; import com.android.launcher3.anim.AnimatorPlaybackController; import com.android.launcher3.anim.PendingAnimation; +import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.folder.FolderIcon; import com.android.launcher3.model.data.ItemInfo; import com.android.launcher3.util.LauncherBindableItemsContainer; @@ -45,6 +47,9 @@ import java.io.PrintWriter; * Handles properties/data collection, then passes the results to TaskbarView to render. */ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbarController { + + private static final String TAG = TaskbarViewController.class.getSimpleName(); + private static final Runnable NO_OP = () -> { }; public static final int ALPHA_INDEX_HOME = 0; @@ -225,14 +230,29 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar int count = mTaskbarView.getChildCount(); for (int i = 0; i < count; i++) { View child = mTaskbarView.getChildAt(i); - ItemInfo info = (ItemInfo) child.getTag(); - setter.setFloat(child, SCALE_PROPERTY, scaleUp, LINEAR); + + int positionInHotseat = -1; + if (FeatureFlags.ENABLE_ALL_APPS_IN_TASKBAR.get() && i == count - 1) { + // Note that there is no All Apps button in the hotseat, this position is only used + // as its convenient for animation purposes. + positionInHotseat = mActivity.getDeviceProfile().inv.numShownHotseatIcons; + + setter.setViewAlpha(child, 0, LINEAR); + } else if (child.getTag() instanceof ItemInfo) { + positionInHotseat = ((ItemInfo) child.getTag()).screenId; + } else { + Log.w(TAG, "Unsupported view found in createIconAlignmentController, v=" + child); + continue; + } + + float hotseatIconCenter = hotseatPadding.left + + (hotseatCellSize + borderSpacing) * positionInHotseat + + hotseatCellSize / 2; float childCenter = (child.getLeft() + child.getRight()) / 2; - float hotseatIconCenter = hotseatPadding.left - + (hotseatCellSize + borderSpacing) * info.screenId - + hotseatCellSize / 2; setter.setFloat(child, ICON_TRANSLATE_X, hotseatIconCenter - childCenter, LINEAR); + + setter.setFloat(child, SCALE_PROPERTY, scaleUp, LINEAR); } AnimatorPlaybackController controller = setter.createPlaybackController(); @@ -279,6 +299,10 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar return mActivity.getItemOnClickListener(); } + public View.OnClickListener getAllAppsButtonClickListener() { + return v -> mControllers.taskbarAllAppsViewController.show(); + } + public View.OnLongClickListener getIconOnLongClickListener() { return mControllers.taskbarDragController::startDragOnLongClick; } diff --git a/res/drawable/ic_all_apps_button.xml b/res/drawable/ic_all_apps_button.xml new file mode 100644 index 0000000000..52b919bd27 --- /dev/null +++ b/res/drawable/ic_all_apps_button.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + diff --git a/src/com/android/launcher3/InvariantDeviceProfile.java b/src/com/android/launcher3/InvariantDeviceProfile.java index 0b168a5242..a381787804 100644 --- a/src/com/android/launcher3/InvariantDeviceProfile.java +++ b/src/com/android/launcher3/InvariantDeviceProfile.java @@ -135,7 +135,7 @@ public class InvariantDeviceProfile { /** * Number of icons inside the hotseat area. */ - protected int numShownHotseatIcons; + public int numShownHotseatIcons; /** * Number of icons inside the hotseat area that is stored in the database. This is greater than diff --git a/src/com/android/launcher3/views/AllAppsButton.java b/src/com/android/launcher3/views/AllAppsButton.java new file mode 100644 index 0000000000..f502d46db7 --- /dev/null +++ b/src/com/android/launcher3/views/AllAppsButton.java @@ -0,0 +1,47 @@ +/* + * Copyright (C) 2022 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. + */ +package com.android.launcher3.views; + +import android.content.Context; +import android.graphics.Bitmap; +import android.util.AttributeSet; + +import com.android.launcher3.BubbleTextView; +import com.android.launcher3.LauncherAppState; +import com.android.launcher3.R; +import com.android.launcher3.icons.FastBitmapDrawable; + +/** + * Button in Taskbar that opens All Apps. + */ +public class AllAppsButton extends BubbleTextView { + + public AllAppsButton(Context context) { + this(context, null); + } + + public AllAppsButton(Context context, AttributeSet attrs) { + this(context, attrs, 0); + } + + public AllAppsButton(Context context, AttributeSet attrs, int defStyle) { + super(context, attrs, defStyle); + + Bitmap bitmap = LauncherAppState.getInstance(context).getIconCache().getIconFactory() + .createScaledBitmapWithShadow(context.getDrawable(R.drawable.ic_all_apps_button)); + setIcon(new FastBitmapDrawable(bitmap)); + } +} From a7548b587188856371be6b6afe51a3e367d3a85b Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Thu, 27 Jan 2022 22:04:48 -0800 Subject: [PATCH 5/5] Fix licenses and license texts. Entire package is 1p. Bug: 210912771 Test: m nothing Change-Id: Id941d93786882aca78f214ac692433a353b84ed3 --- Android.bp | 16 +--- Android.mk | 9 +- NOTICE | 190 ------------------------------------- quickstep/Android.bp | 6 +- tests/Android.bp | 7 +- tests/dummy_app/Android.bp | 3 +- 6 files changed, 13 insertions(+), 218 deletions(-) delete mode 100644 NOTICE diff --git a/Android.bp b/Android.bp index 0575602f17..7c78ba844e 100644 --- a/Android.bp +++ b/Android.bp @@ -13,24 +13,12 @@ // limitations under the License. package { - default_applicable_licenses: ["packages_apps_Launcher3_license"], + // See: http://go/android-license-faq + default_applicable_licenses: ["Android-Apache-2.0"], } min_launcher3_sdk_version = "26" -// Added automatically by a large-scale-change -// See: http://go/android-license-faq -license { - name: "packages_apps_Launcher3_license", - visibility: [":__subpackages__"], - license_kinds: [ - "SPDX-license-identifier-Apache-2.0", - ], - license_text: [ - "NOTICE", - ], -} - android_library { name: "launcher-aosp-tapl", libs: [ diff --git a/Android.mk b/Android.mk index ceaaf138f2..1bc8b283c7 100644 --- a/Android.mk +++ b/Android.mk @@ -49,7 +49,8 @@ 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_NOTICE_FILE := $(LOCAL_PATH)/NOTICE +LOCAL_LICENSE_PACKAGE_NAME := Android Launcher3 +LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE include $(BUILD_PACKAGE) # @@ -85,7 +86,8 @@ LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.launcher3.* LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 LOCAL_LICENSE_CONDITIONS := notice -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE +LOCAL_LICENSE_PACKAGE_NAME := Android Launcher3 +LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE include $(BUILD_PACKAGE) @@ -136,7 +138,8 @@ 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_NOTICE_FILE := $(LOCAL_PATH)/NOTICE +LOCAL_LICENSE_PACKAGE_NAME := Android Launcher3 +LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE include $(BUILD_PACKAGE) diff --git a/NOTICE b/NOTICE deleted file mode 100644 index c5b1efa7aa..0000000000 --- a/NOTICE +++ /dev/null @@ -1,190 +0,0 @@ - - Copyright (c) 2005-2008, 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. - - 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. - - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - diff --git a/quickstep/Android.bp b/quickstep/Android.bp index 7b3e6c45a2..70b1438c38 100644 --- a/quickstep/Android.bp +++ b/quickstep/Android.bp @@ -14,11 +14,7 @@ package { // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "packages_apps_Launcher3_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["packages_apps_Launcher3_license"], + default_applicable_licenses: ["Android-Apache-2.0"], } filegroup { diff --git a/tests/Android.bp b/tests/Android.bp index f3e0500701..8d11ad1088 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -11,13 +11,10 @@ // 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. + package { // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "packages_apps_Launcher3_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["packages_apps_Launcher3_license"], + default_applicable_licenses: ["Android-Apache-2.0"], } // Source code used for test diff --git a/tests/dummy_app/Android.bp b/tests/dummy_app/Android.bp index 4f83bb706e..08ce2f7503 100644 --- a/tests/dummy_app/Android.bp +++ b/tests/dummy_app/Android.bp @@ -15,7 +15,8 @@ // package { - default_applicable_licenses: ["packages_apps_Launcher3_license"], + // See: http://go/android-license-faq + default_applicable_licenses: ["Android-Apache-2.0"], } android_app {