History log of /packages/apps/Camera2/src/com/android/camera/CameraActivity.java
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
f9b2d0c7775b43996a9b9f51c6fc5ab266042c72 05-Dec-2013 Alan Newberger <alann@google.com> Remove TRIM support

Remove the ability to trim a video with the quick menu action.

Bug: 11884080
Change-Id: If00cb31ad6b913012c542a809dba1a8e5d9e5b74
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
a7c84bacfd76e5e865655bd5a9b248d64f970af1 12-Nov-2013 Andy Huibers <andyhuibers@google.com> Merge "Close mode menus if another control is touched" into gb-ub-photos-carlsbad
249653e41763cffbd9bd5ef2298c5120488897fb 12-Nov-2013 Andy Huibers <andyhuibers@google.com> Close mode menus if another control is touched

Bug: 11598901
Bug: 11635865
Change-Id: I9c6237bacef9a28de1fa238e1e7378a57abfc573
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
baffb73ca83d9d81c379f9f3b9f46cdac7355a0d 11-Nov-2013 Ruben Brunk <rubenbrunk@google.com> Start gcam module directly when handling capture intent.

Bug: 11609971

- Prior behavior for capture intents when in HDR+ mode was
to resume into the PhotoModule and switch to the GcamModule.
Following this change, we resume directly into the GcamModule.

- Fixes the bad lockscreen behavior caused by the sequence:
onResume->switch to GcamModule(queue GcamModule onPause and onResume)->
onPause->onResume, where handler queuing order could get in a
state where the GcamModule onResume is called twice in a row,
resulting in duplicate requests being queued for each capture.

Change-Id: Ibd632d74836224288270f5342e45e523e25ca429
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
cbd8267ee99e457f72822e8d8187b5e6823104f8 05-Nov-2013 Seth Raphael <magicseth@google.com> Add logging to various actions

Bug: 11514148

Change-Id: Ib31a74a6badc4dcdeaa316e032f4aef17edd06b2
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
05a04924312fbcda2161da01e0749eb80c2663d1 07-Nov-2013 Erin Dahlgren <edahlgren@google.com> Show chooser on EDIT intents that have no activity for action.

Bug: 11571947
Change-Id: I40ef0f9ae6b4567557064d91b9c3942cd524a60b
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
9070def99369ccdffb1cf5e006ed30646297f490 07-Nov-2013 ztenghui <ztenghui@google.com> Merge "Decouple the visibility check for system UI from action bar" into gb-ub-photos-carlsbad
17f1e65142df55ebccfa30720cd1265f9ab67e96 06-Nov-2013 ztenghui <ztenghui@google.com> Decouple the visibility check for system UI from action bar

And make sure we toggle system UI when reload.

bug:11539377

Change-Id: I4d251557c1d68a173cabb652e0beaa3ee89cb6f0
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
c883a30eff16435909471874d2106acbb63eba03 06-Nov-2013 Erin Dahlgren <edahlgren@google.com> Make image editor intent general.

Bug: 11372979
Change-Id: I7649eb995fbd78f9b29c76da777aca83777c49fc
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
761306fadfa94b538f43e8cf3463bf6d22814947 30-Oct-2013 Alan Newberger <alann@google.com> Remove CameraUtil.launchGallery, ensure SecureCamera uses Gallery up icon

CameraUtil.launchGallery incorrectly describes a mechanism to call an APP_GALLERY
category intent. Since we're using Gallery icon we should go direct to Gallery,
which IntentHelper already does. Simply removed the util class and call the
helper direct from the activity. Also noticed during testing that the SecureCamera
was not correctly showing the Gallery icon, though its behavior would take user
to Gallery. Finally, removing restriction that the video player intent should
go to Gallery, instead it should route to system preferred intent.

Bug: 11065256
Change-Id: I941f9469de169919c4bac6c91dde7e577921f737
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
7cfcafdf8f4a439c8fa87b612616fe409979e8a4 18-Oct-2013 Ruben Brunk <rubenbrunk@google.com> gcam: Add placeholder image.

Bug: 11050749

Change-Id: I374c5919d6da0609fccd21c09775fa91894d5a24
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
fd7f0a9ffd8e7db21e556b1a60a7602ef5d0fe29 21-Oct-2013 Erin Dahlgren <edahlgren@google.com> Update preview controls on deleting all items.

