diff options
author | Sascha Haeberling <haeberling@google.com> | 2013-08-15 17:19:22 -0700 |
---|---|---|
committer | Sascha Haeberling <haeberling@google.com> | 2013-08-19 11:39:16 -0700 |
commit | 88ef7664ba6a888fa5da8693091674e152b56192 (patch) | |
tree | 52c8293d42b394cf09b7d01551df1f2e4787e96a /src/com/android/camera/CameraActivity.java | |
parent | 1571239c21fc4be7fd3c8db6ff1b8dc22f4d7e6f (diff) | |
download | android_packages_apps_Snap-88ef7664ba6a888fa5da8693091674e152b56192.tar.gz android_packages_apps_Snap-88ef7664ba6a888fa5da8693091674e152b56192.tar.bz2 android_packages_apps_Snap-88ef7664ba6a888fa5da8693091674e152b56192.zip |
Bring back the bottom controls in Filmstrip.
Bug: 10367172
Bug: 10074320
Also hooks up the Edit button and the edit menu item.
Change-Id: I0ce3344e09fdfd7794c417ddbe44b3d247a7ed7c
Diffstat (limited to 'src/com/android/camera/CameraActivity.java')
-rw-r--r-- | src/com/android/camera/CameraActivity.java | 35 |
1 files changed, 30 insertions, 5 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index e300b5d08..18fcee6cd 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -57,14 +57,14 @@ import com.android.camera.data.LocalData; import com.android.camera.data.LocalDataAdapter; import com.android.camera.data.MediaDetails; import com.android.camera.data.SimpleViewData; -import com.android.camera.util.ApiHelper; import com.android.camera.ui.CameraSwitcher; import com.android.camera.ui.CameraSwitcher.CameraSwitchListener; import com.android.camera.ui.DetailsDialog; import com.android.camera.ui.FilmStripView; +import com.android.camera.util.ApiHelper; import com.android.camera.util.CameraUtil; -import com.android.camera.util.PhotoSphereHelper.PanoramaViewHelper; import com.android.camera.util.PhotoSphereHelper; +import com.android.camera.util.PhotoSphereHelper.PanoramaViewHelper; import com.android.camera2.R; public class CameraActivity extends Activity @@ -235,12 +235,13 @@ public class CameraActivity extends Activity } @Override - public void onToggleActionBarVisibility() { + public boolean onToggleActionBarVisibility() { if (mActionBar.isShowing()) { mActionBar.hide(); } else { mActionBar.show(); } + return mActionBar.isShowing(); } }; @@ -439,7 +440,7 @@ public class CameraActivity extends Activity // TODO: add the functionality. return true; case R.id.action_edit: - // TODO: add the functionality. + launchEditor(localData); return true; case R.id.action_trim: // This is going to be handled by the Gallery app. @@ -623,12 +624,26 @@ public class CameraActivity extends Activity mCurrentModule.onResumeAfterSuper(); setSwipingEnabled(true); + + // We might be returning from an editor that changed the current item. + updateCurrentDataItem(); + } + + private void updateCurrentDataItem() { + int currentDataId = mFilmStripView.getCurrentId(); + if (currentDataId < 0) { + return; + } + final LocalData localData = mDataAdapter.getLocalData(currentDataId); + if (localData == null) { + return; + } + mDataAdapter.refresh(getContentResolver(), localData.getContentUri()); } @Override public void onStart() { super.onStart(); - mPanoramaViewHelper.onStart(); } @@ -776,6 +791,16 @@ public class CameraActivity extends Activity } } + /** + * Launches an ACTION_EDIT intent for the given local data item. + */ + public void launchEditor(LocalData data) { + Intent intent = new Intent(Intent.ACTION_EDIT) + .setDataAndType(data.getContentUri(), data.getMimeType()) + .setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); + startActivity(Intent.createChooser(intent, null)); + } + private void openModule(CameraModule module) { module.init(this, mRootView); module.onResumeBeforeSuper(); |