Merge "Merging from ub-launcher3-master @ build 6799015" (1dfbeb75) · Commits · e / os / BlissLauncher3

Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ LOCAL_STATIC_ANDROID_LIBRARIES := \
		androidx.recyclerview_recyclerview \
		androidx.dynamicanimation_dynamicanimation \
		androidx.preference_preference \
		androidx.slice_slice-view \
		iconloader_base

		LOCAL_STATIC_JAVA_LIBRARIES := \

quickstep/res/values/override.xml

+0 −2

Original line number	Diff line number	Diff line
		@@ -27,8 +27,6 @@

		<string name="user_event_dispatcher_class" translatable="false">com.android.quickstep.logging.UserEventDispatcherExtension</string>

		<string name="prediction_model_class" translatable="false">com.android.launcher3.hybridhotseat.HotseatPredictionModel</string>

		<string name="model_delegate_class" translatable="false">com.android.launcher3.model.QuickstepModelDelegate</string>

		</resources>

quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java

+0 −17

Original line number	Diff line number	Diff line
		@@ -26,12 +26,10 @@ import android.animation.AnimatorSet;
		import android.animation.ValueAnimator;
		import android.content.Intent;
		import android.content.IntentSender;
		import android.content.SharedPreferences;
		import android.os.Bundle;
		import android.os.CancellationSignal;

		import com.android.launcher3.config.FeatureFlags;
		import com.android.launcher3.hybridhotseat.HotseatPredictionController;
		import com.android.launcher3.model.WellbeingModel;
		import com.android.launcher3.popup.SystemShortcut;
		import com.android.launcher3.proxy.ProxyActivityStarter;
		@@ -40,14 +38,12 @@ import com.android.launcher3.statehandlers.BackButtonAlphaHandler;
		import com.android.launcher3.statehandlers.DepthController;
		import com.android.launcher3.statemanager.StateManager.StateHandler;
		import com.android.launcher3.uioverrides.RecentsViewStateController;
		import com.android.launcher3.util.OnboardingPrefs;
		import com.android.launcher3.util.UiThreadHelper;
		import com.android.quickstep.RecentsModel;
		import com.android.quickstep.SysUINavigationMode;
		import com.android.quickstep.SysUINavigationMode.Mode;
		import com.android.quickstep.SysUINavigationMode.NavigationModeChangeListener;
		import com.android.quickstep.SystemUiProxy;
		import com.android.quickstep.util.QuickstepOnboardingPrefs;
		import com.android.quickstep.util.RemoteAnimationProvider;
		import com.android.quickstep.util.RemoteFadeOutAnimationListener;
		import com.android.quickstep.views.OverviewActionsView;
		@@ -73,7 +69,6 @@ public abstract class BaseQuickstepLauncher extends Launcher
		Float.intBitsToFloat(arg1), arg2 != 0);

		private OverviewActionsView mActionsView;
		protected HotseatPredictionController mHotseatPredictionController;

		@Override
		protected void onCreate(Bundle savedInstanceState) {
		@@ -221,11 +216,6 @@ public abstract class BaseQuickstepLauncher extends Launcher
		return mDepthController;
		}

		@Override
		protected OnboardingPrefs createOnboardingPrefs(SharedPreferences sharedPrefs) {
		return new QuickstepOnboardingPrefs(this, sharedPrefs);
		}

		@Override
		public void useFadeOutAnimationForLauncherStart(CancellationSignal signal) {
		QuickstepAppTransitionManagerImpl appTransitionManager =
		@@ -314,13 +304,6 @@ public abstract class BaseQuickstepLauncher extends Launcher
		Stream.of(WellbeingModel.SHORTCUT_FACTORY));
		}

		/**
		* Returns Prediction controller for hybrid hotseat
		*/
		public HotseatPredictionController getHotseatPredictionController() {
		return mHotseatPredictionController;
		}

		public void setHintUserWillBeActive() {
		addActivityFlags(ACTIVITY_STATE_USER_WILL_BE_ACTIVE);
		}

quickstep/src/com/android/launcher3/appprediction/AllAppsTipView.java

+1 −4

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@ package com.android.launcher3.appprediction;
		import static com.android.launcher3.AbstractFloatingView.TYPE_DISCOVERY_BOUNCE;
		import static com.android.launcher3.AbstractFloatingView.TYPE_ON_BOARD_POPUP;
		import static com.android.launcher3.LauncherState.ALL_APPS;
		import static com.android.quickstep.logging.UserEventDispatcherExtension.ALL_APPS_PREDICTION_TIPS;

		import android.os.UserManager;

		@@ -31,7 +30,6 @@ import com.android.launcher3.Utilities;
		import com.android.launcher3.allapps.FloatingHeaderView;
		import com.android.launcher3.statemanager.StateManager.StateListener;
		import com.android.launcher3.views.ArrowTipView;
		import com.android.systemui.shared.system.LauncherEventUtil;

		/**
		* ArrowTip helper aligned just above prediction apps, shown to users that enter all apps for the
		@@ -57,8 +55,7 @@ public class AllAppsTipView {
		floatingHeaderView.findFixedRowByType(PredictionRowView.class).getLocationOnScreen(coords);
		ArrowTipView arrowTipView = new ArrowTipView(launcher).setOnClosedCallback(() -> {
		launcher.getSharedPrefs().edit().putBoolean(ALL_APPS_TIP_SEEN, true).apply();
		launcher.getUserEventDispatcher().logActionTip(LauncherEventUtil.DISMISS,
		ALL_APPS_PREDICTION_TIPS);
		// TODO: add log to WW
		});
		arrowTipView.show(launcher.getString(R.string.all_apps_prediction_tip), coords[1]);

quickstep/src/com/android/launcher3/appprediction/ComponentKeyMapper.java

deleted100644 → 0

+0 −63

Original line number	Diff line number	Diff line
		/**
		* 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.
		*/

		package com.android.launcher3.appprediction;

		import static com.android.quickstep.InstantAppResolverImpl.COMPONENT_CLASS_MARKER;

		import com.android.launcher3.allapps.AllAppsStore;
		import com.android.launcher3.model.data.AppInfo;
		import com.android.launcher3.model.data.ItemInfoWithIcon;
		import com.android.launcher3.util.ComponentKey;

		public class ComponentKeyMapper {

		protected final ComponentKey componentKey;
		private final DynamicItemCache mCache;

		public ComponentKeyMapper(ComponentKey key, DynamicItemCache cache) {
		componentKey = key;
		mCache = cache;
		}

		public String getPackage() {
		return componentKey.componentName.getPackageName();
		}

		public String getComponentClass() {
		return componentKey.componentName.getClassName();
		}

		public ComponentKey getComponentKey() {
		return componentKey;
		}

		@Override
		public String toString() {
		return componentKey.toString();
		}

		public ItemInfoWithIcon getApp(AllAppsStore store) {
		AppInfo item = store.getApp(componentKey);
		if (item != null) {
		return item;
		} else if (getComponentClass().equals(COMPONENT_CLASS_MARKER)) {
		return mCache.getInstantApp(componentKey.componentName.getPackageName());
		} else {
		return mCache.getShortcutInfo(componentKey);
		}
		}
		}