History log of /packages/apps/Gallery2/src/com/android/camera/CameraActivity.java
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
163a97c3d3e9e1a029e04a8e629eabd8de8f3d9f 09-Aug-2014 Alan Newberger <alann@google.com> Start new task for Gallery trampolines

When testing the Camera trampoline, even in the full gallery app
from a JB to K upgrade, I noticed that the Camera app was starting
in the Gallery trampoline's task -- two recents even with
excludeFromRecents true. Was still the case in the new trampoline.
Adding FLAG_ACTIVITY_NEW_TASK addressed this, also with some
manifest changes in the trampoline in another CL. Photos was working,
I believe because photos activities explicitly set a task affinity
to shield themselves from G+, thus forcing a new task. Also, this
helped shield activities when both trampolines are active. That is,
if Camera was started via its trampoline, then Photos, the Photos
shortcut opened Camera because it already had an activity in the
trampoline's task. Even if Photos works now, this does no harm and
ensures we're not relying on the implementation of another APK.

Bug: 16843573
Change-Id: Ifa6d65ef2b00a4ffc6df78f13dba16270113509d
/packages/apps/Gallery2/src/com/android/camera/CameraActivity.java
9149879dc8c2ff6fe233d6e20858ebc081068abb 03-Oct-2013 Mangesh Ghiware <mghiware@google.com> Add methods to return Camera and Gallery launcher intents.

Bug: 10820027
Change-Id: I340072c48832e23245aa041503649b40cbaf0bf0
/packages/apps/Gallery2/src/com/android/camera/CameraActivity.java
06c027675948259368a902fd6f8c2ecac5db5167 12-Sep-2013 Mangesh Ghiware <mghiware@google.com> Rename Gallery activity and add trampoline

Bug: 10807861

Change-Id: Iaaf17b579db2fe09900e9817f766f43dd66dea61
/packages/apps/Gallery2/src/com/android/camera/CameraActivity.java
94e122bf3dbcd316922cbd145adec30b49f2f8ae 20-Sep-2013 Mangesh Ghiware <mghiware@google.com> Use the same taskAffinity for trampoline as Camera

Bug: 10842131
Change-Id: I2bf6961d7c411dc95e9b9589d9ec71ee34b3011f
/packages/apps/Gallery2/src/com/android/camera/CameraActivity.java
571bacbd331dd9fdb57bed154ce7dbb2abfffb8b 19-Aug-2013 Mangesh Ghiware <mghiware@google.com> Add flags to create new task and clear top during trampoline.

Bug: 10366519
Change-Id: I549c8256d18ea37ac868035e54a56e5f68840b24
/packages/apps/Gallery2/src/com/android/camera/CameraActivity.java
f142f2f0823f08c5d6207066a291449ed90d642f 14-Aug-2013 Mangesh Ghiware <mghiware@google.com> Add a trampoline activity to launch new Camera

This preserves shortcuts, if any, to the Camera activity in the old
package name.

Bug: 10312966
Change-Id: Iffd3d708333515bb3b998faecff360bc01c142d2
/packages/apps/Gallery2/src/com/android/camera/CameraActivity.java
723bf81990245a07739146ac10357703c9839de1 08-Aug-2013 Sascha Haeberling <haeberling@google.com> Remove Camera from Gallery2.

Change-Id: I89adebffcacd1269217d7bd8c630c2f78886f590
/packages/apps/Gallery2/src/com/android/camera/CameraActivity.java
d1763a30cb0191e926467dc529e252b545ec9a9f 07-Aug-2013 George Mount <mount@google.com> Move PanoramaViewHelper out of LightCycleHelper

PanoramaViewHelper can be used outside of LightCycle panorama
picture creation.

Change-Id: I40bb357385fa311f9115dffaa143119cfcb5f45f
/packages/apps/Gallery2/src/com/android/camera/CameraActivity.java
e256999a30f0bb2bf0eb6fbef4023c82d374a5d0 31-Jul-2013 Angus Kong <shkong@google.com> Show PhotoSphere stitching progress.

Change-Id: I35a835f3a9bc28d5f974e318ec3ed257ad8bea37
/packages/apps/Gallery2/src/com/android/camera/CameraActivity.java
3d11536f496c6fd6ab0bd29b487c6c5cd84df40b 06-Aug-2013 Angus Kong <shkong@google.com> Load the FilmStrip data in onCreate()