Bug: 11219537
Change-Id: I897b65bd7c594b904aa29462e056a10d0e9c52a2
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
3044d8c577432d6e9721fc8b26ac2afbbaf21266 11-Oct-2013 Erin Dahlgren <edahlgren@google.com> Set camera controls visibility based on whether the camera preview is centered.

Bug: 10861015
Change-Id: Ib0c4945e35cee16b73a4bba913e11d0f79a26176
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
02cafdfb92a2d53b76c2bb180ee5289a80f4f4ac 14-Oct-2013 Angus Kong <shkong@google.com> Workaround to prevent the data focus callback.

bug:11205669

Change-Id: I5b2d33422ec5f6fe21c81e39d24f36ec8b61ce4e
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
2d5c74785d19f1944cab92948a6fa8233086ebc1 13-Oct-2013 Angus Kong <shkong@google.com> Don't load data when it's secure camera.

bug:11063164

Change-Id: I7e44a13f4d841d16807bd36133b588a0a8c40e49
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
97cb1ea3dbcf03b4e1fc6b149bf475ef3f3920fc 12-Oct-2013 Doris Liu <tianliu@google.com> Bring full screen window flag back to camera

Bug: 11027091
Change-Id: Iee41d7dd040a9b7816a4b5e99d89201dc068f362
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
64cea6aadb912067e31f1a158044c5efeb3e64af 11-Oct-2013 Sascha Haeberling <haeberling@google.com> Don't show a details dialog if there are no details.

Bug: 11021907

Change-Id: Ie4919889f60f2035fbd6f8b99bff4415e2962ae6
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
4ec139dc81482ebfef1e62a3987c53bd5880c759 10-Oct-2013 Sascha Haeberling <haeberling@google.com> Hide the status bar and switch into lights-out mode when popup is dimissed.

Bug: 11119286

Change-Id: I912103f36d27b07cd6fcebc2dae7c2964e883cc8
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
048bf4d0b46c4c34d8caa801c8ddc8c1ff4e79cf 07-Oct-2013 Sascha Haeberling <haeberling@google.com> Initialize GCam with GServices values.

Bug: 11103065

Change-Id: Ic8d3c9825abdc5d79c5e4c7b0e96770ab0941036
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
c14bfe6a287d31c8ee5c7a698a60acfdc7e7e393 10-Oct-2013 Ruben Brunk <rubenbrunk@google.com> Merge "gcam: Add postcapture for gcam debugging." into gb-ub-photos-carlsbad
26862c304a8163016b1f8196c715769750ba1720 09-Oct-2013 Erin Dahlgren <edahlgren@google.com> Update bottom controls and action bar with a tighter bounds on data change.

Bug: 11087361
Change-Id: Ie319d1767eb671ca7ed4a129aa9b75c77d63b20d
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
d217ed0fa931d2a080a159c24e4012697baf5ae3 09-Oct-2013 Ruben Brunk <rubenbrunk@google.com> gcam: Add postcapture for gcam debugging.

Bug: 11010544
Change-Id: I782bf3bd52f7b37cf47291501560ba771951760a
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
0fb819b4619cd4ac20f9d381739e444da011d4ed 08-Oct-2013 Angus Kong <shkong@google.com> Don't go into Gcam when it's capture intent.

bug:11115082

Change-Id: I2532e9597f526eb7daea9753b019d5ed95f5fe6b
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
b0fbd5437cc67ce10e8f4b2a7318d4cc97110976 04-Oct-2013 Doris Liu <tianliu@google.com> Merge "Prevent picture taking via volumn key in filmstrip mode" into gb-ub-photos-carlsbad
dba16ae7d0aee0c3984df68b5787a0d0a7cd6f50 04-Oct-2013 Doris Liu <tianliu@google.com> Prevent picture taking via volumn key in filmstrip mode

Bug: 11045068
Change-Id: Ic823e04520fef3c2cef5341dceb9887fd62a5212
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
3250987bd014d1c5463b8a39bbe988165ab1cc3f 03-Oct-2013 Angus Kong <shkong@google.com> Don't allow actions on items in progress.

bug:11049529

