Gallery2: Convert resource switch statements to if-else (cce97b43) · Commits · e / os / android_packages_apps_Gallery2

src/com/android/gallery3d/app/AlbumPage.java

+26 −38

Original line number	Diff line number	Diff line
		@@ -707,47 +707,35 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster

		@Override
		protected boolean onItemSelected(MenuItem item) {
		switch (item.getItemId()) {
		case android.R.id.home: {
		final int itemId = item.getItemId();
		if (itemId == android.R.id.home) {
		onUpPressed();
		return true;
		}
		case R.id.action_cancel:
		} else if (itemId == R.id.action_cancel) {
		mActivity.getStateManager().finishState(this);
		return true;
		case R.id.action_select:
		} else if (itemId == R.id.action_select) {
		mSelectionManager.setAutoLeaveSelectionMode(false);
		mSelectionManager.enterSelectionMode();
		return true;
		case R.id.action_slideshow: {
		} else if (itemId == R.id.action_slideshow) {
		mInCameraAndWantQuitOnPause = false;
		Bundle data = new Bundle();
		data.putString(SlideshowPage.KEY_SET_PATH,
		mMediaSetPath.toString());
		data.putString(SlideshowPage.KEY_SET_PATH, mMediaSetPath.toString());
		data.putBoolean(SlideshowPage.KEY_REPEAT, true);
		mActivity.getStateManager().startStateForResult(
		SlideshowPage.class, REQUEST_SLIDESHOW, data);
		return true;
		}
		case R.id.action_details: {
		} else if (itemId == R.id.action_details) {
		if (mShowDetails) {
		hideDetails();
		} else {
		showDetails();
		}
		return true;
		}
		case R.id.action_camera: {
		} else if (itemId == R.id.action_camera) {
		GalleryUtils.startCameraActivity(mActivity);
		return true;
		}
		case R.id.action_view_type: {
		} else if (itemId == R.id.action_view_type) {
		switchView();
		return true;
		}
		default:
		} else {
		return false;
		}
		return true;
		}

		@Override

src/com/android/gallery3d/app/AlbumSetPage.java

+30 −41

Original line number	Diff line number	Diff line
		@@ -630,22 +630,19 @@ public class AlbumSetPage extends ActivityState implements

		@Override
		protected boolean onItemSelected(MenuItem item) {
		final int itemId = item.getItemId();
		Activity activity = mActivity;
		switch (item.getItemId()) {
		case R.id.action_more_image:
		if (itemId == R.id.action_more_image) {
		Uri moreUri = Uri.parse(mActivity.getString(R.string.website_for_more_image));
		Intent moreIntent = new Intent(Intent.ACTION_VIEW, moreUri);
		mActivity.startActivity(moreIntent);
		return true;
		case R.id.action_cancel:
		} else if (itemId == R.id.action_cancel) {
		activity.setResult(Activity.RESULT_CANCELED);
		activity.finish();
		return true;
		case R.id.action_select:
		} else if (itemId == R.id.action_select) {
		mSelectionManager.setAutoLeaveSelectionMode(false);
		mSelectionManager.enterSelectionMode();
		return true;
		case R.id.action_details:
		} else if (itemId == R.id.action_details) {
		if (mAlbumSetDataAdapter.size() != 0) {
		if (mShowDetails) {
		hideDetails();
		@@ -657,26 +654,18 @@ public class AlbumSetPage extends ActivityState implements
		activity.getText(R.string.no_albums_alert),
		Toast.LENGTH_SHORT).show();
		}
		return true;
		case R.id.action_camera: {
		} else if (itemId == R.id.action_camera) {
		GalleryUtils.startCameraActivity(activity);
		return true;
		}
		case R.id.action_manage_offline: {
		} else if (itemId == R.id.action_manage_offline) {
		Bundle data = new Bundle();
		String mediaPath = mActivity.getDataManager().getTopSetPath(
		DataManager.INCLUDE_ALL);
		data.putString(AlbumSetPage.KEY_MEDIA_PATH, mediaPath);
		mActivity.getStateManager().startState(ManageCachePage.class, data);
		return true;
		}
		/*case R.id.action_settings: {
		activity.startActivity(new Intent(activity, GallerySettings.class));
		return true;
		}*/
		default:
		} else {
		return false;
		}
		return true;
		}

		@Override

src/com/android/gallery3d/app/GalleryActivity.java

+7 −10

Original line number	Diff line number	Diff line
		@@ -184,16 +184,13 @@ public final class GalleryActivity extends AbstractGalleryActivity implements On
		@Override
		public boolean onNavigationItemSelected(MenuItem item) {
		getGLRoot().lockRenderThread();
		switch (item.getItemId()) {
		case R.id.action_timeline:
		final int itemId = item.getItemId();
		if (itemId == R.id.action_timeline) {
		showScreen(0);
		break;
		case R.id.action_album:
		} else if (itemId == R.id.action_album) {
		showScreen(1);
		break;
		case R.id.action_videos:
		} else if (itemId == R.id.action_videos) {
		showScreen(2);
		break;
		}
		getGLRoot().unlockRenderThread();
		return true;

src/com/android/gallery3d/app/PhotoPage.java

+79 −127

Original line number	Diff line number	Diff line
		@@ -643,34 +643,32 @@ public abstract class PhotoPage extends ActivityState implements
		if (mCurrentPhoto == null) {
		return false;
		}
		switch (control) {
		case R.id.photopage_bottom_controls:
		if (control == R.id.photopage_bottom_controls) {
		return mShowBars;
		case R.id.photopage_bottom_control_edit:
		} else if (control == R.id.photopage_bottom_control_edit) {
		return mHaveImageEditor
		&& mShowBars
		&& !mPhotoView.getFilmMode()
		&& (mCurrentPhoto.getSupportedOperations() & MediaItem.SUPPORT_EDIT) != 0
		&& mCurrentPhoto.getMediaType() == MediaObject.MEDIA_TYPE_IMAGE;
		case R.id.photopage_bottom_control_share:
		} else if (control == R.id.photopage_bottom_control_share) {
		mShareIntent = new Intent(Intent.ACTION_SEND);
		return mShowBars;
		case R.id.photopage_bottom_control_delete:
		} else if (control == R.id.photopage_bottom_control_delete) {
		return mShowBars;
		default:
		} else {
		return false;
		}
		}

		@Override
		public void onBottomControlClicked(int control) {
		switch(control) {
		case R.id.photopage_bottom_control_edit:
		if (control == R.id.photopage_bottom_control_edit) {
		launchPhotoEditor();
		return;
		case R.id.photopage_bottom_control_share:
		} else if (control == R.id.photopage_bottom_control_share) {
		if (mModel != null && mModel.getMediaItem(0) != null) {
		Uri uri = mActivity.getDataManager().getContentUri(mModel.getMediaItem(0).getPath());
		Uri uri = mActivity.getDataManager().getContentUri(
		mModel.getMediaItem(0).getPath());
		mActivity.isTopMenuShow = true;
		mShareIntent.setDataAndType(uri, MenuExecutor.getMimeType(mModel
		.getMediaItem(0).getMediaType()));
		@@ -681,26 +679,18 @@ public abstract class PhotoPage extends ActivityState implements
		Log.d(TAG, "can't share uri started with file://");
		return;
		}
		mActivity.startActivity(Intent.createChooser(mShareIntent,
		shareTitle));
		mActivity.startActivity(Intent.createChooser(mShareIntent, shareTitle));
		}
		return;

		case R.id.photopage_bottom_control_delete:
		} else if (control == R.id.photopage_bottom_control_delete) {
		String confirmMsg = null;
		confirmMsg = mActivity.getResources().getQuantityString(
		R.plurals.delete_selection, 1);
		confirmMsg = mActivity.getResources().getQuantityString(R.plurals.delete_selection, 1);
		if (mModel != null && mModel.getMediaItem(0) != null) {
		Path path = mModel.getMediaItem(0).getPath();
		mSelectionManager.deSelectAll();
		mSelectionManager.toggle(path);
		MenuItem item = null;
		mMenuExecutor.onMenuClicked(item, confirmMsg,
		mConfirmDialogListener);
		mMenuExecutor.onMenuClicked(item, confirmMsg, mConfirmDialogListener);
		}
		return;
		default:
		return;
		}
		}

		@@ -1165,14 +1155,11 @@ public abstract class PhotoPage extends ActivityState implements
		Path path = current.getPath();

		DataManager manager = mActivity.getDataManager();
		int action = item.getItemId();
		final int itemId = item.getItemId();
		String confirmMsg = null;
		switch (action) {
		case android.R.id.home: {
		if (itemId == android.R.id.home) {
		onUpPressed();
		return true;
		}
		case R.id.action_slideshow: {
		} else if (itemId == R.id.action_slideshow) {
		Bundle data = new Bundle();
		data.putString(SlideshowPage.KEY_SET_PATH, mMediaSet.getPath().toString());
		data.putString(SlideshowPage.KEY_ITEM_PATH, path.toString());
		@@ -1180,20 +1167,7 @@ public abstract class PhotoPage extends ActivityState implements
		data.putBoolean(SlideshowPage.KEY_REPEAT, true);
		mActivity.getStateManager().startStateForResult(
		SlideshowPage.class, REQUEST_SLIDESHOW, data);
		return true;
		}
		/*case R.id.action_crop: {
		Activity activity = mActivity;
		Intent intent = new Intent(CropActivity.CROP_ACTION);
		intent.setClass(activity, CropActivity.class);
		intent.setDataAndType(manager.getContentUri(path), current.getMimeType())
		.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
		activity.startActivityForResult(intent, PicasaSource.isPicasaImage(current)
		? REQUEST_CROP_PICASA
		: REQUEST_CROP);
		return true;
		}*/
		case R.id.action_trim: {
		} else if (itemId == R.id.action_trim) {
		Intent intent = new Intent(mActivity, TrimVideo.class);
		intent.setData(manager.getContentUri(path));
		// We need the file path to wrap this into a RandomAccessFile.
		@@ -1206,58 +1180,36 @@ public abstract class PhotoPage extends ActivityState implements
		Toast.makeText(mActivity,mActivity.getString(R.string.can_not_trim),
		Toast.LENGTH_SHORT).show();
		}
		return true;
		}
		case R.id.action_mute: {
		} else if (itemId == R.id.action_mute) {
		MuteVideo muteVideo = new MuteVideo(current.getFilePath(),
		manager.getContentUri(path), mActivity);
		muteVideo.muteInBackground();
		return true;
		}
		case R.id.action_edit: {
		} else if (itemId == R.id.action_edit) {
		launchPhotoEditor();
		return true;
		}
		/*case R.id.action_simple_edit: {
		launchSimpleEditor();
		return true;
		}*/
		case R.id.action_details: {
		} else if (itemId == R.id.action_details) {
		if (mShowDetails) {
		hideDetails();
		} else {
		showDetails();
		}
		return true;
		}
		case R.id.print: {
		} else if (itemId == R.id.print) {
		try {
		mActivity.printSelectedImage(manager.getContentUri(path));
		} catch (SecurityException e) {
		e.printStackTrace();
		mActivity.finish();
		}
		return true;
		}
		case R.id.action_delete:
		} else if (itemId == R.id.action_delete) {
		confirmMsg = mActivity.getResources().getQuantityString(
		R.plurals.delete_selection, 1);
		//case R.id.action_rotate_ccw:
		//case R.id.action_rotate_cw:
		case R.id.action_show_on_map:
		} else if (itemId == R.id.action_show_on_map) {
		mSelectionManager.deSelectAll();
		mSelectionManager.toggle(path);
		mMenuExecutor.onMenuClicked(item, confirmMsg, mConfirmDialogListener);
		return true;
		// case R.id.action_drm_info:
		// String filepath = current.getFilePath();
		// if (DrmHelper.isDrmFile(filepath)) {
		// DrmHelper.showDrmInfo(mActivity.getAndroidContext(), filepath);
		// }
		// return true;
		default :
		} else {
		return false;
		}
		return true;
		}

		private void hideDetails() {

src/com/android/gallery3d/app/TimeLinePage.java

+25 −34

Original line number	Diff line number	Diff line
		@@ -629,42 +629,33 @@ public class TimeLinePage extends ActivityState implements

		@Override
		protected boolean onItemSelected(MenuItem item) {
		switch (item.getItemId()) {
		case android.R.id.home: {
		final int itemId = item.getItemId();
		if (itemId == android.R.id.home) {
		onUpPressed();
		return true;
		}
		case R.id.action_cancel:
		} else if (itemId == R.id.action_cancel) {
		mActivity.getStateManager().finishState(this);
		return true;
		case R.id.action_select:
		} else if (itemId == R.id.action_select) {
		mSelectionManager.setAutoLeaveSelectionMode(true);
		mSelectionManager.enterSelectionMode();
		return true;
		case R.id.action_slideshow: {
		} else if (itemId == R.id.action_slideshow) {
		Bundle data = new Bundle();
		data.putString(SlideshowPage.KEY_SET_PATH,
		mMediaSetPath.toString());
		data.putBoolean(SlideshowPage.KEY_REPEAT, true);
		mActivity.getStateManager().startStateForResult(
		SlideshowPage.class, REQUEST_SLIDESHOW, data);
		return true;
		}
		case R.id.action_details: {
		} else if (itemId == R.id.action_details) {
		if (mShowDetails) {
		hideDetails();
		} else {
		showDetails();
		}
		return true;
		}
		case R.id.action_camera: {
		} else if (itemId == R.id.action_camera) {
		GalleryUtils.startCameraActivity(mActivity);
		return true;
		}
		default:
		} else {
		return false;
		}
		return true;
		}

		@Override