The loading should be done in onCreate() so it won't waste time loading the data
which has been loaded everytime the app is brought to the foreground.

bug:10189998
Change-Id: I5b9158b206f96b065f6f18a5ab7da3ca14b9e52a
/packages/apps/Gallery2/src/com/android/camera/CameraActivity.java
962f9f022ae9e26a52c69e3a52e09fa0f297df71 30-Jul-2013 Angus Kong <shkong@google.com> Add LocalDataAdapter and wrappers.

1. FixedFirstDataAdapter wraps another adapter and add a data at the first
position.
2. FixedLastDataAdapter wraps another adapter and add a data at the last
position.
3. Make the LocalData interface more complete.
- onFullScreen()
- canSwipeInFullScreen()
- getPath()
3. Add methods to the FilmStripView.DataAdapter to receive UI events.
- onDataCentered()
- onDataFullScreen()

Change-Id: I26d3a3b7facd0c451af43ce5fbbcab2baaaec427
/packages/apps/Gallery2/src/com/android/camera/CameraActivity.java
0a4cfdc5ee74759893142754faea77d0d0aba48c 31-Jul-2013 Sascha Haeberling <haeberling@google.com> Adds back the PhotoSphere View icon in filmstrip.

This also exercises the "leave a place cleaner than you found it" rule
by cleaning up stuff:

- Formatting according to the Android format rules
- Removing unused code
- Putting braces where they belong.

Change-Id: Ie1dbfe9195bf3e20d9624d7ae85eeba16df8f931
/packages/apps/Gallery2/src/com/android/camera/CameraActivity.java
c46978c469e8a7f7ea79ac805cef80c892649280 24-Jul-2013 Sascha Haeberling <haeberling@google.com> Refocus integration phase 1.

Bug: 9966846

Change-Id: I591ce1ee878a9f4d6bd63eddef6e79608ffd69ec
/packages/apps/Gallery2/src/com/android/camera/CameraActivity.java
2d3b8b11f03ab41558866d2b996b76e0ceef845a 19-Jul-2013 Angus Kong <shkong@google.com> Remove legacy code ActivityBase.java.

Change-Id: I7b372e5d69c3d01b4012ab61bbf725a7fec8a445
/packages/apps/Gallery2/src/com/android/camera/CameraActivity.java
dfdde249d20535611de78bfb05f260c0cd27a7f6 17-Jul-2013 Angus Kong <shkong@google.com> Add stitching manager in Camera.

Change-Id: I2f27c2c0e77ed3d618df890e709ca09076591f70
/packages/apps/Gallery2/src/com/android/camera/CameraActivity.java
707ccd716d0e0f70f16c4332669695967b0dab52 25-Jun-2013 Doris Liu <tianliu@google.com> Clean up camera switcher

Change-Id: I9f0495524028528ca02c7ddf94f4698d4e87af14
/packages/apps/Gallery2/src/com/android/camera/CameraActivity.java
592bfa6ae120aa092749414fe44015496fbb67fa 19-Jun-2013 Doris Liu <tianliu@google.com> Set window flags to show secure camera

Change-Id: I9acb47ae5d6c5b9248aeea5cd267e17243f93c74
/packages/apps/Gallery2/src/com/android/camera/CameraActivity.java
43d796d5c098be9f92c89db5501b986daf52763e 14-Jun-2013 Doris Liu <tianliu@google.com> Switch over to use new camera activity

Change-Id: Ib907b5ab5d0e818261e95edd182f2e20c3bbebe0
/packages/apps/Gallery2/src/com/android/camera/CameraActivity.java
b22b852c53dff209764249a685725379ebe449ac 22-Apr-2013 Michael Kolb <kolby@google.com> New capture animation

Bug: 8253060

Match new UX design for capture animation
Custom layout for camera controls

Change-Id: I91875ae1685d52d4f9dbb2e6e9299428a8424766
/packages/apps/Gallery2/src/com/android/camera/CameraActivity.java
9ff697aa128947d415c2343700f23c49ecca2fef 19-Apr-2013 Angus Kong <shkong@google.com> Make MediaSaveService destroyed after unbound.

bug:8528779
Change-Id: I1e6b78d5603b10cde3399969cd7a8cc19655051b
/packages/apps/Gallery2/src/com/android/camera/CameraActivity.java
cf18f7e34ea9c175e0cf10150a339e5ff016a57c 16-Apr-2013 Doris Liu <tianliu@google.com> Allow swiping to filmstrip from blocker bar