Change-Id: Id6bd0f912f153b8b8e6b1a525a383ad8cadbe3dd
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
4c0aede4ea37f8fad98a40ec4d28028f338591bd 03-Oct-2013 ztenghui <ztenghui@google.com> Merge "Only show delete action when in secure camera mode." into gb-ub-photos-carlsbad
e941cbeeacac11fbae5ae8b06cc1b311e3f6f36d 03-Oct-2013 ztenghui <ztenghui@google.com> Only show delete action when in secure camera mode.

bug:11048260
Change-Id: Idcf452e91983acdfad17ce1cc503b25d17c2e53c
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
30968d0f9a5094d62de1fb023b8bf7dc3202ebaf 02-Oct-2013 Mangesh Ghiware <mghiware@google.com> Exit Camera on Up button if no APP_GALLERY handler found.

Bug: 11047289
Change-Id: I532e4ab4fc057bb260d74466af6c1926b0e9900c
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
d4f69ed6fa6e302955ce8d0b2a21f47794ce7d64 01-Oct-2013 Erin Dahlgren <edahlgren@google.com> Fix FilmStrip crash by checking if photos are present before updating action bar

Bug: 11027838
Change-Id: I770f8d0187b4f92f5395b27496620acb099eeb6a
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
ad3003bbb275b91d7564568e413400fc187dbcd4 01-Oct-2013 Erin Dahlgren <edahlgren@google.com> Merge "Updates newly centered photos in FilmStrip after a delete." into gb-ub-photos-carlsbad
d42de0adf9ab8d84029856859cb8fbb07eaa96b5 30-Sep-2013 Erin Dahlgren <edahlgren@google.com> Updates newly centered photos in FilmStrip after a delete.

Bug: 10715651

Change-Id: Idf4029270c5d0de2885322b2e25ad75e98def84a
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
0156d9179bb9ba8718b25ee05985a7c71e5578c7 01-Oct-2013 Sascha Haeberling <haeberling@google.com> Show status bar in filmstrip mode

Bug: 11005642

Also makes sure we only call setSystemUiVisibility in only one
place.

Change-Id: I6e4709c63c25a4e69219ec7518dc284cef303aaa
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
2b86d873ca4fb3a921139633ed7be9959ab452df 27-Sep-2013 Doris Liu <tianliu@google.com> Fix memory leak of context in LocalMediaObserver

Bug: 10728773
Change-Id: Ie5a50590e71fd4b853cb7590db4fa14f5b6dc73b
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
f5fc8d67dcbb5df2cb6ac802c5caa50a850d72d2 26-Sep-2013 Doris Liu <tianliu@google.com> Merge "Finalize deletion when app exits and for last photo" into gb-ub-photos-carlsbad
f2c14330a49abb55f75bfae6b3bae67a0dad115b 26-Sep-2013 Doris Liu <tianliu@google.com> Finalize deletion when app exits and for last photo

Bug: 10892925
Change-Id: I94a29ec26f657b5c6c2f784f05b63d45e5e3e010
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
2dcc0a9dfcc23f090bbe36308f92d72f68c4f0a2 25-Sep-2013 Angus Kong <shkong@google.com> Checks for low storage in wide-angle pano mode.

1. Storage.LOW_STORAGE_THRESHOLD -> Storage.LOW_STORAGE_THRESHOLD_BYTE.
2. Checks for low storage before start preview in wide-angle pano mode.
3. Add low storage warning message for debugging when in wide-angle pano mode.

bug:10691367

Change-Id: Iffd96d322b33591c8f235fcf5680e86cf0f06571
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
98f38bb04daa3db49a072718cd8b5005b8b73af1 25-Sep-2013 Sascha Haeberling <haeberling@google.com> Add HQ option and use it to switch to GCam.

Bug: 10430748
Bug: 10785988

Change-Id: If824d1d1876d8434958b2a5bc97d2852da118a8b
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
4863db01e3629a0a29c718b94445332ef74441e9 24-Sep-2013 Sascha Haeberling <haeberling@google.com> Remove hideybars from Camera.

Bug: 10859173

Change-Id: I6e6677ace3d1c35c974e003bebd25c9a43d43719
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
690dc4722d068a1838b16dc0eabe9c7d518d524c 21-Sep-2013 Angus Kong <shkong@google.com> Allow user to tap on lock icon from secure camera.

bug:10857973

