Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3fc9db9d authored Feb 15, 2020 by TreeHugger Robot Committed by Android (Google) Code Review Feb 15, 2020

Merge "Rename flag IS_DOGFOOD to IS_STUDIO." into ub-launcher3-master

parents fa19162a 3eeb41de

quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionRowView.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -296,7 +296,7 @@ public class PredictionRowView extends LinearLayout implements
		predictedApp.container = LauncherSettings.Favorites.CONTAINER_PREDICTION;
		predictedApps.add(predictedApp);
		} else {
		if (FeatureFlags.IS_DOGFOOD_BUILD) {
		if (FeatureFlags.IS_STUDIO_BUILD) {
		Log.e(TAG, "Predicted app not found: " + mapper);
		}
		}

quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -1251,7 +1251,7 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl
		}

		public PendingAnimation createAllTasksDismissAnimation(long duration) {
		if (FeatureFlags.IS_DOGFOOD_BUILD && mPendingAnimation != null) {
		if (FeatureFlags.IS_STUDIO_BUILD && mPendingAnimation != null) {
		throw new IllegalStateException("Another pending animation is still running");
		}
		AnimatorSet anim = new AnimatorSet();
		@@ -1595,7 +1595,7 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl
		}

		public PendingAnimation createTaskLauncherAnimation(TaskView tv, long duration) {
		if (FeatureFlags.IS_DOGFOOD_BUILD && mPendingAnimation != null) {
		if (FeatureFlags.IS_STUDIO_BUILD && mPendingAnimation != null) {
		throw new IllegalStateException("Another pending animation is still running");
		}

quickstep/src/com/android/quickstep/MultiStateCallback.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -130,7 +130,7 @@ public class MultiStateCallback {
		final LinkedList<Runnable> callbacks;
		if (mCallbacks.indexOfKey(stateMask) >= 0) {
		callbacks = mCallbacks.get(stateMask);
		if (FeatureFlags.IS_DOGFOOD_BUILD && callbacks.contains(callback)) {
		if (FeatureFlags.IS_STUDIO_BUILD && callbacks.contains(callback)) {
		throw new IllegalStateException("Existing callback for state found");
		}
		} else {

quickstep/src/com/android/quickstep/TaskAnimationManager.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -55,7 +55,7 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn
		// Notify if recents animation is still running
		if (mController != null) {
		String msg = "New recents animation started before old animation completed";
		if (FeatureFlags.IS_DOGFOOD_BUILD) {
		if (FeatureFlags.IS_STUDIO_BUILD) {
		throw new IllegalArgumentException(msg);
		} else {
		Log.e("TaskAnimationManager", msg, new Exception());

quickstep/src/com/android/quickstep/util/BinderTracker.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@ public class BinderTracker {
		private static final String TAG = "BinderTracker";

		public static void start() {
		if (!FeatureFlags.IS_DOGFOOD_BUILD) {
		if (!FeatureFlags.IS_STUDIO_BUILD) {
		Log.wtf(TAG, "Accessing tracker in released code.", new Exception());
		return;
		}
		@@ -40,7 +40,7 @@ public class BinderTracker {
		}

		public static void stop() {
		if (!FeatureFlags.IS_DOGFOOD_BUILD) {
		if (!FeatureFlags.IS_STUDIO_BUILD) {
		Log.wtf(TAG, "Accessing tracker in released code.", new Exception());
		return;
		}