Merge master@5406228 into git_qt-dev-plus-aosp. (1d4d86d9) · Commits · e / os / android_packages_apps_Trebuchet

Android.bp

+2 −1

Original line number	Diff line number	Diff line
		@@ -12,7 +12,7 @@
		// See the License for the specific language governing permissions and
		// limitations under the License.

		java_library_static {
		android_library {
		name: "launcher-aosp-tapl",
		static_libs: [
		"androidx.annotation_annotation",
		@@ -27,5 +27,6 @@ java_library_static {
		"src/com/android/launcher3/util/SecureSettingsObserver.java",
		"src/com/android/launcher3/TestProtocol.java",
		],
		manifest: "tests/tapl/AndroidManifest.xml",
		platform_apis: true,
		}

Android.mk

+1 −21

Original line number	Diff line number	Diff line
		@@ -16,18 +16,6 @@

		LOCAL_PATH := $(call my-dir)

		#
		# Prebuilt Java Libraries
		#
		include $(CLEAR_VARS)
		LOCAL_MODULE := libSharedSystemUI
		LOCAL_MODULE_TAGS := optional
		LOCAL_MODULE_CLASS := JAVA_LIBRARIES
		LOCAL_SRC_FILES := quickstep/libs/sysui_shared.jar
		LOCAL_UNINSTALLABLE_MODULE := true
		LOCAL_SDK_VERSION := current
		include $(BUILD_PREBUILT)

		include $(CLEAR_VARS)
		LOCAL_MODULE := libPluginCore
		LOCAL_MODULE_TAGS := optional
		@@ -37,14 +25,6 @@ LOCAL_UNINSTALLABLE_MODULE := true
		LOCAL_SDK_VERSION := current
		include $(BUILD_PREBUILT)

		include $(CLEAR_VARS)
		LOCAL_MODULE := libLauncherProtos
		LOCAL_MODULE_TAGS := optional
		LOCAL_MODULE_CLASS := JAVA_LIBRARIES
		LOCAL_SRC_FILES := libs/launcher_protos.jar
		LOCAL_UNINSTALLABLE_MODULE := true
		LOCAL_SDK_VERSION := current
		include $(BUILD_PREBUILT)
		#
		# Build rule for plugin lib (needed to write a plugin).
		#

SecondaryDisplayLauncher/src/com/android/launcher3/SecondaryDisplayLauncher.java

+14 −2

Original line number	Diff line number	Diff line
		@@ -26,12 +26,11 @@ import android.content.Intent;
		import android.content.SharedPreferences;
		import android.content.res.Configuration;
		import android.os.Bundle;
		import com.google.android.material.circularreveal.cardview.CircularRevealCardView;
		import com.google.android.material.floatingactionbutton.FloatingActionButton;
		import android.view.MenuInflater;
		import android.view.MenuItem;
		import android.view.View;
		import android.view.ViewAnimationUtils;
		import android.view.inputmethod.InputMethodManager;
		import android.widget.GridView;
		import android.widget.ImageButton;
		import android.widget.PopupMenu;
		@@ -41,6 +40,9 @@ import androidx.fragment.app.FragmentManager;
		import androidx.lifecycle.ViewModelProvider;
		import androidx.lifecycle.ViewModelProvider.AndroidViewModelFactory;

		import com.google.android.material.circularreveal.cardview.CircularRevealCardView;
		import com.google.android.material.floatingactionbutton.FloatingActionButton;

		import java.util.HashSet;
		import java.util.Set;

		@@ -141,6 +143,16 @@ public class SecondaryDisplayLauncher extends FragmentActivity implements AppPic

		public void onNewIntent(Intent intent) {
		super.onNewIntent(intent);

		if (Intent.ACTION_MAIN.equals(intent.getAction())) {
		// Hide keyboard.
		final View v = getWindow().peekDecorView();
		if (v != null && v.getWindowToken() != null) {
		getSystemService(InputMethodManager.class).hideSoftInputFromWindow(
		v.getWindowToken(), 0);
		}
		}

		// A new intent will bring the launcher to top. Hide the app drawer to reset the state.
		showAppDrawer(false);
		}

build.gradle

+7 −4

Original line number	Diff line number	Diff line
		@@ -9,6 +9,9 @@ buildscript {
		}
		}

		final String ANDROID_TOP = "${rootDir}/../../.."
		final String FRAMEWORK_PREBUILTS_DIR = "${ANDROID_TOP}/prebuilts/framework_intermediates/"

		apply plugin: 'com.android.application'
		apply plugin: 'com.google.protobuf'

		@@ -148,16 +151,16 @@ dependencies {
		implementation "androidx.recyclerview:recyclerview:${ANDROID_X_VERSION}"
		implementation "androidx.preference:preference:${ANDROID_X_VERSION}"
		implementation project(':IconLoader')
		implementation fileTree(dir: "libs", include: 'launcher_protos.jar')
		implementation fileTree(dir: "${FRAMEWORK_PREBUILTS_DIR}/libs", include: 'launcher_protos.jar')

		// Recents lib dependency
		withQuickstepImplementation fileTree(dir: "quickstep/libs", include: 'sysui_shared.jar')
		withQuickstepImplementation fileTree(dir: "${FRAMEWORK_PREBUILTS_DIR}/quickstep/libs", include: 'sysui_shared.jar')

		// Recents lib dependency for Go
		withQuickstepIconRecentsImplementation fileTree(dir: "quickstep/libs", include: 'sysui_shared.jar')
		withQuickstepIconRecentsImplementation fileTree(dir: "${FRAMEWORK_PREBUILTS_DIR}/quickstep/libs", include: 'sysui_shared.jar')

		// Required for AOSP to compile. This is already included in the sysui_shared.jar
		withoutQuickstepImplementation fileTree(dir: "libs", include: 'plugin_core.jar')
		withoutQuickstepImplementation fileTree(dir: "${FRAMEWORK_PREBUILTS_DIR}/libs", include: 'plugin_core.jar')

		testImplementation 'junit:junit:4.12'
		androidTestImplementation "org.mockito:mockito-core:1.9.5"

go/quickstep/res/drawable/clear_all_button.xml

0 → 100644

+22 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2019 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.
		-->
		<shape
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:shape="rectangle">
		<solid android:color="@color/clear_all_button_bg"/>
		<corners android:radius="4dp"/>
		</shape>