Change-Id: Id3c03f4d83c676986748ed083e85e85cea8eb507
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
aa8744284864cda5570e8dfa4eccc2747cee52dc 19-Sep-2013 Doris Liu <tianliu@google.com> Hide action bar after a timeout

Also make sure:
1) Action bar does not go away when the menu is showing
2) Extend the timeout if user swipe to a new image when action bar is visible
3) Hide action bar immediately when double-tap-to-zoom starts
4) Action bar persists in filmstrip mode (i.e. non-fullscreen mode)

Bug: 10750342
Change-Id: I820dc2b57ced61f91246fffe3fecc4e60ea187ca
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
19ab725a5e640a1a20b1a6def083e37d1d1c1e20 19-Sep-2013 nicolasroard <nicolasroard@google.com> Add crop activity

bug:10367125

Change-Id: I8dce6d799e7469ff048d419598d87b0c04bef2a0
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
064d6000933354f7bf344a41e0caa7052401c903 06-Sep-2013 ztenghui <ztenghui@google.com> Use contentObserver to refresh the data when dirty.

Handle another setDataSource exception.
Remove the old work around for refreshing after editing.

bug:10390298

Change-Id: I8777364b96c86eeaf5581a96163aab823cd4b438
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
a5682ab08e1d42fe272ec877929478b4adb769f5 19-Sep-2013 Mangesh Ghiware <mghiware@google.com> Bring back NFC beam support to filmstrip

Bug: 10805211
Change-Id: I457d47625c69fcdaba663e53f46d461d29c7cb92
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
0374e092eb6fdb33cb6edcb7724601928283dd47 19-Sep-2013 Ruben Brunk <rubenbrunk@google.com> Merge "Adding gcam module to Camera2 app." into gb-ub-photos-carlsbad
a9d66bdab247626b31dc182c4d62520b3abffdbd 06-Sep-2013 Ruben Brunk <rubenbrunk@google.com> Adding gcam module to Camera2 app.

Bug: 10430748

Change-Id: I0c53085553cd8505ba376b1518507d36065894f5
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
5df64b0a818d4f85cb14602db725f05b0055c1d9 19-Sep-2013 Mangesh Ghiware <mghiware@google.com> Make Up button in filmstrip go to Gallery.

Bug: 10748904
Change-Id: If80f3354071893dc4f8bd60e4ca605d3626ecdf9
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
638e6f06c877d90b907f66ea9c22b3c6b73c7384 18-Sep-2013 Sascha Haeberling <haeberling@google.com> Clean up ApiHelper and remove unused code paths.

Bug: 10821545

As we're targeting ICS there are a lot of checks and code paths
that are no longer in use. This CL cleans them up.

Change-Id: Ic3dd26628a94e134e25e2c496ccec1f1f957216d
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
4ed20592482d2ab2f3f48ee72d5b1c06bf009034 13-Sep-2013 Sascha Haeberling <haeberling@google.com> Adding Hideybar support for K and up.

Bug: 10723047

Change-Id: Ie1d0bdadfbe6dee6a4e0998facac61ff1fb6e02a
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
15125661ad968cf4d40989a9bc88d11189beb0b3 18-Sep-2013 Sascha Haeberling <haeberling@google.com> Fall back to Photo module if stores index is illegal.

Bug: 10805249

Change-Id: Iace590af34cf646abf7af74b498520d686c04511
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
c2497d0a7213a3c105ec312f12b0f8b00347d5e5 17-Sep-2013 Angus Kong <shkong@google.com> Merge "Show dialog when camera device is not connected." into gb-ub-photos-carlsbad
4f795b878843e59810ec1dca05b7cdb37b5614c5 16-Sep-2013 Angus Kong <shkong@google.com> Show dialog when camera device is not connected.

bug:10726516

Change-Id: I3d3433d0b2eced54027b19910473fd55135d0e1c
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
05804751ba07c8abcf422f57467d0ed3de95576c 17-Sep-2013 ztenghui <ztenghui@google.com> Use a new Intent to work around issues in framework

Framework didn't update the action provider if reusing the intent object.
The work around is creating new intents here.

bug:10713267

Change-Id: Iee64e84e191c8c2c2377fb5b9b95a91dae3c445c
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
a5a08d7642a1fdf961b057cc90e76c4c93103c15 12-Sep-2013 Sascha Haeberling <haeberling@google.com> Bring back tiny planet to the Camera filmstrip

