Merge remote-tracking branch 'origin/lineage-23.2' (d8aba86e) · Commits · e / os / android_packages_apps_Gallery2

gallerycommon/src/com/android/gallery3d/exif/ExifParser.java

+1 −5

Original line number	Original line	Diff line number	Diff line
	@@ -623,11 +623,7 @@ class ExifParser {
	if (isThumbnailRequested()) {		if (isThumbnailRequested()) {
	if (tag.hasValue()) {		if (tag.hasValue()) {
	for (int i = 0; i < tag.getComponentCount(); i++) {		for (int i = 0; i < tag.getComponentCount(); i++) {
	if (tag.getDataType() == ExifTag.TYPE_UNSIGNED_SHORT) {
	registerUncompressedStrip(i, tag.getValueAt(i));		registerUncompressedStrip(i, tag.getValueAt(i));
	} else {
	registerUncompressedStrip(i, tag.getValueAt(i));
	}
	}		}
	} else {		} else {
	mCorrespondingEvent.put(tag.getOffset(), new ExifTagEvent(tag, false));		mCorrespondingEvent.put(tag.getOffset(), new ExifTagEvent(tag, false));

proguard.flags

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -58,7 +58,10 @@
	-dontnote com.android.camera.EffectsRecorder		-dontnote com.android.camera.EffectsRecorder

	# Required for mp4parser		# Required for mp4parser
	-keep public class * implements com.coremedia.iso.boxes.Box		# TODO(b/373579455): Evaluate if <init> needs to be kept.
			-keep public class * implements com.coremedia.iso.boxes.Box {
			void <init>();
			}

	#-assumenosideeffects junit.framework.Assert {		#-assumenosideeffects junit.framework.Assert {
	#*;		#*;

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

+26 −38

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

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

	@Override		@Override

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

+30 −41

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

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

	@Override		@Override

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

+7 −10

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