Bug: 8607910
Change-Id: I69bfcf8d95d6071be7d65fbf433916740cbb655c
/packages/apps/Gallery2/src/com/android/camera/CameraActivity.java
048a61c7ab3f63688faeb39c253251e58f30c5f8 03-Apr-2013 Doris Liu <tianliu@google.com> Improve black bar to keep camera controls in place

Bug: 8340996

Change-Id: Ibca4a9f1ed84bd59e29cc988df346f1567de2a5b
/packages/apps/Gallery2/src/com/android/camera/CameraActivity.java
e5265447dddd9d48c4c78192bd21a6aba5588f9f 22-Mar-2013 Michael Kolb <kolby@google.com> Fix NPE in Camera

Bug: 8409508

Change-Id: I962a7eccec9ca2e1c190eb1c2c252020cd0926e0
/packages/apps/Gallery2/src/com/android/camera/CameraActivity.java
7298e88db5eabc049da1ba3b092f9800a5ccedad 05-Mar-2013 Doris Liu <tianliu@google.com> Add a black bar symmetric to nav bar

Also fix bug: 8323926
Change-Id: I4886b285dee8ad71ad72a55e96bf699b7c18c9f4
/packages/apps/Gallery2/src/com/android/camera/CameraActivity.java
8d2d0f5f0f7fffce9dbcc70da6924af545eba26d 05-Mar-2013 Doris Liu <tianliu@google.com> Keep camera controls on the same physical side

Change-Id: I09c50650c77a89fadfeb376564ef43e750994f8a
/packages/apps/Gallery2/src/com/android/camera/CameraActivity.java
c7fe2c5b1792edfc4054022e72ab3f45e272f361 26-Feb-2013 Doris Liu <tianliu@google.com> Flatten view hierarchy and rotate views

TODO: SRI pano and Lightcycle can use a bit more flattening.
I will get to them next. (Maybe in a different CL.)

TODO: Need to cancel capture animation in onConfigurationChanged()

Change-Id: I00fd3e098117d9fb74fde2c128407ab6275bcedf
/packages/apps/Gallery2/src/com/android/camera/CameraActivity.java
edc63ddadb7c256aba3c8452e419268032185ada 26-Feb-2013 Michael Kolb <kolby@google.com> Use cross fade rotation animation

Bug: 8257846

Change-Id: I891eda12f3de2ec0cd0f7672b991a19e6464873c
/packages/apps/Gallery2/src/com/android/camera/CameraActivity.java
d9de7afa6c343e85b9c2c0221ca280c69a349c5f 16-Feb-2013 Doris Liu <tianliu@google.com> Merge "Make photo orientation consistent with UI" into gb-ub-photos-bryce
9a32480db4e07fe437dd119d6f1d8471382d503f 15-Feb-2013 Doris Liu <tianliu@google.com> Make photo orientation consistent with UI

Also fixed the wrong animation orientation.

Bug: 7302506
Change-Id: I58615a7b3cc2e08c2a8dc4e174512a502c2482f5
/packages/apps/Gallery2/src/com/android/camera/CameraActivity.java
a3dc2c0dd75f4659146fcd257ce32acc3800ae5f 16-Feb-2013 John Reck <jreck@google.com> Remove com.android.camera.R

Change-Id: I0bb03da1423401f872c3bf13caffb9c87d850449
/packages/apps/Gallery2/src/com/android/camera/CameraActivity.java
52fe00244742dbae0072d15f73dab54a55271b56 01-Feb-2013 Angus Kong <shkong@google.com> Make video snapshot save images in the background.

bug:8114662
Change-Id: I4e96269bd7723dd9a82d2905a01f736c8982c4ed
/packages/apps/Gallery2/src/com/android/camera/CameraActivity.java
aa7397114c5ea228efb0eb4a2f8eb625b08288e3 07-Nov-2012 John Reck <jreck@google.com> Animate between photo modules

Change-Id: I20f0d470a14bb41757788897c1c5e7ea42a7426d
/packages/apps/Gallery2/src/com/android/camera/CameraActivity.java
25668cd6ed661c59295cb65348a126fb245757d4 29-Jan-2013 Michael Kolb <kolby@google.com> Move Camera Java/Native source into Gallery2

Change-Id: I968efe4d656e88a7760d3c0044f65b4adac2ddd1
/packages/apps/Gallery2/src/com/android/camera/CameraActivity.java