Bug: 10393598

The native code and XmpUtil are mostly 1:1 copies from Gallery2.
The UI is new and should work on all form factors.

Change-Id: Ia302a4a7a24cf0b3aa583836683c459e9e7e1f85
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
742cd5b18e1899bee1d430b61891238c0f3502b6 13-Sep-2013 Doris Liu <tianliu@google.com> Keep undo bar around until there is user interaciton

Bug: 10678578
Bug: 10674009

Also removed the use of withEndAction() call because it was
introduced in API 16, whereas we need to be compatible with
API 14+

Change-Id: I785770ae9a083f88056e94fc5378daf8ebc6dc6e
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
8566dd777cd219254c945240a31ac97de28792a2 12-Sep-2013 ztenghui <ztenghui@google.com> When current data is preview, don't show the action bar.

bug:10678458

Change-Id: Ia48ca694ddca47438338e7223e9fa19c2c65dd5d
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
7b265a6b2f55c6ae7afc30e63ba324c4084a5d8e 09-Sep-2013 ztenghui <ztenghui@google.com> Fix the flash mode transition in video mode

onSwitchMode is wrongly overloaded, now is fixed.
Basically, onCurrentDataChanged will handle the switching in and out of Camera.
onDataFullScreenChange will handle full screen change on non-preview data.

bug:10610967

Change-Id: I199a20d40d66b78302e90e0f96826d03076b0e39
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
b7639c641f2ed5d0c60546349c3aa9e90c026878 09-Sep-2013 Sascha Haeberling <haeberling@google.com> Make sure we switch to preview view when resuming.

Bug: 10640328

But we need to make sure to not always switch in onResume, as
some activities stared from us (like playing a video or editing)
require the UI flow to stay in filmstrip.

Change-Id: Id2911be4949de9fd9fc4cb3451dd34e3fae8becf
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
08d82bae967db1cc090ab763f072e0410eb4b05e 09-Sep-2013 ztenghui <ztenghui@google.com> Merge "Update the data after edit." into gb-ub-photos-carlsbad
91ff406680b2f3731beb7f82b70b138ccbdffe9c 06-Sep-2013 ztenghui <ztenghui@google.com> Update the data after edit.

bug:10411943

Change-Id: I94804d581470a87f7449a2a249b0b2a27ab640a2
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
a71946012df0eee8fe4859a22da3c56feba0344e 07-Sep-2013 Angus Kong <shkong@google.com> Disable swipe in capture intent mode.

bug:10606988

Change-Id: Iaf80cdef5b463795b9847f2ab9ab5c70f3f0083c
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
56ad83f797ab09af240d1f67d63e55dd602160c1 06-Sep-2013 Angus Kong <shkong@google.com> Merge "Respect system auto-rotate setting." into gb-ub-photos-carlsbad
5199c2078f3aea06732015ce8ad354c066a2f4ec 06-Sep-2013 Sascha Haeberling <haeberling@google.com> Set the system UI to low profile when we hide the action bar.

Bug: 10633686

Change-Id: I3fca7b608807fd0a510641c7b32724173587c458
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
ce2b94917098f211cacaaebaa0f6b40021d3e3fa 06-Sep-2013 Angus Kong <shkong@google.com> Respect system auto-rotate setting.

bug:10623244

Change-Id: I66757e50daf487680ac4f49d854c0f49d672b6ff
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
33bb2d47fa5850c14f7fe42e07ab6f21585efade 05-Sep-2013 Angus Kong <shkong@google.com> Merge "Bring back wide angle panorama." into gb-ub-photos-carlsbad
1ef76d4cbd73c02cb8d02cf4cde3f4cee81548d6 05-Sep-2013 Alan Newberger <alann@google.com> reintroduce action bar hiding for onDataChanged

this code was present but got inadvertently removed by a subsequent
change Icb07e9e890a72bec6ed3b4c5a7e33400be3446f8.

Change-Id: If6c0f31497406fc3056dbb48d67b195342f6d10f
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
33035c19cc47adfb738c20cef66652ae451c8e10 23-Aug-2013 Mangesh Ghiware <mghiware@google.com> Bring back 'share 360 photosphere' to filmstrip

