summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Haeberling <haeberling@google.com>2013-08-15 15:57:29 -0700
committerSascha Haeberling <haeberling@google.com>2013-08-15 15:57:29 -0700
commit394023fb7e3c8d07d4aeafc30bf4b66ed481ebb7 (patch)
tree638719b5466b848dd08986aef74b5e232eead739
parentfae11a165e344a38811770c7d348eda214683edc (diff)
downloadandroid_packages_apps_Snap-394023fb7e3c8d07d4aeafc30bf4b66ed481ebb7.tar.gz
android_packages_apps_Snap-394023fb7e3c8d07d4aeafc30bf4b66ed481ebb7.tar.bz2
android_packages_apps_Snap-394023fb7e3c8d07d4aeafc30bf4b66ed481ebb7.zip
Single-tap in fullscreen view toggles ActionBar.
Bug: 10347286 Change-Id: I55e400c957d4ec1ef1307e45007e2127ea5ab7ea
-rw-r--r--src/com/android/camera/CameraActivity.java9
-rw-r--r--src/com/android/camera/ui/FilmStripView.java7
2 files changed, 15 insertions, 1 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 57863b320..acac19199 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -231,6 +231,15 @@ public class CameraActivity extends Activity
updateStitchingProgress(panoStitchingProgress);
}
}
+
+ @Override
+ public void onToggleActionBarVisibility() {
+ if (mActionBar.isShowing()) {
+ mActionBar.hide();
+ } else {
+ mActionBar.show();
+ }
+ }
};
private void hidePanoStitchingProgress() {
diff --git a/src/com/android/camera/ui/FilmStripView.java b/src/com/android/camera/ui/FilmStripView.java
index 5e6bf699c..22ef9c0e1 100644
--- a/src/com/android/camera/ui/FilmStripView.java
+++ b/src/com/android/camera/ui/FilmStripView.java
@@ -318,6 +318,11 @@ public class FilmStripView extends ViewGroup {
* {@code false} otherwise.
*/
public void onCurrentDataChanged(int dataID, boolean current);
+
+ /**
+ * Toggles the visibility of the ActionBar.
+ */
+ public void onToggleActionBarVisibility();
}
/**
@@ -1604,7 +1609,7 @@ public class FilmStripView extends ViewGroup {
return true;
}
} else if (inFullScreen()) {
- mController.gotoFilmStrip();
+ mListener.onToggleActionBarVisibility();
return true;
}
return false;