| 375f9d11af33688eb0074e3828c870076cfa21b3 |
|
18-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
Stop activity leaks
Bug: 12805279
This CL fixes all known activity leaks that occur from our
app. One leak remains that is caused by Camera Framework and
is tracked under b/18077200.
For details on how to find and chase these leaks down, see
http://go/camera-activity-leaks
Change-Id: I9608e2fcf77fe97528b883ed40e0c08bbbf45bdf
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 05edd2eec40d2a3ce7a76dc9f4d7dfe65e576ab7 |
|
21-Oct-2014 |
Alan Newberger <alann@google.com> |
Increase VERBOSE logging for PhotoModule orientation use
Log all orientation values to diagnose capture orientation behavior.
Bug: 18055323
Change-Id: If63455104f7b96f5797f2651d1aadcadee67e1af
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| b20cf71a817e1835a5ea8d084c9896c2aae706d9 |
|
21-Oct-2014 |
I-Jong Lin <ijonglin@google.com> |
Merge "Secure Camera App survives phone unlock screen" into ub-camera-glacier
|
| 718c43d79bd080ccacc8eb962637c51811616fda |
|
17-Oct-2014 |
I-Jong Lin <ijonglin@google.com> |
Secure Camera App survives phone unlock screen
Bug: 17883828
There is UI path to start the secure camera app from the lock
screen, and then unlock the phone and find the secure camera
app on the task manager.
This live instance of secure camera app is confusing to the
user who is expecting to interact with a full camera app.
This fix kills the secure camera app when the phone is unlocked
and ensures that the user cannot easily restart the secure
camera app from the currently running tasks in task manager.
Change-Id: Ia6a6d077c460e66807d4be9836fe192184aa8eaf
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 828081f5f947abb8930f084386492efde8c5b83b |
|
15-Oct-2014 |
Senpo Hu <senpo@google.com> |
Merge "Log camera exception via UsageStatistics." into ub-camera-glacier
|
| 74b723c7093e5d8acf6f7170dd98f813a2185442 |
|
14-Oct-2014 |
Senpo Hu <senpo@google.com> |
Log camera exception via UsageStatistics.
Change-Id: I2b80338dd489ece87d94e20a303c5e43e972c3b0
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 54985c973140b896db75f086ac0f904d0228f8aa |
|
14-Oct-2014 |
Alan Newberger <alann@google.com> |
Merge "Revert "Make CameraDataAdapter background new data loading and post to listener"" into ub-camera-glacier
|
| 7387c534242dd5c48714c5df1ee79f60c7b2ba4e |
|
14-Oct-2014 |
Alan Newberger <alann@google.com> |
Revert "Make CameraDataAdapter background new data loading and post to listener"
Reverting out of concerns on thread safety, need to more carefully assess the change. Synchronizing may just reintroduce deadlock for affected user.
This reverts commit cc93255f596b47d1a860461dd0d4be697422964f.
Change-Id: I8b003f978d680942d380cc3563bccd055ab28fe9
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| b7378210663a1ac9c6692b9a0d8ae5e414da9370 |
|
14-Oct-2014 |
Alan Newberger <alann@google.com> |
Merge "Make CameraDataAdapter background new data loading and post to listener" into ub-camera-glacier
|
| cc93255f596b47d1a860461dd0d4be697422964f |
|
14-Oct-2014 |
Alan Newberger <alann@google.com> |
Make CameraDataAdapter background new data loading and post to listener
To avoid potentially expensive operations in main thread, only call
back to filmstrip on the main thread. Do all processing in background.
Consistently enforce that all listener callbacks are main thread by
posting to a main thread handler.
Bug: 17437217
Change-Id: I6a96690218043cc42644d12a4162322cc2ee7e8f
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 131591967bb4f27b8b55347e367a144047320c30 |
|
13-Oct-2014 |
Senpo Hu <senpo@google.com> |
Refine camera fatal error handling in CameraActivity.
Use Log.e() to clearly indicate what action has been taken to handle
the error.
Bug: 17964147
Change-Id: I073e06d99a89e6e1e697766736791ef419339944
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| eb81de1d250a5c61f378428f590238ce5c7e16a4 |
|
13-Oct-2014 |
Spike Sprague <spikuru@google.com> |
Merge "Native 16x9 viewfinder stream for Gcam to reduce switching jank and eliminate black bar overlay hack." into ub-camera-glacier
|
| d25eac4c69ccda0a9e91f6af8032b0624554e7ac |
|
09-Oct-2014 |
Spike Sprague <spikuru@google.com> |
Native 16x9 viewfinder stream for Gcam to reduce switching jank and eliminate black bar overlay hack.
companion CL: ag/562183
bug: 17669070
Change-Id: I4d5402df3848423c236108716f7065a87ce95f6d
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| ac9070ee24d2db6e7804cdd26df578e7ab76895e |
|
11-Oct-2014 |
Senpo Hu <senpo@google.com> |
Migrate old CameraErrorCallback class to agent's CameraExceptionHandler.
Per ag/565603, clean up the old CameraErrorCallback.
Bug: 17931297
Change-Id: Id750581850680ed6cf85738daf5ebdebf67f4800
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 37c8be86ac9db4d60c4453fe1e7dbec7cc45cefa |
|
10-Oct-2014 |
Alan Newberger <alann@google.com> |
Add verbose logging for os/apk debug builds
Relax VERBOSE screening so that by default, we log more when not
in a release configuration.
Bug: 17950234
Change-Id: I30250974456607b4fb64c15d6ecfa288ceb2f133
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 2a0e18e280dfe541d4740345511ad299099cda79 |
|
07-Oct-2014 |
Senpo Hu <senpo@google.com> |
Adopt the new error handling mechanism in portability.
Show camera fatal dialog to guide users exiting the app when
1) camera framework throws RTE or
2) DispatchThread job is timeout.
If users hit home button while error dialog is shown, just exit
the app.
Bug: 16189216
Change-Id: Ia0f1c64d452735ec62549f50ab62646d8d873c65
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 6c98fe1de38d587469f05c58126b7ca4100327e3 |
|
07-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
Catch error where framework is broken and returns no cameras.
Bug: 17868174
Exit the app with the "Cannot connect to camera" error.
Change-Id: Ic5a6e0af222a3740b8bd3f6e66ee575f9443008e
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| d2d8b711c14ee47f6f4ea16cb9fe27128462ad5b |
|
02-Oct-2014 |
Spike Sprague <spikuru@google.com> |
disable all user interactions (including mode switching) on SD Card errors
bug: 15841887
Change-Id: I8e7e92a884dda54d9b8385b29d9ef4b7bb7fbd14
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 877c2b65415ad43eb424f8a4a27bbeee7771d5bf |
|
04-Oct-2014 |
Andy Huibers <andyhuibers@google.com> |
Unload timer sounds on pause in PhotoModule; release SoundPLayer on destroy.
Bug: 17740679
Change-Id: Ia15749971f45f6579a19c379ee95c83c9ce20ccc
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 64cb0bf0e5c3efb62b34cd2871723a56f3cc7787 |
|
04-Oct-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Use singleTask to improve unsecure lockscreen startup" into ub-camera-glacier
|
| 4de9b72f79fe256766f25497bff44cb5533b7508 |
|
26-Sep-2014 |
Puneet Lall <puneetl@google.com> |
Use singleTask to improve unsecure lockscreen startup
This enables warm-starts from the lockscreen by reusing the same
activity if possible.
Bug: 16035858
Change-Id: I4b1ce0c290e209a5098e3f3e71509e0ca86e1845
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 365ef4ca63d2c3e988cb54887f0f58a33d92aacc |
|
03-Oct-2014 |
Alan Newberger <alann@google.com> |
Suppress 'help feedback' message pre-L in secure camera
Becase we see issues when starting activities above lockscreen
from filmstrip menu in K, disable unless we are on L.
Bug: 17767821
Change-Id: Ic59defd3fef5e283b356e94a952a2b75f4e9f1d6
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 4d0fe41c92819ac4c70b5d0e75ec544be6cdfbb1 |
|
02-Oct-2014 |
Alan Newberger <alann@google.com> |
Trap CameraAgentFactory RTEs during recycle
Bug: 17759456
Change-Id: I5d6577f4175963168bb4186d70dd7cee68b5466e
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 48d4c8f1856503d88f4e2e42fa729f2556173694 |
|
02-Oct-2014 |
Alan Newberger <alann@google.com> |
Trap camera close exceptions on pause
Bug: 17759456
Change-Id: I5e5fd39829bd0ebf3f37b354ca380cf6396bef55
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 437a186929173ad576e0eac04bd5b79939816158 |
|
02-Oct-2014 |
Alan Newberger <alann@google.com> |
Use NEW_DOCUMENT vs NEW_TASK when starting Activities from Camera
To ensure items are placed in separate affinity in document mode.
Bug: 17758840
Change-Id: I7ea1c9c841f3e60271307ed67e760be494835855
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| a530b688ce6e5b61e7cea8dc500fd2642ccdb82c |
|
29-Sep-2014 |
Alan Newberger <alann@google.com> |
Merge "WIP: Add recursive thumbnail call to LocalMediaData" into ub-camera-glacier
|
| e67bcfdb989f80c8e0870bd6a74b7e2a2cf1181a |
|
25-Sep-2014 |
Puneet Lall <puneetl@google.com> |
Recreate a OneCameraManager instance for each Activity.
Bug: 17484715
Change-Id: If484e3b40ef32324fa77629b1687cd4317466e2e
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| de614ed2bc0fae054d119a424b775e4cfe42117e |
|
23-Sep-2014 |
Alan Newberger <alann@google.com> |
WIP: Add recursive thumbnail call to LocalMediaData
This should allow for flicker free scaling once glide is submitted.
Bug: 17597861
Change-Id: I7a4d874a95f884bc54bea940facc68fd9a1ad7b5
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| dbb048f11d6be915b855089ceaf1bca5ccb57991 |
|
15-Sep-2014 |
Puneet Lall <puneetl@google.com> |
Don't set mCameraAppUI to null in onDestroy
BUG: 17408047
Note that we originally set this to null to address BUG: 12805279
which involved leaking Views. However, this has regressed and will
require another look regardless. The number of views leaked
with and without the null assignment is the same, so this change
does not make the regression any worse.
Change-Id: If90aeebb081073eb4f5b928919fc67ef710e1054
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 486ba1da145f70b07235617e5f1f64186daa0fc0 |
|
12-Sep-2014 |
Alan Newberger <alann@google.com> |
Revert layout change for Camera
Changing from LAYOUT_FULLSCREEN to FULLSCREEN interferes with layout of
Action Bar.
Bug: 17477202
Change-Id: I029a84adbe4c5017cc8185c5c0c2601a03196bde
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 87a2300ff2b49b8bd6a69815d1e4f3db477fcf4d |
|
11-Sep-2014 |
Spike Sprague <spikuru@google.com> |
Merge "workaround fix" into ub-camera-glacier
|
| 2ab141f8d5e53fa7483763ba20aa237424bab691 |
|
10-Sep-2014 |
Spike Sprague <spikuru@google.com> |
workaround fix
change View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN to View.SYSTEM_UI_FLAG_FULLSCREEN
on L, with View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN the entire camera app window is shifted down by the height of the status bar.
with View.SYSTEM_UI_FLAG_FULLSCREEN thw window lays out correctly.
note: with either flag on KitKat the window lays out correctly.
bug: 17457492
Change-Id: I6534fcedaafbbb525967289db7fb759ba50fca42
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 5c4bd6b5348a3464783270ea0bb10d4968d3b0cb |
|
10-Sep-2014 |
Alan Newberger <alann@google.com> |
Reduce logging for unknown camera scope
Still log a warning, but remove stack trace logging.
Change-Id: I28e47feb5d2700fd05e7ff4e6faeb1d5a9e38de5
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| e55801f83dd9e63276ba9ad20c8ce4e825ee242d |
|
06-Sep-2014 |
Alan Newberger <alann@google.com> |
Close the camera when the async open callback runs after pause
Current implementation leaves the camera device open if callback
returns after app is paused, since activity/module pausing is
already complete before the camera opened. This CL adds a close
if the opened callback returns when the activity is already paused.
Bug: 17397753
Change-Id: Iec5d16445201b4e308b16e9237fd98ed8599fddc
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 29a009c974f153f72cd5e28851a8cb85a691e215 |
|
05-Sep-2014 |
Alan Newberger <alann@google.com> |
Add additional lifecycle logging to Camera
To assist in diagnosing startup issues, added some logging.
Bug: 17397753
Change-Id: Icc47ec278c0b68c8834bfb52554425ff7f371ea0
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 17d9084e38e64f06a9d411d64fe3c2739d299cda |
|
29-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
Add short flash animation and shutter sound to ZSL camera.
Bug: 17217567
Change-Id: I9a75fdd15e03f47029ef4a631287899718794c5c
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| df6c9e2750206bd768e8abe7a508fa5677b53f26 |
|
29-Aug-2014 |
Spike Sprague <spikuru@google.com> |
actionbar opactiy tweaks
bug: 17319586
Change-Id: I2bfde2db9cff62b6ac8d8f416c1f8512c25bd900
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 9f2b20a389fa79f35e1e12878e3cbd8db3e1ff95 |
|
30-Aug-2014 |
Senpo Hu <senpo@google.com> |
Starting share/edit/play activities in its own task.
Bug: 17091348
Change-Id: Ib90173e164fab2a1aba753ab4d4f05d305d3d522
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 2d4be2576b265a4abfbabbda20862fcea19c1395 |
|
28-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Add simple sound player to be used in Camera implementations.
Bug: 17205355
Change-Id: I04c4bf1a692c7a4555eafea794737e41a8fc342c
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 3c3398db2d9d67ce61c88f1887dbe7dfcd8c47a6 |
|
28-Aug-2014 |
Alan Newberger <alann@google.com> |
Remove FeedbackHelper
ag/393130 has comments pointing out that startFeedback has a leak. We don't
use it anymore after Help library integration, so just remove it.
Bug: 17302992
Change-Id: I519a2b0eb7a0ce06d6fcdcbfa2c851837e9a6579
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 26b224dd3b4391dbbb8ee6ed35c40c431bdbec85 |
|
27-Aug-2014 |
Alan Newberger <alann@google.com> |
Protect video recording callback from activity/module pauses
This CL should eliminate MediaRecorder start exceptions, which
appear to be due to ending the camera or switching the module.
Storage I/O could take a while during which pauses can occur,
so we check for them and avoid starting video in that case.
Bug: 16298718
Change-Id: I9abca815400e9ce545fed96f6e31cb792860a1d0
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 4cc78bb37f57f1499fe3d2eaf27e2a3b3e2e19bf |
|
21-Aug-2014 |
Spike Sprague <spikuru@google.com> |
set actionbar background to complete transparent
bug: 17114270
Change-Id: I309c98ed1ddbc0c322129e185ca4cd2df1f73520
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 4c1bffecc94cedf56d188eca40bd65a854746413 |
|
21-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Enable switching within CaptureModule to HDR+ and back.
Bug: 16945820
Change-Id: If92371129c5bf2a78b7623d745a8b86d218d32e1
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 0dec43e3d77fd1f40093f2f3430a6e86d8d5307b |
|
20-Aug-2014 |
Spike Sprague <spikuru@google.com> |
filmstrip actionbar tweaks
bug: 17114274
Change-Id: I70e7b285d27f81c87442bcc9d28ae7391d028568
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| fe1af189505e39b2d86af5b9fcec12f1661d1509 |
|
22-Aug-2014 |
Spike Sprague <spikuru@google.com> |
Merge "filmstrip actionbar tweaks" into ub-camera-glacier
|
| 4f93e19ddb504560752fd5da9fecc4b95a4f1733 |
|
20-Aug-2014 |
Spike Sprague <spikuru@google.com> |
filmstrip actionbar tweaks
bug: 17114274
Change-Id: I0e9b3dd37325d39f5a16d81cbfaf71b98baf7510
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| ba97d192b63ea81edf2dd6ca5cfbf6646a1f25a2 |
|
20-Aug-2014 |
Spike Sprague <spikuru@google.com> |
animate filmstrip bottom button bar in and out
from the bottom of the screen
bug: 17114515
Change-Id: If3024f149fc0be0e48a430468c53774893946938
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| f67f64f3b5272d1da317b8eda8e1ea1e46539416 |
|
16-Aug-2014 |
Sol Boucher <solb@google.com> |
Merge "Enable seamless switching to/from camera2-backed Photo module" into ub-camera-glacier
|
| 44ce4b26614f85518d548a6750c7a08908ae3596 |
|
05-Aug-2014 |
Sol Boucher <solb@google.com> |
Enable seamless switching to/from camera2-backed Photo module
This supports running individual modules against the camera2 API framework while
the rest of the modules use the legacy Camera class.
Bug: 16875535
Change-Id: Ic0ae313a3dd96ba22bacc36c7b1712b183b713ff
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| d67c02eaf17287bcb334ad050d0bc81e1beaf288 |
|
14-Aug-2014 |
Alan Newberger <alann@google.com> |
Revert our layout from FULLSCREEN to LAYOUT_FULLSCREEN
We changed this while working on L prep, but FULLSCREEN suppresses the
action bar. Changing back to LAYOUT_FULLSCREEN addresses this.
Bug: 16986789
Change-Id: I561fe765ea5eb72b1d666a124c9810cf349ce56a
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| c2e6813aadeb94f8ec7f093e56c986aac796e783 |
|
13-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Don't try to share null data
Bug: 16875556
Also add warning logs for null check cases.
Change-Id: Ic1e7e81b416d24a748b9572d63c145612b38d822
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 2307b60abdf0af8639d71ba53cf10fdaf8dfe7e7 |
|
05-Aug-2014 |
Alan Newberger <alann@google.com> |
Refactor Upgrade/UpgradeAosp into SettingsUpgrader
This CL does three things:
- removes the Upgrade/UpgradeAosp classes which were bunches of statics,
in favor of a SettingsUpgrader abstract class that can be overridden
- moves 'upgrade to strings' hack logic into AppUpgrader so it only is
checked and run once, not for any of the former UpgradeSteps. logic used
to be in Upgrade and run regardless of key, when it was using detection
only meant for KEY.KEY_UPGRADE_VERSION
- adds existence checks for all hack in-place key string upgrades so they
are no-ops if the key was not persisted in the first place.
Bug: 16573087
Change-Id: Ife42f7aa4a7611ba2d143410a3450057b7464901
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 0be64680fb9b5a982b1b92730236ebb85e76624a |
|
07-Aug-2014 |
Spike Sprague <spikuru@google.com> |
rollback of b/16632474 and ag/518674
Change-Id: I77af6135ff339240bd52881550a0f42ec996f9c4
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 60c02b437771c8fe959b233bcdcb28e4314c7489 |
|
06-Aug-2014 |
Alan Newberger <alann@google.com> |
Merge "fix NPE in action switch" into ub-camera-glacier
|
| ea7db650e3468f913bbea5bad52875c93bde9ba9 |
|
06-Aug-2014 |
Alan Newberger <alann@google.com> |
fix NPE in action switch
Recent conversion of action condition from if/else to switch
overlooked need for switch to be non-null. Fixing here.
Bug: 16847376
Change-Id: I919c585c414d0d3c4ef7fcdefccfda9118ef8104
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| c7ab9c4ab2912f2c2777f907ca4c6f845ce98cef |
|
06-Aug-2014 |
Spike Sprague <spikuru@google.com> |
update system ui flags for full screen on android L
bug: 16632474
Change-Id: I5b555492587df103b41ad13a6893a334b8c71b68
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 0cf4a02c13a7710dc9b26ac39bea15a95ac48baf |
|
31-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
[OC] Enable flash support.
Bug: 16654225
Also show an error and exit the app if camera could not be opened.
Change-Id: Iddccaff35b081ba98efe2aaae51d9ee10bb7726f
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| ad87534c5a9e77e3d8fa09ed0b8692caf2a34937 |
|
03-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Prevent monkey crash when deleting without data" into ub-camera-glacier
|
| 9a9a1086c10ea39ae9a2a5bdeeb600c2d7f940b6 |
|
31-Jul-2014 |
Andy Huibers <andyhuibers@google.com> |
Improved logging of foreground source type.
Change-Id: I6fdd5a52ec136f76352e006a8e95e88aac0ac1af
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 08b3c94a7d7aff30b5da8e99649346e37b67a5c5 |
|
31-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
[OC] Adds the new CaptureModule and UI.
Bug: 16654225
This is essentially a version of the GCamModule without GCam, plus a few
things we need from PhotoModule.
Some code is commented out to be added back in later as a reminder.
CLs to hook the module up will be following up.
Change-Id: I70108529f81a8b0b744dc846287ea2ac121c85da
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 2fe3a3ee942690f3b88218fcd941d6c93039bf82 |
|
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
Prevent monkey crash when deleting without data
Bug: 16536894
Change-Id: I960c0d8f61b2909c7020d3c259fbad8f8c33bc05
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 62c20bfb063743d636300ba49b89f16c6f2546d0 |
|
23-Jul-2014 |
Alan Newberger <alann@google.com> |
Modify Camera settings scope enforcement from crash to warning
Several bugs have appeared particularly for flash settings, where the app
is attempting to get a scope per the new SettingsManager, and the camera
is already closed meaning there is no valid scope. With this change, such
situations will be logged with call stack traces, so if we see deviant
user behavior we'll know the source. Monkeys should no longer trip settings
crashes with this change.
Bug: 16483952
Bug: 16491601
Change-Id: I26487bc58909a05183563f59ae3cfba571f2504e
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 39529585aee23703553c551eadceca78742cf52b |
|
17-Jul-2014 |
Alan Newberger <alann@google.com> |
Route switch preferences through SettingManager
This CL adds a custom switch which uses SettingsManager to control
boolean settings. It relocates SettingsManager to the application
to allow access from multiple activities.
Bug: 16327665
Change-Id: I6af084a4443ea79ca270dab382a66ea527897a38
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| ca82f50dc211daad82abb91bcc35f50d1d81d4e3 |
|
15-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
Don't try to show storage hint if activity is no longer running.
Bug: 16198208
Change-Id: I6a6c92286c98cff8b55434a7a0d011bf5043d183
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 27450ecc1adc01ea7bc4355edcfe549c8a31b0a9 |
|
15-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
Don't crash if filename could not be found for ID.
Bug: 15890671
This is only used for logging but Monkey's crash on master.
Change-Id: I0d08d0a82fd6a7073c7aa1924c21beeb66859577
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| d8cc3ea58938f78012991360cef7a6b3a2e51ccc |
|
02-Jul-2014 |
Sol Boucher <solb@google.com> |
Make app build against updated frameworks/ex portability library
This is necessary to make the app build and run against the updated library, and
specifically the CameraAgentFactory, CameraAgent, and CameraAgent.CameraProxy
contracts.
Change-Id: I2dde04df7ae552eec022d31f78b0ce05525282cd
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 10a16544048c3e5e1b380219144d501351163dc1 |
|
08-Jul-2014 |
Spike Sprague <spikuru@google.com> |
am 1d1af906: Merge "previous CL ag/496035 disabled shutter button clicks during shimmy, scaling back a11y disabling on shutter button" into ub-camera-fishlake
* commit '1d1af90609b7a896f74dda83b7f22f91b50e70cf':
previous CL ag/496035 disabled shutter button clicks during shimmy, scaling back a11y disabling on shutter button
|
| a59e9fc9eef42219cd5a3ec5018de309139782a5 |
|
07-Jul-2014 |
Spike Sprague <spikuru@google.com> |
am 90defd62: Merge "disable shutter button when mode list is open" into ub-camera-fishlake
* commit '90defd62b3d0eed8cf3906c7f8394fc9ad401759':
disable shutter button when mode list is open
|
| 336e533e6f41239bef2b236beabaae93e11301af |
|
07-Jul-2014 |
Sam Judd <judds@google.com> |
am 950fb6b8: Merge "Ensure photosphere/pano thumbs are always shown." into ub-camera-fishlake
* commit '950fb6b8e8e7663f09428f25f2f788a3a191baef':
Ensure photosphere/pano thumbs are always shown.
|
| b7e41a734a9cf9b5789fd3221ba10833f669b7c5 |
|
08-Jul-2014 |
Spike Sprague <spikuru@google.com> |
previous CL ag/496035 disabled shutter button clicks during shimmy,
scaling back a11y disabling on shutter button
Change-Id: I1c788ccbd946b43774f9f4a7bf629c4e019f20f9
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 8aa154952b2d32776759a83dd61437313069e1c8 |
|
07-Jul-2014 |
Sam Judd <judds@google.com> |
Ensure photosphere/pano thumbs are always shown.
Bug: 16061224
Change-Id: I93f1dd8a094cd4f00d06c02c13f51ef8545aa26c
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 90defd62b3d0eed8cf3906c7f8394fc9ad401759 |
|
07-Jul-2014 |
Spike Sprague <spikuru@google.com> |
Merge "disable shutter button when mode list is open" into ub-camera-fishlake
|
| 38989540cb1488cb7b8062ff74b9dedcd76c047f |
|
03-Jul-2014 |
Spike Sprague <spikuru@google.com> |
disable shutter button when mode list is open
bug: 16042076
Change-Id: I0b8fad7b40bb348a3be0fa3c9457a1ceb6a49b05
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 6f2832644260b7ddf540c43d4fb28d22fe679b7f |
|
02-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am aa52b3d2: Prevent crash for when newData cannot be found.
* commit 'aa52b3d28a0285b71be342158386422ed53244b2':
Prevent crash for when newData cannot be found.
|
| aa52b3d28a0285b71be342158386422ed53244b2 |
|
01-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
Prevent crash for when newData cannot be found.
Bug: 15842040
This should never happen, but could if e.g. there is a UI bug that
causes the 'done button on Photo Sphere / Panorama to be visible when no
actual session is active.
Change-Id: Iadd3c1786a4cb204d8a4d3222864aba2807ec36e
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 6a8321ca6932ed484e5b10483079dcf75beeec4f |
|
30-Jun-2014 |
Andy Huibers <andyhuibers@google.com> |
am 0b3f9d51: Clean up foregrounding stats so that they are balanced with backgrounding stats.
* commit '0b3f9d515df7a36d6e73acd4900b2537f4e54c8d':
Clean up foregrounding stats so that they are balanced with backgrounding stats.
|
| 0b3f9d515df7a36d6e73acd4900b2537f4e54c8d |
|
30-Jun-2014 |
Andy Huibers <andyhuibers@google.com> |
Clean up foregrounding stats so that they are balanced with backgrounding stats.
Change-Id: Ib694e8a98822cb475b5dfb2f92a56a34e31ae5dd
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| eb88b3c4aa4f83e35c60e8932d83100be1b8bbb0 |
|
27-Jun-2014 |
Erin Dahlgren <edahlgren@google.com> |
resolved conflicts for merge of deb09a7c to ub-camera-glacier
Change-Id: I98982ef41a2b2dc1175bb8f2ae9f881eb183c53d
|
| 26a4bb961a4b1bd9c6a161cffe39089b2a7b7138 |
|
27-Jun-2014 |
Erin Dahlgren <edahlgren@google.com> |
GoogleHelp launch edits.
* Change Help to "Help & feedback"
* Move open source to the overflow menu in Help & feedback
* Remove send feedback
* Consolidate to one single group of settings (no General Settings and About)
* Put "Help & feedback" in the filmstrip overflow
Bug: 8426295
Change-Id: I3f0dad33b3e0c9ce150dce5c96cf7b9d7d7650da
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| e524b786a8bbc6c9c2fb978245d1fb0f1ac2692c |
|
27-Jun-2014 |
Sam Judd <judds@google.com> |
am 632eaafd: Pull Glide forward.
* commit '632eaafda53eb59b15c81ddeaf2080e6d8515f59':
Pull Glide forward.
|
| 632eaafda53eb59b15c81ddeaf2080e6d8515f59 |
|
24-Jun-2014 |
Sam Judd <judds@google.com> |
Pull Glide forward.
Bug: 15669246
Change-Id: Icdcc5cb7c3ec2bbf5b970ee95ea121e10ac341d7
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| d3580417d6347c52c35b008bf9e333c08b771e8e |
|
24-Jun-2014 |
Andy Huibers <andyhuibers@google.com> |
am 03fd3baf: Merge "Add maximum zoom level and time to view events." into ub-camera-fishlake
* commit '03fd3baf01447f30246b095f816ce337562d15f7':
Add maximum zoom level and time to view events.
|
| c8924b2ec3788ca6d0f0af5ca749e5fe7be125ce |
|
21-May-2014 |
Andy Huibers <andyhuibers@google.com> |
Add maximum zoom level and time to view events.
Bug: 15646701
Change-Id: I7c1de761fc10486b417a25ebc8469cebaf840a1c
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 1fc61197e36b25c593e8b0e95a10a9167d7d621e |
|
21-Jun-2014 |
Sascha Häberling <haeberling@google.com> |
Revert "Memory window analysis in Camera2. Bug: 13280671"
This seems to introduce jank in the app.
This reverts commit b4f3483bfb5c2edcaefd0b44e84bb080e46502c8.
Change-Id: Iad87e32a411eae1e2fdf09d6829c0e006a8eb5f8
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| b4f3483bfb5c2edcaefd0b44e84bb080e46502c8 |
|
17-Apr-2014 |
Kevin Gabayan <gabayan@google.com> |
Memory window analysis in Camera2.
Bug: 13280671
Change-Id: I22249e6aeb76dca2fe79e49d3bd75c089fa7936f
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 831347d9cb5c0e3f03db7aadfc89e91b231104e7 |
|
17-Jun-2014 |
Angus Kong <shkong@google.com> |
Migrate to use new CameraSettings.
Totally get rid of Camera.Parameters.
Change-Id: I147b88f77ecab52600088a10417c3eac3d7fd340
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 6190c36db653e848f29d1caefc4fa1bb61e8a662 |
|
13-Jun-2014 |
Erin Dahlgren <edahlgren@google.com> |
New Settings API
Based on discussions from last week and comments on the design doc,
this api begins to implement the following:
1. Adds a "Scope" variable to api, which tells the SettingsManager
whether the setting can be stored globally (so that it is visible
to all parts of the app), or per-camera, or per-module, or per-
custom scope that the api user provides.
2. Separates keys and default values from SettingsManager,
to make it easy to add new settings/defaults from third party
modules.
3. Stores all settings as strings, to avoid upgrade errors, and
handles casting to type requested. Only String, Integer, and
boolean are supported.
4. Opens SharedPreferences files on demand, depending on scope
argument.
5. Creates a "DefaultsStore" to hold the defaults and possible
values of a setting. Then a user can request the default or
possible values of a setting at any time.
Change-Id: I03e0e1dd0955c519f54112e89716014aa963a425
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 5a344964cb003525727c31d295ca3a592c245606 |
|
17-Jun-2014 |
Sol Boucher <solb@google.com> |
Remove cameradevice subpackage and point references at ex library
This code is being relocated into frameworks/ex for availability to other apps.
Change-Id: Icada261ac7a795b08dd8b187dfd17077077b37c3
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 1ec930eb7cc0ef2b02e997833b712bd8b768bdf9 |
|
17-Jun-2014 |
Kevin Gabayan <gabayan@google.com> |
am 09a46ccb: Merge "MotionManager for motion-aware focus unlock in Camera2. Second revision. Bug: 14222601" into ub-camera-fishlake
* commit '09a46ccb10504579417609d2486dc28e92458bf7':
MotionManager for motion-aware focus unlock in Camera2. Second revision. Bug: 14222601
|
| fb33336bc6f4b70b0686b5e060819d6bd41f3b6f |
|
02-Jun-2014 |
Kevin Gabayan <gabayan@google.com> |
MotionManager for motion-aware focus unlock in Camera2. Second revision.
Bug: 14222601
Change-Id: I36637483b0d7efa2950cd93482de8f1e83bfa8aa
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 120e20acf7005fcc66f3b751521db998c2cb4531 |
|
13-Jun-2014 |
Kevin Gabayan <gabayan@google.com> |
am 811a814d: Merge "Revert "MotionManager for motion-aware focus unlock in Camera2 Bug: 14222601"" into ub-camera-fishlake
* commit '811a814dc3a2221048c1b23206a9d0a4bf9b6901':
Revert "MotionManager for motion-aware focus unlock in Camera2 Bug: 14222601"
|
| a51ccbf170d65079c159d9754fbfe1f5164c8539 |
|
13-Jun-2014 |
Kevin Gabayan <gabayan@google.com> |
am bacc2584: Merge "MotionManager for motion-aware focus unlock in Camera2 Bug: 14222601" into ub-camera-fishlake
* commit 'bacc2584a7c03931643dd4c2d95d6c3f302e4a00':
MotionManager for motion-aware focus unlock in Camera2 Bug: 14222601
|
| 516c11a6885f6e524927bd369567f5bbd592f8ef |
|
13-Jun-2014 |
Kevin Gabayan <gabayan@google.com> |
Revert "MotionManager for motion-aware focus unlock in Camera2 Bug: 14222601"
This reverts commit ebba3288da5628c9ea7579b63139aa7b7312e137.
Change-Id: Ie82d81aa0440339aba1b762fa78caeb7f7d55312
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| ebba3288da5628c9ea7579b63139aa7b7312e137 |
|
02-Jun-2014 |
Kevin Gabayan <gabayan@google.com> |
MotionManager for motion-aware focus unlock in Camera2
Bug: 14222601
Change-Id: Id118e12c8f789c74c8fc2e32ec208ff943b97e49
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 6fbfe5173803b303c883ab2d446f50983cf43c2e |
|
12-Jun-2014 |
Angus Kong <shkong@google.com> |
Merge "Refactor out Camera.Parameters." into ub-camera-glacier
|
| 6607dae6c4d1ee5bbf572695c2042d4d9129a730 |
|
11-Jun-2014 |
Angus Kong <shkong@google.com> |
Refactor out Camera.Parameters.
Change-Id: Ibc1ddac509381530e887b7491069e6367e9a6088
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 159e6e9ca0d0ecb53d49765c75fd7a0b2afef965 |
|
28-May-2014 |
Spike Sprague <spikuru@google.com> |
disambiguate media types in capture/filmstrip a11y descriptions
capture uses current mode for better description string.
filmstrip uses metadata util functions for better description.
bug: 14473074
Change-Id: Id7c87a2cbd3ce5f072f433e74ca6139bf47f2fc7
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| d832f3173eab04a0c1838e0aefcd72ff5c45228b |
|
22-May-2014 |
Spike Sprague <spikuru@google.com> |
secure camera -> gallery launch hardcoded to
launch G+ photos
bug: 15141761
Change-Id: I5009d58917bbc1ea41b01d22b4c2e0f168f6b5cc
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 6809eb840f358430d3032c0532fb42d6dcfd06ef |
|
21-May-2014 |
Doris Liu <tianliu@google.com> |
Freeze the screen during camera switch to hide visual distraction
Bug: 14818897
Change-Id: If6df2a6d0783e27807f01f8518244df33c24647f
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 42c07cc1cca3460c67a4243747074c822e11025f |
|
21-May-2014 |
Spike Sprague <spikuru@google.com> |
Merge "added Filmstrip viewtype tags for session, secure album placeholder, and camera preview" into ub-camera-everglades
|
| a93ba0dbd8e4000f3643567809a4a3fac554fd3c |
|
21-May-2014 |
Spike Sprague <spikuru@google.com> |
added Filmstrip viewtype tags for session, secure album placeholder, and camera preview
bug: 15136020
Change-Id: Ib9d4c93317a1c1603c6368e1f8bb03438922f4a8
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| cfe9acc23fcc5f2c00dde46e7e5c3c5192f5e9f0 |
|
21-May-2014 |
Angus Kong <shkong@google.com> |
Ignore metadata update callback after paused.
bug:14814811
Change-Id: Iaa2185ce533b88b75ec13840b30a6df7c04b0ddb
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 6382c70a769b9ec94a3b0372ee27c0cd075e8be8 |
|
20-May-2014 |
Seth Raphael <magicseth@google.com> |
Add Letterboxing for HDR+
Bug: 14470553
Change-Id: I37d9270b5ad2917c8c19a8aa4abc04967f03621c
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 02c129a598b6a165885fe950275675d62993d2ee |
|
20-May-2014 |
Seth Raphael <magicseth@google.com> |
Preparatory commit for 16:9 hdr+
This exposes some necessary functions for hdr+
to go 16:9. It allows you to pass a preview matrix
that is pre scaled, so that hdr+ can calculate its
own matrix
Bug: 14470553
Change-Id: I56f2c033ff58a9ff6793c6ee4d2317cb9ce5065a
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 256427babcb93dd3cdb11b6e23c47ecf82e5af19 |
|
15-May-2014 |
Sascha Haeberling <haeberling@google.com> |
Close mode options and mode list when needed.
Bug: 14834384
Bug: 14834783
Change-Id: Id96859d57a84c66489a0e764ba2950cc47f7c886
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| db8f97582d09cd36eee8cfe4ed43182bff63f8bd |
|
13-May-2014 |
Doris Liu <tianliu@google.com> |
Start up screen
This is the 2-step full screen popup:
Step 1: (Only for new users) Choose whether geo-tagging should be on
Step 2: For new users and upgraders to choose 4:3 or 16:9 preview
resolution to take advantage of the screen size.
Change-Id: Ibffe5a807cc622a3945b9fd869de1bf7dd660849
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| e10f6cff785050b251cfbd851160a89b68d6b781 |
|
13-May-2014 |
Andy Huibers <andyhuibers@google.com> |
Merge "Logging for Everglades release." into ub-camera-everglades
|
| 910c1a94340163181a35bb60cd347ffbed0fbbf1 |
|
13-May-2014 |
Sascha Haeberling <haeberling@google.com> |
Add custom share and edit intent chooser titles.
Bug: 14834379
Change-Id: I4534a8129ebc540c86d022d758aabfa0c8fbf23a
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| ebd95379407dc99471d8091c7f23189ac0997d82 |
|
12-May-2014 |
Andy Huibers <andyhuibers@google.com> |
Logging for Everglades release.
Bug: 14364757
Change-Id: Ic29b41e7385378e022e388a02af7e4842e7ab9b5
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 1a2fb9018bb839185a0fae352d72d5ea18aa3c3f |
|
07-May-2014 |
Doris Liu <tianliu@google.com> |
Merge "Use last still camera for INTENT_ACTION_STILL_IMAGE_CAMERA" into ub-camera-everglades
|
| 443a1a60eb42e26832f9b543cc32ba0aae7f4cda |
|
07-May-2014 |
Alan Newberger <alann@google.com> |
Move share evaluation into ReleaseDialogHelper
Now delegating to ReleaseDialogHelper the evaluation whether it
should be shown on share.
Bug: 14592653
Change-Id: I9ffc82511237d3a4ff6349feffb068520e4baa9f
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| e903d53c56302d10fffb8065164816db742c44e3 |
|
06-May-2014 |
Doris Liu <tianliu@google.com> |
Use last still camera for INTENT_ACTION_STILL_IMAGE_CAMERA
Bug: 14496045
Change-Id: I96eafa829fafe935880d16239420412d04fe2b3b
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 0b9eb5bb8d2ef409e8c88196c0c82c8ece65728b |
|
01-May-2014 |
Angus Kong <shkong@google.com> |
Cancel onResumeTask when the app is paused.
Also change the camera closing conditions to force close all camera before
killing the handler thread.
bug:14190951
bug:14441425
Change-Id: Ic752b0678530b34eb3710bd7796cb17d15452013
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| f3da6cf0b26be00afe43323b7fac74a317d0f5f5 |
|
01-May-2014 |
Angus Kong <shkong@google.com> |
am 92537afd: Merge "Preload metadata for new videos." into gb-ub-photos-denali
* commit '92537afd29b1dd756e73c0bb58249521a6f65624':
Preload metadata for new videos.
|
| 92537afd29b1dd756e73c0bb58249521a6f65624 |
|
01-May-2014 |
Angus Kong <shkong@google.com> |
Merge "Preload metadata for new videos." into gb-ub-photos-denali
|
| e5a7c3cbb3aa2f0d28dba21579b530bdfe1331fe |
|
01-May-2014 |
Alan Newberger <alann@google.com> |
am 39f1c22b: Merge "Fix storage warning hint crash" into gb-ub-photos-denali
* commit '39f1c22bbe02a5d8edaa1e0ba60e49ed27215e4b':
Fix storage warning hint crash
|
| e95aefe4461e8e3192e227d98076b75975ed3ec5 |
|
01-May-2014 |
Alan Newberger <alann@google.com> |
Fix storage warning hint crash
We rarely hit this warning, but indications are that it crashes 100%. This is an old
class, not even sure why we're using it vs a Toast, but for now fixing the existing
implementation. OnScreenHint accepted a context but attempted to add views which
requires an Activity. Likely started failing when we used to in practice pass Activity
contexts but converted to Application contexts. I have converted OnScreenHint to require
an Activity. We have one device afflicted by this 100% which I used to test, and it now
works with this CL and shows a storage warning.
Bug: 14134552
Change-Id: I1d8a7a7dce799c81c821b9974e8d8d62c6daab39
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 810b0b6c5e1539ddd94c3a268b3f03301c35998b |
|
30-Apr-2014 |
Angus Kong <shkong@google.com> |
Preload metadata for new videos.
bug:14279339
Change-Id: I4733199fecc45b24abc41a241fdb5af3421f5652
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 6db1236ecd6b33b4fd1042570cc0d725634a5276 |
|
30-Apr-2014 |
Spike Sprague <spikuru@google.com> |
resolved conflicts for merge of e903ae3f to ub-camera-everglades
Change-Id: Ic0ea3fdfd5bad7ea3a576c3bc1ab7fddd7b557bc
|
| e6374b76bd10c7e9120b8530b2dae0f4b321ceea |
|
26-Apr-2014 |
Spike Sprague <spikuru@google.com> |
fix free space calculation / querying timing problem
also, be (a little) more agressive about updating
available storage space so app generally has the most
up-to-date space calculation more often
bug: 14275001
Change-Id: I1aa91419be017f1248bb4b3b0aa805bd4e1b05c6
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| dfb5a6f356f3287c5cc9cac20948ec14c1f68a35 |
|
29-Apr-2014 |
Doris Liu <tianliu@google.com> |
Add affordance to toggle mode switcher and filmstrip for accessiblity
Bug: 14109115
Bug: 14106588
Change-Id: Ie5eea0f942739f2f0a1088ba7d568189bfe02b6b
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 311372eb258ed6f3cf28f092ab529d3ff65020bb |
|
29-Apr-2014 |
Andy Huibers <andyhuibers@google.com> |
am eaaf2930: Add logging for failure conditions.
* commit 'eaaf29303c48c2befe216151bf9bedc008a1b616':
Add logging for failure conditions.
|
| eaaf29303c48c2befe216151bf9bedc008a1b616 |
|
28-Apr-2014 |
Andy Huibers <andyhuibers@google.com> |
Add logging for failure conditions.
Bug: 14364757
Change-Id: I252b1d79b94dabdc8960c7e243c50c8d50cb1306
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| b65117fbce9a0dc6d7568a6b7b802baf5df6ead5 |
|
29-Apr-2014 |
Angus Kong <shkong@google.com> |
am 1b9d4fb6: Add history info for camera open failure log.
* commit '1b9d4fb6f649262e491c0fa743229b4930a87802':
Add history info for camera open failure log.
|
| 1b9d4fb6f649262e491c0fa743229b4930a87802 |
|
25-Apr-2014 |
Angus Kong <shkong@google.com> |
Add history info for camera open failure log.
bug:14365703
Change-Id: I4b2259e12121cac5b8165f5c5dbacf9cb3a936a6
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 1045fefdf22bd58fa911b100e7db5750f7efa3e6 |
|
21-Apr-2014 |
Angus Kong <shkong@google.com> |
Create cameradevice package for camera management.
Change-Id: I73c69a70736b0b0eb0ef069a7876cf75fee91262
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 5031c26af8d38b026d8af94f98acfe524cc2da33 |
|
10-Apr-2014 |
Alan Newberger <alann@google.com> |
am 63da42d6: Merge "Tweak log levels for photo, video" into gb-ub-photos-denali
* commit '63da42d610376d2fc02c0ac453d5df3a1e885504':
Tweak log levels for photo, video
|
| d41766fc59fbcc184d891fde2873cca2309a2585 |
|
10-Apr-2014 |
Alan Newberger <alann@google.com> |
Tweak log levels for photo, video
Adjusting log levels to insure some simple state flow statements
are printed for all clients at info, plus a few other adjustments.
Bug: 13737123
Change-Id: Ic58b2ad44067253960d68678c34d82895f49f6a6
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 92f89f4baff831d7e2166fba18ca595cbc40a03b |
|
09-Apr-2014 |
Kevin Gabayan <gabayan@google.com> |
am 05ee74dc: Log memory consumption at end of onCreate (Camera2). Bug: 13280671
* commit '05ee74dcf3b1c8e65229f43441d282fcf89744a6':
Log memory consumption at end of onCreate (Camera2). Bug: 13280671
|
| d3b81299b6c071aeddb160ab8294d422aeb11ebb |
|
09-Apr-2014 |
Kevin Gabayan <gabayan@google.com> |
am 0aeb0c82: Query memory consumption at end of onCreate. Bug: 13280671
* commit '0aeb0c82704401a050ad3b892ed1c9efa457013d':
Query memory consumption at end of onCreate. Bug: 13280671
|
| 05ee74dcf3b1c8e65229f43441d282fcf89744a6 |
|
09-Apr-2014 |
Kevin Gabayan <gabayan@google.com> |
Log memory consumption at end of onCreate (Camera2).
Bug: 13280671
Change-Id: Ifdeadff2c89a08757cc2f3792ba61a2b54d19ae0
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 0aeb0c82704401a050ad3b892ed1c9efa457013d |
|
08-Apr-2014 |
Kevin Gabayan <gabayan@google.com> |
Query memory consumption at end of onCreate.
Bug: 13280671
Change-Id: Iedc4c8907a6e726a1835494bd6fad93e6ee8a666
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| c29db9f8ca2f6c8db2d30e0a90e0a145512f2fb6 |
|
08-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am f773a11d: Merge "Keep lights out even if the system changes it." into gb-ub-photos-denali
* commit 'f773a11d50fc48f3831f259075a0e64460f9baaa':
Keep lights out even if the system changes it.
|
| 099b49b8e9fce2b1e1e5c2f6f8756527852329b4 |
|
08-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Keep lights out even if the system changes it.
Bug: 13894148
Change-Id: Ie6d5b8fc1d3601082942a5c0843b447cb4805ceb
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| d462b8fff7198d080ca83c57dd24315e6a71aed9 |
|
07-Apr-2014 |
Andy Huibers <andyhuibers@google.com> |
am 937a2fc8: Remove unneeded log line.
* commit '937a2fc8c2694353692a122dddd658754bd67cb6':
Remove unneeded log line.
|
| 937a2fc8c2694353692a122dddd658754bd67cb6 |
|
07-Apr-2014 |
Andy Huibers <andyhuibers@google.com> |
Remove unneeded log line.
Change-Id: Ibf22b2389ed898f68f7f9217f0d899dfae8aa767
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| f4985d0f5183259c7b17ff61017a623828e8348f |
|
07-Apr-2014 |
Spike Sprague <spikuru@google.com> |
am abf54e29: exposure compensation control is back
* commit 'abf54e2994961395a0feb0b08353e62718443f23':
exposure compensation control is back
|
| f3e528c6928655b171ddca4d05d0d99e862bbf4f |
|
07-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
resolved conflicts for merge of 0bfc7619 to ub-camera-everglades
Change-Id: Id95979da7701d52f1c25ddba710686465a8ba60d
|
| 107172f82e8c9b7cbfab09f54f97af40b9dfabde |
|
07-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
resolved conflicts for merge of 79dd6876 to ub-camera-everglades
Change-Id: Icba83583ffb5b6210ec084ca7e3193bedebe7da1
|
| 42f9a26ba6b217a4c451c03a239eda95e4a09b38 |
|
07-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 39675164: Turn Lights-Out mode back on.
* commit '396751645d19012eec4fe1d94023c6b474f9fb91':
Turn Lights-Out mode back on.
|
| a7313da16f34aa714cc31d6ac677d248ef8102e6 |
|
07-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 3d022031: Merge "Remove unused ComboPreferences cruft." into gb-ub-photos-denali
* commit '3d02203136fe7955f77529828756de9ebaf163dc':
Remove unused ComboPreferences cruft.
|
| 4607889d595311f07375a11e3264a49a8e7d969b |
|
07-Apr-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 3578a8d9: Merge "Move disk IO from first time use background task." into gb-ub-photos-denali
* commit '3578a8d937f1265eca854f82d9305a0d4a4259a0':
Move disk IO from first time use background task.
|
| 92fb63699265997322a60c8b9c02a74de080cd4b |
|
07-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
resolved conflicts for merge of fed27f98 to ub-camera-everglades
Change-Id: I772dce9ec63a3c60fd4a72b50460ef89dda06338
|
| b5e96a53a312163bbe6177de405f2ac779daf090 |
|
07-Apr-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 45810372: Merge "Fix broken shutter button enabling in Photo and Video." into gb-ub-photos-denali
* commit '458103727c23134f3c9fb678dd757f31779f6db8':
Fix broken shutter button enabling in Photo and Video.
|
| f33880ba31aebb4d5e993bd8e8d7f715242fb984 |
|
07-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 94dea6e4: Merge "Refactor UsageStatistic so it can be disabled more easily." into gb-ub-photos-denali
* commit '94dea6e4d1744aeaa5001a5023fb0a7ecb124128':
Refactor UsageStatistic so it can be disabled more easily.
|
| abf54e2994961395a0feb0b08353e62718443f23 |
|
27-Mar-2014 |
Spike Sprague <spikuru@google.com> |
exposure compensation control is back
bug: 13607051
Change-Id: Ib4920ba3f8f3a548651a2d07613ccfdc28ca1d6e
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 10c5816e1ff3d30e4c4996643ba05d63d522b81a |
|
29-Mar-2014 |
Andy Huibers <andyhuibers@google.com> |
Logging revisions.
Bug: 13747555
Change-Id: Ic5f735de89f9a69d981cdeab209b3966532697c7
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| e3e270f8004521d6acd71cefeea11bbda8ca20d4 |
|
03-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Move SettingsManager back into Activity.
We cannot easily share one instance between Activities as the manager
needs the current module index. So this can cause crashes if two
Activity instances are around and one gets destroyed.
Change-Id: I964b14460669c4fbe3a51ab80cd385d5dfa0a16d
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 396751645d19012eec4fe1d94023c6b474f9fb91 |
|
03-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Turn Lights-Out mode back on.
Bug: 13765919
This is reverting http://ag/436107
Change-Id: Id40645f2555d3133b0e866de57c8c951d8c3b86d
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 3d02203136fe7955f77529828756de9ebaf163dc |
|
03-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Remove unused ComboPreferences cruft." into gb-ub-photos-denali
|
| 4044ab70586b15ae413f3f3751ad449fc775d16f |
|
03-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Remove unused ComboPreferences cruft.
Change-Id: Ib2e005e00316f8840e29fb559e34c6a5d9f28950
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 3578a8d937f1265eca854f82d9305a0d4a4259a0 |
|
02-Apr-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Move disk IO from first time use background task." into gb-ub-photos-denali
|
| fed27f98446ea62db3427a95abf63abf2e478bd7 |
|
02-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Make SettingsManager accessible on app-level, not Activity-level." into gb-ub-photos-denali
|
| 458103727c23134f3c9fb678dd757f31779f6db8 |
|
02-Apr-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Fix broken shutter button enabling in Photo and Video." into gb-ub-photos-denali
|
| 6ee333404c996b02023746c80b5bf6b7bdf99d38 |
|
02-Apr-2014 |
Erin Dahlgren <edahlgren@google.com> |
resolved conflicts for merge of 3c4f7abe to ub-camera-everglades
Change-Id: Ia618681d2bfd3ceb928f47f2b706b83eea2f93d1
|
| fa9c38908429b9a5db5d738fae3b2963c4cb177f |
|
02-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Make SettingsManager accessible on app-level, not Activity-level.
Bug: 13754773
This also cleans up the SettingsManager and removes all constructor
parameters except the context, which is needed.
Change-Id: I60a8d5582771e5a1f53a761897f4d41c30e50166
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 667630d16a2b0cf3acecb817b3aa398abdd33623 |
|
01-Apr-2014 |
Erin Dahlgren <edahlgren@google.com> |
Fix broken shutter button enabling in Photo and Video.
When I went in to implement globally disabling the shutter button during
a certain state transition of the app, I realized that
1. enabling the shutter button in Photo and Video was totally broken: the
methods being used for enabling the shutter button were totally empty!
2. setShutterEnabled in the AppController was totally empty.
3. we've done a horrible job with keeping names consistent: capture button
!= shutter button.
So I've fixed all of these things, which should solve existing bugs and make
my original task easier.
Change-Id: If1ae3b8c740ef678fbd20c2ffbb93576f48c8c19
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| a83ec8a3acb174e2688f0d31f2094e1aa72a06ee |
|
31-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Refactor UsageStatistic so it can be disabled more easily.
Change-Id: I2ca6e7d5642b1400d4b13f2c45cb48793b2fc178
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| c4fbb3d83031686b0bbe5612fa58db90d1d1c9dc |
|
02-Apr-2014 |
Erin Dahlgren <edahlgren@google.com> |
Move disk IO from first time use background task.
Bug: 13251352
Change-Id: Ib6b0dbebb00f3210a649bb4d2782d65faaceb41c
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 3c4f7abe28322f7882d50beffe892db08b4f7f2e |
|
01-Apr-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Move CameraPerformanceTracker methods to beginning of triggers." into gb-ub-photos-denali
|
| 5f38da866e2f0eb057662619ef8703ace40eb64c |
|
01-Apr-2014 |
Erin Dahlgren <edahlgren@google.com> |
Move CameraPerformanceTracker methods to beginning of triggers.
Bug: 11376004
Change-Id: I9aa5d632e4ca5462b4d2604a80346df6897fa413
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 6b165b057209deaf30ba339a360e62d8ab524355 |
|
01-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 3aa83112: Merge "Re-add ongoing session when Activity is restarted." into gb-ub-photos-denali
* commit '3aa83112286c2a0de39cb95f5010bc7882128578':
Re-add ongoing session when Activity is restarted.
|
| 334002bb57bc843b73315b881fc779dbbcf6667f |
|
01-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 84312832: Merge "New generic cling widget, add cling for refocus editor button" into gb-ub-photos-denali
* commit '84312832d7dbae89df75046ce91bf3d675b4b928':
New generic cling widget, add cling for refocus editor button
|
| 3aa83112286c2a0de39cb95f5010bc7882128578 |
|
01-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Re-add ongoing session when Activity is restarted." into gb-ub-photos-denali
|
| adde93f26f39cd856fdf749c83d29f9022a310e1 |
|
01-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Re-add ongoing session when Activity is restarted.
Bug: 13637563
Change-Id: I0fd9a521479d8805f8c1d82b8f930a23d16b4217
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| e7d7b9ef5e09ba464306565c6c62302a4d9bbe5e |
|
01-Apr-2014 |
Doris Liu <tianliu@google.com> |
New generic cling widget, add cling for refocus editor button
Bug: 13307036
Change-Id: If3a1759cbc0cbc66de1d3d15a3ae18999bf0bd1f
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| a0e28c24c0b2d8cf5e5b8c5937f27e012b0cf579 |
|
31-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 4e0a4641: Make last module used sticky after all camera launches.
* commit '4e0a464166fca881fa93d51f43aeb334c874e4b1':
Make last module used sticky after all camera launches.
|
| 4e0a464166fca881fa93d51f43aeb334c874e4b1 |
|
31-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
Make last module used sticky after all camera launches.
Bug: 13716653
Change-Id: If72a2dc7a3dfe94f5ff73b6034b6bafc8073f40c
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 63ab7ed46e9c8a74d3bd95a4215ea7c392e938c5 |
|
28-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 1ca516f2: Allow modules to hard reset settings to prevent out-of-sync errors.
* commit '1ca516f2b612f91e0857ca87d978d39c2aba7c8c':
Allow modules to hard reset settings to prevent out-of-sync errors.
|
| 1ca516f2b612f91e0857ca87d978d39c2aba7c8c |
|
28-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
Allow modules to hard reset settings to prevent out-of-sync errors.
Bug: 13663716
Bug: 13507557
Change-Id: Ie4e66c356c69c3a75a568dae13ddd2d42f60179e
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 9f34b315eb38c99c860cfad99aed204a1bbd0911 |
|
27-Mar-2014 |
Alan Newberger <alann@google.com> |
am b6db6917: Hide bottom bar of Camera when filmstrip is visible
* commit 'b6db6917db367e4ca0992ca8614a4cfc59d68d92':
Hide bottom bar of Camera when filmstrip is visible
|
| b6db6917db367e4ca0992ca8614a4cfc59d68d92 |
|
26-Mar-2014 |
Alan Newberger <alann@google.com> |
Hide bottom bar of Camera when filmstrip is visible
This CL hides the bottom bar, i.e. capture button and onscreen indicators,
when the filmstrip is visible. We hide a wrapper; modules may independently
control the visibility of the items in the wrapper e.g. Photo Sphere turns
the actual buttons invisible even if the wrapper becomes visible.
This change takes care of the most egregious issues with widgets visible to
TalkBack under the filmstrip, but there are still others e.g. 'align to start'
for Photo Sphere, can be navigated to. I'll file a separate bug to pursue
a more aggressive wrapper visibility toggle which turns off the whole camera
preview, mode switcher, etc.
Bug: 13644558
Bug: 13589550
Change-Id: I1cf7e9079210c85f29b3e35e0f7dbf176b86976e
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 2d9fb0ddb2e9d64276506281a27ef1c9a17f01d3 |
|
26-Mar-2014 |
Alan Newberger <alann@google.com> |
am 62c6d864: Add content description for secure lockscreen filmstrip icon
* commit '62c6d864f51fb7f77b598df914a3825e2cfc45fa':
Add content description for secure lockscreen filmstrip icon
|
| 2bca210e5fc8a77685775ffb403096167b017dce |
|
12-Mar-2014 |
Angus Kong <shkong@google.com> |
Use debug.Log instead of android.util.Log.
see http://ag/438423, merge conflicts solved.
1. Change to use com.android.camera.debug.Log instead of android.util.Log.
2. Add DebugCameraProxy to support more detailed debug info.
3. Add CameraErrorCallback in CameraManager.
4. Support posting to a specific handler for CameraErrorCallback.
5. Trim down some TAGs to match the framework tag length limit.
6. Remove some unused codes in CameraSettings.
bug:13324870
Change-Id: I8c20a8a0d11cfd50b6e199b03cbc88d3c4ad2ceb
Conflicts:
src/com/android/camera/data/LocalMediaData.java
src/com/android/camera/data/RotationTask.java
src/com/android/camera/widget/FilmstripView.java
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 62c6d864f51fb7f77b598df914a3825e2cfc45fa |
|
26-Mar-2014 |
Alan Newberger <alann@google.com> |
Add content description for secure lockscreen filmstrip icon
This CL adds a description for the lock icon in the secure filmstrip.
Bug: 13644391
Bug: 13589550
Change-Id: Ib81e3a419d51ca14d6d4d912de22d04bac4d3234
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 5596b4c902dcb685928b43678f428746ca5ffd08 |
|
12-Mar-2014 |
Angus Kong <shkong@google.com> |
Use debug.Log instead of android.util.Log.
1. Change to use com.android.camera.debug.Log instead of android.util.Log.
2. Add DebugCameraProxy to support more detailed debug info.
3. Add CameraErrorCallback in CameraManager.
4. Support posting to a specific handler for CameraErrorCallback.
5. Trim down some TAGs to match the framework tag length limit.
6. Remove some unused codes in CameraSettings.
bug:13324870
Change-Id: I8c20a8a0d11cfd50b6e199b03cbc88d3c4ad2ceb
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 93eb42683e939c790f2d31c43100ab79e283fdb7 |
|
26-Mar-2014 |
Carlos Hernandez <chernand@google.com> |
am 82cd60ca: Merge "Implement callbacks for setProgressMessage" into gb-ub-photos-denali
* commit '82cd60ca5a3fd38e43b141c08336c5099777fdfa':
Implement callbacks for setProgressMessage
|
| 82cd60ca5a3fd38e43b141c08336c5099777fdfa |
|
26-Mar-2014 |
Carlos Hernandez <chernand@google.com> |
Merge "Implement callbacks for setProgressMessage" into gb-ub-photos-denali
|
| 096d03d80a6c4554a6881242991ed59b9a8eff39 |
|
26-Mar-2014 |
Doris Liu <tianliu@google.com> |
am 744eee4a: Merge "Disconnect visibility change listener in onDestroy()" into gb-ub-photos-denali
* commit '744eee4a13bb33449dba51e371a62257d6e7ef56':
Disconnect visibility change listener in onDestroy()
|
| 3cea8cc394ec2468de7b4ba1b5a68717b22f7c8a |
|
26-Mar-2014 |
Doris Liu <tianliu@google.com> |
Disconnect visibility change listener in onDestroy()
Bug: 13642099
Change-Id: If31304db8eb7152aea4365e6c112e3254fd8820b
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| cbd058a6e3cd7a9b254c51e3db4d4aef2d31579f |
|
25-Mar-2014 |
Carlos Hernandez <chernand@google.com> |
Implement callbacks for setProgressMessage
Change-Id: Id958d39c91ba3371d6b52b8f6005cc533ca38b45
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| f79ecd56c1f985c8b43aa5969a124541567fb611 |
|
25-Mar-2014 |
Alan Newberger <alann@google.com> |
am 735578a1: revert camera controls hiding to filmstrip
* commit '735578a1f80c6c642ec96fca2e9b81986fc82d2b':
revert camera controls hiding to filmstrip
|
| 735578a1f80c6c642ec96fca2e9b81986fc82d2b |
|
25-Mar-2014 |
Alan Newberger <alann@google.com> |
revert camera controls hiding to filmstrip
A previous CL added hiding to filmstrip of camera controls, but not
all modes have visible controls themselves, so this CL prevents
those kinds of modes from having controls made visible after returning
from filmstrip. Will pursue a followup CL to do it right.
Bug: 13589550
Change-Id: I3820dad019c068586358d378a6c382f8f9d058be
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| fdd34d2d28a3c8b88098772881afabac8f8c7957 |
|
25-Mar-2014 |
Alan Newberger <alann@google.com> |
am f495ea8c: Set capture controls invisible when in filmstrip
* commit 'f495ea8ca078fc752b1ed1045ba22817d75e968e':
Set capture controls invisible when in filmstrip
|
| f495ea8ca078fc752b1ed1045ba22817d75e968e |
|
25-Mar-2014 |
Alan Newberger <alann@google.com> |
Set capture controls invisible when in filmstrip
Though covered by the filmstrip, by being visible in filmstrip these
controls are reachable in TalkBack when in filmstrip which is confusing.
This CL makes them invisible in filmstrip and filmstrip Talkback is now
clean
Bug: 13589550
Change-Id: Ib92823a6efb07a4f56a83516e7decf08397c6edf
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| ad7d4540edd6fa8ed7789256a7f4cac16c3a0236 |
|
25-Mar-2014 |
Alan Newberger <alann@google.com> |
am dd9739a9: Merge "add filmstrip DPAD capabilities" into gb-ub-photos-denali
* commit 'dd9739a98402b8d325ec34a1a2ce743b871aa325':
add filmstrip DPAD capabilities
|
| dd9739a98402b8d325ec34a1a2ce743b871aa325 |
|
25-Mar-2014 |
Alan Newberger <alann@google.com> |
Merge "add filmstrip DPAD capabilities" into gb-ub-photos-denali
|
| e22e489c6b5b03b8e3c044dc25b97e8deff7b7e7 |
|
25-Mar-2014 |
Angus Kong <shkong@google.com> |
am 2ed67843: Show hint animations forever.
* commit '2ed67843b7eb5cb67eaec51561770262f5fd36c7':
Show hint animations forever.
|
| 8099a371048e45b9161ac63e4d6bd9644fcad5b5 |
|
25-Mar-2014 |
Alan Newberger <alann@google.com> |
add filmstrip DPAD capabilities
this CL adds left/right DPAD handling to filmstrip. If you reach the
first item, the filmstrip is hidden and user is back in capture.
Bug: 13589550
Change-Id: Id2b2d52da31ef65cb568ce4ef3f5cdc9384caf1f
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 2ed67843b7eb5cb67eaec51561770262f5fd36c7 |
|
25-Mar-2014 |
Angus Kong <shkong@google.com> |
Show hint animations forever.
bug:13544174
Change-Id: I7d679c8e13b41a5d8266c2c2768e914ef3d5ea1b
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| aec4d6c88aef0ce832753e0ce9c79cf04a3377a8 |
|
25-Mar-2014 |
Alan Newberger <alann@google.com> |
am 623dd0c6: Add DPAD support to capture window
* commit '623dd0c68d64038ed2bcfd264348d9b6f1a13c8a':
Add DPAD support to capture window
|
| 623dd0c68d64038ed2bcfd264348d9b6f1a13c8a |
|
24-Mar-2014 |
Alan Newberger <alann@google.com> |
Add DPAD support to capture window
This CL adds DPAD support for capture screen gestures, in particular
to mode switcher and to filmstrip. Left goes to mode switcher and again
toggles it off; right goes to filmstrip.
A followon CL will add additional filmstrip calls that control gestures
within the filmstrip itself, namely navigation between items and hiding.
Bug: 13589550
Change-Id: I7b6a7a37c5be8137c2503244dc178284139594dd
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| d5f38f505d5a5445288677f839cf4d8b9222a6c8 |
|
24-Mar-2014 |
Sameer Padala <sxp@google.com> |
Merge "Enable SmartCamera in video mode" into ub-camera-everglades
|
| 43ea41960cb4085965608db9e19ef357d9c03efb |
|
24-Mar-2014 |
Sam Judd <judds@google.com> |
am 777cbe66: Merge "Don\'t render the preview while it\'s not visible to the user." into gb-ub-photos-denali
* commit '777cbe660a5dc236d120375ecd3a7b9939b1ad7c':
Don't render the preview while it's not visible to the user.
|
| 777cbe660a5dc236d120375ecd3a7b9939b1ad7c |
|
24-Mar-2014 |
Sam Judd <judds@google.com> |
Merge "Don't render the preview while it's not visible to the user." into gb-ub-photos-denali
|
| 1b1253241a5a9b3a59037ba7a626bca68a9b06d8 |
|
22-Mar-2014 |
Sam Judd <judds@google.com> |
Don't render the preview while it's not visible to the user.
Bug: 13586944
Change-Id: Ide777da080ce150cec601b4e6e88cd6c4ea19cda
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| db81ce638be2782ba3313e721fcd4e062c0935fe |
|
21-Mar-2014 |
Sameer Padala <sxp@google.com> |
Enable SmartCamera in video mode
Change-Id: Ic10715c961990aacba1c20f9678358856ed4081c
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 4021c896985d9ba43db0199f259ce4b8bfc0dc88 |
|
17-Mar-2014 |
Sam Judd <judds@google.com> |
Decreases jank/speeds image loading in filmstrip.
Adds Glide, an image loading library, to handle image caching and bitmap reuse.
This is working, but there are still some significant todos:
1. We're loading larger images than we need.
2. We're not aggressively cancelling loads so if you scroll far
it takes longer than necessary for the image to appear.
3. Video thumbnail loading is slow (will require changes to Glide to improve).
Change-Id: I01387429068451b923509f78c6d5f8ce115e74ad
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 553a0a5508d0a476c1cebc1297ca6385924376f2 |
|
21-Mar-2014 |
Sam Judd <judds@google.com> |
am 48d6492c: Merge "Best effort fix to prevent stretched videos." into gb-ub-photos-denali
* commit '48d6492ccc56cb7d62a30ecc1f8576dc44e25718':
Best effort fix to prevent stretched videos.
|
| 48d6492ccc56cb7d62a30ecc1f8576dc44e25718 |
|
21-Mar-2014 |
Sam Judd <judds@google.com> |
Merge "Best effort fix to prevent stretched videos." into gb-ub-photos-denali
|
| de3e9abaa241dc2aa66e5d02ba8b7bd35e0d8f00 |
|
17-Mar-2014 |
Sam Judd <judds@google.com> |
Best effort fix to prevent stretched videos.
To avoid increasing load times, we now only parse video headers asynchronously
while the user scrolls. We make a best effort attempt to prefetch video headers
while we're scrolling to avoid the layout jumping around when we update
dimensions for an item that's visible to the user.
Bug: 13505062
Change-Id: Ib7d7835c39d50f22f45db5673ec4c49d84b81124
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| e6073afeeadada2e4440b1a921c0fad4cb287c24 |
|
21-Mar-2014 |
Sascha Häberling <haeberling@google.com> |
am 74b139ed: Merge "fix the build" into gb-ub-photos-denali
* commit '74b139ed4bb6845ba3dff4231e93c89e3d94bdba':
fix the build
|
| 74b139ed4bb6845ba3dff4231e93c89e3d94bdba |
|
21-Mar-2014 |
Sascha Häberling <haeberling@google.com> |
Merge "fix the build" into gb-ub-photos-denali
|
| 16bca01abfca562f0d9ad80de5dfa96a7a3b2544 |
|
21-Mar-2014 |
Seth Raphael <magicseth@google.com> |
fix the build
Change-Id: I069ada1529de371e2d17351b9bee53484cac1f5f
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| a063688b64705a860d8553ed5583918ea031b839 |
|
21-Mar-2014 |
Seth Raphael <magicseth@google.com> |
am 10d7803c: Merge "Avoid race condition when Sessions are finished" into gb-ub-photos-denali
* commit '10d7803c6638992c97d2f7400b52fd3f695c8d1a':
Avoid race condition when Sessions are finished
|
| 10d7803c6638992c97d2f7400b52fd3f695c8d1a |
|
21-Mar-2014 |
Seth Raphael <magicseth@google.com> |
Merge "Avoid race condition when Sessions are finished" into gb-ub-photos-denali
|
| cc79da28315aa4cb346e06346df5e379272d5c92 |
|
21-Mar-2014 |
Seth Raphael <magicseth@google.com> |
Avoid race condition when Sessions are finished
Bug: 13550276
Change-Id: I813f601a54708cd291cb0524c7b63724bd9c9fb8
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 5110169eb91068c742244eb9b64677a284c44243 |
|
19-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
am dafb91f8: Disable lights-out mode.
* commit 'dafb91f89d4b1ff9f944b6af4b0540c3c0424040':
Disable lights-out mode.
|
| dafb91f89d4b1ff9f944b6af4b0540c3c0424040 |
|
19-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Disable lights-out mode.
Bug: 13546760
Change-Id: Ia45d099d991819a2705c715fe3fcac9b0c332208
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| e9ff9a5ff011da76b8539802b78367e03beda1ba |
|
19-Mar-2014 |
Sam Judd <judds@google.com> |
am 6383d975: Dont call requestLoadNewPhotos in secure camera mode.
* commit '6383d97558433e39e4f43a5895d81bba0d0aafba':
Dont call requestLoadNewPhotos in secure camera mode.
|
| 6383d97558433e39e4f43a5895d81bba0d0aafba |
|
19-Mar-2014 |
Sam Judd <judds@google.com> |
Dont call requestLoadNewPhotos in secure camera mode.
Bug: 13530796
Change-Id: I6e9bb51ed529bc633511f7c29d3ac9268c617717
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 43bf03f6e7f9a71b7553e7282b5799798997caf7 |
|
17-Mar-2014 |
Sam Judd <judds@google.com> |
Allow views to be reused in filmstrip.
Change-Id: Ic2b8bbc251c9b19e658412ac3885a0cb83680809
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 593e71a94441d1d21549f85712796cffd6983aef |
|
18-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
am bd245b28: Reset startup module index to default on upgrade.
* commit 'bd245b28022503b5f9060b384cb8b6601aba66b5':
Reset startup module index to default on upgrade.
|
| bd245b28022503b5f9060b384cb8b6601aba66b5 |
|
18-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
Reset startup module index to default on upgrade.
Bug: 13515204
Change-Id: I69370503b9af5a4dad40f0fea7509e616173ce43
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 0145c3ad793144abae142380e56800dc8bc97cdd |
|
18-Mar-2014 |
Angus Kong <shkong@google.com> |
am 0315eef6: Merge "Refactor data model." into gb-ub-photos-denali
* commit '0315eef6893e7f349440bc116e0a30ee7694c7e1':
Refactor data model.
|
| 0315eef6893e7f349440bc116e0a30ee7694c7e1 |
|
18-Mar-2014 |
Angus Kong <shkong@google.com> |
Merge "Refactor data model." into gb-ub-photos-denali
|
| 571a8c389798bd3f01429f6be34cd3e606ab34df |
|
13-Mar-2014 |
Angus Kong <shkong@google.com> |
Refactor data model.
bug:13176987
bug:13410244
This refactor is to make the relationship between Controller, Model and View
clearer. Now controller (CameraActivity in our case) takes the full
responsibility to add/remove data. The model (CameraDataAdapter, LocalData and
its subclasses) is only responsible to store the data with correct types and
data structures. The view (Filmstrip) is a totally passive component who takes
care of how the data is presented and define how the user can interactive with
it.
The session API should not be exposed to the filmstrip MVC architecture and
instead we should make them as independent as possible. The controller should
maintain the logics of how to interact between these components.
Major changes in this CL:
1. ImageData.getContentUri() -> getUri(). The Uri is no longer a content Uri.
2. LocalDataAdapter: addNewSession() and finishSession() removed. We don't
assume the session concept in data adapters anymore.
3. LocalDataAdapter: addPhotoData() removed.
4. LocalDataAdapter: addData() added (original private in CameraDataAdapter)
5. LocalDataAdapter.Listener: onNewDataAdded() removed (since it's actually
triggered by the caller who is adding the data.)
Session API change:
CaptureSession.onPreviewUpdated() is changed to onPreviewAvailable. The module
now should decide the timing to notify the availability of the preview through
it.
CaptureSession.updatePreview(String path) is added. Not all the module can have
a preview when the session is created. Panorama/PhotoSphere creates the preview
after a background processing. The preview is stored as a file and should be
update to the internal preview storage through CaptureSession.updatePreview().
Change-Id: Id73c8f289bd4b3c13149da1b72c99fc6bab5849e
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| de9bc921a3f50f345f56f79496683578df9cbf03 |
|
17-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 18f1cb9b: Merge "Implement an upgrade path between old and new source files." into gb-ub-photos-denali
* commit '18f1cb9bde8b21c9b75b74490609d5d51fdd9392':
Implement an upgrade path between old and new source files.
|
| 18f1cb9bde8b21c9b75b74490609d5d51fdd9392 |
|
17-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Implement an upgrade path between old and new source files." into gb-ub-photos-denali
|
| 7299e4d4a185c2b2a9ae20decfd3f473ad310301 |
|
17-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 9795ed47: Non-secure capture intents cannot support HDR+.
* commit '9795ed47e73c99f0049f10a56a2910e3595fcea0':
Non-secure capture intents cannot support HDR+.
|
| 9795ed47e73c99f0049f10a56a2910e3595fcea0 |
|
17-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
Non-secure capture intents cannot support HDR+.
* We still need to find a way to avoid losing a user's HDR+ preference
when they launch a capture intent (and get booted into photo module).
Bug: 13475212
Change-Id: I9aeed950d0ace060eb2ea2a1822d91da2860fbaf
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 9182ac8901cb10f83a8f9beb528e8a2bf1b5c64d |
|
17-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
Implement an upgrade path between old and new source files.
* applies the upgrade path to location, which needs to recovered
from the old setting in both type and source file.
Bug: 13165733
Change-Id: Icaef2c49c46acba57e59f3da3d0bc9c4f153d9cc
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 8e7a03046e6157c0c0f586748f76db9f000d810c |
|
17-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 6d4b5e12: Merge "Support HDR+ secure camera is user prefers." into gb-ub-photos-denali
* commit '6d4b5e12a281f38c1b3d42c971f438758e5d38bc':
Support HDR+ secure camera is user prefers.
|
| 6d4b5e12a281f38c1b3d42c971f438758e5d38bc |
|
17-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Support HDR+ secure camera is user prefers." into gb-ub-photos-denali
|
| ac4cce59e834d55e7f4e00f44fc617cfd7a7150b |
|
15-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
am b8d4e380: Merge "Respond to menu button key events based on current view." into gb-ub-photos-denali
* commit 'b8d4e380828a49ba2bb119ac2c676904ae0f15e8':
Respond to menu button key events based on current view.
|
| 5e255bfd80a12dbe4d0a02a80f89238a5e7a1345 |
|
14-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
Support HDR+ secure camera is user prefers.
Bug: 13475212
Change-Id: I2a061256ddc689cd6fdc6a0e9bd22c4f57aca9bb
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 15691af76927d932fcc1250b4ffaefd31a61cf81 |
|
14-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
Respond to menu button key events based on current view.
Bug: 13347834
Change-Id: Id917bb488e7d67a233f65c4d95bdaf6c8facb33b
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 32948419ac711279abdbb520ced3115dcfc5a80d |
|
14-Mar-2014 |
Sam Judd <judds@google.com> |
am 3cf55144: Merge "Show photos added to camera folder externally in filmstrip promptly." into gb-ub-photos-denali
* commit '3cf55144483327b2b82af73b1a40335dba749f41':
Show photos added to camera folder externally in filmstrip promptly.
|
| aeed91f3777d08a4160d68ddfc2626808a08b92d |
|
13-Mar-2014 |
Sam Judd <judds@google.com> |
Show photos added to camera folder externally in filmstrip promptly.
Bug: 13320658
Change-Id: I2f605674fdd23e31bc7567b28ba098fff59802c0
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 7601bea7a4378866952f60d8c7917179408d39ce |
|
13-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
am 9906b209: Merge "Make preview visibility logic more robust." into gb-ub-photos-denali
* commit '9906b20940dbd0b15550ef08d7437733eccd3c6c':
Make preview visibility logic more robust.
|
| 9906b20940dbd0b15550ef08d7437733eccd3c6c |
|
13-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Make preview visibility logic more robust." into gb-ub-photos-denali
|
| 2d11fcfdfd7f28be7cb201d6fde3fbf560347db1 |
|
13-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Make preview visibility logic more robust.
Bug: 13213657
Bug: 13403920
Filmstrip and mode switcher are two separate entities so we need to
track their visibilities separately and derive preview visibility
from their joint state.
Change-Id: I24b810b6c2bb0ac4ec60678f92c36172242b7b1c
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 17c12ec9107d5e5cb9f2adc92e8f3bdf094dddc3 |
|
13-Mar-2014 |
Seth Raphael <magicseth@google.com> |
am ca93cb14: Merge changes Ie0d123f0,I97c1f825 into gb-ub-photos-denali
* commit 'ca93cb14e4f318698248ea28978ac2e9197102d3':
Avoid showing old preview frames on restart.
Support cancel layout for long captures
|
| 7dcf8b1864774192e6cbf58a801e6a42634484cb |
|
12-Mar-2014 |
Seth Raphael <magicseth@google.com> |
Avoid showing old preview frames on restart.
We were previously waiting for onResume to
display the mode cover.
Now we do it in onStart if necessary. This
prevents the display of the last preview frame
or the film strip on turning the phone on and off.
Change-Id: Ie0d123f0492cdced89d8479cb511d3e22b96b5c6
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 062054f24ef6b98ac170f56cf19cd96beed97102 |
|
11-Mar-2014 |
Teresa Ko <teresako@google.com> |
Merge "Move startSmartCamera call back into onPreviewStarted(). (onPreviewInitialDataReceived() doesn't seem to be called anymore.)" into ub-camera-everglades
|
| 59953a2bd28fa476bcb200623fe21da2f64f46ad |
|
08-Mar-2014 |
Teresa Ko <teresako@google.com> |
Move startSmartCamera call back into onPreviewStarted(). (onPreviewInitialDataReceived() doesn't seem to be called anymore.)
Change-Id: I25455dd8e1076150be37e419c73d5e5447c144d2
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 3413517f52239cebe3261cfce32b00899f8bd1e5 |
|
11-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Handle uncaught runtime exceptions from the framework." into gb-ub-photos-denali
|
| 630d55ba8111357730119899565026be503264c0 |
|
10-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
Handle uncaught runtime exceptions from the framework.
Bug: 12529676
Change-Id: I0319b1fa7367076f33853200b8b09a6abe7b0bdf
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 88d5e6df0f7dab24c6b5e74504ffece1f4d9f4bb |
|
11-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Support an abstract API for tutorials." into gb-ub-photos-denali
|
| c813ce181810a444b6fea4a399e6685aef4103e2 |
|
10-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Support an abstract API for tutorials.
Bug: 12440059
Change-Id: I5597c3c2dc28714405bd2e148093831039af1dd2
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 455ba5a146484d2af4a4fb44eb50ad294834dfa0 |
|
14-Feb-2014 |
Seth Raphael <magicseth@google.com> |
Hold in-progress sessions in mem, not media store
Bug: 12457236
Change-Id: I88f7c3a822010744881b8be966adbcf2774a8115
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 597c1a093f840af3c42e00af05da01ef124dc846 |
|
06-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Support for capture session errors.
Bug: 13026663
Change-Id: I3713440483aa4732f94aff9eaff2fc34a04c0427
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 2bacca795a1b0adb0daf515c43c48234b44bbba5 |
|
06-Mar-2014 |
Angus Kong <shkong@google.com> |
Align the gridlines with the preview area.
1. Rename onPreviewAreaSizeChanged() to onPreviewAreaChanged() since it's
passing in the real preview area and is called when the area is changed
regardless of size changes.
2. GridLines.java now draws the lines based on the preview area.
bug:13098715
Change-Id: Idbd2ba03cad4698689cee46d2aa04588a415fa3d
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 1b98b97f458e4a2146384b840987e15a7d0dd4e5 |
|
06-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Tell the module it's visible when we start dragging out the filmstrip." into gb-ub-photos-denali
|
| 6779140675b31e0ce4e7e03e544d9326f2e7f323 |
|
06-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Tell the module it's visible when we start dragging out the filmstrip.
Bug: 13327997
Change-Id: I56193472ad80246c8a1fe98e2d2d350231d208ec
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| f0a683470f46fcf0b74960b378002852a86e6b9c |
|
05-Mar-2014 |
Andy Huibers <andyhuibers@google.com> |
Add details open event to logs.
Change-Id: I6a468bcbb5dde0fb5703c629d0b305c0bc32f6cb
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 8c1f97010898020ef7776a91aa1e437ce621fedb |
|
05-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
Only allow simple capture for image intents.
Bug: 13289606
Change-Id: Id753def11f6499940a284b6bc3d33f5e45363183
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 1ba90e3ea4b8280c28cf6d87e5b4cc6b3b5f1645 |
|
03-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
Implement return to hdr plus after switch to front facing camera.
Bug: 12894444
Change-Id: Ia9c0cba83f0ee99f2156e9e58f4fff1af9b6100f
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 44442f6f673a37e5d0fa9c7676f5147fffd97218 |
|
04-Mar-2014 |
Angus Kong <shkong@google.com> |
Don't show peek anim after 20 swipes to filmstrip.
bug:13165526
Change-Id: I7e74ba9a92bb0e145ffda753c8a3475f1ea04417
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 7e016126879908ec9b1edfa7b1dd91cf592556f1 |
|
01-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Add 'Details' menu item in filmstrip" into gb-ub-photos-denali
|
| d114a7715445dba0dc06e12a574787242356ce57 |
|
01-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Add 'Details' menu item in filmstrip
Bug: 13029695
Bug: 13176584
ALso fixes the chevron color on the home button.
Change-Id: I7f57da4ad94c5c89163fd6dfc724372ac84d0212
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 50c9cdce87ada203ad282c9dedd1cb65c7608736 |
|
01-Mar-2014 |
Alan Newberger <alann@google.com> |
Force chooser for sharing actions
User should not be able to select 'always' in the Camera filmstrip, so this
uses the system chooser. This does not do the same for panoramas. This is a
simple implementation, no querying for counts of intent receivers, but having
just one for images or videos is a corner case, showing the list is safe.
Bug: 13229214
Change-Id: I0b7a8327b157828e03edf65579318b758e1873e8
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 001dc31f0b6e78b70db83c6d9b8cc7872e540965 |
|
28-Feb-2014 |
Angus Kong <shkong@google.com> |
Show progress UI in secure camera.
bug:13226795
Change-Id: I9de44b1c802094b88797ab90ceb022a42b3589f9
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 8f4dba0d4e69cbd045a379f58e23cec7148894a7 |
|
27-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Fix potential crash by moving OrientationManager init." into gb-ub-photos-denali
|
| ba29a44d07272059686c51b2acf3b914f45d35ca |
|
27-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
Fix potential crash by moving OrientationManager init.
Bug: 13195324
Change-Id: I620c192495317d5268823bc4cf4c8ff3e75f45b5
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| fc1c289dff5b91cb9470009eb973325a38f91f4e |
|
27-Feb-2014 |
Angus Kong <shkong@google.com> |
Merge "Add camera state in CameraManager implementation" into gb-ub-photos-denali
|
| 91c25e3d33120d5466c42f17276565f99df79c56 |
|
26-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
First sweep to clean up unused preference code.
Change-Id: I7caa89c8b5cb70824821d7fba5d05fbaadc39a2f
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 5d18769f53db81d401488811250570290a73626b |
|
26-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Generalize shutter button listeners and add one for mode options.
Bug: 13099000
Change-Id: Ib0726c70a9e4aa06197550f29360bacb2dda4783
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 09a34b12c8049a6a0f4d09635af6742e3a40e70e |
|
26-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Pass Activity to GServices to launch panorama viewer." into gb-ub-photos-denali
|
| 013ad4e1567f268b8ce2b630075ec2f604ce3da0 |
|
26-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Pass Activity to GServices to launch panorama viewer.
Bug: 13206692
Change-Id: Ie3d76fa7b3fd427d9cd3c1cf283e48173a06f41c
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 73e09f39f7d4075f3c95d20bb229f354211d05c0 |
|
26-Feb-2014 |
Angus Kong <shkong@google.com> |
Hide action bar upon filmstrip is off position.
bug:13184003
Change-Id: I6ad2bf2c4d0da45764907d819a5d4651a9887209
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 7ae25c21fefd8b7fd4c4e1c207631f751167cb0a |
|
25-Feb-2014 |
Angus Kong <shkong@google.com> |
Align progress bar with filmstrip bottom controls.
bug:13026663
Change-Id: Ic751bf26475fd27237690678715e399f0d987e82
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 62753ae94be2ae7c08bf24ebcf1c462975af230f |
|
10-Feb-2014 |
Angus Kong <shkong@google.com> |
Add camera state in CameraManager implementation
1. Add camera states.
2. Avoid potentially dangerous camera operations according the states.
bug:11985910
Change-Id: I2bce5c778077473e07f281053a441097fa71e3fb
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| a71aa2a1b895b305a6eab7f334a92d8bb0b107f0 |
|
25-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Make visibility support three states." into gb-ub-photos-denali
|
| 8c1a922df154182b53f00c38198db7da0b4feb20 |
|
25-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
Make visibility support three states.
Bug: 13169154
This will enable us to either stop preview rendering or pause
picture taking in certain modes.
Change-Id: I28014452ce43effeeaef9638b2f3a3bc42027257
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 4569b7089b4bc7ea6949505b7dd3637778011d7c |
|
24-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Implement general upgrade recovery strategies and strict versioning.
Bug: 11984903
Bug: 13165733
Change-Id: I2e7f39778fb185c3276ec35f3cc7afc9bfa5a747
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 96fe3f0b5cddbb13d452933d48f5408f7bb11b48 |
|
21-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Maybe show release information before sharing certain data types." into gb-ub-photos-denali
|
| 7190c6a9018e95ff0c49642442c7a069e16a6a7a |
|
21-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
Maybe show release information before sharing certain data types.
Bug: 11984630
Change-Id: I22646291c50ae126ffa34ad451fc2969b566ecbc
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 43fd6d1e00a1290ec60a54d7b562594bdcc64676 |
|
21-Feb-2014 |
Angus Kong <shkong@google.com> |
Merge "Make up-affordance behavior consistent." into gb-ub-photos-denali
|
| 601c8c12a032d863bd4fb072ad8df5b32399be32 |
|
21-Feb-2014 |
Angus Kong <shkong@google.com> |
Make up-affordance behavior consistent.
bug:13026878
Change-Id: I8f547d379a79eb29872d5317df5bd329144d2cc0
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| a7cbfc04d888624858271facdbf68797c54df8b6 |
|
14-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
To support Refocus orientation refactoring.
Bug: 13007150
Bug: 12996493
Change-Id: I360d0d0fcf8090d96277cd708bd8d0eb4e188b00
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| c195e7a9208c90d7a55e184d4b2b9c747e9c90f1 |
|
21-Feb-2014 |
Angus Kong <shkong@google.com> |
Tweak the peek animation image size.
bug:12451161
Change-Id: Ie5a8a2911ed4b5ce831331ca7e7600d6d13659b7
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| a303a71ff636535e59bd356bda40e9a324699357 |
|
20-Feb-2014 |
Angus Kong <shkong@google.com> |
Merge "A test for media details." into gb-ub-photos-denali
|
| 26795a9258c0815ca2a92d2c660438066f001022 |
|
20-Feb-2014 |
Angus Kong <shkong@google.com> |
A test for media details.
Change-Id: If2615de75ed555c34316686de536d3289c834e75
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 791f211c87d0e15e3264086a5ea75ff9066aa177 |
|
20-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Don't show flash mode option if it's never supported." into gb-ub-photos-denali
|
| e346fb291bd6209b0167d110e15f58576568f99c |
|
20-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Don't show flash mode option if it's never supported.
The motivation behind this design is that if the camera id
preference is cleared on every upgrade, we should be able to
obtain the flash support setting before ever switching to front
camera.
Bug: 12192238
Change-Id: I01dbcf2f614e7359fd456665e58c922b347a46da
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| b86a02cddc807ac2f7524b786ff3c589cc340353 |
|
20-Feb-2014 |
Angus Kong <shkong@google.com> |
Merge "Filmstrip peek animation." into gb-ub-photos-denali
|
| c26a3286fc2b4816a5a077cde313a4908d4fb73b |
|
19-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
Install a release dialog at start-up if necessary.
Bug: 11984630
Change-Id: I0619c82458b6f2d2dc4c9cbb8fca3a11b75a9ad5
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 5052117cc429d85cf446421ca74859f4365747d3 |
|
18-Jan-2014 |
Angus Kong <shkong@google.com> |
Filmstrip peek animation.
First version.
bug:12451161
Change-Id: Ie49314569bf607efd9220977ad5ffb1ca26d161c
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| c893312b7639d1e9c9c73e29bbb4470e8b8147e3 |
|
12-Feb-2014 |
Seth Raphael <magicseth@google.com> |
Merge "Give Smart Camera a signal to start" into gb-ub-photos-denali
|
| 3083642a424b74e8f7b898f26a045f438edfa042 |
|
06-Feb-2014 |
Seth Raphael <magicseth@google.com> |
Give Smart Camera a signal to start
Change-Id: I1b31d4cbf81a5865ef0807b07df0f644fa871247
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 9d264309a341c52601bdccdeff6647e0ce58c31f |
|
11-Feb-2014 |
Doris Liu <tianliu@google.com> |
Add settings entry point into mode switcher
Bug: 12963148
Bug: 12964884
Change-Id: I11b45037abe1716d89fe723170284c61fbb33a87
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| de30323ee0598ed0e1c8a1ab942c3e16160062d3 |
|
07-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
New Settings UI and video quality selection logic.
Bug: 12467965
Bug: 12935910
Bug: 12575084
Implements the settings as a proper activity/fragment. Also cleans
up some of the old logic we had for handling and displaying settings.
Also has the new L/M/S logic for video quality.
Change-Id: I412af424b74369cef15c7ead2cb09704875972e3
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 213a4a086b54904cee543adf60b16fc1a61efe38 |
|
05-Feb-2014 |
Doris Liu <tianliu@google.com> |
New mode drawer.
-Changed the entire look of the mode drawer by using a live preview
as background, and use circle icons rather than block shaped icons
-Fade in the blurred preview frame during mode switch
-Add highlighted and selected states to mode icons
-Center the mode drawer in preview rather than whole screen
-Swapped mode order in the drawer
TODO:
-Add settings access point
-Refine swipe in/out behavior of the drawer
Change-Id: Ibab0fe960bcfbb9635ca7f45d50178cb1ef2941f
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| d8de077f72b04cee1bdf26e5ca1678ac5297bd71 |
|
03-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Shared texture view in photosphere.
Change-Id: I8dd4898e3800b02fa7f0488104dcfa4600b3845f
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| fbf3a90e72eb954ce90cd32fdbae2353411933a6 |
|
05-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Prevent crash if first-time location dialog." into gb-ub-photos-denali
|
| f526f2f0614e6ca408a261dcbebb4374afea9632 |
|
05-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
Prevent crash if first-time location dialog.
Change-Id: I34f44220202f7b7b39facf7caf9cd46e6e44acc4
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 1fc5502ed041e3c781225ed5ba8ee0928e9ea632 |
|
05-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Properly guard the weak reference." into gb-ub-photos-denali
|
| aa46ec9f5456610d61103f6422ffaeefd46c62ed |
|
05-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
Properly guard the weak reference.
Bug: 12805279
Change-Id: I268b121807d10edaba5d627eb3fc2d2ffc6579d3
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| a6587a1a1e3672013da6a454c0e478846eced15d |
|
03-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Elevate refocus to its own mode, merge craft and camera.
Change-Id: I9686db26993319fdaf09f09c0610bb65e00a0e05
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 846d3abfe3da2fa2a5593c7d40a196005408bed1 |
|
04-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
Avoid activity leaks.
Bug: 12805279
Change-Id: Ib91ff2d286f6a0e0d67dad673e7af24600e15759
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| e6dba2a113bdab462f849e2be3f7f36299f6aa7a |
|
04-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Set bottom bar to a consistent color across app." into gb-ub-photos-denali
|
| 80461c2de3ee7f12e17e9951567a843c500b8fe1 |
|
04-Feb-2014 |
Alan Newberger <alann@google.com> |
Add content URI for current filmstrip item to Gallery intent
when starting Gallery, if there is a current filmstrip ID, retrieve
its content URI and pass to the GalleryHelper to process it. Do nothing
within the GalleryHelper at this time.
Bug: 12587688
Change-Id: I5becbfa7d12e739383b9f2ef3d3dba7460fa3d25
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 14466ba8f9ee23c003067f2c7b5569a6417cc60a |
|
03-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Set bottom bar to a consistent color across app.
Change-Id: Ieda492a9dbc122a828d8b5d8df831fbe99e6295f
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| f6edd53668afe094c8dc09ac35d294d049f6cec1 |
|
31-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Correctly log the source of a foreground event.
Bug: 12589465
Change-Id: Ib26d44e1a8fdc4e03561c6a00886682881106ec2
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 4ba3c72b6cf7b17345a8ffe643a3e21df460893d |
|
31-Jan-2014 |
Doris Liu <tianliu@google.com> |
Merge "First pass on tracking camera performance" into gb-ub-photos-denali
|
| 7cbeceed6d03d0550797c435f3db6205714cd49f |
|
30-Jan-2014 |
Doris Liu <tianliu@google.com> |
First pass on tracking camera performance
Record time spent on cold/warm start, mode switching for later
hooking up with instrument tests.
Bug: 12838163
Change-Id: I1004f2b26d9ff9d59b4729e7323c079a6b561fdc
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 9fdeb77f5d3f9e25ce18f18be64f726305aedcc6 |
|
31-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Log swipes out of filmstrip." into gb-ub-photos-denali
|
| e8959e7a72cd6f057ac4cd8bd47075272700e62e |
|
31-Jan-2014 |
Sascha Haeberling <haeberling@google.com> |
Move tiny planet editor into the edit action.
Bug: 12553864
Change-Id: I3431565928bef637c11246fc6e711ef3d1f925ce
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 3488188fa8dff9a90021446e6ed4f9c321c4d4db |
|
30-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Log swipes out of filmstrip.
Bug: 12589465
Change-Id: I13b20b3e56b1ae4285ecc00ca4c2fb5a42fa75ed
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 2ecb9dda1b10ce12386819402845d3a8407a8e4e |
|
30-Jan-2014 |
Alan Newberger <alann@google.com> |
Merge "add additional lifecycle states to PanoramaViewHelper" into gb-ub-photos-denali
|
| 04bd11c53a63f3302a21875f4488feb8118aa5b4 |
|
29-Jan-2014 |
Alan Newberger <alann@google.com> |
add additional lifecycle states to PanoramaViewHelper
Bug: 12192549
Change-Id: I36668db7657c8b285419e7eca824b3d6e495e5ef
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 5e6c3e7840b41685ebd27c40ee243a7ae75e7229 |
|
29-Jan-2014 |
Doris Liu <tianliu@google.com> |
Merge "Fix mode transition jank and stretched video preview" into gb-ub-photos-denali
|
| 5a367545ab931a308c8d8555ef5a747dc9565caf |
|
18-Jan-2014 |
Doris Liu <tianliu@google.com> |
Fix mode transition jank and stretched video preview
Bug: 11963674
Change-Id: I9cb292aa3dea6b0073dfc19af8105dce1f0c9865
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 5e09d01d80b64c81f21c57f1b99dd9dc1afed18d |
|
18-Dec-2013 |
Seth Raphael <magicseth@google.com> |
Clearcut Logs
Change-Id: I564a2452cb7f02f899760ac086e56eaa76b174eb
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 481a3b330d8641d8a9f698dfd0fe4d8ab9cca442 |
|
22-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Switch to gcam module only if gcam is supported.
Bug: 12682385
Bug: 12594403
Change-Id: I86b8156ea5027818135ccfce03a1d23f377055f2
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| b1641f5df0cf839b54385ea4d2e43521620fc237 |
|
15-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Remove global UI elements based on supported camera parameters.
Bug: 12192238
Change-Id: I6373adeaa9c95385a2a4ca8d81cf7656550911f2
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| a0e8347f9cfb583f90543635c5c86dc9252526e1 |
|
16-Jan-2014 |
Kevin Gabayan <gabayan@google.com> |
Measure time to first valid preview frame in testImageCapture.
Bug: 11999851
Change-Id: Iec695d7de98454435fc9ae239a500fedb9eee894
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| fecd723c1cfd90332cd2805be79a24f26643ebb9 |
|
16-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Set the shutter button icon across all modes.
Bug: 12552362
Change-Id: I55d4238b0ddbc4bb3ea206dc577381b6de2f68a7
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 55007febc18832eebf3cedd3d8497f9bcb221b9d |
|
16-Jan-2014 |
Angus Kong <shkong@google.com> |
Merge "Change refocus icon asset." into gb-ub-photos-denali
|
| 00b3371ca5c3340a81174ea5443443a9176d5130 |
|
16-Jan-2014 |
Angus Kong <shkong@google.com> |
Change refocus icon asset.
bug:12550183
Change-Id: Iad54468a1f88bcc23e68ebda39931c93c5ee407d
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| c30ca9776999611863cbf7cb623c6d9d47ecbb1c |
|
16-Jan-2014 |
Doris Liu <tianliu@google.com> |
Merge "Add quick switch support for advanced camera" into gb-ub-photos-denali
|
| cf8b653a7697406d6bed2bf8f9b970b17e47e4ef |
|
16-Jan-2014 |
Doris Liu <tianliu@google.com> |
Add quick switch support for advanced camera
Bug: 12429444
Change-Id: I62d5a5b3ce2b8d0ca8d19c8f3a35363114815b20
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 6fb7342dfcc8a24351032511977fea628d119faf |
|
16-Jan-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Disables swipe during video recording and during photo sphere sessions." into gb-ub-photos-denali
|
| 6c0c7f1281425f4296cb1a42563d00ae056cd14a |
|
15-Jan-2014 |
Angus Kong <shkong@google.com> |
Make up affordance dependent on installed packages
bug:12549744
Change-Id: I3b39ccb45518f1044c2149bd5b8c633a6899d96c
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 8793eff1b85bda89047316fed36cdc1161a8b811 |
|
16-Jan-2014 |
Sascha Haeberling <haeberling@google.com> |
Disables swipe during video recording and during photo sphere sessions.
Bug: 12554964
Change-Id: I2ab1ae34ae6964371680418eac3583b2e766b26c
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| de3e438679092ef66222bc691a046864d5436047 |
|
14-Jan-2014 |
Angus Kong <shkong@google.com> |
Up affordance should act as back key in 1up view.
bug:12549094
Change-Id: Id19e2532d9aae929ee15e518a6cd125ff4e550ac
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 4567160a43fa5787012bf0b618c216cf18ac0457 |
|
14-Jan-2014 |
Angus Kong <shkong@google.com> |
Add more filmstrip fullscreen states.
And callbacks for new state events also.
bug:12468756
Change-Id: I0ebdd99f251394a871c1e050e565fc5cd1706324
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| b92910e04c4da91fc4ea5a9484b83f9ecba1c896 |
|
14-Jan-2014 |
Spike Sprague <spikuru@google.com> |
capture button pressed colors
Change-Id: Ia568be11e6f9b6160f3f8332b504866cbe6ac94f
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 0a6a8d8e4e1c9796aac606379a42970cdffb8911 |
|
10-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Sync dependencies between bottom bar options.
* Centralizes the bottom bar button customization.
* Makes HDR+ and front camera exclusive.
Bug: 12469207
Change-Id: I65e3d16d314a26889f04e9bcc26fa4bf095150b7
Conflicts:
src/com/android/camera/ButtonManager.java
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| ed413d8a432c88c91af5334e700edefdb927bbe6 |
|
13-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Make Front and back camera a mode specific setting." into gb-ub-photos-denali
|
| d186f22622752ae9735715f31e8a4318290c987d |
|
10-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Make Front and back camera a mode specific setting.
Bug: 12467987
Change-Id: I69b788565979bb45df511974e1e494f7a5ffe9d8
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 2520b5033461422b4aa2f33422656ffd9394b81f |
|
11-Jan-2014 |
Angus Kong <shkong@google.com> |
Refresh the current item after editing
We currently only support calling external editor on the current item of
filmstrip. After returning from other apps, we should refresh the current item
in case it's modified. Also handles the case of data being removed.
bug:12412022
Change-Id: Idf86603ffd75a825f1311f83b3d38181d1eba16f
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| f63967a175cabd57fcbc20275cc7918bc34b2baf |
|
02-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Show registered modes as default camera options.
Bug: 12178782
Change-Id: I1dc4c3d9a6bf6448e0083b508210577584a35a1c
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 1f9db2dfe59c33228103c54523281501ef52c9ba |
|
09-Jan-2014 |
Angus Kong <shkong@google.com> |
Continue the animation after the data is updated.
When the data is updated, the animation is interrupted because of the original
view is replaced by the new one from the new data. We should copy the original
animation and continue.
Handles the condition when the last photo is deleted.
Also some refinement of the codes.
bug:12196441
bug:12476802
Change-Id: I2139b09bf5f958af6fa21b91e3d0c14908e1ba79
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| bd1b8f910d6f2c94daac304f4bd1a098939474c3 |
|
04-Jan-2014 |
Doris Liu <tianliu@google.com> |
Centralize camera mode resources
Moved camera mode related resources such as mode theme color, mode
icon, text, mode id, etc to resources xml. And created utility
functions to query for them.
Part II at ag/404854
Change-Id: I828502c76851cc2ed0b632b1ed4bb7f702fee231
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| fe47650a9cac114ca0a16697e3b13ab70893f352 |
|
09-Jan-2014 |
Doris Liu <tianliu@google.com> |
Merge "Stops playing shimmy after 10 sessions where mode drawer is swiped open" into gb-ub-photos-denali
|
| 2c559c4bd3c65e0cb0bca06f30e3bc979038e6f7 |
|
09-Jan-2014 |
Doris Liu <tianliu@google.com> |
Stops playing shimmy after 10 sessions where mode drawer is swiped open
Bug: 12412506
Change-Id: Ib2e62fa93c5e1bca5eb547a6a74f688f0b0cb633
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| f05962f4e05a9e29faef001ddf3a206f2b554d42 |
|
26-Dec-2013 |
Emil Arfvidsson <ear@google.com> |
Move the Gallery shortcut to the action bar.
Change-Id: I0f2c7c72ff9ed3b5a243350b562cd4432bea1911
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| dd4300ec89e82a1ba1bb85678d54a48f6b6ac9d9 |
|
08-Jan-2014 |
Angus Kong <shkong@google.com> |
Merge "Remove the dependency on CameraHolder." into gb-ub-photos-denali
|
| d74e6a1014278e1a05c802e3ed594381288c6381 |
|
07-Jan-2014 |
Angus Kong <shkong@google.com> |
Remove the dependency on CameraHolder.
Change-Id: I39882f1bf2a4cd730d00ceabc7705692bcee6bc0
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| cb99b3d61f6451b84e263949910a1fb7b9893a12 |
|
08-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Unify setting the bottom bar color.
* Camera, Video, Advanced Camera
Change-Id: I862543c52372e0028debda7e89a56ebf8e737270
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 37b9f92c89d6d130bd54892c157bc6b614110daf |
|
08-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Show onscreen indicators for enabled and visible options." into gb-ub-photos-denali
|
| 1848494bd09c85002d8c59d4feb8a6e0dc32871f |
|
07-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Show onscreen indicators for enabled and visible options.
Bug: 12434780
Change-Id: I85a3efba46303fc47f456d696d89b0ca2997f9f6
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| ed4bdc0d3f50a6960eae44099a764bf8cdd7a731 |
|
07-Jan-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Enable lights-out mode at all times." into gb-ub-photos-denali
|
| 20639e78e441c19752d22ceb54e48115c6084c73 |
|
07-Jan-2014 |
Sascha Haeberling <haeberling@google.com> |
Enable lights-out mode at all times.
Bug: 12429885
Change-Id: I92481003b408cd63334dd8dd4b2df1603b7432e3
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| a340f0755c4a0037ead0419687204700d1101998 |
|
07-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Make refocus and hdr+ sticky on mode change.
Bug: 12413073
Bug: 12368672
Change-Id: I151581c73bafbf307889b6aa19131c4add400ba9
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 1648c36927501ff32bf2918e8a445118d5208731 |
|
07-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Add on screen indicators.
Known caveats:
* Does not respect the first orientation change.
* PhotoModule resets flash to default on a mode switch.
* Hdr plus is not sticky on mode switch.
Bug: 12368905
Change-Id: I377f28c6d0f7115371cc9e9dad9378f049bf7d7c
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 1c5e61ffa20701d99bb1051f121aba5b0e21b824 |
|
06-Jan-2014 |
Angus Kong <shkong@google.com> |
Merge "Check filmstrip visibility to pass down key events" into gb-ub-photos-denali
|
| 2d60a0b803e5645f93e2cf53bdd272201cadf001 |
|
06-Jan-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Clean-up TAGs and some more auto-clean-ups." into gb-ub-photos-denali
|
| 5850115399516c9186cc0a8231eb1b554f570441 |
|
06-Jan-2014 |
Sascha Haeberling <haeberling@google.com> |
Clean-up TAGs and some more auto-clean-ups.
Change-Id: Ib5f01a6fed99dd21b87138d8e4f792aefa74880d
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 7f0151dff66fed52448056e5f73b15db9485a77e |
|
03-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Update camera parameters when setting has changed.
Bug: 12250474
* Implemented for photo mode only.
* To be extended to all other modules.
Change-Id: Ie5218f3a76acb757ac526d3f987ef3165736b46d
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 8dcccb160b2f82e5ddc97bad96d4812bc6cfa043 |
|
03-Jan-2014 |
Angus Kong <shkong@google.com> |
Check filmstrip visibility to pass down key events
bug:12196741
Change-Id: I7ef5c65060b4c5481adc41f45f47f9c817f3a8b6
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 482de029dc20e0a577388a602985fb31c3200309 |
|
19-Dec-2013 |
Doris Liu <tianliu@google.com> |
Touch to focus
Change-Id: I69860bd05426e3a04bc5fd7d0dd581b5d6ff768d
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| db290c33bd0250b473c475254cbfbbd19dd72430 |
|
21-Dec-2013 |
Erin Dahlgren <edahlgren@google.com> |
Merge "New Capture UI." into gb-ub-photos-denali
|
| 4efa8b54c1df4e06f2d3caed2568015a737f9dda |
|
18-Dec-2013 |
Erin Dahlgren <edahlgren@google.com> |
New Capture UI.
* depends on ag/400799
Change-Id: Ieb0e27447659bcb04dee57348583f68d680408d2
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 44c1afb9dac08e02004244e602469c29a27487b6 |
|
20-Dec-2013 |
Sascha Haeberling <haeberling@google.com> |
Simplify the LocalData API.
By removing the Context from most method calls, it makes the
API much more concise and focus on what's important.
Change-Id: Ib79344365bd4d6a33f8ef59d1d28b5e9780102f5
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 4d4a4bc8891bbfc5a7ca842f2981829ac3a716e8 |
|
20-Dec-2013 |
Doris Liu <tianliu@google.com> |
Hook up with camera for accurate timing of new frame
TextureView's onSurfaceTextureChanged callback has been proved
inaccurate in terms of timing for new frame, which contradicts
the documentation. Nevertheless, we need accurate timing to
ensure smooth mode change.
Bug: 11963674
Bug: 11767246
Change-Id: I8673174ac5e191c0ab7c4377ff81b3e0889f8831
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| ba259ce7c19771ba85eca88d2d2503dc8fd88e0a |
|
19-Dec-2013 |
Kevin Gabayan <gabayan@google.com> |
Merge "Use Fused Location Provider when gms is available. Bug: 8295289" into gb-ub-photos-denali
|
| e2f4c03eaea059e15adf34d8782c433b1f7164dc |
|
19-Dec-2013 |
Angus Kong <shkong@google.com> |
Load metadata of LocalData on demand.
1. Metadata of LocalData is not always needed. It's more efficient to load it on
demand.
2. MetadataLoader added to be responsible for loading all the metadata.
3. Metadata loading callback added in LocalDataListener.
4. The loading of the metadata and the bitmap are now all executed by the thread
pool executor.
bug:12216695
Change-Id: I5c75746630e9952b389f9b50416a0bb950301f33
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| ffbc43c3dd3c94a968a41431fb07645a13696c4a |
|
09-Dec-2013 |
Kevin Gabayan <gabayan@google.com> |
Use Fused Location Provider when gms is available.
Bug: 8295289
Change-Id: I3dba25c35fd3754ff70ed3ecea33052505274feb
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 8a2350a3d557465b53445685db0f9ac838cf90c5 |
|
17-Dec-2013 |
Angus Kong <shkong@google.com> |
Refactor the photosphere/refocus metadata loading.
1. Metadata added to allow for different attributes to describe LocalData.
2. Move the metadata loading process to image data loading.
3. LocalData.view() removed. The invocation of external viewer is moved back to
the activity.
bug:12197251
Change-Id: I496b018186f7a4b4818b976201703b966103a636
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 70da918464276b110c43868caa272c97baadb89e |
|
18-Dec-2013 |
Doris Liu <tianliu@google.com> |
Centralized TextureView transform logic
Automated transform matrix adjustment and bottom bar adjustment for
orientation or preview size change.
Bug: 12177718
Bug: 12179046
Change-Id: I4cd6fc90bb549774cfd83aaf8ac9654711a5c752
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 0eaf01670a1198c95b6472ec0dc076c9f84971de |
|
17-Dec-2013 |
Angus Kong <shkong@google.com> |
Launch activity through the controller.
bug:12173532
Change-Id: Ia99f53b6a5220c962f261ab598270d49366065ff
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 1d997499522e80a3a078cbc3994bbd6a4ad2ddad |
|
16-Dec-2013 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Have the CameraAppUI manage refocus UI." into gb-ub-photos-denali
|
| e4002f3a703a1835dce30d74ccfc22e00956e13f |
|
14-Dec-2013 |
Angus Kong <shkong@google.com> |
Avoid double tapping the share button.
Might fire the share intent twice.
Change-Id: Ib4efb2302a2bee8fa6b9eaab6896fc75512734f3
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 14ff6c8df2924ccad083591c0fc873322c6828c0 |
|
13-Dec-2013 |
Sascha Haeberling <haeberling@google.com> |
Add placeholder image support.
Bug: 12132677
Change-Id: I2add5837f82a956901c132cacae71b193007d482
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 79fcbe48d7bef83469573782d095df5551895a65 |
|
14-Dec-2013 |
Erin Dahlgren <edahlgren@google.com> |
Have the CameraAppUI manage refocus UI.
Change-Id: I47bfd4a3b9e79ed0186cbac1c735d010b504362e
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| d3de171d6afa5ebd74d56dde6d4818b14a001286 |
|
13-Dec-2013 |
Angus Kong <shkong@google.com> |
Enable gallery button.
bug:11898278
Change-Id: Id7953f5fa95a6597e5cd223094ab7ccb21f53e2c
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 1dfe7828fd60741b9752553af3ee439c04e758a0 |
|
12-Dec-2013 |
Doris Liu <tianliu@google.com> |
New flash animation
Change-Id: I266b631a5c6feac114467e0a05799ad5e1ffae92
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 662fbf4637e5b1a28338613af05f21832cd820cb |
|
12-Dec-2013 |
Angus Kong <shkong@google.com> |
Enable share from filmstrip.
bug:11898278
Change-Id: I3c7986666cfcf05f87fa0c4a15024262afc2dc4f
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| e0aff89f3e05eb6008651b290ba79d484de55970 |
|
12-Dec-2013 |
Angus Kong <shkong@google.com> |
Move buttons from action bar to bottom.
Known issues:
1. Share has no effect.
2. Gallery icon has no effect.
bug:11898278
Change-Id: I545e4dc339b6aa9242f61abb6021de874fcd3090
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 0f3c4b4fc9ac87d7d4c3d04c3cb3426c711f57ea |
|
11-Dec-2013 |
Spike Sprague <spikuru@google.com> |
unify preview and bottom bar resizing code
move bottom bar button into own layout files
Change-Id: Ib6237fddaa545476563b796cbd752b9562e9d9e4
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| a21945c7d628aadee74410013782b950a7aa93ff |
|
12-Dec-2013 |
Angus Kong <shkong@google.com> |
Merge "A small refactor of ImageData and LocalData." into gb-ub-photos-denali
|
| a63dbb6231f06031204fe20b19a87d0440bd1661 |
|
22-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
Add a capture-session API to be used by all modules.
Bug: 11747284
This refactors the way we think of sessions. Instead of
having multiple session and notification APIs being used
by different modules, we create on central capture session
API to be used by all modules.
This also adds a first implementation of a Memory API which
tells modules about the current memory situation.
Change-Id: I7f030e32fc2f70f4007825ba7bbbdce9521a2bd9
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 740cbeef73e8b8fad7605cf0723a647d81f73962 |
|
12-Dec-2013 |
Angus Kong <shkong@google.com> |
A small refactor of ImageData and LocalData.
1. isPhoto() removed since it's for checking if we can edit it.
Use isDataActionSupported() instead since is designed for this purpose.
2. AuxInfoSupportCallback is moved to LocalData since filmstrip doesn't care
about this and it's only available on the local data.
Change-Id: I4eed477d6cdbe729904577b77a7ba97eed90074f
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| b2510252fb020f3ccb88787c870930427377b9df |
|
11-Dec-2013 |
Angus Kong <shkong@google.com> |
Refactor filmstrip BottomControls out of filmstrip
1. The control logic should stay in the controller instead of the view.
2. Fix various issues.
3. Remove some unnecessary hacky checks.
bug:12089863
bug:12095905
Change-Id: I6fceb5bf1a3121c45bc509f2fa96d01db2cedb5d
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 2b906b8c9754b564d5113c7a342654c82f97f180 |
|
11-Dec-2013 |
Doris Liu <tianliu@google.com> |
Show a camera theme cover until preview is ready
Also removed the toast for tap to take video snapshot
Change-Id: I85025a9d09842097403e5ea7ce7391ea0ed9ec98
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 414723eeef540d8a740d4a6d9bfdcaf1298748a8 |
|
11-Dec-2013 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Gcam uses the PreviewStatusListener controlled by CameraAppUI." into gb-ub-photos-denali
|
| 5f500bea98883c0d5686d23d4293353cd445c1ff |
|
10-Dec-2013 |
Erin Dahlgren <edahlgren@google.com> |
Gcam uses the PreviewStatusListener controlled by CameraAppUI.
Change-Id: I1c1a6fba0df6b2eef440e87e0f3d8f9313f8ee1a
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 01054e922aa547b937a71131ad04c6bd15356240 |
|
10-Dec-2013 |
Angus Kong <shkong@google.com> |
Move/refactor filmstrip related files around.
1. Rename filmstrip.FilmstripDataAdapter to filmstrip.DataAdapter.
2. Rename filmstrip.FilmstripImageData to filmstrip.ImageData.
3. Move filmstrip.FilmstripListener to filmstrip.FilmstripController.Listener.
4. Add FilmstripContentPanel interface.
5. Move ui.FilmstripView to widget.FilmstripView
6. Move ui.FilmstrpLayout to widget.Filmstripview
7. Move ui.FilmstripBottomControls to widget.FilmstripBottomLayout
8. Extracted interface from widget.FilmstripBottomLayout as
filmstrip.BottomControls
Change-Id: I83bdd89e2a48a98002a4fed7dab011b28036d1a0
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| b95699ed89d02a465950c48ea9b6147d90c80389 |
|
07-Dec-2013 |
Angus Kong <shkong@google.com> |
Move data-related controls with filmstrip.
bug:12015169
Change-Id: I3185acc37adec23fc696f6693236178779a7459e
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 06db742814dd635d100639f977fcfdc904deb778 |
|
10-Dec-2013 |
Doris Liu <tianliu@google.com> |
Setup preview status listener for preview related changes
Change-Id: Ibd8341dfbe5e03ec77c149e671f4dd991833e678
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| a20074f0efeaa62a29b05838110d04a1b7271418 |
|
10-Dec-2013 |
Doris Liu <tianliu@google.com> |
Only display supported modes in mode drawer
Change-Id: I1891de0ca485db7d24982b2e73ac5d415480813e
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 5bff8a37f9cd25b863e65576e3ed495f04f8307f |
|
10-Dec-2013 |
Angus Kong <shkong@google.com> |
Merge "Re-design callbacks from filmstrip." into gb-ub-photos-denali
|
| faaee012acc80ad369cb03df9c196e48140f1e7b |
|
07-Dec-2013 |
Angus Kong <shkong@google.com> |
Re-design callbacks from filmstrip.
Enumerated the possible states of filmstrip and have proper callbacks when
entering/leaving each of the states.
Change-Id: I5a6e931095bb0792e0832fda11d1f1b5ba850263
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 8a2933b2c0156b752425b499f3081e4ffc350061 |
|
06-Dec-2013 |
Erin Dahlgren <edahlgren@google.com> |
Make the ButtonManager api associative.
* Makes handling dependent behavior between buttons
less error prone.
Change-Id: I13acf3475c46573668e0c8fee633e71efafd9588
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 5b6502597edfd4658a937de2b5121dabf3510d52 |
|
07-Dec-2013 |
Angus Kong <shkong@google.com> |
A quick not-so-good fix for action bar issue.
Will remove this fix after the filmstrip callback is re-designed.
Change-Id: Ie445581ab8c3a1fc3e474bef96366932d52ddcc9
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| c6c9740d996bf073a157721aa3eb2a1aa60c477d |
|
07-Dec-2013 |
Doris Liu <tianliu@google.com> |
Cleanup after camera root is moved out of filmstrip
Change-Id: I9e6efea3848f2f618aefc888ba7cca364fb64085
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| b7d3ce145dd7b1cf0ac51f53d5bc73dbbf35f6e6 |
|
07-Dec-2013 |
Doris Liu <tianliu@google.com> |
Refining shimmy
Bug: 11858581
Change-Id: I7eefc5189caefc6d23d2dbbca243632db716b0c3
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 248f42b1926294ffa1855fd4319036a02b5f39a1 |
|
07-Dec-2013 |
Angus Kong <shkong@google.com> |
Change the home logo and the behavior of actionbar
Change-Id: I2a930fafd22ea36ae2a84b749c54f64c67a7d06d
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 18e2ef6d2b2d36abcaa7378a0f7df792ecf8ed81 |
|
05-Dec-2013 |
Erin Dahlgren <edahlgren@google.com> |
Create a ButtonManager for managing common button behaviors.
Change-Id: I02d99c393a01e6de9ffb2f4f351a832b4eae9e37
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 166e36fb6e04d40a1bef0459ee6b96c9c736039b |
|
03-Dec-2013 |
Angus Kong <shkong@google.com> |
Implement the new filmstrip UI - first step.
More fancy stuffs will be added in the following CLs.
Change-Id: I065c7baf1ff9695121db4917158ffecd0bfc0d01
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 095fa44f760234376946cd97ccf262e3df0cd7d6 |
|
03-Dec-2013 |
Angus Kong <shkong@google.com> |
Merge "Make onLayoutOrientationChanged to take a boolean." into gb-ub-photos-denali
|
| 2f0e4a3995684c986afad55db7715c15393a9df0 |
|
03-Dec-2013 |
Angus Kong <shkong@google.com> |
Make onLayoutOrientationChanged to take a boolean.
ModuleController.onLayoutOrientationChanged() call back can just take a boolean
to know whether the layout orientation is in landscape or portrait.
Change-Id: I1675cbea263b12bb0b568a6038f0fc17dd03799a
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| ca2b4025adc409a5c8927d4e3d4a68e6a01a3861 |
|
03-Dec-2013 |
Doris Liu <tianliu@google.com> |
Remove deprecated fitSystemWindows logic
Change-Id: I6393db86b017652dfc16f41a0a915fc5e7cff6a0
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| ff33b520b30a3faf72623f2889fdae1096a8586b |
|
03-Dec-2013 |
Doris Liu <tianliu@google.com> |
Merge "No longer lay out under nav bar." into gb-ub-photos-denali
|
| 773e1c9285bd2d0f03ba87db13e77b4f5197ac4f |
|
03-Dec-2013 |
Doris Liu <tianliu@google.com> |
No longer lay out under nav bar.
Gutted out camera root view that was intended to lay out its child
views correctly when it is laid out under the nav bar.
Change-Id: Iee33daf63dd6a592577f59010f0fc6b71a126f7c
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 53ae041d63ee7a251c73ac47abeeb143a2f0da44 |
|
02-Dec-2013 |
Angus Kong <shkong@google.com> |
Change to have finer callbacks.
onConfigurationChanged() is too general since the configuration contains many
things. Should use finer callbacks for each of the changes we care about.
Change-Id: I5ffbb7f1f71e6675a4fbb07e564ae09f55fa5127
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 6fe8c828a186e584c7849ef002eff59e6d14ae4d |
|
26-Nov-2013 |
Christian Wyglendowski <dowski@google.com> |
Add base support for camera user feedback
By default it does nothing. Implementations need to provide their own
FeedbackHelper class that handles submitting feedback for the app.
Bug: 8155939
Change-Id: I33536267fcc4c3f9aecd957c6064963f5e9d1b6c
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 40d95e9455cdc9a58e2cb3ef55e8a94d948bd4ec |
|
28-Nov-2013 |
Angus Kong <shkong@google.com> |
No need to upgrade preferences.
Since we changed the package name in Carlsbad, there is no old versions of
preferences anymore for now. We can skip upgrade the preferences file from
previous versions in modules. Instead we do this in the activity although it's
an no-op for now.
Change-Id: Ibb153d4f8f80b6891fb4cb00d13cd8a386ee44a9
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| e13b4fd550b230f0fef5ae315e2b2be021c03c55 |
|
27-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Make the entire listview row clickable." into gb-ub-photos-denali
|
| 4bb8082489dc6806c7c05635bd24f6d42c876e16 |
|
27-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
Make the entire listview row clickable.
Change-Id: I616ff498c7a8bdfdc11d9a6c013ef34f35f310f1
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 491c628441a58f2dd4b5a5745147552d3f3d9dec |
|
25-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
Refactor settings dialogs.
* Adds first time location dialog.
* Makes all settings dialogs static.
* Moves initialization of first time location dialog.
Change-Id: If93f6a9c903f422409bda478b8cb76442eb0ad82
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 635a4b8ba2b8684f95e5cb0aa35c244a06985f4c |
|
26-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
Optimize Settings api.
* Caches settings descriptors.
* Uses a hashmap for finding setting descriptor from key.
Change-Id: I97fb536a2b30226896644b56911d4aec3c61cda5
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 13e87c4d06e96e03adc229637f07baf3b56b90d6 |
|
25-Nov-2013 |
Angus Kong <shkong@google.com> |
Migrate from old CameraModule to ModuleController.
The following methods are removed.
init() of old module interface
onUserInteraction()
installIntetFilter()
onPreviewTextureCopied()
onCaptureTextureCopied()
onStop()
onActivityResult()
onShowSwitcherPopup
updateStorageHintOnResume()
The logic of controlling screen on/off is moved to CameraActivity.
Change-Id: I6807ac6bc314bdfcfe47273baf071be94098fd44
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 357b7673f03d9b45d281d585cc3f4f87dc7d727b |
|
21-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
Build out the SettingsManager model.
Change-Id: Ie831dbf624efc5c7e27924785a0ec193b3ce53bd
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| f55f3c461c5a6ae6b61fa75562ca01683aa93f9a |
|
20-Nov-2013 |
Doris Liu <tianliu@google.com> |
Pinhole animation, quick switch between photo and video
Also, first pass of the view hierarchy refactor.
Change-Id: I6c80191f15908bd24c16b76df6ef92df3ef905fc
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| c4e665625b88a8363fa2bd9848bf88ec9b45637f |
|
23-Nov-2013 |
Angus Kong <shkong@google.com> |
Consolidate onResume* and onPause* in modules.
1. Combine onResumeAfterSuper() and onResumeBeforeSuper() to resume().
2. Combine onPauseAfterSuper() and onPauseBeforeSuper() to pause().
3. Add helper function requestBackCamera() to CameraModule.
Change-Id: Ie0ffb0168e2df1e77aba4ead4f8729eca09c894a
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| def975daaa81bda4301cc45de6920ac0a0c12fec |
|
22-Nov-2013 |
Andy Huibers <andyhuibers@google.com> |
Delay onResume tasks to speed up lockscreen
onResume->onPause->onResume launch sequence.
Change-Id: I819ba9893c1fbcf0c6e15a91a5733978dcdb9e1f
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 280fd3edae1dc35ac1015bcc9532477169fad3aa |
|
21-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
Introduce common services and integrate Refocus end-to-end.
Bug: 11120164
Bug: 10073814
This adds a new common CameraServices interface and a method to every
module to get it. Through this we can expose common services and due to
the interface, we can easily mock them for tests.
Also makes the MediaSaveService not a service anymore.
Change-Id: Ifa093efd4ba53c2955ccc2a990b4f18610c29944
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| c120b0f6e5ea919fcbb87f832a2b6c82509a2114 |
|
19-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
Custom settings ui with dialogs.
Change-Id: I117744135e5b08370c1feb63fe4abcccfe325659
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| e6700b8f84a0d4047dfc9e60f06f13d842b553b9 |
|
20-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Initialize a global LocationManager." into gb-ub-photos-denali
|
| 21c21a62aaed42cb0d4c2c91a735f08e40f8cd07 |
|
20-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
Initialize a global LocationManager.
Change-Id: I69f76e88f5e5b372bdcf6ba9fba8614e34595cc9
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 612321f39ca524de2efced1e826db9ec523bd6dc |
|
19-Nov-2013 |
Angus Kong <shkong@google.com> |
Centralize the module information.
Change-Id: I4d9fdbe480a518c7b6ca0268aa9beee49d22610c
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 0e57fc1baa471ea2acdd6b5bf8b961aa43b1a4a8 |
|
18-Nov-2013 |
Angus Kong <shkong@google.com> |
Fix a potential CameraManagerFactory memory leak
Change-Id: I5fca4cce0baaa9250eca1f74d5e3df950f618cc9
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 10f9092b4f7aa4b69d2aec116015242b98d816fc |
|
18-Nov-2013 |
Angus Kong <shkong@google.com> |
Merge "Major refactor: Make resources access through app." into gb-ub-photos-denali
|
| 20fad249cbb587b8cf03e8e53bc64ff8e0bec7fd |
|
12-Nov-2013 |
Angus Kong <shkong@google.com> |
Major refactor: Make resources access through app.
1. Make the camera device avaiability a callback event so the process can be
event-driven.
2. Add ModuleManager interface and implementation.
3. Make AndroidCameraManagerImpl implementation package private.
This CL is the refactoring work on Gallery2 side. The other part is
http://ag/389297/
Known issue: only work for normal photo mode and video mode for now.
Change-Id: Ib0a89ca56c00f6a7294192e9737a70dec5143ee3
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 70576b611fddc929abbfb466fa44c396a3a793db |
|
15-Nov-2013 |
Doris Liu <tianliu@google.com> |
Dim the background of mode switcher as swiping in
Also updated comments, and hooked up shimmy.
Bug: 11514368
Change-Id: I4055195dc8309ed78be9a04bdfcffd714257cb10
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 0e1af6db25a2ff36009a4a0aa168dc18e6645cee |
|
13-Nov-2013 |
Angus Kong <shkong@google.com> |
Merge "Refine comments and small change of interfaces." into gb-ub-photos-denali
|
| 1c94b7d0fa0143230d04b9f14c2ff93c6886d6cc |
|
10-Nov-2013 |
Doris Liu <tianliu@google.com> |
Introduce new mode switcher
TODO: Get assets from UX and activate shimmy
Bug: 11514368
Change-Id: Iebfd3c3c2dc1b08db25e166d5f90d3418a67ed22
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| c02b13af4c44fe23d4a563d3c2df1ca50e44affc |
|
12-Nov-2013 |
Angus Kong <shkong@google.com> |
Refine comments and small change of interfaces.
1. Use Context as possible as we can instead of the concrete implementaion
Activity.
2. Update/add some comments.
Change-Id: If80b2a8ab9ddeb297b8ec821568a74db4f52104f
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 15c3c9e8dd4e32fe7439bd14542ca4e7cc96b506 |
|
12-Nov-2013 |
Andy Huibers <andyhuibers@google.com> |
am a7c84bac: Merge "Close mode menus if another control is touched" into gb-ub-photos-carlsbad
* commit 'a7c84bacfd76e5e865655bd5a9b248d64f970af1':
Close mode menus if another control is touched
|
| a7c84bacfd76e5e865655bd5a9b248d64f970af1 |
|
12-Nov-2013 |
Andy Huibers <andyhuibers@google.com> |
Merge "Close mode menus if another control is touched" into gb-ub-photos-carlsbad
|
| 78748fbc35e1944e363059a365d8df5134ba6692 |
|
12-Nov-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am baffb73c: Start gcam module directly when handling capture intent.
* commit 'baffb73ca83d9d81c379f9f3b9f46cdac7355a0d':
Start gcam module directly when handling capture intent.
|
| 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
|
| 9f1db5210361802a30a7866825c3b29ef5fe0024 |
|
10-Nov-2013 |
Angus Kong <shkong@google.com> |
Refactor OrientationManager.
We should use a single OrientationManager instead of one for each module.
Change-Id: I20adddf50e9e55e4af44bfbe4298bdb1e1e50df3
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 628481532e1e58a0a26330d238e850aec5657bce |
|
09-Nov-2013 |
Angus Kong <shkong@google.com> |
Further refactor
1. Create filmstrip package.
2. Move ImageTaskManager to under package app/.
3. Adde app UI abstract layer AppUi.
Change-Id: I9d640de65c59196c5d3e5c3a8901bb3220b29f62
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 1138d7ad2dc727bc256ee42f7603bebb37468b61 |
|
08-Nov-2013 |
Angus Kong <shkong@google.com> |
Merge "Refactor MediaSaveService for future test needs." into gb-ub-photos-denali
|
| 57f235bb4d8e017d983ad2d1e062276f049ad7ab |
|
08-Nov-2013 |
Seth Raphael <magicseth@google.com> |
resolved conflicts for merge of cbd8267e to gb-ub-photos-denali
Change-Id: I24dcc27aa7aef1575f03b6ceaf418cf49712a170
|
| 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
|
| fd4fc0e52ad69c2d486f5f46c2d465b4c4ba2849 |
|
08-Nov-2013 |
Angus Kong <shkong@google.com> |
Refactor MediaSaveService for future test needs.
Added interface MediaSaver as the abstract layer to make the implementation
independent of the clients.
Change-Id: I98db3f732e4ed1c87da005b9c18e888682a5e6a5
/packages/apps/Camera2/src/com/android/camera/CameraActivity.java
|
| 9c19a579c3b39277c7f94ac18340723d64a4f038 |
|
07-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 05a04924: Show chooser on EDIT intents that have no activity for action.
* commit '05a04924312fbcda2161da01e0749eb80c2663d1':
Show chooser on EDIT intents that have no activity for action.
|
| 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
|
| 0b614e05bb44fd1421594454ab6397abb6a26dff |
|
07-Nov-2013 |
ztenghui <ztenghui@google.com> |
am 9070def9: Merge "Decouple the visibility check for system UI from action bar" into gb-ub-photos-carlsbad
* commit '9070def99369ccdffb1cf5e006ed30646297f490':
Decouple the visibility check for system UI from action bar
|
| 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
|
| bb1b88be8289f3f60f98b13efaba2518ebb2169a |
|
06-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 98254270: Merge "Make image editor intent general." into gb-ub-photos-carlsbad
* commit '982542701ef5737456f5ee204684a36620db5475':
Make image editor intent general.
|
| 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
|
| 03e0145861f790b633118dfc1d53ff89160c193a |
|
07-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
Add Refocus module.
Bug: 10073814
Change-Id: Ibeeeaa6627dce77034f2786040fb3be8e0c19da9
/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
|