Bug: 10367406
Change-Id: Icb07e9e890a72bec6ed3b4c5a7e33400be3446f8
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
ed15d1a140986473bbe7fffd72ec9618c41c5979 20-Aug-2013 Angus Kong <shkong@google.com> Bring back wide angle panorama.

bug:10293937

Change-Id: I23a977e87b7416f07ecac20025b6c142ae61be05
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
269c824d720b2e902c4ad6c3bb23422644da1f41 03-Sep-2013 ztenghui <ztenghui@google.com> Merge "Don't show the action bar in the capture intent." into gb-ub-photos-carlsbad
2c3d9a58d8942f73bc16c71e57584e4d89410185 03-Sep-2013 ztenghui <ztenghui@google.com> Don't show action bar when in camera preview.

There are 3 cases we need to toggle the action bar.
1. Touch in full screen mode. onToggleActionBarVisibility()
2. Swipe back and forth to film stripe from preview. onSwitchMode()
3. In full screen mode, current data becomes the preview.
onCurrentDataChanged()

bug:10563392
Change-Id: I576c49b767cd863da725cf991238c27440d85b9b
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
fd43e3be3d69f48a97bdd9084e9549f41e963cc2 03-Sep-2013 ztenghui <ztenghui@google.com> Don't show the action bar in the capture intent.

bug:10571262

Change-Id: I85ed9c632f76084db95ce24277fb303c67c3949f
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
5f6b50deaf46fb546ebf6d0d6244ebf7fb79c7ca 31-Aug-2013 Alan Newberger <alann@google.com> Add back button handlng to CameraActivity.

This CL first detects whether user is in filmstrip mode i.e. not in Camera,
if so brings user back to the first item which is the Camera. If in Camera,
we route back handling to the current Camera module which enables already-
written module handling for back button e.g. backing out of pie menus.

Bug: 8781981
Change-Id: I18377ea5fbdcd8bd8c6fc3af9cb5322d5f5a889a
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
2581af9b08ac913465303795745c3ce24eb0f20c 30-Aug-2013 Alan Newberger <alann@google.com> Merge "add up button support for filmstrip" into gb-ub-photos-carlsbad
3f969c1735e2636bf22dfe44104d0e99924cca97 23-Aug-2013 Alan Newberger <alann@google.com> add up button support for filmstrip

This CL adds up affordance handling to CameraActivity. There was no working call to reset the filmstrip back to the camera, so this CL adds a controller which then calls reload, which is itself fixed to work as desired. Note that during testing I identified issue 10563392, I've decided to file that separately since it is orthogonal to up button function, but it does affect the overall experience and should be fixed.

Bug: 10414498
Change-Id: I1ee914dc1d264adb1fb5a363c2d6174070cd7b71
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
2654dd9bb6a7d917dab1a48e2182c4f49fe71f11 29-Aug-2013 Sascha Haeberling <haeberling@google.com> Let the Camera app remember which mode it was started in last.

Bug: 7320368

Change-Id: Ia2ae47693f453c9bcff315af87fe1e5a44b6e5c7
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
a16e7b50f3148f581439509279f242092e254309 23-Aug-2013 ztenghui <ztenghui@google.com> Add rotate support in Film Strip

Move the exif related code under src.com.android.camera.exif.
Refactor the member variables under LocalMediaData.java.
Refactor the LocalData to make sure they are immutables for thread safety.

bug:10367037
Change-Id: I0e84bcc0097925b2be749fe016984177a68e0a4d
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
cd2eeb0efc4370f20e9836e20eb11cb974e3b00d 23-Aug-2013 Mangesh Ghiware <mghiware@google.com> Bring back Share to filmstrip

Bug: 10367406
Change-Id: I37834442e3af209fb00b98e6da524263ac8c70f0
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
653c43be6e58be54cf2ac3c8efb2d65ac20bd03b 22-Aug-2013 Angus Kong <shkong@google.com> Bring back undo delete confirmation.

Also corrects the default decoding size.

bug:10413110
bug:10330214

Change-Id: I45465fdea2320501fd17ac4e35e0f0f54c08cbba
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
734598c39e6a9d809982dae2907dc7d10e0b0e9f 22-Aug-2013 Angus Kong <shkong@google.com> Add support to "go-to-next" in film strip.

bug:10328123

