diff options
| author | George Mount <mount@google.com> | 2013-08-20 16:31:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-20 16:31:02 +0000 |
| commit | 2f3a8e1c95e1a689086e585a9db2482dc66ea39b (patch) | |
| tree | 28aeddf1d2763280eb1b491646cd4ea48414e9c5 /src | |
| parent | 929d90ca51c2856c0a8cb5a812f0e70628bb71d7 (diff) | |
| parent | 97dd05ad6ed8bfb9fde741919738bec5d87daf79 (diff) | |
| download | android_packages_apps_Gallery2-2f3a8e1c95e1a689086e585a9db2482dc66ea39b.tar.gz android_packages_apps_Gallery2-2f3a8e1c95e1a689086e585a9db2482dc66ea39b.tar.bz2 android_packages_apps_Gallery2-2f3a8e1c95e1a689086e585a9db2482dc66ea39b.zip | |
Merge "Allow for extension for pano-based navigation." into gb-ub-photos-carlsbad
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/gallery3d/filtershow/crop/CropActivity.java | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/src/com/android/gallery3d/filtershow/crop/CropActivity.java b/src/com/android/gallery3d/filtershow/crop/CropActivity.java index 0a0c36703..3a7829681 100644 --- a/src/com/android/gallery3d/filtershow/crop/CropActivity.java +++ b/src/com/android/gallery3d/filtershow/crop/CropActivity.java @@ -106,17 +106,18 @@ public class CropActivity extends Activity { mCropView = (CropView) findViewById(R.id.cropView); ActionBar actionBar = getActionBar(); - actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM); - actionBar.setCustomView(R.layout.filtershow_actionbar); - - View mSaveButton = actionBar.getCustomView(); - mSaveButton.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View view) { - startFinishOutput(); - } - }); - + if (actionBar != null) { + actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM); + actionBar.setCustomView(R.layout.filtershow_actionbar); + + View mSaveButton = actionBar.getCustomView(); + mSaveButton.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View view) { + 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 { |