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

proguard.flags

+4 −1

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

		# 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 {
		#*;

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;