Merge "Removing multiple system RPCs to packageMAnager and userManager from UI... (81e651db) · Commits · e / os / android_packages_apps_Trebuchet

robolectric_tests/src/com/android/launcher3/model/LoaderCursorTest.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -92,7 +92,8 @@ public class LoaderCursorTest {
		SCREEN, CELLX, CELLY, RESTORED, INTENT
		});

		mLoaderCursor = new LoaderCursor(mCursor, LauncherSettings.Favorites.CONTENT_URI, mApp);
		mLoaderCursor = new LoaderCursor(mCursor, LauncherSettings.Favorites.CONTENT_URI, mApp,
		new UserManagerState());
		mLoaderCursor.allUsers.put(0, Process.myUserHandle());
		}

robolectric_tests/src/com/android/launcher3/model/ModelMultiCallbacksTest.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -199,7 +199,7 @@ public class ModelMultiCallbacksTest {
		}

		@Override
		public void bindAllApplications(AppInfo[] apps) {
		public void bindAllApplications(AppInfo[] apps, int flags) {
		mAppInfos = apps;
		}

src/com/android/launcher3/Launcher.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -2455,8 +2455,9 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
		*
		* Implementation of the method from LauncherModel.Callbacks.
		*/
		public void bindAllApplications(AppInfo[] apps) {
		mAppsView.getAppsStore().setApps(apps);
		@Override
		public void bindAllApplications(AppInfo[] apps, int flags) {
		mAppsView.getAppsStore().setApps(apps, flags);
		}

		/**

src/com/android/launcher3/LauncherModel.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -117,7 +117,7 @@ public class LauncherModel extends LauncherApps.Callback implements InstallSessi
		@Override
		public void run() {
		if (mModelLoaded && hasShortcutsPermission(mApp.getContext())
		!= mBgDataModel.hasShortcutHostPermission) {
		!= mBgAllAppsList.hasShortcutHostPermission()) {
		forceReload();
		}
		}

src/com/android/launcher3/allapps/AllAppsContainerView.java

+16 −18

Original line number	Diff line number	Diff line
		@@ -16,6 +16,9 @@
		package com.android.launcher3.allapps;

		import static com.android.launcher3.logging.LoggerUtils.newContainerTarget;
		import static com.android.launcher3.model.BgDataModel.Callbacks.FLAG_HAS_SHORTCUT_PERMISSION;
		import static com.android.launcher3.model.BgDataModel.Callbacks.FLAG_QUIET_MODE_CHANGE_PERMISSION;
		import static com.android.launcher3.model.BgDataModel.Callbacks.FLAG_QUIET_MODE_ENABLED;

		import android.animation.ValueAnimator;
		import android.content.Context;
		@@ -37,7 +40,6 @@ import android.view.WindowInsets;
		import androidx.annotation.NonNull;
		import androidx.annotation.Nullable;
		import androidx.annotation.StringRes;
		import androidx.dynamicanimation.animation.DynamicAnimation;
		import androidx.recyclerview.widget.DefaultItemAnimator;
		import androidx.recyclerview.widget.LinearLayoutManager;
		import androidx.recyclerview.widget.RecyclerView;
		@@ -54,7 +56,6 @@ import com.android.launcher3.Utilities;
		import com.android.launcher3.keyboard.FocusedItemDecorator;
		import com.android.launcher3.model.data.AppInfo;
		import com.android.launcher3.model.data.ItemInfo;
		import com.android.launcher3.pm.UserCache;
		import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
		import com.android.launcher3.userevent.nano.LauncherLogProto.Target;
		import com.android.launcher3.util.ItemInfoMatcher;
		@@ -195,7 +196,7 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
		}

		private void resetWorkProfile() {
		mWorkModeSwitch.refresh();
		mWorkModeSwitch.update(!mAllAppsStore.hasModelFlag(FLAG_QUIET_MODE_ENABLED));
		mAH[AdapterHolder.WORK].setupOverlay();
		mAH[AdapterHolder.WORK].applyPadding();
		}
		@@ -431,12 +432,14 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
		}

		private void setupWorkToggle() {
		if (Utilities.ATLEAST_P) {
		mWorkModeSwitch = (WorkModeSwitch) mLauncher.getLayoutInflater().inflate(
		R.layout.work_mode_switch, this, false);
		this.addView(mWorkModeSwitch);
		mWorkModeSwitch.setInsets(mInsets);
		mWorkModeSwitch.post(() -> mAH[AdapterHolder.WORK].applyPadding());
		}
		}

		private void replaceRVContainer(boolean showTabs) {
		for (int i = 0; i < mAH.length; i++) {
		@@ -470,7 +473,9 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
		}
		reset(true /* animate */);
		if (mWorkModeSwitch != null) {
		mWorkModeSwitch.setWorkTabVisible(pos == AdapterHolder.WORK);
		mWorkModeSwitch.setWorkTabVisible(pos == AdapterHolder.WORK
		&& mAllAppsStore.hasModelFlag(
		FLAG_HAS_SHORTCUT_PERMISSION \| FLAG_QUIET_MODE_CHANGE_PERMISSION));
		}
		}

		@@ -580,15 +585,8 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
		&& valueAnimator.getAnimatedFraction() >= FLING_ANIMATION_THRESHOLD) {
		int searchViewId = getSearchView().getId();
		addSpringView(searchViewId);

		finishWithShiftAndVelocity(1, velocity * FLING_VELOCITY_MULTIPLIER,
		new DynamicAnimation.OnAnimationEndListener() {
		@Override
		public void onAnimationEnd(DynamicAnimation animation,
		boolean canceled, float value, float velocity) {
		removeSpringView(searchViewId);
		}
		});
		(anim, canceled, value, velocity) -> removeSpringView(searchViewId));

		shouldSpring = false;
		}
		@@ -647,7 +645,7 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo

		void setupOverlay() {
		if (!mIsWork \|\| recyclerView == null) return;
		boolean workDisabled = UserCache.INSTANCE.get(mLauncher).isAnyProfileQuietModeEnabled();
		boolean workDisabled = mAllAppsStore.hasModelFlag(FLAG_QUIET_MODE_ENABLED);
		if (mWorkDisabled == workDisabled) return;
		recyclerView.setContentDescription(workDisabled ? mLauncher.getString(
		R.string.work_apps_paused_content_description) : null);