Change-Id: I018876df89cc7ed125a32af850e6b26114fb1004
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
7e374eb0a450ed2689b556ab42a0a88c8f74df2e 21-Aug-2013 Angus Kong <shkong@google.com> Stop the MediaSaveService after unbinding.

bug:10361258

Change-Id: Ie1dc3caac03f7a691aae0c84c468bfb21ce6ae90
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
0819304bc06ffd3498d9fd0d8a148c50f0903c46 20-Aug-2013 nicolasroard <nicolasroard@google.com> Add "set as" capability in Film Strip

bug:10367174
Change-Id: I9161e08f26c02edd1d168ac6986de61066d69552
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
e857cc90a98e280e2008beb03e2446bd642d2ec4 19-Aug-2013 Angus Kong <shkong@google.com> Implement deletion in the menu.

bug:10367402

Change-Id: Ia48544ccb4186808f8cf89c7b4ea6d291aa8cf24
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
e5b3ce3da8537b7a6bb971f293a5940f117a7a3f 19-Aug-2013 Sascha Haeberling <haeberling@google.com> Don't refresh item on resume as it leads to a filmstrip bug.

Instead we should listen to the proper events when something is changed
with the media.

Change-Id: Ia5337a4a83de73962070148e0a10f0a12f769345
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
88ef7664ba6a888fa5da8693091674e152b56192 16-Aug-2013 Sascha Haeberling <haeberling@google.com> 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
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
6b9203214d828d72758943aca55adceab684a862 17-Aug-2013 ztenghui <ztenghui@google.com> Add the trim functionality back to FilmStripView

At the same time, disable the mute for now.

bug:10313015

Change-Id: Ic2139f509ddb4ed57f3a4d67782eadb150e88ea5
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
394023fb7e3c8d07d4aeafc30bf4b66ed481ebb7 16-Aug-2013 Sascha Haeberling <haeberling@google.com> Single-tap in fullscreen view toggles ActionBar.

Bug: 10347286

Change-Id: I55e400c957d4ec1ef1307e45007e2127ea5ab7ea
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
fae11a165e344a38811770c7d348eda214683edc 15-Aug-2013 Sascha Haeberling <haeberling@google.com> Implent show-on-map functionality.
Also make sure the show-on-map item is only shown for items with coordinates. and add the coordinate to the details view.

Bug: 10346208
Bug: 10330505

Change-Id: Idaeec207bcc0e7311fa3b651868515ccea81d083
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
6f64b50db6565bc6454304fd20c0c4020b297bb7 15-Aug-2013 Sascha Haeberling <haeberling@google.com> Brings back the details menu with most EXIF data in it.
Some are still missing and will come back later.

Bug: 10330505

Change-Id: I7bc44b19fac5b47557d5feae3ed969040ac3ae9b
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
dcccc510652b835fdbd39310a07849af8203052a 09-Aug-2013 Angus Kong <shkong@google.com> Fix camera preview stopped after onResume().

This fix is for the blank camera preview blank after onPause() -> onResume().
1. Refined camera start up procedure by removing redundant camera startup
thread.
2. Cleanup unused calls after aparted from gallery.

bug:10189998

Change-Id: I13ffa24aff5069f0032cd4bc801548fccc63d0e7
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
50df47071c776703a36dbc4cb90ec8d1df3c0f6e 14-Aug-2013 ztenghui <ztenghui@google.com> Hide the actionbar and title at the beginning

bug:10245009

Change-Id: I39640e9f7add0c8ae20257dd5c71cefd4a927a0e
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
0353ca2e048543bd6e233b4c2110a1df1070cd3f 13-Aug-2013 ztenghui <ztenghui@google.com> Add the menu items back

bug:10245009

Change-Id: I4e11e0cd64800bd9c07158d1a46ea5765ba51d15
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
57549631449fab8cd4d8dffe730bee4d5c4d8890 13-Aug-2013 Sascha Haeberling <haeberling@google.com> Remove Refocus from Camera UI.

Bug:10073814

Change-Id: I023c7f61463690b02492705cedec8c74159c515d
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
2a7f44cac888de5683d05bef5708f846ee950f43 13-Aug-2013 Doris Liu <tianliu@google.com> Fix video capture intent handling

Bug: 10296343

