Merge "Starting wallpaper picker in a separate task" into ub-launcher3-master (457dedd1) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/BaseDraggingActivity.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -45,7 +45,7 @@ public abstract class BaseDraggingActivity extends BaseActivity {
		private static final String TAG = "BaseDraggingActivity";

		// The Intent extra that defines whether to ignore the launch animation
		private static final String INTENT_EXTRA_IGNORE_LAUNCH_ANIMATION =
		protected static final String INTENT_EXTRA_IGNORE_LAUNCH_ANIMATION =
		"com.android.launcher3.intent.extra.shortcut.INGORE_LAUNCH_ANIMATION";

		// When starting an action mode, setting this tag will cause the action mode to be cancelled

src/com/android/launcher3/Launcher.java

+4 −30

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@ import static android.content.pm.ActivityInfo.CONFIG_SCREEN_SIZE;
		import static com.android.launcher3.LauncherAnimUtils.SPRING_LOADED_EXIT_DELAY;
		import static com.android.launcher3.LauncherState.ALL_APPS;
		import static com.android.launcher3.LauncherState.NORMAL;
		import static com.android.launcher3.LauncherState.OVERVIEW;
		import static com.android.launcher3.logging.LoggerUtils.newContainerTarget;

		import android.animation.Animator;
		@@ -147,7 +146,6 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns, L
		private static final int REQUEST_CREATE_APPWIDGET = 5;

		private static final int REQUEST_PICK_APPWIDGET = 9;
		private static final int REQUEST_PICK_WALLPAPER = 10;

		private static final int REQUEST_BIND_APPWIDGET = 11;
		public static final int REQUEST_BIND_PENDING_APPWIDGET = 12;
		@@ -574,14 +572,6 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns, L
		ON_ACTIVITY_RESULT_ANIMATION_DELAY);
		}
		return;
		} else if (requestCode == REQUEST_PICK_WALLPAPER) {
		if (resultCode == RESULT_OK && isInState(OVERVIEW)) {
		// User could have free-scrolled between pages before picking a wallpaper; make sure
		// we move to the closest one now.
		mWorkspace.setCurrentPage(mWorkspace.getPageNearestToCenterOfScreen());
		mStateManager.goToState(NORMAL, false);
		}
		return;
		}

		boolean isWidgetDrop = (requestCode == REQUEST_PICK_APPWIDGET \|\|
		@@ -1671,35 +1661,19 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns, L
		Toast.makeText(this, R.string.msg_disabled_by_admin, Toast.LENGTH_SHORT).show();
		return;
		}

		int pageScroll = mWorkspace.getScrollForPage(mWorkspace.getPageNearestToCenterOfScreen());
		float offset = mWorkspace.mWallpaperOffset.wallpaperOffsetForScroll(pageScroll);
		setWaitingForResult(new PendingRequestArgs(new ItemInfo()));
		Intent intent = new Intent(Intent.ACTION_SET_WALLPAPER)
		.putExtra(Utilities.EXTRA_WALLPAPER_OFFSET, offset);

		String pickerPackage = getString(R.string.wallpaper_picker_package);
		boolean hasTargetPackage = !TextUtils.isEmpty(pickerPackage);
		if (hasTargetPackage) {
		if (!TextUtils.isEmpty(pickerPackage)) {
		intent.setPackage(pickerPackage);
		}

		final Bundle launchOptions;
		if (v != null) {
		intent.setSourceBounds(getViewBounds(v));
		// If there is no target package, use the default intent chooser animation
		launchOptions = hasTargetPackage
		? getActivityLaunchOptionsAsBundle(v, isInMultiWindowModeCompat())
		: null;
		} else {
		launchOptions = null;
		}
		try {
		startActivityForResult(intent, REQUEST_PICK_WALLPAPER, launchOptions);
		} catch (ActivityNotFoundException e) {
		setWaitingForResult(null);
		Toast.makeText(this, R.string.activity_not_found, Toast.LENGTH_SHORT).show();
		// If there is no target package, use the default intent chooser animation
		intent.putExtra(INTENT_EXTRA_IGNORE_LAUNCH_ANIMATION, true);
		}
		startActivitySafely(v, intent, null);
		}

		@TargetApi(Build.VERSION_CODES.M)

src/com/android/launcher3/views/OptionsPopupView.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -107,7 +107,7 @@ public class OptionsPopupView extends AbstractFloatingView

		private boolean handleViewClick(View view, int action) {
		if (view.getId() == R.id.wallpaper_button) {
		mLauncher.onClickWallpaperPicker(null);
		mLauncher.onClickWallpaperPicker(view);
		logTap(action, ControlType.WALLPAPER_BUTTON);
		close(true);
		return true;