QuickStep: Google Feed integration (03202a2e) · Commits · e / os / android_packages_apps_Trebuchet

Android.mk

+14 −1

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

		LOCAL_PATH := $(call my-dir)

		#
		# Prebuilt Google Feed library
		#
		include $(CLEAR_VARS)
		LOCAL_MODULE := libGoogleFeed
		LOCAL_MODULE_TAGS := optional
		LOCAL_MODULE_CLASS := JAVA_LIBRARIES
		LOCAL_SRC_FILES := libs/libGoogleFeed.jar
		LOCAL_UNINSTALLABLE_MODULE := true
		LOCAL_SDK_VERSION := 27
		include $(BUILD_PREBUILT)

		#
		# Build rule for Launcher3 dependencies lib.
		#
		@@ -32,7 +44,8 @@ LOCAL_STATIC_ANDROID_LIBRARIES := \

		LOCAL_STATIC_JAVA_LIBRARIES := \
		LauncherPluginLib \
		launcher_log_protos_lite
		launcher_log_protos_lite \
		libGoogleFeed

		LOCAL_SRC_FILES := \
		$(call all-proto-files-under, protos) \

build.gradle

+2 −0

Original line number	Diff line number	Diff line
		@@ -145,6 +145,8 @@ allprojects {
		}

		dependencies {
		implementation fileTree(dir: 'libs', include: ['libGoogleFeed.jar'])

		implementation "androidx.dynamicanimation:dynamicanimation:${ANDROID_X_VERSION}"
		implementation "androidx.recyclerview:recyclerview:${ANDROID_X_VERSION}"
		implementation "androidx.preference:preference:${ANDROID_X_VERSION}"

libs/libGoogleFeed.jar

0 → 100644

+49.7 KiB

File added.

No diff preview for this file type.

View file

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/OverlayCallbackImpl.java

0 → 100644

+184 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2016 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.uioverrides;

		import android.app.Activity;
		import android.content.SharedPreferences;
		import android.os.Bundle;

		import com.android.launcher3.Launcher;
		import com.android.launcher3.Utilities;
		import com.android.systemui.plugins.shared.LauncherOverlayManager;
		import com.android.systemui.plugins.shared.LauncherOverlayManager.LauncherOverlay;
		import com.android.systemui.plugins.shared.LauncherOverlayManager.LauncherOverlayCallbacks;

		import com.google.android.libraries.gsa.launcherclient.LauncherClient;
		import com.google.android.libraries.gsa.launcherclient.LauncherClientCallbacks;

		import java.io.PrintWriter;

		/**
		* Implements {@link LauncherOverlay} and passes all the corresponding events to {@link
		* LauncherClient}. {@see setClient}
		*
		* <p>Implements {@link LauncherClientCallbacks} and sends all the corresponding callbacks to {@link
		* Launcher}.
		*/
		public class OverlayCallbackImpl
		implements LauncherOverlay, LauncherClientCallbacks, LauncherOverlayManager,
		SharedPreferences.OnSharedPreferenceChangeListener {

		private static final String KEY_ENABLE_MINUS_ONE = "pref_enable_minus_one";

		private final Launcher mLauncher;
		private final LauncherClient mClient;

		private LauncherOverlayCallbacks mLauncherOverlayCallbacks;
		private boolean mWasOverlayAttached = false;

		public OverlayCallbackImpl(Launcher launcher) {
		SharedPreferences prefs = Utilities.getPrefs(launcher);

		mLauncher = launcher;
		mClient = new LauncherClient(mLauncher, this, getClientOptions(prefs));
		prefs.registerOnSharedPreferenceChangeListener(this);
		}

		@Override
		public void onDeviceProvideChanged() {
		mClient.reattachOverlay();
		}

		@Override
		public void onAttachedToWindow() {
		mClient.onAttachedToWindow();
		}

		@Override
		public void onDetachedFromWindow() {
		mClient.onDetachedFromWindow();
		}

		@Override
		public void dump(String prefix, PrintWriter w) {
		mClient.dump(prefix, w);
		}

		@Override
		public void openOverlay() {
		mClient.showOverlay(true);
		}

		@Override
		public void hideOverlay(boolean animate) {
		mClient.hideOverlay(animate);
		}

		@Override
		public void hideOverlay(int duration) {
		mClient.hideOverlay(duration);
		}

		@Override
		public boolean startSearch(byte[] config, Bundle extras) {
		return false;
		}

		@Override
		public void onActivityCreated(Activity activity, Bundle bundle) {
		// Not called
		}

		@Override
		public void onActivityStarted(Activity activity) {
		mClient.onStart();
		}

		@Override
		public void onActivityResumed(Activity activity) {
		mClient.onResume();
		}

		@Override
		public void onActivityPaused(Activity activity) {
		mClient.onPause();
		}

		@Override
		public void onActivityStopped(Activity activity) {
		mClient.onStop();
		}

		@Override
		public void onActivitySaveInstanceState(Activity activity, Bundle bundle) { }

		@Override
		public void onActivityDestroyed(Activity activity) {
		mClient.onDestroy();
		mLauncher.getSharedPrefs().unregisterOnSharedPreferenceChangeListener(this);
		}

		@Override
		public void onSharedPreferenceChanged(SharedPreferences prefs, String key) {
		if (KEY_ENABLE_MINUS_ONE.equals(key)) {
		mClient.setClientOptions(getClientOptions(prefs));
		}
		}

		@Override
		public void onServiceStateChanged(boolean overlayAttached, boolean hotwordActive) {
		if (overlayAttached != mWasOverlayAttached) {
		mWasOverlayAttached = overlayAttached;
		mLauncher.setLauncherOverlay(overlayAttached ? this : null);
		}
		}

		@Override
		public void onOverlayScrollChanged(float progress) {
		if (mLauncherOverlayCallbacks != null) {
		mLauncherOverlayCallbacks.onScrollChanged(progress);
		}
		}

		@Override
		public void onScrollInteractionBegin() {
		mClient.startMove();
		}

		@Override
		public void onScrollInteractionEnd() {
		mClient.endMove();
		}

		@Override
		public void onScrollChange(float progress, boolean rtl) {
		mClient.updateMove(progress);
		}

		@Override
		public void setOverlayCallbacks(LauncherOverlayCallbacks callbacks) {
		mLauncherOverlayCallbacks = callbacks;
		}

		private LauncherClient.ClientOptions getClientOptions(SharedPreferences prefs) {
		return new LauncherClient.ClientOptions(
		prefs.getBoolean(KEY_ENABLE_MINUS_ONE, true),
		true, /* enableHotword */
		true /* enablePrewarming */
		);
		}
		}

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/QuickstepLauncher.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -76,6 +76,7 @@ import com.android.quickstep.SysUINavigationMode.Mode;
		import com.android.quickstep.SystemUiProxy;
		import com.android.quickstep.views.RecentsView;
		import com.android.quickstep.views.TaskView;
		import com.android.systemui.plugins.shared.LauncherOverlayManager;

		import java.io.FileDescriptor;
		import java.io.PrintWriter;
		@@ -93,6 +94,11 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
		public static final AsyncCommand SET_SHELF_HEIGHT = (context, arg1, arg2) ->
		SystemUiProxy.INSTANCE.get(context).setShelfHeight(arg1 != 0, arg2);

		@Override
		protected LauncherOverlayManager getDefaultOverlay() {
		return new OverlayCallbackImpl(this);
		}

		@Override
		protected void onCreate(Bundle savedInstanceState) {
		super.onCreate(savedInstanceState);