Change-Id: I55fb6c71b59a1559ebb58c65e71d510379367435
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
a0bd080a978fd7e9a67436b412f929c5b3cf8854 12-Aug-2013 ztenghui <ztenghui@google.com> Merge "Add the basic action bar back." into gb-ub-photos-carlsbad
fa9e2cc9ccbcd746f5765cb7a0afebcdb60e2973 10-Aug-2013 ztenghui <ztenghui@google.com> Add the basic action bar back.

Remove outdated styles.

bug:10245009

Change-Id: I1ab6e6ea7c3e5c4157951203209b573dd2edda88
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
b50b5cbfbc0a67db6fc43373363b10381c9c61a3 09-Aug-2013 Angus Kong <shkong@google.com> Clean up Gallery codes.

bug:10263696

Change-Id: I3a16dba3aabe52b8103a2c591cfa39907265a263
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
bd26069d391830856c57c2141cd2efbc8423d871 07-Aug-2013 Angus Kong <shkong@google.com> Refactor data/LocalData.

Make the design more easily understood.

Change-Id: I4f7dbe7d3f0a0534c13996b773f1767997848746
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
37f3611bbdc787c996a99894dcef7d8fb77e3f7c 06-Aug-2013 Sascha Haeberling <haeberling@google.com> This adds the following four CLs to Camera2:

http://ag/339319
http://ag/338974
http://ag/338401
http://ag/324149

Adapted to work in Camera2 and adding a .gitignore so that temporary
Eclipse files and folders are not submitted.

Change-Id: I40295c7f0139f76270c44f0ca395c0574a288569
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
8e963a5a6016d246184ed65906f9d103e92b17e2 06-Aug-2013 Sascha Haeberling <haeberling@google.com> This removes all non-Camera stuff from Camera2.

Note: Camera2 is a clone of Gallery2 right now.
Note 2: I will bring .mk files back later.

Change-Id: Ida958654296f5ebaacb6bb0ff59d52a7c37ce6fc
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
d475c670423404931e1b7281ac2dcb430490c27b 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/Camera2/src/com/android/camera/CameraActivity.java
8e5e4eedb25a4589342660b928935acca4375fc7 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/Camera2/src/com/android/camera/CameraActivity.java
f1f5186f7d3fd8bf35009d9e65a43914c664d82b 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/Camera2/src/com/android/camera/CameraActivity.java
77fb852da18c6ee8ba1f1037f385319eb47bdce6 24-Jul-2013 Sascha Haeberling <haeberling@google.com> Refocus integration phase 1.

Bug: 9966846

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

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

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

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

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

Change-Id: Ib907b5ab5d0e818261e95edd182f2e20c3bbebe0
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
705604dfd85362a4b98887b2b1a173e6658853d8 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/Camera2/src/com/android/camera/CameraActivity.java
b13f87be0defbea052e317302f37e9d260244c9a 19-Apr-2013 Angus Kong <shkong@google.com> Make MediaSaveService destroyed after unbound.

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

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

Bug: 8340996

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

Bug: 8409508

Change-Id: I962a7eccec9ca2e1c190eb1c2c252020cd0926e0
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
09106a41ee6acc6b20553662cb9b730702a8f08a 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/Camera2/src/com/android/camera/CameraActivity.java
48239f4dd39040a9ab2ffc977586035a8784fd78 05-Mar-2013 Doris Liu <tianliu@google.com> Keep camera controls on the same physical side

Change-Id: I09c50650c77a89fadfeb376564ef43e750994f8a
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
6a0de79a7066d4ae5cc4677f88989abd15e892ff 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/Camera2/src/com/android/camera/CameraActivity.java
08650187c1f1a2d1ef7f754be0f479a29958daaa 26-Feb-2013 Michael Kolb <kolby@google.com> Use cross fade rotation animation

Bug: 8257846

Change-Id: I891eda12f3de2ec0cd0f7672b991a19e6464873c
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
f7159e15dd704e9501a3538cb05498f40a30f042 16-Feb-2013 Doris Liu <tianliu@google.com> Merge "Make photo orientation consistent with UI" into gb-ub-photos-bryce
3cf565c4242a9deab7da5eb84fc302c79d594f11 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/Camera2/src/com/android/camera/CameraActivity.java
54987e8d3af88214ce4f3aed0b5c4e9ded5b1392 16-Feb-2013 John Reck <jreck@google.com> Remove com.android.camera.R

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

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

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

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