Merge "Allow for extension for pano-based navigation." into gb-ub-photos-carlsbad (2f3a8e1c) · Commits · e / os / android_packages_apps_Gallery2

src/com/android/gallery3d/filtershow/crop/CropActivity.java

+13 −12

Original line number	Diff line number	Diff line
		@@ -106,6 +106,7 @@ public class CropActivity extends Activity {
		mCropView = (CropView) findViewById(R.id.cropView);

		ActionBar actionBar = getActionBar();
		if (actionBar != null) {
		actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
		actionBar.setCustomView(R.layout.filtershow_actionbar);

		@@ -116,7 +117,7 @@ public class CropActivity extends Activity {
		startFinishOutput();
		}
		});

		}
		if (intent.getData() != null) {
		mSourceUri = intent.getData();
		startLoadBitmap(mSourceUri);
		@@ -275,7 +276,7 @@ public class CropActivity extends Activity {
		}
		}

		private void startFinishOutput() {
		protected void startFinishOutput() {
		if (finalIOGuard) {
		return;
		} else {