| 431be7f85d9693a05b1a1863d75ea44e7b008754 |
31-Jul-2015 |
Alan Newberger <alann@google.com> |
am c8594ddf: Check for zero length array returns
* commit 'c8594ddf504109dc3c17baf9c2448469b28973e9':
Check for zero length array returns
|
| c8594ddf504109dc3c17baf9c2448469b28973e9 |
31-Jul-2015 |
Alan Newberger <alann@google.com> |
Check for zero length array returns
permissions API may return zero length arrays, check before
access.
Bug: 22871531
Change-Id: I0ebd5feecb24f03fda0350a9ab42efa25127b3dc
ndroid/camera/PermissionsActivity.java
|
| ef0b96ce4571805066c1e0865d41272b066e22e6 |
30-Jul-2015 |
Dianne Hackborn <hackbod@google.com> |
Change MNC codename to just M.
Change-Id: I1a6d7b269e5b7a1630d29e9f406684175d5bdf7d
ndroid/camera/util/ApiHelper.java
|
| 151f74fca138df5d3c6f83b86e3b6e8d9748a7e3 |
24-Jul-2015 |
Alan Newberger <alann@google.com> |
am 4df3011e: Protect against destroying uncreated values
* commit '4df3011e2f3680a80ecc89c817ba528b2a578f0f':
Protect against destroying uncreated values
|
| 4df3011e2f3680a80ecc89c817ba528b2a578f0f |
24-Jul-2015 |
Alan Newberger <alann@google.com> |
Protect against destroying uncreated values
Though we attempt to minimize lifecycle impact by exiting onCreate
early due to inadequate permissions, we need to protect against
touching fields in onDestroy that we did not initialize in onCreate.
BUG=22718094
Change-Id: I49adcbbed005c4efa785458aa398e61488cfceb0
ndroid/camera/CameraActivity.java
|
| 1aaec6c024f7f2077590ea507fe70900c4889c48 |
23-Jul-2015 |
Sascha Haeberling <haeberling@google.com> |
am ae474d0b: [Haleakala] Change JPEG compression thread priority to BACKGROUND - 1.
* commit 'ae474d0b2967b3995a4e1e334d6689b0cd9a38c9':
[Haleakala] Change JPEG compression thread priority to BACKGROUND - 1.
|
| ae474d0b2967b3995a4e1e334d6689b0cd9a38c9 |
23-Jul-2015 |
Sascha Haeberling <haeberling@google.com> |
[Haleakala] Change JPEG compression thread priority to BACKGROUND - 1.
Bug: 22670310
Change-Id: Ic2ee7e2de141d7df2a316733b465daa354b2d517
ndroid/camera/async/AndroidPriorityThread.java
ndroid/camera/processing/imagebackend/ImageBackend.java
|
| 2506ff92df39152e2ea0cb9070fa08db05262e2a |
18-Jul-2015 |
zafir <zafir@google.com> |
am ac0e2425: Fixes to M permissions.
* commit 'ac0e2425e77a9b69e76d2f31876798825ea44584':
Fixes to M permissions.
|
| ac0e2425e77a9b69e76d2f31876798825ea44584 |
15-Jul-2015 |
zafir <zafir@google.com> |
Fixes to M permissions.
Previously, we called PermissionsActivity with startActivityForResult().
However, this creates race conditions as we check for permissions
and the CameraActivity continues to operate. Now, we end CameraActivity
and launch a new instance upon successful permissions resolution.
We can also put the preload filmstrip logic back in its original
place in onCreate. The checks for permissions happen in both
onCreate and onResume.
Bug: 22442745, 22478144, 22497152
Change-Id: I82e9125a46581db44aa61d4ee94aec5a820e9df0
ndroid/camera/CameraActivity.java
ndroid/camera/PermissionsActivity.java
|
| e65f51f583c1707548662992d85176a8ed9ba19e |
17-Jul-2015 |
zafir <zafir@google.com> |
am dd334be9: Camera M permissions: lockscreen improvements
* commit 'dd334be92c5513a06c809ee3ea25e411dfad0589':
Camera M permissions: lockscreen improvements
|
| dd334be92c5513a06c809ee3ea25e411dfad0589 |
15-Jul-2015 |
zafir <zafir@google.com> |
Camera M permissions: lockscreen improvements
This CL now just provides some improvements for lockscreen independent
of any onCreate/onResume lifecycle adjustments. Fixes include:
* add a black content view to Permissions Activity -- noticed screen
junk opening from lockscreen due to unpainted regions, the whole
activity needs to paint the screen not just the dialog.
* use FLAG_SHOW_WHEN_LOCKED to show permissions screen over lockscreen,
per bug discussion in this case force failure, don't prompt for
permission grants.
* fun double onResumes induce flicker jank in the dialog UI. Inherit
QuickActivity to automatically pick up the workarounds for double
onResumes from lockscreens, no more flicker in the permission
dialog.
* also borrow from CameraActivity, broadcast receives to shut down
the permissions dialog when screen goes off or user hits home on
top of lockscreen. Actually apply this more broadly so that even
below lockscreen, we finish this activity on screen off, IMO it
is jarring to go in through lockscreen and see our permission
dialog again without context of having just opened camera.
* tweak permission dialog to not be cancelable, and to finish
activity on back button press.
* excludeFromRecents on the activity to prevent dual recents
for Camera to show up when opening both via SecureCameraActivity
and CameraActivity.
Bug: 22502696
Change-Id: Ib545d3baa2d83b52604eec5517047b0c6278cd92
ndroid/camera/PermissionsActivity.java
|
| ade8896d12cb0c250c24e38e81848f5fb9032310 |
10-Jul-2015 |
Alan Newberger <alann@google.com> |
am 2fc4970c: am 00720781: Null check when evaluating valid resolution size
* commit '2fc4970c2631ec5593c4566a72d4524014b49a29':
Null check when evaluating valid resolution size
|
| 2fc4970c2631ec5593c4566a72d4524014b49a29 |
10-Jul-2015 |
Alan Newberger <alann@google.com> |
am 00720781: Null check when evaluating valid resolution size
* commit '00720781f6703de532ddbc05238db5bf5fd7cd2d':
Null check when evaluating valid resolution size
|
| 00720781f6703de532ddbc05238db5bf5fd7cd2d |
10-Jul-2015 |
Alan Newberger <alann@google.com> |
Null check when evaluating valid resolution size
Guard against nonexistent size so that logic to reset size
preference can proceed
BUG=22396405
Change-Id: Id508713ef91f632867366934e72fe939a839e228
ndroid/camera/settings/ResolutionSetting.java
|
| dfd3ecb1b6bbec03d419b3a65a10dd344ae5dbc3 |
09-Jul-2015 |
zafir <zafir@google.com> |
am 148d0b8e: Launch PermissionsActivity if CameraActivity resume is called without critical permissions.
* commit '148d0b8e3fd412fa6a666e75484fe6b7e0465f5a':
Launch PermissionsActivity if CameraActivity resume is called without critical permissions.
|
| 148d0b8e3fd412fa6a666e75484fe6b7e0465f5a |
09-Jul-2015 |
zafir <zafir@google.com> |
Launch PermissionsActivity if CameraActivity resume is called without critical permissions.
Bug: 22358833
Change-Id: I5c189d4976b9355d531e028ecc163bb67bae6987
ndroid/camera/CameraActivity.java
ndroid/camera/PermissionsActivity.java
|
| 6e0e81f33fb78722474ee139c99c8f2e94af5592 |
08-Jul-2015 |
Alan Newberger <alann@google.com> |
am 5c8c7d3c: Clear permissions check after successful PermissionsActivity
* commit '5c8c7d3c86a866fc955d2cf2e6c3ed5e49d1d233':
Clear permissions check after successful PermissionsActivity
|
| 5c8c7d3c86a866fc955d2cf2e6c3ed5e49d1d233 |
08-Jul-2015 |
Alan Newberger <alann@google.com> |
Clear permissions check after successful PermissionsActivity
If the permissions activity indicates the user was successful,
mark mHasCriticalPermissions true to allow the app to resume normally.
BUG=22347017
Change-Id: I6b9bdd02382d071530529a08e8f8fe7faf02fe3b
ndroid/camera/CameraActivity.java
|
| f2bdf2767617415e476ecab683e1fc05704174e7 |
08-Jul-2015 |
Alan Newberger <alann@google.com> |
am c2d5d078: Restrict permission checks to M devices
* commit 'c2d5d078821ca5e8de0c0d03b6603bf7c505c53f':
Restrict permission checks to M devices
|
| c2d5d078821ca5e8de0c0d03b6603bf7c505c53f |
08-Jul-2015 |
Alan Newberger <alann@google.com> |
Restrict permission checks to M devices
Add an ApiHelper check and only call checkSelfPermission if we
are on M and the methods exist.
BUG=22345681
Change-Id: Icda8d40057b5492502858ced731a749a2f66abf8
ndroid/camera/CameraActivity.java
ndroid/camera/util/ApiHelper.java
|
| 2b4101fe49818cc4b71105386820c9d753ca5aaa |
07-Jul-2015 |
zafir <zafir@google.com> |
am ad44cda8: Minimum viable Android M runtime permissions handling for H.
* commit 'ad44cda82fe6ec5ee090115129223c6314f9e1bb':
Minimum viable Android M runtime permissions handling for H.
|
| ad44cda82fe6ec5ee090115129223c6314f9e1bb |
29-Jun-2015 |
zafir <zafir@google.com> |
Minimum viable Android M runtime permissions handling for H.
Creates new activity for permissions handling: both checking
for permissions and handling error condition when critical
permissions are not present. The reason for creating a
new activity is so the app does not attempt to continue
executing OnCreate, OnResume etc, which opens
the camera while the dialogs are showing. This should
not slow the app down because the permissions activity
will only run when a) the first time the app has
insufficient permissions and b) when a critical
permission is missing and the app needs to shut down.
Bug: 21273463
Change-Id: I603acfb3057ba26b9cfa7935eb4cb24b5d547cb5
ndroid/camera/CameraActivity.java
ndroid/camera/PermissionsActivity.java
ndroid/camera/settings/Keys.java
|
| 1cef126a6de13b002f0caf55963fe0b48de00546 |
29-Jun-2015 |
Alan Newberger <alann@google.com> |
am fd6f316a: Merge "Ensure CaptureModule/API2 works without front camera" into ub-camera-haleakala
* commit 'fd6f316adc5abfa071534642688bdf46f47a3925':
Ensure CaptureModule/API2 works without front camera
|
| 245239baa8ac24036f05716af4b2739b254846f6 |
29-Jun-2015 |
Alan Newberger <alann@google.com> |
am 62240e14: Merge "Update filmstrip item on metadata update" into ub-camera-haleakala
* commit '62240e14e310aa06601b4d069f30c0190e7b5ef3':
Update filmstrip item on metadata update
|
| fd6f316adc5abfa071534642688bdf46f47a3925 |
29-Jun-2015 |
Alan Newberger <alann@google.com> |
Merge "Ensure CaptureModule/API2 works without front camera" into ub-camera-haleakala
|
| 62240e14e310aa06601b4d069f30c0190e7b5ef3 |
29-Jun-2015 |
Alan Newberger <alann@google.com> |
Merge "Update filmstrip item on metadata update" into ub-camera-haleakala
|
| 75dcaf3bd47ec093f5805dc422dcdd397d2d0e1a |
27-Jun-2015 |
Senpo Hu <senpo@google.com> |
am 04a9f8b6: Merge "Fix transform issue in CaptureIntent." into ub-camera-haleakala
* commit '04a9f8b68dfc636e5d2194af18cc2022e6b8354f':
Fix transform issue in CaptureIntent.
|
| ef22af43f7769ce6975f674351d29d5fa0df5e07 |
25-Jun-2015 |
Alan Newberger <alann@google.com> |
Ensure CaptureModule/API2 works without front camera
Add a check in both first run dialogs, and the generated HardwareSpec,
so that front cameras are only used if detected.
BUG=21781461
Change-Id: I6844655b2fd3df90b649f5dfd6a006ef68dbf1da
ndroid/camera/CaptureModule.java
ndroid/camera/app/FirstRunDialog.java
ndroid/camera/one/v2/Camera2OneCameraManagerImpl.java
|
| 9ad71f6fa9cc5471fbc08d181fa2d6361974e524 |
25-Jun-2015 |
Alan Newberger <alann@google.com> |
Update filmstrip item on metadata update
Due to async metadata loading, when viewing an image progress bar,
after progress completion the main handler hiding progress bar would
also hide filmstrip buttons if in secure mode, but the async metadata
handler was calling a restricted handler that would only update the
controls, not hiding for secure, or updating overflow menu. This
change ensures all UI aspects of the item update are processed upon
metadata loading.
BUG=21499182
Change-Id: I92f22667d836d6ece6aa8427d967ec8e038b1e77
ndroid/camera/CameraActivity.java
|
| a6572422e8940e176e3630c23a331927b5b08853 |
13-Jun-2015 |
Senpo Hu <senpo@google.com> |
Fix transform issue in CaptureIntent.
On M, EventOnTextureViewLayoutChanged comes earlier during app
initialization in StateForeground which doesn't handle it. So
here in StateReadyForCapture, we pull the current preview layout
size and inform ResourceSurfaceTexture to allow it to calculate
transform.
Noted that we also need to bring this fix to Ivvavik.
Bug: 21786937
Bug: 20173626
Change-Id: I417aef2f09247e77059fc5b066cbf10602ce5cf1
ndroid/camera/captureintent/CaptureIntentModuleUI.java
ndroid/camera/captureintent/resource/ResourceSurfaceTextureImpl.java
ndroid/camera/captureintent/state/StateReadyForCapture.java
|
| d3611d6a86f46fb877e5260410ddd6389445be1e |
19-Jun-2015 |
Alan Newberger <alann@google.com> |
AOSP Camera source should run camera2 API on M
In all cases has Camera2 app run in CaptureModule, using
capability levels to configure in either LEGACY or LIMITED
JPEG, or full ZSL mode.
BUG=21490086
Change-Id: I75842e9afc8d6ef387dd6611a5251394e8318caa
ndroid/camera/one/config/OneCameraFeatureConfigCreator.java
|
| 8d8b329da25456adb5ee45e0450680654114e125 |
11-Jun-2015 |
I-Jong Lin <ijonglin@google.com> |
Fix for invalidated resolutions via upgrade
Bug: 21758681
There was a upgrade bug where an valid resolution of the
previous version of the Camera App could then be invalidated
the subsequent version of the Camera App. If there were no
other valid resolutions of the same aspect ratio available
to the app, the current Camera App would choose (0,0) as its
default size and then write this value into the saved settings.
This fix allows the current Camera App to consider other resolutions
not of aspect ratio as a fallback resolution setting. Also, if
an invalid resolution valid has been saved to the settings, it
also ignores it and then resaves a valid resolution value to the
settings.
Change-Id: I08f19d1ee6491619e92697897b73e4fd33a19a00
ndroid/camera/settings/ResolutionSetting.java
ndroid/camera/settings/ResolutionUtil.java
|
| e2323c537f0ec4966ad58251a14e1437071ae085 |
08-Jun-2015 |
I-Jong Lin <ijonglin@google.com> |
Refresh required for full-screen undo in filmstrip
Bug: 21666018
A Glacier regression bug: when filmstrip is in full-screen mode,
and an deletion is undone, a blank screen is shown. With the fix,
the undo forces the filmstrip into its "filmstrip" mode and
forces a refresh with the un-deleted image.
Change-Id: Id99be5d4d06e220e8698821badff32dba9b43997
ndroid/camera/CameraActivity.java
|
| 2eb8298b5fa99af132f6be6da920ed8867974488 |
30-May-2015 |
Sascha Haeberling <haeberling@google.com> |
Use Google Feedback CrashBuilder API to make reports easier to consume.
Manual Cherry-Pick Part 1 of http://ag/699672
Currently, Feedback reports don't include a stacktrace. You have to
download
a system log file to find it. This tweak allows us to see the stacktrace
on the Report page itself.
Example old report:
https://feedback.corp.google.com/product/102042/crash?lView=rd&lCategory=8590053278&lRSort=1&lROrder=2&lRFilter=1&lReport=5517267704
Example new report:
https://feedback.corp.google.com/product/102042/crash?lView=rd&lCategory=8590053278&lRSort=1&lROrder=2&lRFilter=1&lReport=5517601160
Change-Id: If5f0ed6c69e96fe5f3661af913ae1525f8594b75
ndroid/camera/FatalErrorHandlerImpl.java
ndroid/camera/util/CameraUtil.java
|
| e6b00bf3c0319cba17ce23161402568c8e3c3547 |
28-May-2015 |
Gabriel Nava <gnava@google.com> |
Fix for unusable camera after quick pause/resume and HDR+ switch (camera-Haleakala)
- Removing the hack for b/18854352
- Running the camera reopen camera operations and onReadyForCapture callback in a non-UI thread to avoid dead-locks
Bug: 21025113
Change-Id: I5545148769d92e5a87ffa9b693397fd7737edee6
ndroid/camera/CaptureModule.java
ndroid/camera/one/v2/initialization/GenericOneCameraImpl.java
|
| dad39b12816f05468476804b7caf3ef39a4aa682 |
28-May-2015 |
Sascha Haeberling <haeberling@google.com> |
Add logging for when a session knowingly failed.
Bug: 21169512
Change-Id: Ic1dc499785a97f7344e517f555fa5f7b3a1c7ea9
ndroid/camera/session/CaptureSession.java
ndroid/camera/session/CaptureSessionImpl.java
|
| 14d92c346e1890cf3eeb0fb9c846d834e2c59179 |
28-May-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Log capture session canceled events." into ub-camera-haleakala
|
| 646e84f85a3f463ce094ad5a9caca261277f0d0e |
28-May-2015 |
Paul Rohde <codelogic@google.com> |
Log capture session canceled events.
This will handle the edgecase where capture sessions may be
canceled inbetween the time the button is pressed and the capture
actually starts so that it is possible to subtract these cases
out of the unsaved image data.
Bug: 21169512
Change-Id: Ie226d81bb10acd90dc1297230d4b024b7cd2d4d6
ndroid/camera/CaptureModule.java
ndroid/camera/session/CaptureSession.java
ndroid/camera/session/CaptureSessionImpl.java
|
| d927492ade2e253ccc620effd5602582eaa6dd2d |
27-May-2015 |
Gabriel Nava <gnava@google.com> |
Handling the GcamService timeout due to application in paused state (camera-Haleakala)
- When GcamService times out due to a pause state, all resources are released.
- Releasing the gcam resources without showing the error dialog allows next resume operation to open the camera
Bug: 21025113
Change-Id: I95a89fbf6ce2498c1323cd4d06383141cc7cb913
ndroid/camera/CaptureModule.java
|
| 090f2fce636d45d8e32d3e8cb665c0880d5a9e70 |
20-May-2015 |
Spike Sprague <spikuru@google.com> |
Fill out more EXIF data, closer parity to Nexus HAL
bug: 21277434
Change-Id: I4e4d9b4bffa6b0a8ccb3e870d553643dd27d2356
ndroid/camera/exif/ExifInterface.java
ndroid/camera/util/ExifUtil.java
|
| fa77628ec03fcd74af79da7a85437b0fd14bdae2 |
20-May-2015 |
Sascha Haeberling <haeberling@google.com> |
Merge "Don't attempt to update thumbnail if session is finished." into ub-camera-haleakala
|
| dae7a41623e04e8d583dfd636e3f5a5ae0e245e6 |
20-May-2015 |
Sascha Haeberling <haeberling@google.com> |
Don't attempt to update thumbnail if session is finished.
Bug: 21167342
Change-Id: If2e4db523aa66e82809d30aa35fb9a30d124d9df
ndroid/camera/session/CaptureSessionImpl.java
|
| 51495cc98578dda7ea2e9eafd5271f2dc0bc2d97 |
20-May-2015 |
Gabriel Nava <gnava@google.com> |
Fix to avoid random ArrayIndexOutOfBoundsException in bottom bar (camera-Haleakala)
Bug: 20957536
Change-Id: I6985d009e550f8f67ff36be3fce53c82ada0610e
ndroid/camera/MultiToggleImageButton.java
|
| 76ab7148d30b5eab605f3448ac4ff1613f2f019d |
20-May-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Log capture started and bytes on disk" into ub-camera-haleakala
|
| 231b1c0679892e431bac9fe4461d5fb235e362b1 |
16-May-2015 |
Paul Rohde <codelogic@google.com> |
Log capture started and bytes on disk
Change-Id: I3a62aed33f55b396b4940a7bc9e5da5131616890
ndroid/camera/CaptureModule.java
ndroid/camera/captureintent/CaptureIntentSession.java
ndroid/camera/captureintent/resource/ResourceCaptureToolsImpl.java
ndroid/camera/session/CaptureSession.java
ndroid/camera/session/CaptureSessionImpl.java
|
| 95a80b6bd97d306cafc74fb96be00ea0eeba1842 |
18-May-2015 |
Paul Rohde <codelogic@google.com> |
Make filmstrip grey squares less common.
Increase the encoding priority of the intermediate thumbnails
by changing the task priority to "Average". This causes the
intermediate thumbs to run on their own thread pool, after
the tiny thumbs are generated but allow them to not get
prempted by slow, full jpg encoding tasks.
Bug: 21169512
Change-Id: I2862acac724cf6302c896feeeb04702170cbf030
ndroid/camera/processing/imagebackend/TaskPreviewChainedJpeg.java
|
| 10aea802d1ab9e2a05e65b347fdb89153bbd2e5a |
16-May-2015 |
Pengchong Jin <pengchong@google.com> |
Merge "Workaround of the face detection failure on L and N5" into ub-camera-haleakala
|
| 83160a849de1488a602f08821ee14353ef67973f |
16-May-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Increase the default JPG buffer size." into ub-camera-haleakala
|
| ce10e6217be01d56238fac708a738f8d3313bac0 |
16-May-2015 |
Paul Rohde <codelogic@google.com> |
Increase the default JPG buffer size.
BUG: 21162720
Change-Id: Ie9d634533778c254a000da92f0af2948d814b1dd
ndroid/camera/processing/imagebackend/TaskCompressImageToJpeg.java
|
| 9218dc38da07cbfe48d64897d67472028644fea1 |
15-May-2015 |
Pengchong Jin <pengchong@google.com> |
Workaround of the face detection failure on L and N5
This patch is a workaround of the face detection failure on L
and Nexus 5. For Nexus 5 on L, the current FD only works when
the preview stream is configured as the first stream before the
JPEG stream. This change lock the order by creating a capture
session with the preview stream first, and then creating the
normal capture session with preview and JPEG.
Bug: b/21039466
Change-Id: Icb7f1f758bc9d7ca428c7a4748223072d39dd57f
ndroid/camera/one/v2/initialization/PreviewStarter.java
|
| f361659dd9ab34087276b2514a766eadafe344ae |
13-May-2015 |
Gabriel Nava <gnava@google.com> |
Fix for crash when switching cameras on KitKat (camera-haleakala)
- Adding null check for hardwareSpec in CameraAppUI.onChangeCamera()
- Hardware spec may not be available if call to get camera parameters hasn't finished yet
Bug: 21118170
Change-Id: I5bf1b0328f2cae7211464ff136a31ace2577630f
ndroid/camera/app/CameraAppUI.java
|
| 49f0d8846a84e23207dd547ab320c5fa0ee4078a |
13-May-2015 |
Pengchong Jin <pengchong@google.com> |
Merge "WAR of the face detection failure" into ub-camera-haleakala
|
| f51a30f89aeab87a3f163e306aa7a51b886d2920 |
12-May-2015 |
Gabriel Nava <gnava@google.com> |
Merge "Ensuring the right HDR icon is shown on camera switch (camera-haleakala)" into ub-camera-haleakala
|
| 64efe896623b1eb9b3116869ae1f6ad9be9a1195 |
12-May-2015 |
Alan Newberger <alann@google.com> |
Merge "skip first run dialog when starting in secure mode" into ub-camera-haleakala
|
| 04e24acb19a2f283f36fc67d6c32f6b11350dca7 |
12-May-2015 |
Alan Newberger <alann@google.com> |
skip first run dialog when starting in secure mode
Go right into camera mode when starting from secure lockscreen, this
restores prior behavior and avoids resume loops in double onResume
workarounds.
Bug: 21070237
Change-Id: I353bdd4b73c8c63e58710e35304b5c269458c72e
ndroid/camera/CameraActivity.java
|
| 4368ec0368f69e7604403b4a6db6f1e3123a1814 |
12-May-2015 |
Gabriel Nava <gnava@google.com> |
Ensuring the right HDR icon is shown on camera switch (camera-haleakala)
- When switching cameras HDR+ icon was always shown in disabled state regardless of the actual support mode
- Existing boolean setting to track device's HDR support is not enough
- Changing global device's HDR support setting to string that can hold no-hdr, hdr or hdr-plus values
Bug: 21037428
Change-Id: Ia9cf0484879a22a27e4deb0e4aa066ec806a43e6
ndroid/camera/app/CameraAppUI.java
ndroid/camera/settings/Keys.java
|
| 55bcfcad2e492277c84c7d32912469c4b31d16e7 |
12-May-2015 |
Gabriel Nava <gnava@google.com> |
Merge "Freezing preview in capture intent when image is exposed instead of shutter click (camera-haleakala)" into ub-camera-haleakala
|
| 7e39f8b015985fc0e539e14c193286065b5e51d4 |
09-May-2015 |
Pengchong Jin <pengchong@google.com> |
WAR of the face detection failure
This patch gives a work-around of the face detection failure that
occurs when the ZSL camera is used. It forces to request a preview
frame followed by a 5-frame ZSL burst before requesting the repeated
preview and ZSL streams. It also hides the first preview frame in order
to avoid potential janks. We do this only for L, Nexus 6 and Haleakala.
Bug: 20724126
Change-Id: I40b7861e07570ed53135b2d8d182b65c5799adac
ndroid/camera/app/CameraAppUI.java
ndroid/camera/one/v2/ZslOneCameraFactory.java
ndroid/camera/one/v2/commands/ZslPreviewCommand.java
ndroid/camera/one/v2/commands/ZslPreviewCommandFactory.java
ndroid/camera/util/ApiHelper.java
|
| ea48e2e02549198b7c3fca075328ee35845d693e |
11-May-2015 |
Gabriel Nava <gnava@google.com> |
Freezing preview in capture intent when image is exposed instead of shutter click (camera-haleakala)
- Removing preview freeze call from shutter button callback
- Relocating preview freeze call to quick expose handler
Bug: 20957671
Change-Id: Ie1c68ed52e04cdafd6f5894d001990a030d15761
ndroid/camera/captureintent/state/StateReadyForCapture.java
|
| cc986451105a407142e6939a88c3821dadbebd5f |
11-May-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Hide no active camera NPE by defaulting to camera device -1" into ub-camera-haleakala
|
| d46ac0034a0fe7b700c4f39499dd22c2c5da5300 |
11-May-2015 |
Paul Rohde <codelogic@google.com> |
Hide no active camera NPE by defaulting to camera device -1
NPE's can occur if no camera device is currently active. It's
not feasable to rewire all parts of the codebase for this
release to properly access the target camera device. This
fix may lead to inconsistent setting persistance if in places
where a NPE would otherwise occur.
Bug: 21026362
Change-Id: I76c5b5fab429f61238a1ba91c0c52e839a431573
ndroid/camera/CameraActivity.java
ndroid/camera/app/CameraController.java
|
| c534c71cee79c91310ad5c43824165cc06e7cbae |
11-May-2015 |
Alan Newberger <alann@google.com> |
Fall back to bounds if provided width/height is 0
Monkey results show async dimensions can lag behind
automated filmstrip. Protect against this case, should
reduce monkey issues.
Bug: 21023148
Change-Id: I8fef5e8d00f96c4b4c249b3a9daebfcf9991e193
ndroid/camera/util/CameraUtil.java
|
| edd5f8086326786390a7c74dda3f0a6c9ba933b5 |
08-May-2015 |
Senpo Hu <senpo@google.com> |
[ImageIntent] Support volume / camera key to take photo.
Bug: 20947910
Change-Id: I01e49840b69926b1489d6564a8b183d653b71ac1
ndroid/camera/captureintent/CaptureIntentModule.java
ndroid/camera/captureintent/event/EventClickOnCameraKey.java
ndroid/camera/captureintent/resource/ResourceCaptureTools.java
ndroid/camera/captureintent/state/StateReadyForCapture.java
|
| 14de25b5c502ffb2ac6396014624206562affef2 |
07-May-2015 |
Gabriel Nava <gnava@google.com> |
Opening the right camera on app restart when using PhotoModule (camera-haleakala)
- In existing logic PhotoModule reverts to back camera if no aspect ratio has been selected
- Reverting to Back camera only if device allows showing the aspect ratio dialog (N4,N5,N6)
- Updating the Camera ID persistent setting if reverting, not only the runtime value
Bug: 20889927
Change-Id: Ie59b878fd03da751c552fbf92ec5c96889144016
ndroid/camera/PhotoModule.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/app/FirstRunDialog.java
|
| 0ec045201975bc12ac12007615c099c5e98d202a |
06-May-2015 |
Alan Newberger <alann@google.com> |
Refresh metadata for every filmstrip item update.
Current filmstrip item updates:
1. call CameraFilmstripDataAdapter.updateItemAt which then calls FilmstripView.updateViewItem
2. FilmstripView.updateViewItem updates the view then calls CameraActivity.updateUiByData
3. CameraActivity.updateUiByData calls CameraFilmstripDataAdapter.updateMetadataAt
4. MetadataUpdateTask calls FilmstripView.updateViewItem again if metadata was loaded
The double updateViewItems disrupts SessionItem -> PhotoItem transitions, and for some
reason for LB causes the second updateViewItem to only request tiny thumbnails. For a very targeted
fix, we instead make step 1 do the metadata load, and then updateViewItem is only called once. The
code in step 3 still executes but is a no-op since metadata was already loaded in step one.
Tested with Camera mode, Pano/PhotoSphere, LB, redoing an LB, calling out to editor and changing a
photo, and taking a video.
Bug: 20862631
Change-Id: Ib8b112c2ef1b5a364a5569d1391ef359d1b5fb1a
ndroid/camera/data/CameraFilmstripDataAdapter.java
ndroid/camera/data/PhotoItem.java
|
| ca434e5414ae721e577da44c279a7fad9f43ca2a |
04-May-2015 |
Gabriel Nava <gnava@google.com> |
Preventing camera button to get into wrong state when pressed in succession (camera-haleakala)
- Adding methods to ButtonManager to enable/disable camera button explicitly
- Camera button cannot be enabled during initialization if it was explicitly disabled
- PhotoModule, VideoModule and CaptureModule enable/disable camera button on camera switch
- Capture button is disabled before requesting the camera switch
- Capture button is re-enabled once the camera open confirmation is received
Bug: 20693214
Change-Id: I6383c705eee0a82397b975332cf37bbcd5913128
ndroid/camera/ButtonManager.java
ndroid/camera/CaptureModule.java
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.java
|
| 012cfd9ffff557070aa796bbd346d1606a927abf |
04-May-2015 |
Gabriel Nava <gnava@google.com> |
Merge "Avoid camera switch while HDR activation is in progress (camera-haleakala)" into ub-camera-haleakala
|
| 9a57f184a6f5be46e93dd2f6c66f4b9ba07bdd75 |
02-May-2015 |
Gabriel Nava <gnava@google.com> |
Avoid camera switch while HDR activation is in progress (camera-haleakala)
- Adding pre-change listener to MultiToggleImageButton to be executed before running state change animations
- Allowing button initialization with pre-change callback in ButtonManager
- Adding pre-change callback for conflicting options in CameraAppUI:
HDR/HDR+ button disables camera button to avoid camera facing switch
Camera facing disables HDR/HDR+
- Conflicting button is shown in disabled state for a while until re-enabled if applicable when the module switch is completed
Bug: 20696068
Change-Id: I11a0a0567363f656be52a9ece0707ccf326f2d67
ndroid/camera/ButtonManager.java
ndroid/camera/MultiToggleImageButton.java
ndroid/camera/app/CameraAppUI.java
|
| 64f82d503cebad274deb8b5f7f7063135c99bba9 |
02-May-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Check for a potentially destroyed activity before startPreview." into ub-camera-haleakala
|
| e76ece9cb051dbd0cf48271b11381ff9c1aac689 |
02-May-2015 |
Pengchong Jin <pengchong@google.com> |
Merge "Fix bug b/20638423" into ub-camera-haleakala
|
| 6e2dc1ef0c021ca6bd86f4878a159b38778cf942 |
02-May-2015 |
Gabriel Nava <gnava@google.com> |
Merge "Disabling non available options instead of hiding when hw support is present (camera-haleakala)" into ub-camera-haleakala
|
| 2914f845c1d53f4a3b9aac68998b521290a7192c |
30-Apr-2015 |
Paul Rohde <codelogic@google.com> |
Check for a potentially destroyed activity before startPreview.
There is a small chance that the activity can be destroyed
between the time the camera is created and the preview is started.
This can lead to unchecked NPE's across the app because most code
assumes that there will never be a case where activity objects
are accessed after onDestroy.
Bug: 20097425
Change-Id: I2904ffba451ded2417a806c83fd12e4f62611150
ndroid/camera/CameraActivity.java
ndroid/camera/CaptureModule.java
ndroid/camera/captureintent/event/EventOnOpenCameraSucceeded.java
ndroid/camera/captureintent/state/StateOpeningCamera.java
ndroid/camera/one/OneCamera.java
ndroid/camera/one/v2/Camera2OneCameraOpenerImpl.java
|
| ce9ef4e3528e5599773809f74657b798c370aad2 |
01-May-2015 |
Gabriel Nava <gnava@google.com> |
Disabling non available options instead of hiding when hw support is present (camera-haleakala)
- Global scope property persists the support of flash and hdr for the main camera (back)
- If option is not supported at all, option is hidden
- If option is supported in at least one camera but not supported in current module, option is disabled
- If option is supported in current module, option is enabled
- Avoiding race condition where CameraAppUI.applyModuleSpecs was bein called multiple times simultaneously for the same change
- Adding a check so BottomBar UI is updated only when there's a scope (module/camera) change, unless...
- Scope check can be requested within same scope for settings change
Bug: 20630060
Change-Id: Iac5fa2658f04fe8329a2232fb0d5b11d20e566a2
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/settings/Keys.java
|
| e3ba951d640316c598f0e690422879e8d4ba0a62 |
30-Apr-2015 |
Pengchong Jin <pengchong@google.com> |
Fix bug b/20638423
Catch the AssertionError exception thrown by
CameraAgentFactory.getAndroidCameraAgent, and pop up the reporting
dialog before App termination.
Bug: 20638423
Change-Id: I090ea03b7ff872b40f4b0cc6bcbb33e41f332920
ndroid/camera/CameraActivity.java
ndroid/camera/device/PortabilityCameraActions.java
|
| 1fe3cb806057878c136866871a8a26f76b282560 |
01-May-2015 |
Pengchong Jin <pengchong@google.com> |
Merge "Fix bug b/19965993" into ub-camera-haleakala
|
| a88d6fb320a84c1371c7177153408903f91185c7 |
01-May-2015 |
Senpo Hu <senpo@google.com> |
Merge "Freeze preview after taking shot in capture intent." into ub-camera-haleakala
|
| e5c19b4acc3be9b70e665627f76d082c6fc3289d |
01-May-2015 |
Senpo Hu <senpo@google.com> |
Freeze preview after taking shot in capture intent.
Bug: 20690039
Change-Id: I3402b7d7acb956a886596267ca37bd129ba74e3c
ndroid/camera/app/CameraAppUI.java
ndroid/camera/captureintent/state/StateReadyForCapture.java
|
| 09d24d469c7a33e2bf423c824bfa52cc0dd98ed6 |
01-May-2015 |
Pengchong Jin <pengchong@google.com> |
Fix bug b/19965993
CameraId null check before checking whether the exposure compensation is
supported.
Bug: 19965993
Change-Id: If5cd7fbfe9ae6d2f83e56c8647836f96fa6e7426
ndroid/camera/settings/CameraSettingsActivity.java
|
| 350c3a424d42784c8df4a289adbc4a9033f4b3e6 |
01-May-2015 |
I-Jong Lin <ijonglin@google.com> |
Merge "Fix for N4 Video and inclusion of CaptureIntent" into ub-camera-haleakala
|
| 436aba83744b104d000ae34fead732c5271d3144 |
30-Apr-2015 |
I-Jong Lin <ijonglin@google.com> |
Fix for N4 Video and inclusion of CaptureIntent
Bug: 20694189
Workaround b/19271661 needs to specifically applied in
these circumstances only:
1. Phone is Nexus4
2. CaptureModule is enabled
3. Photo Mode, OR Capture Intent Photo is enabled.
Since we are passing the CameraActivity in TextureViewHelper,
it has enough context to know everything. Previous implementation
used an invalid CameraProvider to signal that Camera2 was enabled.
Now we just ask the CameraActivity directly.
Change-Id: I47f841ae6476bc034a7ad3f487c40616eed05b71
ndroid/camera/TextureViewHelper.java
|
| d9ca269f8f54ea9b316d383ec85e05708b0fefcb |
30-Apr-2015 |
Sascha Haeberling <haeberling@google.com> |
Make sure we cancel countdown before mPaused is set.
Bug: 20696312
Change-Id: I3785a46881e2bb027d0cd06d1c2eba1b38ca2b4a
ndroid/camera/CaptureModule.java
|
| ff1bb57533728cdb7aea13f8f4ca998993905b47 |
30-Apr-2015 |
Sascha Haeberling <haeberling@google.com> |
Lower the priority of ProcessingService to 'background'.
Bug: 20675397
This should e.g. greatly reduce the jank we see while Lens Blurs are
processing.
Change-Id: I7ffd9bb394a113b913105a6e91c8f12fc067bfbb
ndroid/camera/processing/ProcessingService.java
|
| a49c2be37cf75db0a28807783782c4fd1e1bb471 |
30-Apr-2015 |
I-Jong Lin <ijonglin@google.com> |
Merge "Fix for N4 Video Rotation Bug" into ub-camera-haleakala
|
| f018bce18af5626bf67e6dcb37ea60b0cc6a53cd |
30-Apr-2015 |
I-Jong Lin <ijonglin@google.com> |
Fix for N4 Video Rotation Bug
Previous fix for N4 preview (b/19271661) needed to only be applied
when PhotoModule is active. Grossly plumbed the correct object
references into TextureViewHelper so that it could know which
module was active.
Bug: 20694189
Change-Id: I0f639ae6ee0832f453213699723dc8aa25e5d9e7
ndroid/camera/TextureViewHelper.java
ndroid/camera/app/CameraAppUI.java
|
| a8fcb96eadae508dc3b6036594cbaf9a7bacfc0d |
30-Apr-2015 |
Sascha Haeberling <haeberling@google.com> |
Merge "DO NOT MERGE - Show an error if we couldn't connect to the Camera device." into ub-camera-haleakala
|
| 301a3e18f52f9c8ca99a5bbad2943f0a323ddc15 |
30-Apr-2015 |
Sascha Haeberling <haeberling@google.com> |
DO NOT MERGE - Show an error if we couldn't connect to the Camera device.
Bug: 20158861
Change-Id: Ib7cec6547a52ef02bb4ab1791d3945ef9e0a99d7
ndroid/camera/CameraActivity.java
|
| 470df0382d13b71e9c301b4e3e99b0736a0374db |
30-Apr-2015 |
Pengchong Jin <pengchong@google.com> |
Merge "Fix b/20638271: (Part 1)" into ub-camera-haleakala
|
| de88a4254b858f7234d5f6d8e4d59d080af99849 |
30-Apr-2015 |
Pengchong Jin <pengchong@google.com> |
Fix b/20638271: (Part 1)
Handle the case when the instance of CameraDeviceInfo is null.
Bug: b/20638271
Change-Id: If8d9938405f4f2229bc5962c21f3f46e9a2bd1dd
ndroid/camera/settings/SettingsUtil.java
|
| bb7cd0a2b1b499784af5764dc2280bd5cab317c2 |
30-Apr-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Correctly read AF and AE capabilities for front-camera." into ub-camera-haleakala
|
| 7340e5c860c3ed94f48cf7af1aad70c64979bba0 |
30-Apr-2015 |
Senpo Hu <senpo@google.com> |
Merge "Fix a race condition while tapping retake button." into ub-camera-haleakala
|
| bc75813126be7e9518e821fae31471db5ec3fe1a |
29-Apr-2015 |
Senpo Hu <senpo@google.com> |
Fix a race condition while tapping retake button.
Bug: 19988384
Change-Id: I2dd6c31bdaaf24475b1cb1239a06592b3bd2ec56
ndroid/camera/captureintent/state/StateReadyForCapture.java
|
| c5ecbd6e0a6c2a2d93fc58f0ba3d273249b06da2 |
29-Apr-2015 |
Spike Sprague <spikuru@google.com> |
calling setDrawableByLayerId sets that Drawable's level to 0. reset level of video shutter button to maximum.
bug: 19955500
Change-Id: Ie1fb79dc57edfcd53fa2148b2223a0cd5d6faeb3
ndroid/camera/ui/AnimatedCircleDrawable.java
ndroid/camera/ui/BottomBar.java
|
| b55bc734e5d9284cd739bc384a190dbe155d540d |
29-Apr-2015 |
Paul Rohde <codelogic@google.com> |
Correctly read AF and AE capabilities for front-camera.
Bug: 20088402
Change-Id: I034bc7db3a52a9ab950da0f41515ceec8f170d03
ndroid/camera/CaptureModule.java
ndroid/camera/captureintent/state/StateReadyForCapture.java
ndroid/camera/one/OneCameraCharacteristics.java
ndroid/camera/one/v1/OneCameraCharacteristicsImpl.java
ndroid/camera/one/v2/OneCameraCharacteristicsImpl.java
|
| d82f136d7e34e22619dfaec7b6c975b152a2437f |
21-Apr-2015 |
Alan Newberger <alann@google.com> |
Ensure OnScreenHint uses an Activity
While using an appContext WindowManager is useful in certain cases,
for OnScreenHint is MUST have an Activity-based one so that it
can attach views to it. This was changed before but when moved to
AndroidServices layer, regressed. Added explicit doc comment to
ensure we preserve the activity reference.
Bug: 20430202
Change-Id: Id4977bd8913e8bff8848e5241738111dcc10ac74
ndroid/camera/CameraActivity.java
ndroid/camera/OnScreenHint.java
|
| 2c1c639ff161b0b1b2cba16d44b738f774cfb696 |
15-Apr-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Add copywrite headers for device lifecycle classes." into ub-camera-haleakala
|
| bb5cb5fa3d9e4ac18f4b4c9adaf237b804a09c56 |
15-Apr-2015 |
Paul Rohde <codelogic@google.com> |
Add copywrite headers for device lifecycle classes.
Bug: 20263460
Change-Id: Ia583ec45ba9bec7dbcf41312905f7d92fa9b47dd
ndroid/camera/device/CameraDeviceActionProvider.java
ndroid/camera/device/CameraDeviceLifecycle.java
ndroid/camera/device/SingleDeviceActions.java
ndroid/camera/device/SingleDeviceCloseListener.java
ndroid/camera/device/SingleDeviceLifecycle.java
ndroid/camera/device/SingleDeviceOpenListener.java
ndroid/camera/device/SingleDeviceRequest.java
ndroid/camera/device/SingleDeviceShutdownListener.java
ndroid/camera/device/SingleDeviceStateMachine.java
|
| f7b0fbad338552d697bad5fa152715cb09737cc4 |
15-Apr-2015 |
Sascha Haeberling <haeberling@google.com> |
Merge "Add some basic progress reporting for saving JPEG files." into ub-camera-haleakala
|
| 922cd8565b2f1e5dc198b88f6f039ccc75b72e65 |
15-Apr-2015 |
Sascha Haeberling <haeberling@google.com> |
Add some basic progress reporting for saving JPEG files.
Bug: 18960470
Change-Id: I8f1547ae6652cd6b81773acf7726751f2d22a55c
ndroid/camera/one/v2/imagesaver/YuvImageBackendImageSaver.java
|
| 5f1f618eb3df6b9a2f8554e97e8410467b642653 |
15-Apr-2015 |
Paul Rohde <codelogic@google.com> |
Send a warmup burst to the camera before attaching the preview.
This reduces startup jank by submitting a warmup burst of n
frames to the camera before the preview surface is attached to
the camera. This ensures the large internal buffers are
allocated by the HAL before the preview stream is attached. The
change will delay the preview by n frames in exchange for a
smoother preview once the preview is actually shown.
Bug: 19076469
Change-Id: I5abb8b49a64c35686c014001a45239f4eccfe34d
ndroid/camera/one/v2/SimpleOneCameraFactory.java
ndroid/camera/one/v2/ZslOneCameraFactory.java
ndroid/camera/one/v2/commands/BasicPreviewCommandFactory.java
ndroid/camera/one/v2/commands/PreviewCommand.java
ndroid/camera/one/v2/commands/PreviewCommandFactory.java
ndroid/camera/one/v2/commands/ZslPreviewCommand.java
ndroid/camera/one/v2/commands/ZslPreviewCommandFactory.java
ndroid/camera/one/v2/commands/zsl/BasicPreviewCommandFactory.java
ndroid/camera/one/v2/commands/zsl/PreviewCommandFactory.java
ndroid/camera/one/v2/commands/zsl/ZslPreviewCommand.java
ndroid/camera/one/v2/commands/zsl/ZslPreviewCommandFactory.java
ndroid/camera/one/v2/common/BasicCameraFactory.java
|
| 417e1941bdb3738c0037032adfbc015ccc395064 |
15-Apr-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Add a memory pool for reusing direct bytebuffers." into ub-camera-haleakala
|
| de2c5f84c216d91a366d3361be78a8c8710bd65d |
09-Apr-2015 |
Paul Rohde <codelogic@google.com> |
Add a memory pool for reusing direct bytebuffers.
This should reduce GC's caused by releasing and reusing direct
bytebuffers for subsequent image captures and jpg encoding.
Bug: 20129797
Change-Id: I5dd2538bd3dbc77be1446564f537e7ec0fc56ec4
ndroid/camera/processing/imagebackend/ImageBackend.java
ndroid/camera/processing/imagebackend/TaskCompressImageToJpeg.java
ndroid/camera/processing/imagebackend/TaskJpegEncode.java
ndroid/camera/processing/imagebackend/TaskPreviewChainedJpeg.java
ndroid/camera/processing/memory/ByteBufferDirectPool.java
ndroid/camera/processing/memory/LruPool.java
ndroid/camera/processing/memory/LruResourcePool.java
ndroid/camera/processing/memory/SimpleLruResourcePool.java
|
| 9c6f9b8085c2752758e0f5633958fd17cfc9307e |
13-Apr-2015 |
Sascha Haeberling <haeberling@google.com> |
Add proper support for canceling sessions.
Bug: 19384186
Change-Id: I45b0262947dcd4257d54e706f3cffc69b6bd4bc9
ndroid/camera/CameraActivity.java
ndroid/camera/Storage.java
ndroid/camera/captureintent/state/StateReadyForCapture.java
ndroid/camera/captureintent/state/StateReviewingPicture.java
ndroid/camera/data/SessionItem.java
ndroid/camera/session/CaptureSessionImpl.java
ndroid/camera/session/CaptureSessionManager.java
ndroid/camera/session/CaptureSessionManagerImpl.java
ndroid/camera/session/PlaceholderManager.java
ndroid/camera/session/SessionNotifier.java
|
| 6a9e937e35091639211208960b36de1940a37c4d |
11-Apr-2015 |
zafir <zafir@google.com> |
Merge "Catch security exception and show error dialog." into ub-camera-haleakala
|
| efcd55e4573e6049090bdfaf4c645e83d30b6329 |
11-Apr-2015 |
zafir <zafir@google.com> |
Catch security exception and show error dialog.
Bug: 20159429
Change-Id: I180ca3d5582d6e5824adc6bdf248af686724ceba
ndroid/camera/one/v2/Camera2OneCameraOpenerImpl.java
|
| 9640ff98f5ea513e8665be92d75b454b0bf22435 |
11-Apr-2015 |
Alan Newberger <alann@google.com> |
Merge "Fix view recycling in filmstrip" into ub-camera-haleakala
|
| 5a0be52d3db2398cfe01d18adf779d9e443edf82 |
09-Apr-2015 |
Alan Newberger <alann@google.com> |
Fix view recycling in filmstrip
View recycling is pretty broken, with code put in for the old
camera preview in filmstrip being used to avoid recycling in all
cases. This looks like its been broken in a number of releases, but
less so due to a destructive removal of views during updates. I had
fixed that but it then exposed the issue that recycling wasn't occurring
elsewhere. This CL removes views from hierarchy, confirmed no more leaks
when capturing and when swiping through filmstrip.
Bug: 19970885
Change-Id: Ic63b9231bd24db0f44a99567278886eb0998d740
ndroid/camera/widget/FilmstripView.java
|
| e1bfecfb5efaa29419705b35706decece4985126 |
09-Apr-2015 |
I-Jong Lin <ijonglin@google.com> |
Add average priority speed to ImageBackend
Bug: 20129797
Create another priority level for ImageBackend so that
we have finer grain assignment of thread priority.
Change-Id: I291efeab8cf4be561c7d53c52fe13b64dc75f080
ndroid/camera/one/v2/errorhandling/FramerateJankDetector.java
ndroid/camera/processing/imagebackend/ImageBackend.java
ndroid/camera/processing/imagebackend/TaskImageContainer.java
|
| 40d3aad3972244f05888f03343cc1d23150532da |
09-Apr-2015 |
Paul Rohde <codelogic@google.com> |
Increase the thread priority of critical camera components.
This increases the priority of the frame server and metadata
response listeners that must respond immediatly to frames and
callbacks that are returned from the camera HAL. Both threads have
a tiny amout of code and callbacks that get run but must not block
or they will stall the preview on image capture. This appears to
only have limited impact on jank in the app.
Bug: 19076469
Change-Id: I41845e094feffb1ecd3be9613489a3d70f916580
ndroid/camera/async/HandlerFactory.java
ndroid/camera/one/v2/core/FrameServerFactory.java
ndroid/camera/one/v2/sharedimagereader/imagedistributor/ImageDistributorFactory.java
|
| 220539de13121614b92323fdc54213aa587f991e |
08-Apr-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Reduce software jpg encoding priority." into ub-camera-haleakala
|
| 22f00c96114a150ed75f02810a3fff1fa6461564 |
08-Apr-2015 |
Paul Rohde <codelogic@google.com> |
Reduce software jpg encoding priority.
This skews the time-to-jpg vs preview jank in favor of a smoother
preview after capturing an image compared to jpg encoding time.
This should remove some of the excessive jank present post-image
capture.
Bug: 19076469
Change-Id: I908ec91153268a0fc9eb3a8e0112dda5bd15a6fb
ndroid/camera/processing/imagebackend/ImageBackend.java
ndroid/camera/processing/imagebackend/ImageProcessorProxyListener.java
|
| 4f70ac0cc2624ed85f1ef2065a795ba0d2041fc7 |
07-Apr-2015 |
Senpo Hu <senpo@google.com> |
On non-Nexus device, don't show aspect ratio dialog.
Bug: 20101791
Change-Id: I569f0d235c27b87bf5275d7d8f8956162f6de7bf
ndroid/camera/app/FirstRunDialog.java
|
| f80bfbb58f6ddd0a1f428e0166334daebc5887ab |
06-Apr-2015 |
I-Jong Lin <ijonglin@google.com> |
Avoid Camera2 Contanimation in Kit-Kat, Part 2
Bug: 383307
Removed the run-time references to Camera2 API structures
within the face-detection instrumentation code.
Change-Id: Ib2e6acb74446c5abbbb572e28d8cc06f83f01a8f
ndroid/camera/stats/Camera2FaceProxy.java
ndroid/camera/stats/CaptureSessionStatsCollector.java
|
| fbc5a67362ce14668f18b81064956c963d8f98a2 |
06-Apr-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Defer the ZSL stream by 500 ms" into ub-camera-haleakala
|
| faa6c880d64300b135592af3b0ca62bcfab20531 |
03-Apr-2015 |
Sascha Haeberling <haeberling@google.com> |
Make sure a 0x0 size is not crashing summary filling.
Bug: 20036947
Change-Id: I56a39cd9bf65b84ca5d9820ad6738d16bbc4446e
ndroid/camera/settings/CameraSettingsActivity.java
|
| ffae1b53110ddae98b810bdb9a5c9dc210d96551 |
01-Apr-2015 |
Paul Rohde <codelogic@google.com> |
Defer the ZSL stream by 500 ms
This forces the preview to start before the ZSL stream is
attached, and then attaches the ZSL stream to the repeating
request after a 500ms delay to give the system time to allocate
the underlying buffers for the ZSL image readers.
Bug: 19076469
Change-Id: I75ea28ead5b009e0f65f5f00c0522bcb2219cb22
ndroid/camera/one/v2/SimpleOneCameraFactory.java
ndroid/camera/one/v2/ZslOneCameraFactory.java
ndroid/camera/one/v2/commands/zsl/BasicPreviewCommandFactory.java
ndroid/camera/one/v2/commands/zsl/PreviewCommandFactory.java
ndroid/camera/one/v2/commands/zsl/ZslPreviewCommand.java
ndroid/camera/one/v2/commands/zsl/ZslPreviewCommandFactory.java
ndroid/camera/one/v2/common/BasicCameraFactory.java
|
| bb2eeedb5567cf56790e094d5c894ab4ad215b16 |
02-Apr-2015 |
Senpo Hu <senpo@google.com> |
Merge "[CaptureIntent] Disable the shutter button after taking photo." into ub-camera-haleakala
|
| 42d1bb07b9c9c57b8b477a1f784e1eca9a57ac13 |
02-Apr-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Ignore TRIGGER_CANCEL when tracking AF state" into ub-camera-haleakala
|
| 6420374af54849ccd8544780f2079c2d4fe4eff5 |
02-Apr-2015 |
Puneet Lall <puneetl@google.com> |
Ignore TRIGGER_CANCEL when tracking AF state
Ignores AF state changes caused by the TRIGGER_CANCEL sent before AF
scans resulting from tap-to-focus.
Bug: 20036915
Change-Id: Iea4db57d5683f454dbf929d95af8fa0f0f419f92
ndroid/camera/one/v2/autofocus/FullAFScanCommand.java
|
| 6aca73ead6c02357b517383313cfec202767c651 |
02-Apr-2015 |
Senpo Hu <senpo@google.com> |
[CaptureIntent] Disable the shutter button after taking photo.
Disable the button immediately. The button will be
re-enabled when users press re-take button.
Bug: 19988700
Change-Id: I17088b858e43079bbf17f84fec252a7ba205f5d0
ndroid/camera/captureintent/resource/ResourceCaptureToolsImpl.java
|
| ef670bfd726c3b60cc8557fcff7963f119c10c62 |
02-Apr-2015 |
Sascha Häberling <haeberling@google.com> |
Merge "[CaptureIntent] Fix post-capture screen off-by-one pixel issue." into ub-camera-haleakala
|
| c2953af6223dafabce2f4809e725727377926787 |
01-Apr-2015 |
Senpo Hu <senpo@google.com> |
[CaptureIntent] Fix post-capture screen off-by-one pixel issue.
Bug: 19676505
Change-Id: Ifc9b8847f2194d73768e94d426f7ddc56d21f536
ndroid/camera/captureintent/CaptureIntentModuleUI.java
|
| d03edd0bad7f888200cdb3e060ac2013adb2dedc |
01-Apr-2015 |
Sascha Haeberling <haeberling@google.com> |
Merge "Make sure picture sizes are cached on start-up, if they are not already." into ub-camera-haleakala
|
| 35a69421972d22fcd627ca1702b5f65521ef8f67 |
01-Apr-2015 |
Sascha Haeberling <haeberling@google.com> |
Make sure picture sizes are cached on start-up, if they are not already.
Bug: 20015834
We cache picture sizes on disk, keyed by OS build version number. This makes sure
we update this cache if we start the app on an updated OS. Refocus requires these
sizes and loads them from cache.
Change-Id: Ib8aa9a37481b9a6be441122be41ab81917a5bd37
ndroid/camera/CameraActivity.java
|
| 36a1ad23bead41193e22442d3196e93a01ec7fe6 |
31-Mar-2015 |
Puneet Lall <puneetl@google.com> |
Add support for dynamic ring-buffer max size
Enables specifying a maximum ring-buffer size.
Setting the ring-buffer size to a value smaller than
ImageReader#getMaxImages reduces the number of android.media.Images held
open at a steady-state at application startup.
Because ImageReader images are allocated on-demand, this mitigates
stuttering in the preview-stream caused by massive allocations that
would otherwise occur as the ring buffer expands.
Bug: 19989536
Change-Id: I5623d0cd0da6542599f430f0dcbf97d581ec8df1
ndroid/camera/one/v2/ZslOneCameraFactory.java
ndroid/camera/one/v2/sharedimagereader/ZslSharedImageReaderFactory.java
ndroid/camera/one/v2/sharedimagereader/ringbuffer/DynamicRingBuffer.java
ndroid/camera/one/v2/sharedimagereader/ringbuffer/DynamicRingBufferFactory.java
|
| 7e120c2f0b886ab20c3328d69b61a514219b083a |
31-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Report jank for simple capture module cameras." into ub-camera-haleakala
|
| cee1a391dd8f5e0a57f6fae5b0ec3849f2a20871 |
31-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Report jank for simple capture module cameras.
This clarifies the jank statistics by explicitly including a
report if the jank detector is installed.
Bug: 19987252
Change-Id: Ie8e4b9826eb0e3152d7f8358728019d1a81e787b
ndroid/camera/one/v2/SimpleOneCameraFactory.java
ndroid/camera/one/v2/errorhandling/FramerateJankDetector.java
|
| 592c9e774a67ffd447ce75ded8e5926524936d18 |
31-Mar-2015 |
Sascha Haeberling <haeberling@google.com> |
Merge "Add support for new independent Lens Blur quality setting." into ub-camera-haleakala
|
| 45314d55fb25d19dc452be076ad3cbd3faaebe29 |
31-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Collect and log jank statistics in the Camera." into ub-camera-haleakala
|
| 4a0c6900b1aaa75cbd2546fdc26b08fcb9544e22 |
30-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Reduce startup preview jank by preventing Glide pre-allocation." into ub-camera-haleakala
|
| 46f8751da2fef488f6612b6f2f96e749595d3a2e |
26-Mar-2015 |
Sascha Haeberling <haeberling@google.com> |
Add support for new independent Lens Blur quality setting.
Bug: 19424875
This CL and its sibling do two things:
- Bring back the Lens Blur setting
- Populate the setting with up to three native picture resolutions.
- If needed, choose the default as being the second highest resolution.
(The list is not a full list, but filterd by what we show to the user).
- Make sure that after a new install a the default is set.
- Extra check in RefocusModule to make sure the default is set if old
setting is not valid. This is important for upgrades.
- To make the size logic re-usable, I wrapped it into a PictureSizeLoader
which also makes the CameraSettingsActivity a bit easier to read.
Change-Id: I53fcac8304f19be4f2c5ac053363f6805b933d89
ndroid/camera/CameraActivity.java
ndroid/camera/settings/AppUpgrader.java
ndroid/camera/settings/CameraPictureSizesCacher.java
ndroid/camera/settings/CameraSettingsActivity.java
ndroid/camera/settings/ListPreferenceFiller.java
ndroid/camera/settings/PictureSizeLoader.java
ndroid/camera/settings/SettingsUtil.java
ndroid/camera/util/Size.java
|
| a1a76c8ae8a0c6f0ffca427758c771ee77af2c59 |
30-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Collect and log jank statistics in the Camera.
This detects and logs sequences of camera timestamps where the
delta between the the current and last frame exceeds the
previous delta by a percentage threshold. This should only occur
when there are visible janks in the camera preview.
Bug: 19987252
Change-Id: Icced48be8232bba625aa501b2b1f5c111dbb5573
ndroid/camera/one/v2/ZslOneCameraFactory.java
ndroid/camera/one/v2/errorhandling/FramerateJankDetector.java
|
| 778a15a2bd60115c19d461e90523e8726ec62ea4 |
30-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Detect jank in the preview by measuring sensor timestamps." into ub-camera-haleakala
|
| 3bc38870104d065beb667f2c1274efea26fbc3af |
28-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Detect jank in the preview by measuring sensor timestamps.
This detects frames dropped by the camera (Which results in a
preview that skips and jitters) by tracking the delta between
frames and logging when that delta increases by more than 120%.
Bug: 19076469
Change-Id: Icc9f08174097587c850c06ae88007ce784775851
ndroid/camera/one/v2/ZslOneCameraFactory.java
ndroid/camera/one/v2/errorhandling/FramerateJankDetector.java
|
| 7456d9eb353f0d2f60e0c0b997e7413d53444b7b |
28-Mar-2015 |
zafir <zafir@google.com> |
Merge "Enable exposure compensation in capture intent." into ub-camera-haleakala
|
| cdc63303895d39e6f8b8dc60ba72e73d101ab401 |
28-Mar-2015 |
zafir <zafir@google.com> |
Enable exposure compensation in capture intent.
Bug: 19964499
Change-Id: I2f7d43aa421dba0fa873eaf47c46d955136662e5
ndroid/camera/CaptureModule.java
ndroid/camera/captureintent/state/StateOpeningCamera.java
|
| c14fe7dc7e8f61850cdf75c90825217ec6391726 |
28-Mar-2015 |
Sascha Haeberling <haeberling@google.com> |
Merge "Don't use undersore for variable names." into ub-camera-haleakala
|
| c9f44b6b9d0462e3fd5ed3f65270c36bea56d200 |
27-Mar-2015 |
Sascha Haeberling <haeberling@google.com> |
Don't use undersore for variable names.
Gets rid of the following compiler warning:
"use of '_' as an identifier might not be supported in releases after Java SE 8)"
Change-Id: Icb7eec3093acdd629f1e5b9994bd157a01fd8781
ndroid/camera/data/GlideFilmstripManager.java
|
| a3fee380ed9ab59ba5c6e2c3bf867db078d9ebe7 |
27-Mar-2015 |
Spike Sprague <spikuru@google.com> |
Merge "Sync Video torch setting with on-screen indicator" into ub-camera-haleakala
|
| 6ffdeac1670c8938d0331c89d9269b68f361d6fa |
27-Mar-2015 |
zafir <zafir@google.com> |
Hiding manual exposure button in video module.
Manual exposure button should never appear in non-camera modes.
This fix explicitly ensures that it will never appear in either
disabled or greyed out states in video module.
Bug: 19954837
Change-Id: Ia6730da9e3acaa62e2a30f594f344d86e2b25c69
ndroid/camera/VideoModule.java
ndroid/camera/app/CameraAppUI.java
|
| 030ea25812565f3e35d3e76942eaa79a751ff006 |
27-Mar-2015 |
Spike Sprague <spikuru@google.com> |
Sync Video torch setting with on-screen indicator
bug: 19954583
Change-Id: Ia491b63f31d81038ca8d8841b1f72f5ee76bb64f
ndroid/camera/widget/IndicatorIconController.java
|
| a4158d3452cee1ecb3a669c9821ba75033911680 |
27-Mar-2015 |
Andy Huibers <andyhuibers@google.com> |
Merge "Include HDR on/off correctly in event." into ub-camera-haleakala
|
| 86eb60744b65f90d1f710585007b300c11181fa3 |
27-Mar-2015 |
Andy Huibers <andyhuibers@google.com> |
Include HDR on/off correctly in event.
Bug: 19900458
Change-Id: Ifd9a585a61801cd1abe16bdbe47a56d96399b84e
ndroid/camera/CaptureModule.java
|
| e2529657eeb168588b9a47f5dc3bc87eb54f503d |
27-Mar-2015 |
Sascha Haeberling <haeberling@google.com> |
Make sure N4 uses the correct texture view transform.
Bug: 19948775
Change-Id: Ib489a5a66cf4a667914c8516f71f54219660fc09
ndroid/camera/TextureViewHelper.java
|
| 458cb4c551fe9114a11befe0a02450aa4414c7ed |
26-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Prevent countdown cancelation from starting the camera on pause.
Bug: 19937825
Change-Id: I13e774afe2da9342b9defcc0f1d304032d931b12
ndroid/camera/CaptureModule.java
|
| 70dbb60a3c7100e3fe412e0834e6a32c6ad884de |
26-Mar-2015 |
Senpo Hu <senpo@google.com> |
[CaptureIntent] Fix NPE crash when open camera.
Change-Id: I09cddae3ce935c92d6829924372a4082bb69f48a
ndroid/camera/captureintent/state/StateOpeningCamera.java
|
| 11daa1d9b88b4976758672b82550a09172027149 |
26-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Remove the setFocusRatio verbose logspam." into ub-camera-haleakala
|
| 863e9ac43fc1dbfaff3daf555a85b12d0c553385 |
26-Mar-2015 |
Sascha Haeberling <haeberling@google.com> |
Merge "Change CaptureSession.saveAndFinish to return a future for the URI." into ub-camera-haleakala
|
| 37036186326fb68c27063f97305405d3667a5eb3 |
25-Mar-2015 |
Sascha Haeberling <haeberling@google.com> |
Change CaptureSession.saveAndFinish to return a future for the URI.
Bug: 19665531
Most callers of saveAndFinish never provided the callback. In addition
it's unclear on what thread the callback is called. This cleans this up
a bit and moves the responsibility to the caller to decide on which
thread the URI should be received. Callers that don't care don't have to
do anything.
Also fixes a bug where we wouldn't even supply a URI for when there was
no placeholder.
Change-Id: I1a186b470d2cca8f34a674e9eb5c533fc01a4409
ndroid/camera/CaptureModule.java
ndroid/camera/captureintent/CaptureIntentSession.java
ndroid/camera/one/v2/OneCameraImpl.java
ndroid/camera/one/v2/OneCameraZslImpl.java
ndroid/camera/processing/imagebackend/TaskCompressImageToJpeg.java
ndroid/camera/session/CaptureSession.java
ndroid/camera/session/CaptureSessionImpl.java
|
| 15001b3d8e1f8f2ce37b7cb847b1d0606e936f15 |
26-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Remove the setFocusRatio verbose logspam.
Bug: 19931564
Change-Id: Ib4d9768a95e47879f945f9a869ce1631d43cbbc8
ndroid/camera/ui/focus/FocusController.java
|
| 6dced729a2b3416a3399a744ea188d5e5d4331d3 |
25-Mar-2015 |
Sascha Haeberling <haeberling@google.com> |
Merge "Catch HAL error that prevents retrieval of resolutions." into ub-camera-haleakala
|
| 9a532be5b1e06603f4374f5e106f04df3283de25 |
25-Mar-2015 |
Sascha Häberling <haeberling@google.com> |
Merge "Cancel in-progress capture when paused" into ub-camera-haleakala
|
| 3ad9c9035f8be50f6b2ef8cac9943045f7cf8a74 |
24-Mar-2015 |
Sascha Haeberling <haeberling@google.com> |
Catch HAL error that prevents retrieval of resolutions.
Bug: 19899007
Change-Id: I822510c03ecc1d48f607bf8f765831f1a39e3074
ndroid/camera/CaptureModule.java
ndroid/camera/captureintent/state/StateStartingPreview.java
ndroid/camera/one/v2/Camera2OneCameraOpenerImpl.java
ndroid/camera/one/v2/OneCameraCharacteristicsImpl.java
ndroid/camera/one/v2/OneCameraFactory.java
ndroid/camera/one/v2/common/PictureSizeCalculator.java
|
| 4fe6f70c5def72185769917ec17734f61bb482be |
25-Mar-2015 |
Puneet Lall <puneetl@google.com> |
Cancel in-progress capture when paused
Change exception-handling behavior to cancel an in-progress capture (via
CaptureSession#cancel()) if the app is paused before any image is
acquired from the device. Previous behavior launched an error dialog to the
user.
Bug: 19913612
Change-Id: If40dceabc4adbd901fbdac1a0d97f805389c778d
ndroid/camera/one/v2/photo/PictureTakerImpl.java
|
| d6780314422f6cfa6e905f52e2744d7e45bd3b66 |
25-Mar-2015 |
Alan Newberger <alann@google.com> |
Suppress HDR 16:9 on N4
Add logic to CaptureModule HardwareSpec to avoid
support for HDR if in 16:9. This takes care of UI,
also wire HardwareSpec into OneCameraCaptureSetting
to ensure we only use the stored setting when HDR
is supported.
Bug: 19697027
Change-Id: Idcd02ea9910974d8afda5f81c45eb928b9df89af
ndroid/camera/CaptureModule.java
ndroid/camera/captureintent/state/StateOpeningCamera.java
ndroid/camera/one/OneCameraCaptureSetting.java
|
| 6d58416b7d82f4755246e671b08d300b5b5496ea |
25-Mar-2015 |
zafir <zafir@google.com> |
Merge "Show error dialog when camera is unavailable." into ub-camera-haleakala
|
| 8d84a7c1bb9df49aa21396f98b371875c816ed42 |
25-Mar-2015 |
zafir <zafir@google.com> |
Show error dialog when camera is unavailable.
Bug: 19888394
Change-Id: I6d52d1be7ecac6ece85845bc3f06b1c7e0963d6f
ndroid/camera/CaptureModule.java
|
| 29d61c9ac3a0343cabed508e1c56cad820a1af18 |
25-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Reduce startup preview jank by preventing Glide pre-allocation.
Several systraces and app runs seem to show that removing the
Glide bitmap pre-allocation for full size images slightly reduces
the startup preview jank on the N6. There did not appear to be
any significant regressions in the filmstrip jank.
Bug: 19076469
Change-Id: Ia01d7d09eedfc6ac78611c0f433cdcad8c15c559
ndroid/camera/CameraActivity.java
|
| d10cbf43dc137eebde6970445dbd8becc1c27959 |
25-Mar-2015 |
Senpo Hu <senpo@google.com> |
Merge "[CaptureIntent] Log CaptureDone event to Clearcut." into ub-camera-haleakala
|
| 8aefbc59ce6176f27efd47f4a568117bd4d9ea77 |
25-Mar-2015 |
Senpo Hu <senpo@google.com> |
[CaptureIntent] Log CaptureDone event to Clearcut.
Bug: 19035503
Change-Id: I786f834beb45d519047aaa06a7838720c0188459
ndroid/camera/captureintent/CaptureIntentModule.java
ndroid/camera/captureintent/event/EventTapOnShutterButton.java
ndroid/camera/captureintent/event/EventTimerCountDownToZero.java
ndroid/camera/captureintent/resource/ResourceCaptureTools.java
ndroid/camera/captureintent/resource/ResourceCaptureToolsImpl.java
ndroid/camera/captureintent/resource/ResourceOpenedCamera.java
ndroid/camera/captureintent/resource/ResourceOpenedCameraImpl.java
ndroid/camera/captureintent/state/StateOpeningCamera.java
ndroid/camera/captureintent/state/StateReadyForCapture.java
ndroid/camera/captureintent/state/StateStartingPreview.java
|
| 107171c5ac8bfe6ba65176d2ca9ce878e16309a2 |
25-Mar-2015 |
Sascha Haeberling <haeberling@google.com> |
DO NOT MERGE Disable ZSL for N5.
Bug: 19565931
Data showed the preview freeze is happening and WAR is not working.
Change-Id: I9e49bfe7cdf447ef5fe57a1a393ba8d96d1b051b
ndroid/camera/one/config/OneCameraFeatureConfigCreator.java
|
| c2908a7aa1a4effb1191e551cc7ea215293f8614 |
24-Mar-2015 |
Puneet Lall <puneetl@google.com> |
Send AF_TRIGGER_CANCEL before every AF_TRIGGER_START
Implements a workaround for bug on N6 in which the camera driver may get
stuck if two adjacent AF_TRIGGER_START are sent in a sequence.
Bug: 19892741
Change-Id: I729d7a5ca865cd5b3ba8ddd5862e422470c16671
ndroid/camera/one/v2/autofocus/FullAFScanCommand.java
|
| 899a750cc80afebfeca13146d714b049c2a1775e |
24-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Fix the camera2 build and import the correct Android metadata." into ub-camera-haleakala
|
| b10d44a37d33f6964a068adce135bfa57c4f0bb9 |
24-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Fix the camera2 build and import the correct Android metadata.
Change-Id: Id7f6d630ec7eb8db2e43c97025b5cbb172ed9192
ndroid/camera/one/v2/OneCameraCharacteristicsImpl.java
ndroid/camera/one/v2/common/StatisticsFaceDetectMode.java
|
| 28a98f5cbadee3589e3698f3653301351e46d200 |
24-Mar-2015 |
zafir <zafir@google.com> |
Merge "Hiding manual exposure button in N6. The button was previously disabled." into ub-camera-haleakala
|
| bb27cc628ee84737c72b0368b8b27a5bf8609b56 |
24-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Read and enable face detection when available in capture module.
Bug: 19715640
Change-Id: I719cc92800a73ec3eaa27044fda09f64e1b9d946
ndroid/camera/one/OneCameraCharacteristics.java
ndroid/camera/one/v1/OneCameraCharacteristicsImpl.java
ndroid/camera/one/v2/OneCameraCharacteristicsImpl.java
ndroid/camera/one/v2/SimpleOneCameraFactory.java
ndroid/camera/one/v2/common/BasicCameraFactory.java
ndroid/camera/one/v2/common/ControlModeSelector.java
ndroid/camera/one/v2/common/ControlSceneModeSelector.java
ndroid/camera/one/v2/common/HdrSettingBasedControlMode.java
ndroid/camera/one/v2/common/HdrSettingBasedSceneMode.java
ndroid/camera/one/v2/common/StatisticsFaceDetectMode.java
ndroid/camera/one/v2/face/FaceDetect.java
|
| 57c889d4b88517dd0996547dbae4f314c2a3fcdf |
24-Mar-2015 |
zafir <zafir@google.com> |
Hiding manual exposure button in N6. The button was previously disabled.
Bug: 18523154
Change-Id: Id08cef46fc4a67e50ce4b1acd185c5ae6efa94ad
ndroid/camera/CaptureModule.java
ndroid/camera/app/CameraAppUI.java
|
| 55542d27c0b0631879c970ffaaa1ba2fa6047cce |
24-Mar-2015 |
Andy Huibers <andyhuibers@google.com> |
Merge "Limit maximum display size to prevent out of memory problems." into ub-camera-haleakala
|
| 0ee271c0d50bffa5f83177c74fbcb6806004591f |
24-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Limit maximum display size to prevent out of memory problems.
Change-Id: Id681ab9f66d6a5f10f9df8fb6ae57ce90f5e25d8
ndroid/camera/CameraActivity.java
ndroid/camera/data/GlideFilmstripManager.java
|
| 6bb2326e658562bbffb8ca5b8d33e84062e519d9 |
24-Mar-2015 |
I-Jong Lin <ijonglin@google.com> |
Merge "Add Faces and Lens Dist. info to photoCaptureDone" into ub-camera-haleakala
|
| 90db65676b53f591ca4333c35768cd7e2c8d49ed |
24-Mar-2015 |
Senpo Hu <senpo@google.com> |
Merge "OneCameraOpener should inform ActiveCameraDeviceTracker about camera open." into ub-camera-haleakala
|
| 75384f97d5db98182503c9d76dae98357470e000 |
23-Mar-2015 |
Senpo Hu <senpo@google.com> |
Merge "Clean up HDR+ button state logic." into ub-camera-haleakala
|
| 00562dd0a8451eda80815b3d8fdcb8075e4b9db6 |
23-Mar-2015 |
Senpo Hu <senpo@google.com> |
OneCameraOpener should inform ActiveCameraDeviceTracker about camera open.
Therefore, people use OneCameraOpener to open a camera don't need to worry
about ActiveCameraDeviceTracker.
To make people don't need to depend on CameraActivity/AppController, move
setting scope generation into two utility methods:
* SettingsManager.getCameraSettingScope()
* SettingsManager.getModuleSettingScope()
Bug: 19892712
Change-Id: I04caae24ea72a41d7d8e0786a99912098c2cf1ef
ndroid/camera/CameraActivity.java
ndroid/camera/CaptureModule.java
ndroid/camera/captureintent/state/StateOpeningCamera.java
ndroid/camera/captureintent/stateful/StateMachineImpl.java
ndroid/camera/one/OneCameraModule.java
ndroid/camera/one/v2/Camera2OneCameraOpenerImpl.java
ndroid/camera/settings/AppUpgrader.java
ndroid/camera/settings/CameraFacingSetting.java
ndroid/camera/settings/SettingsManager.java
|
| ad529c3073ce16c1cc2861f33658132b87bfea95 |
18-Mar-2015 |
I-Jong Lin <ijonglin@google.com> |
Add Faces and Lens Dist. info to photoCaptureDone
Added the plumbing for getting values off of the
TotalCaptureResult and putting them into the
photoCaptureDoneEvent.
Bug: 19805467
Change-Id: Id0d16623ffe7eef78b23fd15a4edfeeca5a66eaa
ndroid/camera/CaptureModule.java
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.java
ndroid/camera/processing/imagebackend/TaskCompressImageToJpeg.java
ndroid/camera/stats/CaptureSessionStatsCollector.java
|
| 7ecd24520b56ec39766bbbbc12cbfa46a1c9b060 |
23-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Compute the max texture size from the EGL context" into ub-camera-haleakala
|
| d67aae7d87998b394ce66d1d85267f438158cd0d |
23-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Clamp pixels and bounds for filmstrip images." into ub-camera-haleakala
|
| 41783f006b435d247459c1a781ec39d2a87b7287 |
23-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Compute the max texture size from the EGL context
Initialize and read the GL_MAX_TEXTURE_SIZE property by opening
and initializing an Open GL display, context, and surface and
using the initialized objects to read out the texture size.
Bug: 19871547
Change-Id: If74045e00d99e7268b78dcca0ad0a22f4d581f0e
ndroid/camera/CameraActivity.java
ndroid/camera/data/GlideFilmstripManager.java
|
| 46aac2cd824dceb30afebf1c8da955e4fa55ac5c |
20-Mar-2015 |
Senpo Hu <senpo@google.com> |
Clean up HDR+ button state logic.
CameraAppUI#applyModuleSpecs should honor whatever HardwareSpec and
BottomBarUISpec provided by modules. UI should not change behavior by
poking setting by itself. This can cause huge pain when debugging.
Bug: 19657871
Change-Id: Ief153f6c92a12ab1a72732a7a0908059fd91167e
ndroid/camera/CaptureModule.java
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/hardware/HardwareSpecImpl.java
ndroid/camera/module/ModulesInfo.java
ndroid/camera/one/config/OneCameraFeatureConfig.java
|
| 689348be49bf1e5e5f705d55915f87292d9506ed |
23-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Clamp pixels and bounds for filmstrip images.
This change does a more extensive set of checks and constraints
based on the maximum area (to prevent jank) and adds clamping for
the bounds of the image based on the maximum supported texture
size of the device to prevent blank frames.
Bug: 19871547
Change-Id: Ib33e6e591638fb4dfefb60ddea488818e985495d
ndroid/camera/CameraActivity.java
ndroid/camera/data/FilmstripItemBase.java
ndroid/camera/data/GlideFilmstripManager.java
ndroid/camera/data/PhotoItem.java
ndroid/camera/data/VideoItem.java
|
| 5aaf7c89b7debfd38e5f27f721176a7cda47f8eb |
23-Mar-2015 |
Alan Newberger <alann@google.com> |
Check for null on N5 resolution upgrade
In case of first run with no existing resolution setting, ignore
the upgrade step.
Bug: 19889422
Change-Id: I518eaf089468c8255dedfea371f68763d62d777a
ndroid/camera/settings/AppUpgrader.java
|
| 1435b30dd0e683b9697ebf5b07b6f5da54ac57cc |
20-Mar-2015 |
zafir <zafir@google.com> |
Merge "Display error dialog and log error when video recording fails to start." into ub-camera-haleakala
|
| b66922aa8e3ca5c3e95d6b72eceabca9ad84e16b |
20-Mar-2015 |
I-Jong Lin <ijonglin@google.com> |
Merge "Catch memory allocation errors JPEG ImageTask" into ub-camera-haleakala
|
| b7eb9e8272cd43171cee142c371b5b1c421d9795 |
20-Mar-2015 |
zafir <zafir@google.com> |
Display error dialog and log error when video recording fails to start.
Bug: 19814676
Change-Id: Iec3fde247720db4471da8f40a5c0f55d706d52cd
ndroid/camera/VideoModule.java
|
| 9a70cc71fc487f4af8e6652e55b5675c8e4d6223 |
20-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Re-arrange camera initialization." into ub-camera-haleakala
|
| 1d84d7107686aa428ee2eeb1a8caf0ea3e43b1df |
12-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Re-arrange camera initialization.
This change re-arranges several things to make it possible to know
the CameraId you are about to open before you actually open the
camera device. It also adds an explicit CameraId class for handling
both legacy and camera2 id comparisons, an active camera tracker,
and moves the camera id query mechanism into a hardware manager
class in prep for the subsequent camera release.
Bug: 19679820
Change-Id: I4c09b9a12a1ea5badcac3a6a073a56764f9a7eba
ndroid/camera/CameraActivity.java
ndroid/camera/CaptureModule.java
ndroid/camera/PhotoModule.java
ndroid/camera/TextureViewHelper.java
ndroid/camera/app/AppController.java
ndroid/camera/app/CameraController.java
ndroid/camera/app/CameraProvider.java
ndroid/camera/app/FirstRunDialog.java
ndroid/camera/captureintent/CaptureIntentModule.java
ndroid/camera/captureintent/resource/ResourceConstructed.java
ndroid/camera/captureintent/resource/ResourceConstructedImpl.java
ndroid/camera/captureintent/resource/ResourceOpenedCamera.java
ndroid/camera/captureintent/resource/ResourceOpenedCameraImpl.java
ndroid/camera/captureintent/state/StateForegroundWithSurfaceTexture.java
ndroid/camera/captureintent/state/StateOpeningCamera.java
ndroid/camera/captureintent/state/StateReadyForCapture.java
ndroid/camera/captureintent/state/StateStartingPreview.java
ndroid/camera/device/ActiveCameraDeviceTracker.java
ndroid/camera/device/Camera2ActionProvider.java
ndroid/camera/device/Camera2Actions.java
ndroid/camera/device/CameraDeviceActionProvider.java
ndroid/camera/device/CameraDeviceKey.java
ndroid/camera/device/CameraDeviceLifecycle.java
ndroid/camera/device/CameraId.java
ndroid/camera/device/LegacyCameraActionProvider.java
ndroid/camera/device/LegacyCameraActions.java
ndroid/camera/device/MultiCameraDeviceLifecycle.java
ndroid/camera/device/PortabilityCameraActionProvider.java
ndroid/camera/device/PortabilityCameraActions.java
ndroid/camera/device/SingleDeviceActions.java
ndroid/camera/device/SingleDeviceStateMachine.java
ndroid/camera/module/ModulesInfo.java
ndroid/camera/one/OneCameraCaptureSetting.java
ndroid/camera/one/OneCameraManager.java
ndroid/camera/one/OneCameraModule.java
ndroid/camera/one/OneCameraOpener.java
ndroid/camera/one/v1/LegacyOneCameraManagerImpl.java
ndroid/camera/one/v1/LegacyOneCameraOpenerImpl.java
ndroid/camera/one/v1/OneCameraManagerImpl.java
ndroid/camera/one/v2/Camera2OneCameraManagerImpl.java
ndroid/camera/one/v2/Camera2OneCameraOpenerImpl.java
ndroid/camera/one/v2/OneCameraManagerImpl.java
ndroid/camera/settings/CameraSettingsActivity.java
ndroid/camera/settings/ResolutionSetting.java
ndroid/camera/settings/ResolutionUtil.java
ndroid/camera/settings/SettingObserver.java
ndroid/camera/settings/SettingsManager.java
|
| 12df9856109645b9f874d3f007c100ed7130f94c |
20-Mar-2015 |
I-Jong Lin <ijonglin@google.com> |
Catch memory allocation errors JPEG ImageTask
Bug: 19354210
Although rare, we should fail gracefully in the case
where we cannot allocate a large memory buffer in
TaskCompressImageToJpeg.
Change-Id: I1f16ba16a785b32869030a5f8ec2116fbbc900d3
ndroid/camera/processing/imagebackend/TaskCompressImageToJpeg.java
|
| 976bba4cfffb0089d4b7c61e16b90f506dbf1a2b |
20-Mar-2015 |
Sascha Haeberling <haeberling@google.com> |
Rename CaptureSession#finalize to not collide with Object#finalize.
Bug: 19855781
Change-Id: Ie32024a9d2b7c04a27cc1ff7eee62df0e6857031
ndroid/camera/captureintent/CaptureIntentSession.java
ndroid/camera/session/CaptureSession.java
ndroid/camera/session/CaptureSessionImpl.java
ndroid/camera/session/CaptureSessionManager.java
ndroid/camera/session/CaptureSessionManagerImpl.java
|
| 826267d28d6a03cd925a5aa1d800de486fdadcd9 |
19-Mar-2015 |
Spike Sprague <spikuru@google.com> |
Merge "Hide flash icon if not supported by camera hardware." into ub-camera-haleakala
|
| 34cf891d6962f03b38f6e0048c91cbfe7dc504df |
19-Mar-2015 |
Spike Sprague <spikuru@google.com> |
Hide flash icon if not supported by camera hardware.
bug: 19199856
Change-Id: I5e4f7842c61e6c260b7a35c455f2caaa4d8e5e53
ndroid/camera/app/CameraAppUI.java
|
| 9ef3768c26c67ba4c1b97b2151d9456b19b53ddb |
18-Mar-2015 |
Spike Sprague <spikuru@google.com> |
don't mess with the options buttons in transistionToCapture and transitionToCancel
bug: 19366720
Change-Id: I0620d1ceb80c2c45de95336be18ccf212ace6f69
ndroid/camera/app/CameraAppUI.java
|
| c36bcac14302b1bb3d7a316f221685d4d6ad95cb |
17-Mar-2015 |
I-Jong Lin <ijonglin@google.com> |
Pass crop and implement crop in JPEG ImageSaver
Bug: 19660460
Allows for the JpegImageBackendSaver to accept crop
regions and then implements this crop within the
JPEG compression task.
Change-Id: I165b272376c3d5c919c1c41b55bf0b8e551520be
ndroid/camera/one/v2/imagesaver/JpegImageBackendImageSaver.java
ndroid/camera/processing/imagebackend/TaskCompressImageToJpeg.java
ndroid/camera/processing/imagebackend/TaskImageContainer.java
ndroid/camera/processing/imagebackend/TaskJpegEncode.java
|
| 0994d56562a3814e08fd62696e571a505a39a2be |
17-Mar-2015 |
Andy Huibers <andyhuibers@google.com> |
Merge "Add processing time to capture done event for CaptureModule captures." into ub-camera-haleakala
|
| 599ebc0d346e6ac920ef45f051a97f0e5334a721 |
17-Mar-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Detect and log missing images" into ub-camera-haleakala
|
| 29ef6293a9d3ff61b1e32fd61594fb60fd3f2e36 |
17-Mar-2015 |
Puneet Lall <puneetl@google.com> |
Detect and log missing images
Adds logic to detect and log when the camera framework
fails to deliver an image, but successfully delivers
subsequent images.
Bug: 19430369
Change-Id: I404888882879ac021ba84d725732e9c9a9c61f05
ndroid/camera/one/v2/sharedimagereader/imagedistributor/ImageDistributorFactory.java
ndroid/camera/one/v2/sharedimagereader/imagedistributor/ImageDistributorImpl.java
|
| c64fce911ef412068bc73c58230fd389a6c00d1a |
17-Mar-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Optimize ZSL for auto-flash mode" into ub-camera-haleakala
|
| 5ca7d2642881f3cf06adb2532e0d5950524a34f4 |
07-Mar-2015 |
Puneet Lall <puneetl@google.com> |
Optimize ZSL for auto-flash mode
Cache the most recent converged AE state to enable more
auto-flash pictures to be taken with zero shutter lag.
Bug: 19151363
Change-Id: I7d4bd5a67d4cddb7a1f733844e1a080acfacf7f4
ndroid/camera/one/v2/OneCameraImpl.java
ndroid/camera/one/v2/OneCameraZslImpl.java
ndroid/camera/one/v2/SimpleOneCameraFactory.java
ndroid/camera/one/v2/ZslOneCameraFactory.java
ndroid/camera/one/v2/camera2proxy/AndroidCaptureResultProxy.java
ndroid/camera/one/v2/camera2proxy/AndroidTotalCaptureResultProxy.java
ndroid/camera/one/v2/camera2proxy/CameraDeviceProxy.java
ndroid/camera/one/v2/camera2proxy/CaptureResultProxy.java
ndroid/camera/one/v2/camera2proxy/TotalCaptureResultProxy.java
ndroid/camera/one/v2/common/TotalCaptureResultResponseListener.java
ndroid/camera/one/v2/core/RequestTemplate.java
ndroid/camera/one/v2/core/ResponseListeners.java
ndroid/camera/one/v2/core/ResponseManager.java
ndroid/camera/one/v2/photo/FlashBasedPhotoCommand.java
ndroid/camera/one/v2/photo/MetadataFuture.java
ndroid/camera/one/v2/photo/PictureTakerFactory.java
ndroid/camera/one/v2/photo/ZslPictureTakerFactory.java
ndroid/camera/one/v2/photo/zsl/AutoFlashZslImageFilter.java
ndroid/camera/one/v2/photo/zsl/ZslImageCaptureCommand.java
|
| d0d01c38dad9a7d2a4868be29618f8fcec984e31 |
17-Mar-2015 |
Sascha Haeberling <haeberling@google.com> |
Merge "Fix bug where return value for thumbnail can be null." into ub-camera-haleakala
|
| 70fea35dbda91e0a3f8489d325afd5856a547a6e |
16-Mar-2015 |
Puneet Lall <puneetl@google.com> |
Optimize shot-to-shot time for camera2 legacy
Optimize shot-to-shot time for devices which only support
the camera2 LEGACY api by releasing the exclusive lock on the
FrameServer as soon as each image is exposed, allowing the user
to immediately submit a request for the next shot.
Bug: 19365933
Change-Id: I8935611fae666dde1fb3a1c4aecf95c1cc5a7ef8
ndroid/camera/one/v2/photo/SimpleImageCaptureCommand.java
|
| d2672f692de547859664be4e7f6950f8f9b0bc89 |
17-Mar-2015 |
Andy Huibers <andyhuibers@google.com> |
Add processing time to capture done event for CaptureModule captures.
Bug: 18913439
Bug: 19035503
Change-Id: Ib3768d93a2240ccfbf5f5a750b66939c6930ed0e
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.java
ndroid/camera/processing/imagebackend/TaskCompressImageToJpeg.java
ndroid/camera/stats/CaptureSessionStatsCollector.java
|
| 6d3c6c5208314e2a120ae6b8d4a99a9f925b0f20 |
17-Mar-2015 |
Sascha Haeberling <haeberling@google.com> |
Fix bug where return value for thumbnail can be null.
Bug: 19779596
Change-Id: I4ccf39b0e19956c6873868bc02be836b547fa1c5
ndroid/camera/data/VideoItem.java
|
| 14b9f1fc0b273bbfb79fde19d699e5db8fcf95f6 |
16-Mar-2015 |
I-Jong Lin <ijonglin@google.com> |
Merge "Add PhotoCaptureEvent to Capture Module" into ub-camera-haleakala
|
| e7c53cc907f5bb40c8d112830d12ac494e4c68c5 |
12-Mar-2015 |
I-Jong Lin <ijonglin@google.com> |
Add PhotoCaptureEvent to Capture Module
Adds a CaptureSession collector class so that
we can combine stats information from both the
CaptureModule and ImageBackend to create a
complete PhotoCaptureDone event.
Bug: 19035503
Change-Id: Ide5f708c5f3efb710fa704f3f30c52ac7a8c3fe4
ndroid/camera/CaptureModule.java
ndroid/camera/captureintent/CaptureIntentSession.java
ndroid/camera/processing/imagebackend/TaskCompressImageToJpeg.java
ndroid/camera/session/CaptureSession.java
ndroid/camera/session/CaptureSessionImpl.java
ndroid/camera/stats/CaptureSessionStatsCollector.java
|
| 0f40400dbed72f89fafbedd06734759abb852639 |
14-Mar-2015 |
Senpo Hu <senpo@google.com> |
[CaptureIntent] clean up extra PreviewAreaChangedListener.
A simple cleanup that we register two PreviewAreaChangedListener for
CaptureIntentModuleUI which is kind of silly. This CL consolidate it
into one.
Change-Id: I1c5b29a77021a21cd6d8c023b4b98906430c305e
ndroid/camera/captureintent/CaptureIntentModule.java
ndroid/camera/captureintent/CaptureIntentModuleUI.java
|
| 4638d752066a96fcb98b3d3bc6ccf6233b9ee230 |
13-Mar-2015 |
Sascha Haeberling <haeberling@google.com> |
Merge "Don't take picture if camera is closed." into ub-camera-haleakala
|
| 0f0329889f69182648fe8f535335e48978d63cc0 |
06-Mar-2015 |
I-Jong Lin <ijonglin@google.com> |
Automated ImageProcessorListener registration
I've added the ImageConsumer interface and implementation
in ImageBackend to support the automatic registering and
unregistering of the ImageProcessingListener. This
new functionality avoids the issues of reference leaking,
so that the transient listener implementations are NOT
held by the image backend. Also more general purpose
interface has been created such that any passed Runnable
will be executed when the associated set of tasks that have
been enqueued with ImageBackend::ReceiveImage have finished
processing. This functionality solves the referencing
leaking issue of ImageProcessingListener in the current
implementation. Also, removed all references to Main
thread executor so that ImageBackend is not a direct
suspect in jank issues.
Bug: 19517380
Change-Id: I806582f13157030ed6bc23ad70a4efd93339d9ff
ndroid/camera/one/v2/imagesaver/JpegImageBackendImageSaver.java
ndroid/camera/one/v2/imagesaver/YuvImageBackendImageSaver.java
ndroid/camera/processing/imagebackend/ImageBackend.java
ndroid/camera/processing/imagebackend/ImageConsumer.java
ndroid/camera/processing/imagebackend/ImageProcessorProxyListener.java
ndroid/camera/processing/imagebackend/ImageShadowTask.java
ndroid/camera/processing/imagebackend/TaskImageContainer.java
|
| 46a5b5e7a933e510e0ab634e3f222aeff7de7a76 |
13-Mar-2015 |
Sascha Haeberling <haeberling@google.com> |
Don't take picture if camera is closed.
Bug: 19712310
Change-Id: Iaaae7a1c784e4149ca837e9bda496f734be56890
ndroid/camera/CaptureModule.java
|
| fddf523fda6ea8af438ef476c991412fd96f3cc7 |
13-Mar-2015 |
I-Jong Lin <ijonglin@google.com> |
Merge "Implementation of Crop in Thumbnail Creation" into ub-camera-haleakala
|
| 7b68d60653d5022a142aa2369e25f35b7b4b074f |
13-Mar-2015 |
Puneet Lall <puneetl@google.com> |
Fix build
Change-Id: I36c5f2bf963bfe7d63941777ecedce7354aa0212
ndroid/camera/one/v2/autofocus/PointMeteringParameters.java
|
| fd761634a6921694aa473fc01a14172c30a5c949 |
12-Mar-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Reset existing AF scan upon tap-to-focus" into ub-camera-haleakala
|
| 7abd8f51ff9c6764966e3ae879f3ecc4039987fd |
12-Mar-2015 |
zafir <zafir@google.com> |
Merge "Disable manual exposure button in HDR+ mode." into ub-camera-haleakala
|
| 0409c8594fd1629ee07df827cf0d7a0f336b9326 |
11-Mar-2015 |
zafir <zafir@google.com> |
Disable manual exposure button in HDR+ mode.
Bug: 19641530
Change-Id: I70d47a678eb0c5b77040ff071af14dd35c1e73a8
ndroid/camera/ButtonManager.java
ndroid/camera/CaptureModule.java
ndroid/camera/app/CameraAppUI.java
|
| 725059d4d1ab78b5ffaa99cbba397b2dafc717d2 |
10-Mar-2015 |
I-Jong Lin <ijonglin@google.com> |
Implementation of Crop in Thumbnail Creation
Propogated the crop information into the thumbnail creation
code. Required generalization of the thubmnail creator to
accept a crop region, and implementation of consistent
handling of the crop parameter into the TaskInfo.
Tests for this newer functionality are available in ag/653259.
Bug: 19323062
Change-Id: I135ae16459eedf7f2631925526c0e64184f6a859
ndroid/camera/processing/imagebackend/TaskChainedCompressImageToJpeg.java
ndroid/camera/processing/imagebackend/TaskCompressImageToJpeg.java
ndroid/camera/processing/imagebackend/TaskConvertImageToRGBPreview.java
ndroid/camera/processing/imagebackend/TaskImageContainer.java
ndroid/camera/processing/imagebackend/TaskPreviewChainedJpeg.java
|
| 7b132e3a555529a3add373fe169a1eca5cf006e8 |
12-Mar-2015 |
Spike Sprague <spikuru@google.com> |
If JPEG data already has some EXIF data, carry it over during EXIF population
bug: 16961102
Change-Id: I887726dda0af62c7eaecbde4297079fc447c39fa
ndroid/camera/processing/imagebackend/TaskCompressImageToJpeg.java
|
| 249a22cf1f87d3b306c7dfac08e7ef5d92ae4323 |
12-Mar-2015 |
Spike Sprague <spikuru@google.com> |
add null check protections to ExifUtil to prevent Nexus 4 crashes
bug: 19701200
Change-Id: Icea7d5d57e5c692d214745f83efd4b06f3517740
ndroid/camera/util/ExifUtil.java
|
| c44b7c47dbb8f53a6401285c4ca9218326d21a7e |
10-Mar-2015 |
Puneet Lall <puneetl@google.com> |
Reset existing AF scan upon tap-to-focus
* Interrupts existing, in-progress AF scans upon tap-to-focus
(triggerFocusAndMeterAtPoint).
* Removes pending delayed-af-resets upon subsequent tap-to-focus
to fix the case in which a user triggers AF twice within <3 seconds
which previously resulted in the AF mode returning to
continuous_picture shortly after the second AF scan.
* Removes dependencies on CameraUtil and static Settings3A
methods, and refactors FrameServerImpl to enable unit-testing.
Bug: 18935538
Change-Id: I0c2d5d92d2b07efdc11de8388e42b931d3ea89d0
ndroid/camera/async/ResettingDelayedExecutor.java
ndroid/camera/one/Settings3A.java
ndroid/camera/one/v2/AutoFocusHelper.java
ndroid/camera/one/v2/SimpleOneCameraFactory.java
ndroid/camera/one/v2/ZslOneCameraFactory.java
ndroid/camera/one/v2/autofocus/AEMeteringRegion.java
ndroid/camera/one/v2/autofocus/AFMeteringRegion.java
ndroid/camera/one/v2/autofocus/AFScanHoldResetCommand.java
ndroid/camera/one/v2/autofocus/GlobalMeteringParameters.java
ndroid/camera/one/v2/autofocus/ManualAutoFocusFactory.java
ndroid/camera/one/v2/autofocus/ManualAutoFocusImpl.java
ndroid/camera/one/v2/autofocus/MeteringParameters.java
ndroid/camera/one/v2/autofocus/PointMeteringParameters.java
ndroid/camera/one/v2/commands/CameraCommandExecutor.java
ndroid/camera/one/v2/commands/ResettingRunnableCameraCommand.java
ndroid/camera/one/v2/common/BasicCameraFactory.java
ndroid/camera/one/v2/core/FrameServerImpl.java
ndroid/camera/one/v2/core/TagDispatchCaptureSession.java
ndroid/camera/util/CameraUtil.java
|
| ccb0c17a104801a994c901d1c89c9d99005782ed |
06-Mar-2015 |
Puneet Lall <puneetl@google.com> |
Fix ready-state issue when commands are queued
Ensure that the FrameServer is marked as unavailable if a command is
queued, waiting to acquire access.
Bug: 19367334
Change-Id: Id7b1639c6c3a7e65c75002b9f6f8f24c7515e932
ndroid/camera/one/v2/SimpleOneCameraFactory.java
ndroid/camera/one/v2/ZslOneCameraFactory.java
ndroid/camera/one/v2/core/ObservableFrameServer.java
ndroid/camera/one/v2/photo/PictureTakerImpl.java
|
| bc99343fe987af501f73eed4e9113e7e6edcaa87 |
11-Mar-2015 |
Sascha Haeberling <haeberling@google.com> |
Merge "Fix 16:9 start-up dialog selection." into ub-camera-haleakala
|
| 14ed26ab891ad561cf445aa453a3bc7033283f72 |
11-Mar-2015 |
Sascha Haeberling <haeberling@google.com> |
Fix 16:9 start-up dialog selection.
Bug: 19696056
We need to make sure the list from which we choose the highest
resolution size of a given aspect ratio based on a list that is filtered
to be chosen by the user. In case of the N5 the native camera list will
be augmented with a new high resolution 16:9 size which needs to be
selected if the user chooses 16:9 on start-up on the N5.
Change-Id: I03a86aa0a148b6cbabbd51a577202b79b4941d7d
ndroid/camera/settings/ResolutionSetting.java
|
| 24aceb0bee1f1fa99ea8d7c4e22457f08ca4e2fa |
11-Mar-2015 |
Sascha Haeberling <haeberling@google.com> |
Swap dimensions of artificial 16:9 resolution on N5 on upgrade.
Bug: 19693226
Since the N5 doesn't natively support a high resolution 16:9 size we need
to artificially add it and then crop the result from the high-resolution
4:3 size. In version 2.4 we unfortunately swapped the dimensions of
ResolutionUtil#NEXUS_5_LARGE_16_BY_9_SIZE, which now causes a few issues
in 2.5. If we detect this case, we will swap the dimensions here to make
sure they are the right way around going forward.
Change-Id: I579e464d177ac86d6cc88e9142c26fd9d6b67a76
ndroid/camera/settings/AppUpgrader.java
|
| 9f0a07d216d4eb6e2523d567f34580467d8ce83b |
06-Mar-2015 |
Shashi Shekhar <shashishekhar@google.com> |
Enable shutter button as soon as burst finishes.
Instead of keeping the Capture button disabled, do not wait for burst
results to enable the capture button. Instead enable it as soon as burst
is done.
Change-Id: I19f873d8e461b0c5385bdd2f9fb93f0a9fb7a05b
ndroid/camera/CaptureModule.java
ndroid/camera/burst/BurstCaptureCommand.java
ndroid/camera/burst/BurstFacade.java
ndroid/camera/burst/BurstFacadeFactory.java
ndroid/camera/burst/BurstFacadeImpl.java
ndroid/camera/burst/ToastingBurstFacadeDecorator.java
|
| dfef32425e6184d5721bb7af9db823ec46bc2b4f |
11-Mar-2015 |
Sascha Haeberling <haeberling@google.com> |
Add Location to EXIF
Bug: 16961102
Change-Id: I9f2335c0f02bea1286698330483cd30fdb875f45
ndroid/camera/one/v2/OneCameraImpl.java
ndroid/camera/one/v2/OneCameraZslImpl.java
ndroid/camera/processing/imagebackend/TaskCompressImageToJpeg.java
ndroid/camera/util/ExifUtil.java
|
| f6031c016d916db9789026dc0a6c559d8163a088 |
19-Feb-2015 |
Spike Sprague <spikuru@google.com> |
Add EXIF data to images processed via software JPEG encoder.
bug: 16961102
Change-Id: I3df48a74fedbba6ca5540bf095f5e5eaf93db3ab
ndroid/camera/burst/BurstCaptureCommand.java
ndroid/camera/burst/BurstController.java
ndroid/camera/burst/RingBuffer.java
ndroid/camera/one/OneCameraCharacteristics.java
ndroid/camera/one/v1/OneCameraCharacteristicsImpl.java
ndroid/camera/one/v2/OneCameraCharacteristicsImpl.java
ndroid/camera/one/v2/OneCameraImpl.java
ndroid/camera/one/v2/OneCameraZslImpl.java
ndroid/camera/one/v2/imagesaver/JpegImageBackendImageSaver.java
ndroid/camera/one/v2/imagesaver/MetadataImage.java
ndroid/camera/one/v2/imagesaver/MostRecentImageSaver.java
ndroid/camera/one/v2/imagesaver/YuvImageBackendImageSaver.java
ndroid/camera/one/v2/photo/ConvergedImageCaptureCommand.java
ndroid/camera/one/v2/photo/MetadataFuture.java
ndroid/camera/processing/imagebackend/ImageToProcess.java
ndroid/camera/processing/imagebackend/TaskCompressImageToJpeg.java
ndroid/camera/util/ExifUtil.java
|
| 5b2561d44c39d9c78feede919338105df410127c |
10-Mar-2015 |
Alan Newberger <alann@google.com> |
Merge "Workaround for future GPS timestamps" into ub-camera-haleakala
|
| 65bf3ddf0b0377ea9fb0e78c3e82a4bba27b531a |
10-Mar-2015 |
Alan Newberger <alann@google.com> |
Workaround for future GPS timestamps
Some images are known to have incorrect GPS timestamps, which are used
by MediaStore as creation date. If future creation dates are encountered,
fall back to modification date which is not known to have bugs.
Bug: 19565464
Change-Id: I35b5e43c9a3de1f05d9a2f405502a2bb2bf9adde
ndroid/camera/data/CameraFilmstripDataAdapter.java
ndroid/camera/data/NewestFirstComparator.java
|
| 1c1427e4cbee47656d6beea1a13f650d4526115b |
10-Mar-2015 |
zafir <zafir@google.com> |
Add error handling for CameraDevice.StateCallBack when the camera is already opened.
Bug: 19569722
Change-Id: I510931e595d491c2d42710151b05edea89c81094
ndroid/camera/one/v2/OneCameraManagerImpl.java
|
| e57ca2ca7d23e1c3f7e5f060a192fe845e4b1994 |
10-Mar-2015 |
Alan Newberger <alann@google.com> |
Merge "Grant read URI permission for playback of video capture" into ub-camera-haleakala
|
| acb342b9b5b21824d5992d59544c7a8a24c4b3a4 |
10-Mar-2015 |
Senpo Hu <senpo@google.com> |
Merge "[CaptureIntent] Detect if flash is supported from camera characteristics." into ub-camera-haleakala
|
| 6442baf3a8ac4eb0c4e4d4b472f62fb7c68a3427 |
10-Mar-2015 |
Alan Newberger <alann@google.com> |
Grant read URI permission for playback of video capture
Current implementation of video capture UI configured MediaRecorder to
output directly into supplied URI, which per recommendation should be
a content: URI. We pass this URI to another app to play back the video,
and should pass along the read permission.
Bug: 19675889
Change-Id: I37f8ae3702a9f1ed9dbaac9416104c0c0bfb6dd0
ndroid/camera/VideoModule.java
|
| 8c50948fce260d0614daed71fc53ca5bf0e98060 |
10-Mar-2015 |
Senpo Hu <senpo@google.com> |
[CaptureIntent] Detect if flash is supported from camera characteristics.
Bug: 19669175
Change-Id: I04c5ab27d9ee0c8723d9bffab55b89def7311acf
ndroid/camera/app/CameraAppUI.java
ndroid/camera/captureintent/CaptureIntentModule.java
ndroid/camera/captureintent/CaptureIntentModuleUI.java
ndroid/camera/captureintent/state/StateOpeningCamera.java
|
| 4b8af33d9d17d10863bd9b328e1d0bca53d0f514 |
10-Mar-2015 |
Alan Newberger <alann@google.com> |
Merge "Limit setting photo item placeholders when session is done." into ub-camera-haleakala
|
| 86f1d1f3664c909d1d949951056c7bb1e9627324 |
09-Mar-2015 |
Alan Newberger <alann@google.com> |
Limit setting photo item placeholders when session is done.
Only add placeholders for an item visible in the filmstrip. If a session
is done for an item not visible, it is less janky for the user to see the
standard gray placeholder while loading the image from disk.
Pruned older methods of determining filmstrip visibility, none of which
worked and relied on older code assuming the camera preview was an item
in the filmstrip, including 'sticky' filmstrip item bits. Added a method
to CameraAppUI that proxies the FilmstripLayout visibility, which is
actually what app uses to show/hide the filmstrip.
Bug: 19517380
Change-Id: I5e2a61b55aa2045bfd09f495dd02cdcb9c65dc68
ndroid/camera/CameraActivity.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/data/FilmstripItemAttributes.java
ndroid/camera/filmstrip/FilmstripController.java
ndroid/camera/widget/FilmstripView.java
|
| 2414329ae1e1052d0c38ddfd888aa1ed5510e7ba |
09-Mar-2015 |
Shashi Shekhar <shashishekhar@google.com> |
Merge "Fix zoom for burst." into ub-camera-haleakala
|
| b7f5e884cf358f4ad1884d9e4342f51e35f0034b |
09-Mar-2015 |
Alan Newberger <alann@google.com> |
Merge "Remove video portrait orientation prompt" into ub-camera-haleakala
|
| 21a5390e04de17dc843bedec4267a48f49584ab8 |
09-Mar-2015 |
Alan Newberger <alann@google.com> |
Remove video portrait orientation prompt
No longer display visual reminder for users to rotate device to landscape.
Bug: 19416311
Change-Id: Ia03f54809f64e6034479a9021c87b50f186bab99
ndroid/camera/VideoModule.java
ndroid/camera/VideoUI.java
ndroid/camera/widget/VideoRecordingHints.java
|
| 259ef720650f3d4e77dd381167ed12cdfd489403 |
09-Mar-2015 |
Shashi Shekhar <shashishekhar@google.com> |
Fix zoom for burst.
Instead of passing the root request builder, use the request builder
configured by the Camera factory.
BUG: 19637871
Change-Id: Ibae1a85c47b0b31e07c91c4a15ec138ad021449e
ndroid/camera/burst/BurstCaptureCommand.java
ndroid/camera/one/v2/ZslOneCameraFactory.java
|
| f88566e97d2d6866120bff6ca82abc370d540731 |
09-Mar-2015 |
Shashi Shekhar <shashishekhar@google.com> |
Merge "Fix a typo in Camera capture session." into ub-camera-haleakala
|
| aa92d134dd63b71396e0c734007d24a3b37662bd |
09-Mar-2015 |
Shashi Shekhar <shashishekhar@google.com> |
Fix a typo in Camera capture session.
Fix a typo that leads to recursive call.
Change-Id: Iad9fe9335169f1d7b211d6d6f5355229a08f797b
ndroid/camera/CaptureModule.java
|
| 20d1014b73d467531d2e5a6c53164ad2955d515c |
09-Mar-2015 |
zafir <zafir@google.com> |
Merge "Hide "Advanced" settings screen on N6." into ub-camera-haleakala
|
| df682a2d9cd88c31e84b8e69d6bdc3dbb5c894bb |
07-Mar-2015 |
zafir <zafir@google.com> |
Hide "Advanced" settings screen on N6.
The N6 currently doesn't support manual exposure. That's the only item
under Advanced, so hiding that option entirely.
Bug: 18523154
Change-Id: I1b8238a9b9f0e04f8b0d2047a444b81fcecc4767
ndroid/camera/settings/CameraSettingsActivity.java
|
| 0460ef28c6970d646260584b7df0b2b3157a67ee |
07-Mar-2015 |
Sascha Haeberling <haeberling@google.com> |
CaptureSession passes on message IDs instead of strings.
Bug: 18867164
Change-Id: Ie601a0fbaf64873c56c6a9b2767a2fa6a04a11d9
ndroid/camera/CameraActivity.java
ndroid/camera/captureintent/CaptureIntentSession.java
ndroid/camera/captureintent/state/StateReadyForCapture.java
ndroid/camera/captureintent/state/StateReviewingPicture.java
ndroid/camera/one/v2/imagesaver/YuvImageBackendImageSaver.java
ndroid/camera/one/v2/photo/PictureTakerImpl.java
ndroid/camera/processing/ProcessingService.java
ndroid/camera/session/CaptureSession.java
ndroid/camera/session/CaptureSessionImpl.java
ndroid/camera/session/CaptureSessionManager.java
ndroid/camera/session/CaptureSessionManagerImpl.java
ndroid/camera/session/SessionNotifier.java
|
| 698e271d2b263778bfa73d1e67d6e2cd2783c89e |
04-Mar-2015 |
zafir <zafir@google.com> |
Added more error handling for camera access and picture storage issues.
Implemented onFailure() method in the OpenCallback interface and
onPictureTakingFailed() in the PictureCallback interface.
OnFailure() routes through showErrorAndFinish() in the AppController.
Bug: 19452391
Change-Id: I3c19a274cc7664f7d1834899a486c57d0585dc9a
ndroid/camera/CameraActivity.java
ndroid/camera/CaptureModule.java
ndroid/camera/FatalErrorHandler.java
ndroid/camera/FatalErrorHandlerImpl.java
ndroid/camera/PhotoModule.java
ndroid/camera/app/AppController.java
ndroid/camera/captureintent/CaptureIntentModule.java
ndroid/camera/captureintent/CaptureIntentSession.java
ndroid/camera/captureintent/state/StateFatal.java
ndroid/camera/captureintent/state/StateReadyForCapture.java
ndroid/camera/captureintent/state/StateReviewingPicture.java
ndroid/camera/captureintent/state/StateStartingPreview.java
ndroid/camera/one/v2/photo/PictureTakerImpl.java
ndroid/camera/session/CaptureSession.java
ndroid/camera/session/CaptureSessionImpl.java
ndroid/camera/session/CaptureSessionManager.java
ndroid/camera/session/CaptureSessionManagerImpl.java
ndroid/camera/session/SessionNotifier.java
|
| 4a1378acfdebc4c2959bf68ee31e44dc9d131ae8 |
07-Mar-2015 |
Alan Newberger <alann@google.com> |
Merge "Fix units in video duration calculation" into ub-camera-haleakala
|
| 51d891107f231b5c91bd86cb0c4221516395037d |
07-Mar-2015 |
I-Jong Lin <ijonglin@google.com> |
Merge "Fix Version Codes from L to LOLLIPOP" into ub-camera-haleakala
|
| 5a729094346d0be1a117e2265181e045d8777186 |
07-Mar-2015 |
I-Jong Lin <ijonglin@google.com> |
Fix Version Codes from L to LOLLIPOP
Just so that Intellij IDE don't barf on these files.
Change-Id: I405e41da920d15bd4b0726fb90b859a8741bfef7
ndroid/camera/one/v2/common/HdrSettingBasedSceneMode.java
ndroid/camera/ui/focus/LensRangeCalculator.java
|
| 2cd148f3cb0d37b2e8220c6226c201bf4d117ea2 |
07-Mar-2015 |
Sascha Haeberling <haeberling@google.com> |
Merge "Add black-list for resolutions." into ub-camera-haleakala
|
| 86d753fcbb0c7474fa9b2797e76e31ef575e76cd |
06-Mar-2015 |
Sascha Haeberling <haeberling@google.com> |
Add black-list for resolutions.
Bug: 19611738
Change-Id: I5147bcd925c28e3db0e1e50c8a013cc6750fb47e
ndroid/camera/CameraActivity.java
ndroid/camera/captureintent/resource/ResourceConstructedImpl.java
ndroid/camera/settings/CameraSettingsActivity.java
ndroid/camera/settings/ResolutionSetting.java
ndroid/camera/settings/ResolutionUtil.java
|
| adb9d0d9af9bc969a38cac0f26d11cdc544cdf40 |
06-Mar-2015 |
Alan Newberger <alann@google.com> |
Fix units in video duration calculation
Convert milliseconds coming out of media table, to seconds
for details formatting.
Bug: 19305203
Change-Id: I4fafae9b3d09d23e60906c2fb3c3f305faee1339
ndroid/camera/data/VideoItem.java
|
| ac8e7dfcf441ffa38415f2e555ad2061673ef2cd |
06-Mar-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Fix exif dimensions for cropped images" into ub-camera-haleakala
|
| 56ccc3e5f74dcef523fd45a6cd32b96e00a15c6a |
06-Mar-2015 |
Puneet Lall <puneetl@google.com> |
Fix exif dimensions for cropped images
Bug: 19323062
Change-Id: Ieb2905bc44324f2e9f7f4498fd1e1882924e4e92
ndroid/camera/processing/imagebackend/TaskCompressImageToJpeg.java
|
| 799e1b9b1617b25be9d301e9c3ca11c527bc64dc |
06-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Fix flash mode by changing the setting scope to be correct." into ub-camera-haleakala
|
| 12fe621b859fe5c270cdae0088dd9fb104d5aa0a |
06-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Fix flash mode by changing the setting scope to be correct.
Bug: 19630464
Change-Id: I27abc70041002ff8f9134f249b70d318e05620b9
ndroid/camera/captureintent/state/StateOpeningCamera.java
|
| c7b2c5b495735d4de405ea7fe00fa7f9e12172f7 |
06-Mar-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Add support for negative rotations" into ub-camera-haleakala
|
| 94aa337fb9fe49cc277727174db4846d767d78ec |
06-Mar-2015 |
Shashi Shekhar <shashishekhar@google.com> |
Merge " Change interface of BurstMediaItem to provide filepath." into ub-camera-haleakala
|
| 3a92e37230714aafc7fe8924e7f2d1413306da17 |
06-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Fix flash mode by changing the setting scope to be correct.
Bug: 19630464
Change-Id: Id1257c23fef1152792a9fb81572768a4d91e22e5
ndroid/camera/CaptureModule.java
|
| 01b66bf18ca26982b8d5fadf68ec19f9fa260147 |
06-Mar-2015 |
Puneet Lall <puneetl@google.com> |
Add support for negative rotations
Bug: 19636843
Change-Id: I03a30b433942cacd4978c7788e2ae7d0046479a7
ndroid/camera/util/JpegUtilNative.java
|
| 4361352633d1e106c1574c02ddd27c8891c5ee78 |
25-Feb-2015 |
Shashi Shekhar <shashishekhar@google.com> |
Change interface of BurstMediaItem to provide filepath.
- Instead of passing a byte array, use a file path for the burst media
item.
- Change the save operation in Stack saver to simply rename the image.
- The burst controller is now responsible for managing captured images and
implementations should free the captured images as soon as possible.
Change-Id: I6762972c68865d6ab15bd6fa20b60fb275f103f1
ndroid/camera/Storage.java
ndroid/camera/burst/BurstCaptureCommand.java
ndroid/camera/burst/BurstController.java
ndroid/camera/burst/BurstFacadeImpl.java
ndroid/camera/burst/BurstMediaItem.java
ndroid/camera/burst/BurstResultsSaver.java
ndroid/camera/session/StackSaver.java
ndroid/camera/session/StackSaverImpl.java
|
| 9d007ad3629d82317f39e52449e67cf6e90ef564 |
06-Mar-2015 |
Andy Huibers <andyhuibers@google.com> |
Merge "Update stats." into ub-camera-haleakala
|
| 84e3363cc64e6627d160f1247f72cf462272c41c |
06-Mar-2015 |
Senpo Hu <senpo@google.com> |
Merge "[CaptureIntent] Fix 16x9 stretch problem on Nexus 4." into ub-camera-haleakala
|
| 2c9a42a87e599e58be189b4d52d9f8999a8cd34b |
05-Mar-2015 |
Andy Huibers <andyhuibers@google.com> |
Update stats.
Bug: 18913439
Change-Id: Iadca6b527c76b55504ce21e9f37f7c29dbb71c57
ndroid/camera/CameraActivity.java
ndroid/camera/util/QuickActivity.java
|
| f41cdaebdab8e5559e5ce4f8a4cbe40cdd3c7d3d |
06-Mar-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Add partial crop support to ImageBackend" into ub-camera-haleakala
|
| cc6139467c1c9545de1f098d938409e182c9b7ad |
05-Mar-2015 |
Senpo Hu <senpo@google.com> |
[CaptureIntent] Fix 16x9 stretch problem on Nexus 4.
2. Also, more clean up for unit tests.
Unfortunately I lump two things together is because there are some nice
things about the clean up that helps deliver the fix.
Bug: 19616722
Change-Id: I632e9f679db6e8a68179912ee4e29c1394084324
ndroid/camera/async/RefCountBase.java
ndroid/camera/captureintent/CaptureIntentConfig.java
ndroid/camera/captureintent/CaptureIntentModule.java
ndroid/camera/captureintent/CaptureIntentModuleUI.java
ndroid/camera/captureintent/resource/ResourceConstructed.java
ndroid/camera/captureintent/resource/ResourceConstructedImpl.java
ndroid/camera/captureintent/resource/ResourceSurfaceTexture.java
ndroid/camera/captureintent/resource/ResourceSurfaceTextureImpl.java
ndroid/camera/captureintent/resource/ResourceSurfaceTextureNexus4Impl.java
ndroid/camera/captureintent/state/StateBackground.java
ndroid/camera/captureintent/state/StateBackgroundWithSurfaceTexture.java
ndroid/camera/captureintent/state/StateForeground.java
ndroid/camera/captureintent/state/StateForegroundWithSurfaceTexture.java
ndroid/camera/captureintent/state/StateOpeningCamera.java
ndroid/camera/captureintent/state/StateReadyForCapture.java
ndroid/camera/captureintent/state/StateStartingPreview.java
ndroid/camera/captureintent/stateful/State.java
ndroid/camera/captureintent/stateful/StateImpl.java
ndroid/camera/util/AspectRatio.java
|
| 90122434d474a891c48dd2fdc251f451a2ecb1d3 |
06-Mar-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Fix CameraCaptureSession exception handling" into ub-camera-haleakala
|
| 89dabed144478060db022093e44f7160d3063a00 |
06-Mar-2015 |
Puneet Lall <puneetl@google.com> |
Fix CameraCaptureSession exception handling
Bug: 19484657
Change-Id: I475444ad5f52d790460fa3c7232f1571c432d54e
ndroid/camera/one/v2/camera2proxy/AndroidCameraCaptureSessionProxy.java
|
| e995c04e754b8227ff3118bf300007b164020488 |
06-Mar-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Fix jpeg compression without rotation" into ub-camera-haleakala
|
| b759b67a8574fa30ea04d2340ecdfc2979ec0304 |
05-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Switch round thumbnail to respond immedatly to thumbnails.
Previous version queued thumbnail requests and would wait to show
thumbnails until the animations completed.
Bug: 19606612
Change-Id: I6c9ab8946ba39d6ac53476bf493829647b415cba
ndroid/camera/widget/RoundedThumbnailView.java
|
| 89c4277aa2f9f4dda2f2a70d4d6c19866f4994d9 |
06-Mar-2015 |
Puneet Lall <puneetl@google.com> |
Fix jpeg compression without rotation
Fix an incorrect precondition which had resulted in crash upon attempts
to compress images to jpeg with 0 rotation.
Bug: 19630619
Change-Id: Ic70edda6288cf88f24cd552705adaa615b6daaa5
ndroid/camera/util/JpegUtilNative.java
|
| c56ef82017f772c5892bfc8a46f4ee5e3a9b65ad |
06-Mar-2015 |
Puneet Lall <puneetl@google.com> |
Add partial crop support to ImageBackend
Adds functionality to crop final YUV images through the ImageBackend.
Note that thumbnails are not yet cropped correctly.
Bug: 19323062
Change-Id: I55e0ad2ce60fd963d0d3f452dc10bc7548f08b1c
ndroid/camera/one/v2/imagesaver/JpegImageBackendImageSaver.java
ndroid/camera/one/v2/imagesaver/YuvImageBackendImageSaver.java
ndroid/camera/processing/imagebackend/ImageToProcess.java
ndroid/camera/processing/imagebackend/TaskCompressImageToJpeg.java
|
| 06659480c5cfef2ea43c74aefaa0457a8f196cd9 |
05-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Read tiny thumbnail resolution from resources." into ub-camera-haleakala
|
| 2c0832daaeca1bf9a0568ab1bfb7492303caaacf |
05-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Read tiny thumbnail resolution from resources.
Previous implemenation used a hardcoded pixel value. This makes the
tiny thumbnail generation work better across all devices and
ensures the resolution matches the displayed circle size.
Bug: 19621182
Change-Id: Ibfcf76bdddd476a1ad107a6541278ffedf0104d8
ndroid/camera/processing/ProcessingServiceManager.java
ndroid/camera/processing/imagebackend/ImageBackend.java
|
| 0e531c67cc8bcaa57390a9e3c1170b3fbe72710d |
05-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Fix rotation problem with the capture indicator." into ub-camera-haleakala
|
| a6794192885c0e5e942de43b7dbff9e6c4282e70 |
05-Mar-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Add error handling for repeating preview workaround" into ub-camera-haleakala
|
| 9f69ef5117dbfa7d6587d5b5f276bb611d5f3cb9 |
05-Mar-2015 |
Sascha Haeberling <haeberling@google.com> |
Merge "Fixing comment syntax for RoundedThumbnailView." into ub-camera-haleakala
|
| a0e9afff5bb91d096f4b87d747e4d86222d42fbd |
05-Mar-2015 |
Senpo Hu <senpo@google.com> |
Merge "[CaptureIntent] remove log spam." into ub-camera-haleakala
|
| b499c975c56275d757bf94c03e1de55b6a7b80f9 |
05-Mar-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Add on-the-fly cropping and rotation to jpegutil" into ub-camera-haleakala
|
| 8950eeb4deed45538d5e5143cd6d0282ed325746 |
05-Mar-2015 |
Senpo Hu <senpo@google.com> |
[CaptureIntent] remove log spam.
Bug: 19535852
Change-Id: I79d11e0de40b8952983e8af71481358bc2cf8643
ndroid/camera/captureintent/state/StateReadyForCapture.java
ndroid/camera/captureintent/stateful/State.java
ndroid/camera/captureintent/stateful/StateImpl.java
ndroid/camera/captureintent/stateful/StateMachineImpl.java
|
| 04aab100674dfdd11bffabc46e6a199f5e9a5267 |
05-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Fix rotation problem with the capture indicator.
This addresses a tiny problem where taking a new picture after
rotating the device causes the indicator to temporarily rotate.
Bug: 19479623
Change-Id: I567edba32ff7e776ef7605e993db09007b956acd
ndroid/camera/app/CameraAppUI.java
ndroid/camera/widget/RoundedThumbnailView.java
|
| ee669af495f2d3d22c97ab53fc5804c41e807e67 |
05-Mar-2015 |
Sascha Haeberling <haeberling@google.com> |
Fixing comment syntax for RoundedThumbnailView.
Change-Id: I167489672f0df4d9bd0f7ccc194a8c50608d5c5f
ndroid/camera/widget/RoundedThumbnailView.java
|
| 7e744b14ab0657d5e766d6313255eed6dd6eab2a |
10-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Add on-the-fly cropping and rotation to jpegutil
Bug: 19323062
* Adds another JpegUtilNative method for compression with a crop
rectangle.
* Improves speed of Jpeg compression with a non-zero rotation.
* Fixes small native memory leak caused by not calling
jpeg_destroy_compress() to free the libjpeg context.
* Adds gunit tests for native code.
Change-Id: Id0aa5fd525fb232c4241a6b24970923f4f2c20df
ndroid/camera/util/JpegUtilNative.java
|
| 66b942a3d20aac65454961ef2bc219ca560b9fba |
03-Mar-2015 |
Puneet Lall <puneetl@google.com> |
Add error handling for repeating preview workaround
Adds error handling to show a dialog if the workaround for the repeating
preview (bug: 19061883) fails.
Bug: 19565931
Change-Id: Iabc3b4fdbc6977b0e1828243e80138385a3ef522
ndroid/camera/CameraActivity.java
ndroid/camera/CaptureModule.java
ndroid/camera/FatalErrorHandler.java
ndroid/camera/FatalErrorHandlerImpl.java
ndroid/camera/app/AppController.java
ndroid/camera/captureintent/resource/ResourceConstructed.java
ndroid/camera/captureintent/resource/ResourceConstructedImpl.java
ndroid/camera/captureintent/state/StateBackground.java
ndroid/camera/captureintent/state/StateOpeningCamera.java
ndroid/camera/one/OneCameraManager.java
ndroid/camera/one/v1/OneCameraManagerImpl.java
ndroid/camera/one/v2/OneCameraFactory.java
ndroid/camera/one/v2/OneCameraManagerImpl.java
ndroid/camera/one/v2/SimpleOneCameraFactory.java
ndroid/camera/one/v2/ZslOneCameraFactory.java
ndroid/camera/one/v2/errorhandling/FailureHandler.java
ndroid/camera/one/v2/errorhandling/FastCameraReset.java
ndroid/camera/one/v2/errorhandling/FatalErrorDialogFailureHandler.java
ndroid/camera/one/v2/errorhandling/RecoverySuccessCallback.java
ndroid/camera/one/v2/errorhandling/RepeatFailureDetector.java
ndroid/camera/one/v2/errorhandling/RepeatFailureHandlerComponent.java
ndroid/camera/util/CameraUtil.java
|
| 9e310b7471da884bf8a0c9e2d651d24fd815ac92 |
05-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Cache Paint objects for capture animation rendering." into ub-camera-haleakala
|
| d6fad4a44e0afca5164704fcd906601744e68fb7 |
04-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Cache Paint objects for capture animation rendering.
This should help reduce the draw times for the thumbnail view by
reducing object allocation and reusing the same paint objects.
Bug: 19424945
Change-Id: Ia38a65dec4477f100a27543312b736c10ec07e40
ndroid/camera/widget/RoundedThumbnailView.java
|
| a73b87109097e0557e3b9e7a03a12ae04b610245 |
05-Mar-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Add support for non-native picture sizes" into ub-camera-haleakala
|
| 76132c239e0d7732610ba30f3d945c42ca12eeb7 |
05-Mar-2015 |
I-Jong Lin <ijonglin@google.com> |
Merge "N4 16:9 Preview Workaround" into ub-camera-haleakala
|
| 55e498578b46ef9e7b3aa70f30a68ea9bd788d63 |
04-Mar-2015 |
I-Jong Lin <ijonglin@google.com> |
N4 16:9 Preview Workaround
The N4-specific fix is to trick the layout UI logic to accept a
16:9 preview coming from a 4:3 surface. When we render the 4:3
surface, we fill in the size of the preview area. So, if
the surface dimensions are 4:3 AND the surface actually
contains 16:9 content AND the preview view is also 16:9, then
preview will actually look correct. To maintain this inconsistency
between the surface and the content aspect ratio, we use the
legacy layout path, and trick the UI layout into laying out
a 16:9 preview, but using a matrix transform that converts 4:3
surface into a 16:9 view. In new and improved matrix transformation
codepath, we correctly assume that the matrix and the preview
size should be consistent.
Currently, the 0.9MP camera setting on the N4 on the front and back
camera produces a squeezed preview, but also produces a squeezed
JPEG artifact and is probably another independent N4 HAL related issue.
But it's WYSIWYG, so I guess it's correct.
Bug: 19271661
Change-Id: I213a423f891a7c216568970c7f520a6134f9ad13
ndroid/camera/CaptureModule.java
ndroid/camera/TextureViewHelper.java
|
| 0842910285929b6612eff62791c2041c37d4955e |
05-Mar-2015 |
Sascha Haeberling <haeberling@google.com> |
Merge "Make sure we don't start sessions on long-press if no burst is taken." into ub-camera-haleakala
|
| 2f6fe6f07a6d43d8bb49156a7a73e86896ab7d1e |
24-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Add support for non-native picture sizes
Add a new PictureSizeCalculator which selects the most-appropriate
natively-supported picture size for any target, user-selected, picture
size. The appropriate, centered, crop-region is passed to the
ImageBackend, but is currently ignored. Future work is required
to crop the resulting images using these values.
Bug: 19323062
Change-Id: I65cdc97950840dde0a94c96179ade3aae17acc30
ndroid/camera/one/v2/common/PictureSizeCalculator.java
ndroid/camera/one/v2/imagesaver/JpegImageBackendImageSaver.java
ndroid/camera/one/v2/imagesaver/YuvImageBackendImageSaver.java
ndroid/camera/settings/ResolutionUtil.java
ndroid/camera/util/AspectRatio.java
ndroid/camera/util/Size.java
|
| a6043e2655340b65cd36b42397e43e85d2dc9245 |
05-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Change the capture flash to use paint opacity." into ub-camera-haleakala
|
| dd565aafbdfba7310289ff2a371d46ef157c1b4d |
04-Mar-2015 |
Senpo Hu <senpo@google.com> |
Merge "[CaptureIntent] refactor state machine." into ub-camera-haleakala
|
| d2d86155337a7dd9fd285a25c93e27dc05200ed1 |
28-Feb-2015 |
Senpo Hu <senpo@google.com> |
[CaptureIntent] refactor state machine.
1. Change the event handling mechanism by introducing EventHandler and
get rid of all processXXX() methods in State class.
2. Remove State.ID enum.
3. Move core classes to "stateful" package.
Refactor for unit test.
1. Extract interface for ResourceXXX class.
2. Extract interface for StateMachine.
Change-Id: I5b988959c44cf995f5a52b638bcda86d625e6795
ndroid/camera/captureintent/CaptureIntentModule.java
ndroid/camera/captureintent/event/Event.java
ndroid/camera/captureintent/event/EventCameraBusy.java
ndroid/camera/captureintent/event/EventCameraQuickExpose.java
ndroid/camera/captureintent/event/EventCameraReady.java
ndroid/camera/captureintent/event/EventFastPictureBitmapAvailable.java
ndroid/camera/captureintent/event/EventOnOpenCameraFailed.java
ndroid/camera/captureintent/event/EventOnOpenCameraSucceeded.java
ndroid/camera/captureintent/event/EventOnStartPreviewFailed.java
ndroid/camera/captureintent/event/EventOnStartPreviewSucceeded.java
ndroid/camera/captureintent/event/EventOnSurfaceTextureAvailable.java
ndroid/camera/captureintent/event/EventOnSurfaceTextureDestroyed.java
ndroid/camera/captureintent/event/EventOnSurfaceTextureUpdated.java
ndroid/camera/captureintent/event/EventOnTextureViewLayoutChanged.java
ndroid/camera/captureintent/event/EventPause.java
ndroid/camera/captureintent/event/EventPictureCompressed.java
ndroid/camera/captureintent/event/EventPictureDecoded.java
ndroid/camera/captureintent/event/EventResume.java
ndroid/camera/captureintent/event/EventTapOnCancelIntentButton.java
ndroid/camera/captureintent/event/EventTapOnCancelShutterButton.java
ndroid/camera/captureintent/event/EventTapOnConfirmPhotoButton.java
ndroid/camera/captureintent/event/EventTapOnPreview.java
ndroid/camera/captureintent/event/EventTapOnRetakePhotoButton.java
ndroid/camera/captureintent/event/EventTapOnShutterButton.java
ndroid/camera/captureintent/event/EventTapOnSwitchCameraButton.java
ndroid/camera/captureintent/event/EventTimerCountDownToZero.java
ndroid/camera/captureintent/event/EventZoomRatioChanged.java
ndroid/camera/captureintent/resource/ResourceCaptureTools.java
ndroid/camera/captureintent/resource/ResourceCaptureToolsImpl.java
ndroid/camera/captureintent/resource/ResourceConstructed.java
ndroid/camera/captureintent/resource/ResourceConstructedImpl.java
ndroid/camera/captureintent/resource/ResourceOpenedCamera.java
ndroid/camera/captureintent/resource/ResourceOpenedCameraImpl.java
ndroid/camera/captureintent/resource/ResourceSurfaceTexture.java
ndroid/camera/captureintent/resource/ResourceSurfaceTextureImpl.java
ndroid/camera/captureintent/state/ResourceCaptureTools.java
ndroid/camera/captureintent/state/ResourceConstructed.java
ndroid/camera/captureintent/state/ResourceOpenedCamera.java
ndroid/camera/captureintent/state/ResourceSurfaceTexture.java
ndroid/camera/captureintent/state/State.java
ndroid/camera/captureintent/state/StateBackground.java
ndroid/camera/captureintent/state/StateBackgroundWithSurfaceTexture.java
ndroid/camera/captureintent/state/StateFatal.java
ndroid/camera/captureintent/state/StateForeground.java
ndroid/camera/captureintent/state/StateForegroundWithSurfaceTexture.java
ndroid/camera/captureintent/state/StateIntentCompleted.java
ndroid/camera/captureintent/state/StateMachine.java
ndroid/camera/captureintent/state/StateOpeningCamera.java
ndroid/camera/captureintent/state/StateReadyForCapture.java
ndroid/camera/captureintent/state/StateReviewingPicture.java
ndroid/camera/captureintent/state/StateSavingPicture.java
ndroid/camera/captureintent/state/StateStartingPreview.java
ndroid/camera/captureintent/stateful/Event.java
ndroid/camera/captureintent/stateful/EventHandler.java
ndroid/camera/captureintent/stateful/State.java
ndroid/camera/captureintent/stateful/StateImpl.java
ndroid/camera/captureintent/stateful/StateMachine.java
ndroid/camera/captureintent/stateful/StateMachineImpl.java
|
| e48cd5405840c530d4beefca84674c4919a77edb |
04-Mar-2015 |
Sascha Haeberling <haeberling@google.com> |
Make sure we don't start sessions on long-press if no burst is taken.
Bug: 19602850
Change-Id: Ia49e508811ca145e93d1f7e2df83100ba3fa1816
ndroid/camera/CaptureModule.java
ndroid/camera/burst/BurstFacade.java
ndroid/camera/burst/BurstFacadeFactory.java
ndroid/camera/burst/BurstFacadeImpl.java
ndroid/camera/burst/ToastingBurstFacadeDecorator.java
ndroid/camera/session/CaptureSession.java
|
| 6e1029f9136ed9deb540c583998ae0bc9fd10287 |
04-Mar-2015 |
Senpo Hu <senpo@google.com> |
Merge "Decouple OneCameraManager and CameraActivity." into ub-camera-haleakala
|
| a166b882d74c9c8d638479b79517c99448865e99 |
04-Mar-2015 |
Senpo Hu <senpo@google.com> |
Decouple OneCameraManager and CameraActivity.
1. To allow other activity (such as SettingsActivity) to
create OneCameraManager.
2. Also simplify OneCameraManager.open() and OneCameraCreator.create()
interface by introducing OneCameraCaptureSetting. From time to time,
we always need to change these interfaces if we want to pass in more
things to OneCamera. This solves the headache and also removes the
dependency between OneCameraCreator and SettingsManager.
Bug: 18523154
Change-Id: Ifb9077bb046740c600dab3b3b369a0f422dbbbeb
ndroid/camera/CameraActivity.java
ndroid/camera/CaptureModule.java
ndroid/camera/captureintent/state/StateOpeningCamera.java
ndroid/camera/one/OneCameraCaptureSetting.java
ndroid/camera/one/OneCameraManager.java
ndroid/camera/one/config/OneCameraFeatureConfig.java
ndroid/camera/one/config/OneCameraFeatureConfigCreator.java
ndroid/camera/one/v1/OneCameraManagerImpl.java
ndroid/camera/one/v2/OneCameraManagerImpl.java
|
| 60b24b89cda589914a71da627360985b02280b5b |
04-Mar-2015 |
Senpo Hu <senpo@google.com> |
Merge "[FirstRunDialog] finish when users hit back button." into ub-camera-haleakala
|
| 7f83911e75e5a4a30d783a4e06f4337e61750eaa |
04-Mar-2015 |
Senpo Hu <senpo@google.com> |
[FirstRunDialog] finish when users hit back button.
Bug: 19593942
Change-Id: I5c3d811759f4943e8fca4fc4634bc8ee3df04f58
ndroid/camera/CameraActivity.java
ndroid/camera/app/FirstRunDialog.java
|
| 33adbba93511bb4c25f23096f87a5403ee626379 |
04-Mar-2015 |
I-Jong Lin <ijonglin@google.com> |
Merge "PhotoModule Timing Regression Fix onResume" into ub-camera-haleakala
|
| 4c364aa8a0c0a536548c0186462289173fe23334 |
04-Mar-2015 |
I-Jong Lin <ijonglin@google.com> |
PhotoModule Timing Regression Fix onResume
Fix for an timing issue on initializing the Accessibility UI
without having a valid CameraCapabilities. The initialization
of the Accessibility UI is moved to onCameraAvailable.
Bug: 19605317
Change-Id: Ifbbaca71141a187750890ffe66a1a62558f80f64
ndroid/camera/PhotoModule.java
|
| 5eecde851c9dfa590ff0f8386fa64ca2f523ab82 |
04-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Change the capture flash to use paint opacity.
Performance optimization to prevent GPU thrashing that was occuring
because of custom draw in addition to layer alpha animation. This
makes this animation more performant by altering the alpha property
of the paint instead of the entire layer.
Bug: 19424945
Change-Id: Idb14b49148ce0caf9d5c19380f364e7f20339aca
ndroid/camera/ui/CaptureAnimationOverlay.java
|
| 6b7e9c3fec6d53eed53185e84644fb1a01fff284 |
04-Mar-2015 |
Shashi Shekhar <shashishekhar@google.com> |
Merge "Switch Burst to use 24 fps for N5." into ub-camera-haleakala
|
| f88e75f8478162955e170d763f1b2be8e3753c92 |
03-Mar-2015 |
Shashi Shekhar <shashishekhar@google.com> |
Switch Burst to use 24 fps for N5.
Make burst use 24 fps for N5.
Change-Id: Ifeec74c3a854d6173557ee5a31626b61289a23c0
ndroid/camera/burst/BurstCaptureCommand.java
|
| 5cb9b7c456c59d751b44408cab362347308152c9 |
04-Mar-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Filter out duplicate calls to ready state listener" into ub-camera-haleakala
|
| 81308a22b0f64c6667f6c23adee9da520415bcb6 |
03-Mar-2015 |
Puneet Lall <puneetl@google.com> |
Filter out duplicate calls to ready state listener
* Adds a FilteredCallback to filter out callback invocations with
duplicate values.
* Simplifies ready-state calculations.
Bug: 19535852
Change-Id: I8376c13f24ff7a4f6f2d347f363746c2a6466601
ndroid/camera/async/FilteredCallback.java
ndroid/camera/async/Listenable.java
ndroid/camera/async/ListenableConcurrentState.java
ndroid/camera/async/ObservableCombiner.java
ndroid/camera/async/Observables.java
ndroid/camera/one/v2/SimpleOneCameraFactory.java
ndroid/camera/one/v2/ZslOneCameraFactory.java
ndroid/camera/one/v2/initialization/GenericOneCameraImpl.java
ndroid/camera/one/v2/initialization/InitializedOneCameraFactory.java
|
| 8d1f04d7babc04d73ac5bd0d9e1dd46bc559ff3d |
03-Mar-2015 |
I-Jong Lin <ijonglin@google.com> |
Merge "Legacy Autotransform Support to CaptureModule" into ub-camera-haleakala
|
| e61fbc4cba45ec740703d9a9e2a651e2d3e3a3c2 |
03-Mar-2015 |
zafir <zafir@google.com> |
Merge "Adding ability to zoom in accessibility mode using TalkBack" into ub-camera-haleakala
|
| 971ad50c0f220a396ffce50245617ff59ed0a09e |
21-Feb-2015 |
zafir <zafir@google.com> |
Adding ability to zoom in accessibility mode using TalkBack
Bug: 18986078
Bug: 19546523
Change-Id: Ie68234a9a3a0b8b9be870cc674658194c72c84ef
ndroid/camera/AccessibilityUtil.java
ndroid/camera/CameraActivity.java
ndroid/camera/CaptureModule.java
ndroid/camera/CaptureModuleUI.java
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
ndroid/camera/VideoModule.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/PreviewOverlay.java
|
| 1d0dd50db5d3d02d1209b4c0a3e6d4a71d2c8acf |
03-Mar-2015 |
I-Jong Lin <ijonglin@google.com> |
Legacy Autotransform Support to CaptureModule
Added the legacy support for Capture Module to use
the combination of transformations, dynamic layout, and
transform helpers that PhotoModule uses. It seems
to replicate that same functionality as the CaptureModuleUI,
but it's good to have that option for comparison, and to be
able to turn it on and off with one line configuration.
Bug: 19271661
Change-Id: I4ad4fa6fe3547373d6fbf77a53a1a18cd26df8ec
ndroid/camera/CaptureModule.java
ndroid/camera/TextureViewHelper.java
|
| e727428fb48a0df77a42eca417dec8749397d407 |
03-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Use getLayerType() instead of boolean for hardware layers." into ub-camera-haleakala
|
| 7543914f2de33b1be25626afb31fa979b06dd582 |
03-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Use getLayerType() instead of boolean for hardware layers.
Prevent hardware layers from existing during steady states by
using getLayerType() and checking progress during each update.
Bug: 19514276
Change-Id: Ia5d9434cddd78e28aa5575bcba1cec5a91c46b2f
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/ModeListView.java
|
| f51ad7e460fc231b42c137fc11d9edac2f3f0923 |
03-Mar-2015 |
Senpo Hu <senpo@google.com> |
[OneCamera v1] wrap RuntimeException properly.
Bug: 19280025
Change-Id: Id23fedb018cbe188917bca76abc9a0130dd52b9e
ndroid/camera/one/OneCameraAccessException.java
ndroid/camera/one/v1/OneCameraManagerImpl.java
|
| 66956b43db3b539513afa635c392d65bc8637053 |
03-Mar-2015 |
Senpo Hu <senpo@google.com> |
Merge "[CaptureIntent] trigger active focus." into ub-camera-haleakala
|
| 9a13c50727b29e2e8c94224db52a298c76268946 |
03-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Turn on hardware layers for semi-transparent layers." into ub-camera-haleakala
|
| 06b99efe8afaae7c311ff144c6ed906528d4394b |
03-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Add a shutdown mechanism to the camera lifecycle." into ub-camera-haleakala
|
| 915337c1a51f9816878e12c3049fca5664f5564f |
03-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Futures2 async join functions." into ub-camera-haleakala
|
| c7ef4da1e06ad9a4b88daed9ffc49bdb415fd011 |
03-Mar-2015 |
Senpo Hu <senpo@google.com> |
[CaptureIntent] trigger active focus.
Bug: 19559091
Change-Id: I8060465237c8bf14b36bece9255b1175644be04c
ndroid/camera/captureintent/CaptureIntentModuleUI.java
ndroid/camera/captureintent/state/ResourceOpenedCamera.java
ndroid/camera/captureintent/state/StateReadyForCapture.java
|
| 1908beee07fe9792338dbf8e0c36a5f1e3e9401f |
02-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Turn on hardware layers for semi-transparent layers.
This tracks and enables hardware layers for the mode switcher
when the alpha values are being animated. This helps prevent large
extra draws that are causing jank when opening or closing the mode
switcher.
Bug: 19514276
Change-Id: I902be1d4470bc5ae9c82ff7329d9b9167dee5eb9
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/ModeListView.java
|
| 624f758a41220fc96280f2817707b3d283cebcf9 |
02-Mar-2015 |
Senpo Hu <senpo@google.com> |
Merge "[CaptureIntent] suppress capture indicator." into ub-camera-haleakala
|
| 660ed40ad0b4dc942893ec714e6297702e596162 |
02-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Fix focus ring radius responses." into ub-camera-haleakala
|
| 1106276c9b365afadb12a7280ec3a297fdeeec44 |
02-Mar-2015 |
Senpo Hu <senpo@google.com> |
[CaptureIntent] suppress capture indicator.
Bug: 19559037
Change-Id: Ie62cc6e7a5a984633c27624fc06e26a4be76d8b7
ndroid/camera/captureintent/CaptureIntentModuleUI.java
|
| 22cc812406334dfe7f1d38ecac75b82b51c1c9d1 |
02-Mar-2015 |
Andy Huibers <andyhuibers@google.com> |
Move JPEG quality to separate stub-able method.
Bug: 19548882
Change-Id: I43e1fe93de63eacdc8c8a16b4f3b528e3a65728b
ndroid/camera/processing/imagebackend/TaskCompressImageToJpeg.java
|
| 02d42f96dc463f76beae47b9ac4d681e87c06c57 |
28-Feb-2015 |
Pengchong Jin <pengchong@google.com> |
Change software jpeg encoder quality to CameraProfile.QUALITY_HIGH
Bug: 19548882
Change-Id: I9bdbeb11c2614f3d3d3f60d2a940d2c368617072
ndroid/camera/processing/imagebackend/TaskCompressImageToJpeg.java
|
| d1f25e8507bc27a85853bb718c365d79a838dc33 |
27-Feb-2015 |
Paul Rohde <codelogic@google.com> |
Fix focus ring radius responses.
This fixes a scaling problem that was causing the focus controller
to ignore the radius changes on devices that supported providing
lens position. It also removes redundant focus indicator clearing
that was causing intermitent and jumpy animations.
Bug: 19527399
Change-Id: I0b2a734aa9dc4030430f1420cc26d75784dcbdf6
ndroid/camera/CaptureModule.java
ndroid/camera/captureintent/state/StateReadyForCapture.java
ndroid/camera/one/OneCamera.java
ndroid/camera/ui/focus/FocusController.java
ndroid/camera/ui/focus/LensRangeCalculator.java
ndroid/camera/ui/motion/LinearScale.java
|
| 389b11bf5bcf9f6fbddecb43cd7cb7f43673396e |
27-Feb-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Require USE_SCENE_MODE when HDR is turned on." into ub-camera-haleakala
|
| 7db6d1eb6f124496a4fbc10733741c62d97d29d2 |
27-Feb-2015 |
Paul Rohde <codelogic@google.com> |
Require USE_SCENE_MODE when HDR is turned on.
Setting the scene mode to the HDR value is not enough for legacy
devices to pick up the scene mode change. USE_SCENE_MODE must
also be set at the same time for the HDR scene mode to capture
images correctly.
Bug: 18622877
Change-Id: I84c5d483ac7e50860eff28c874ac046220f35a8d
ndroid/camera/one/v2/common/BasicCameraFactory.java
ndroid/camera/one/v2/common/HdrSettingBasedControlMode.java
|
| de4e5225ea92d681f9f4c005e6285f739635d271 |
27-Feb-2015 |
Senpo Hu <senpo@google.com> |
[CaptureIntentModule] Fix preview layout race condition.
Bug: 19510313
Change-Id: I5bcf89eeedcf3850a632683b695ebde0bf86d643
ndroid/camera/captureintent/CaptureIntentModule.java
ndroid/camera/captureintent/CaptureIntentModuleUI.java
ndroid/camera/captureintent/PreviewTransformCalculator.java
ndroid/camera/captureintent/event/EventOnSurfaceTextureDestroyed.java
ndroid/camera/captureintent/event/EventOnSurfaceTextureUpdated.java
ndroid/camera/captureintent/state/ResourceSurfaceTexture.java
ndroid/camera/captureintent/state/State.java
ndroid/camera/captureintent/state/StateBackgroundWithSurfaceTexture.java
ndroid/camera/captureintent/state/StateForegroundWithSurfaceTexture.java
ndroid/camera/captureintent/state/StateReadyForCapture.java
ndroid/camera/captureintent/state/StateStartingPreview.java
|
| 14cbe7d9b51fd07503344054d44fa2e8e00d78e2 |
27-Feb-2015 |
Senpo Hu <senpo@google.com> |
Merge "[CaptureIntentModule] Transition StateBackgroundWithSurfaceTexture when module got paused." into ub-camera-haleakala
|
| 8185c13b1562def4774cabd710c23402b27d0a0a |
27-Feb-2015 |
Senpo Hu <senpo@google.com> |
[CaptureIntentModule] Transition StateBackgroundWithSurfaceTexture when
module got paused.
Bug: 19522250
Change-Id: Iaea6229cb4b7329f401842565d322f041fbc6b3f
ndroid/camera/captureintent/state/StateBackgroundWithSurfaceTexture.java
ndroid/camera/captureintent/state/StateOpeningCamera.java
ndroid/camera/captureintent/state/StateReadyForCapture.java
ndroid/camera/captureintent/state/StateStartingPreview.java
|
| f77ff55b5c3be0b03de296ff432be62de56313a3 |
27-Feb-2015 |
Alan Newberger <alann@google.com> |
Merge "Remove accordion" into ub-camera-haleakala
|
| 13560fbb4348746b5b007fc7535ff41dc102ad56 |
27-Feb-2015 |
Sascha Haeberling <haeberling@google.com> |
Merge "Capture Intent: Initialize options status." into ub-camera-haleakala
|
| 0877b74d42b0e33952fcf5b1640d6accafcc3826 |
27-Feb-2015 |
Andy Huibers <andyhuibers@google.com> |
Allow number of Images in ImageReader to be variable.
Goes with ag/644111.
Bug: 19534046
Change-Id: I7c54de56cd97798f0c325260d6215e1ad8834348
ndroid/camera/one/v2/OneCameraManagerImpl.java
|
| f307e8544b96e6ac2b226cd7fd8f8dcab58f7131 |
27-Feb-2015 |
Andy Huibers <andyhuibers@google.com> |
Merge "Disable ZSL for pre-MR1 L only for Nexus 5 and 6." into ub-camera-haleakala
|
| 722d2759dd94db85b4515cd66c6ca6839b68f81d |
27-Feb-2015 |
Sascha Haeberling <haeberling@google.com> |
Capture Intent: Initialize options status.
Bug: 19535308
Change-Id: I7880d02514a85a6871cc5a000efd127729260733
ndroid/camera/captureintent/CaptureIntentModule.java
|
| a27011ccd08c97465a1329b30e6b856f9c2d258f |
27-Feb-2015 |
Senpo Hu <senpo@google.com> |
[CaptureIntentModule] Remove event for focus state update.
Because now FocusStateListener is registered inside StateReadyForCapture.
Change-Id: I179232077fd37b4206cc13083c167ddccd1824ec
ndroid/camera/captureintent/state/State.java
ndroid/camera/captureintent/state/StateReadyForCapture.java
|
| d2710487e724660cbb890ebf5eb887b4a93281c1 |
27-Feb-2015 |
Alan Newberger <alann@google.com> |
Remove accordion
No more accordion animation.
Bug: 19535309
Change-Id: I001315e03b63de1ed228d371c849f30f5af2f17d
ndroid/camera/ui/ModeListView.java
|
| 924c693b2c70d5332ad86d39550c99cb8ff696ed |
27-Feb-2015 |
Sascha Haeberling <haeberling@google.com> |
Capture intent: Cancel countdown on resume.
Bug: 19521959
Change-Id: I06c9462a34718adf3b6669bbecc45a4ee82fb124
ndroid/camera/captureintent/state/StateReadyForCapture.java
|
| 64d22d9caf0824739cb250575d69a56fe7f3fa3c |
27-Feb-2015 |
Sascha Haeberling <haeberling@google.com> |
Capture Intent: Add capture-cancel (cancel countdown) support.
Bug: 19521614
Change-Id: I624601268947d9540d379b74753b7c92898c7553
ndroid/camera/app/CameraAppUI.java
ndroid/camera/captureintent/CaptureIntentModule.java
ndroid/camera/captureintent/CaptureIntentModuleUI.java
ndroid/camera/captureintent/event/EventTapOnCancelIntentButton.java
ndroid/camera/captureintent/event/EventTapOnCancelShutterButton.java
ndroid/camera/captureintent/state/State.java
ndroid/camera/captureintent/state/StateReadyForCapture.java
ndroid/camera/captureintent/state/StateReviewingPicture.java
|
| 2f5eba72136bcc8974ec44f68b19ea4c306c1d84 |
26-Feb-2015 |
Senpo Hu <senpo@google.com> |
[CaptureIntentModule] Add StateBackgroundWithSurfaceTexture.
Module is in this state when first run dialog is still presented. The
module will be resumed after people finish first run dialog.
Bug: 19531554
Change-Id: Ibe878eba66ab4f235a39a6d5ba0abfdad30f5cab
ndroid/camera/captureintent/CaptureIntentModule.java
ndroid/camera/captureintent/state/State.java
ndroid/camera/captureintent/state/StateBackground.java
ndroid/camera/captureintent/state/StateBackgroundWithSurfaceTexture.java
ndroid/camera/captureintent/state/StateForegroundWithSurfaceTexture.java
|
| a10a07d23b207fd2e7c2c415b69bec87199a41f1 |
26-Feb-2015 |
Andy Huibers <andyhuibers@google.com> |
Disable ZSL for pre-MR1 L only for Nexus 5 and 6.
Bug: 19534046
Change-Id: I6c46c5027658cc6afc6e486114149b46a2f8f4c1
ndroid/camera/one/config/OneCameraFeatureConfigCreator.java
|
| 86d3e0684b39aa6fd303dcf5546295b26bfaba38 |
26-Feb-2015 |
Senpo Hu <senpo@google.com> |
Merge "[CaptureIntentModule] Dont' dispatch startPreview call" into ub-camera-haleakala
|
| 8b4309b20d64b15bc49d5cdc891d09208f009f06 |
26-Feb-2015 |
Senpo Hu <senpo@google.com> |
[CaptureIntentModule] Dont' dispatch startPreview call
it will result in race condition.
Bug: 19522251
Bug: 19522250
Change-Id: I078ed51a92ae54dd064a00e376e3e151523eb361
ndroid/camera/captureintent/state/StateStartingPreview.java
|
| fe458825264fc909c503564903a37b6c58c2c8c3 |
26-Feb-2015 |
Sascha Haeberling <haeberling@google.com> |
CaptureIntent: Disable button before taking a picture.
Bug: 19521616
Change-Id: I1c071ab1eddabb759c651bec261363227629ed0e
ndroid/camera/captureintent/state/StateReadyForCapture.java
|
| a7ec5eabe57a2bc8512a4e45c60d457cad895a98 |
26-Feb-2015 |
Senpo Hu <senpo@google.com> |
[CaptureIntentModule] enable flash photo.
Bug: 19520829
Change-Id: Id56c621f92feb4124d745716f9b101c200b20d3b
ndroid/camera/captureintent/CaptureIntentModule.java
ndroid/camera/one/v2/initialization/GenericOneCameraImpl.java
|
| 482ee873725a2e7ff9be5aa819b69e2a277b38ba |
26-Feb-2015 |
Senpo Hu <senpo@google.com> |
Fix build break by ag/643763
Change-Id: I4e274526667ec40daa8cd3d2b6d3e8ac5a03ddea
ndroid/camera/captureintent/event/EventOnSurfaceTextureAvailable.java
ndroid/camera/captureintent/event/EventOnTextureViewLayoutChanged.java
ndroid/camera/captureintent/event/EventTapOnPreview.java
ndroid/camera/captureintent/event/EventZoomRatioChanged.java
|
| 687476eb81212f13e122ea822c5551cf899ee3bd |
26-Feb-2015 |
Senpo Hu <senpo@google.com> |
Merge "[CaptureIntentModule] Refactoring to help writing unit tests." into ub-camera-haleakala
|
| 1b98e83085e2b0a3066a4bf3cbde2d664b8422ee |
26-Feb-2015 |
Senpo Hu <senpo@google.com> |
[CaptureIntentModule] Refactoring to help writing unit tests.
Eventually I want to get rid of those processXXX methods in State class.
1. Move various callback into state class instead of having them all in
the module class.
2. Create various event class instead of using anonymous class.
Change-Id: I065ca199052be36b5b29cc0d6743bb174b128d75
ndroid/camera/captureintent/CaptureIntentModule.java
ndroid/camera/captureintent/event/Event.java
ndroid/camera/captureintent/event/EventOnOpenCameraFailed.java
ndroid/camera/captureintent/event/EventOnOpenCameraSucceeded.java
ndroid/camera/captureintent/event/EventOnStartPreviewFailed.java
ndroid/camera/captureintent/event/EventOnStartPreviewSucceeded.java
ndroid/camera/captureintent/event/EventOnSurfaceTextureAvailable.java
ndroid/camera/captureintent/event/EventOnTextureViewLayoutChanged.java
ndroid/camera/captureintent/event/EventPause.java
ndroid/camera/captureintent/event/EventResume.java
ndroid/camera/captureintent/event/EventTapOnCancelIntentButton.java
ndroid/camera/captureintent/event/EventTapOnConfirmPhotoButton.java
ndroid/camera/captureintent/event/EventTapOnPreview.java
ndroid/camera/captureintent/event/EventTapOnRetakePhotoButton.java
ndroid/camera/captureintent/event/EventTapOnShutterButton.java
ndroid/camera/captureintent/event/EventTapOnSwitchCameraButton.java
ndroid/camera/captureintent/event/EventZoomRatioChanged.java
ndroid/camera/captureintent/state/Event.java
ndroid/camera/captureintent/state/ResourceCaptureTools.java
ndroid/camera/captureintent/state/ResourceConstructed.java
ndroid/camera/captureintent/state/ResourceOpenedCamera.java
ndroid/camera/captureintent/state/ResourceSurfaceTexture.java
ndroid/camera/captureintent/state/State.java
ndroid/camera/captureintent/state/StateBackground.java
ndroid/camera/captureintent/state/StateForeground.java
ndroid/camera/captureintent/state/StateForegroundWithSurfaceTexture.java
ndroid/camera/captureintent/state/StateMachine.java
ndroid/camera/captureintent/state/StateOpeningCamera.java
ndroid/camera/captureintent/state/StateReadyForCapture.java
ndroid/camera/captureintent/state/StateReviewingPicture.java
ndroid/camera/captureintent/state/StateStartingPreview.java
|
| 9d31043682f3ed17bce71145e02eb015561a04df |
25-Feb-2015 |
zafir <zafir@google.com> |
Merge "Adding reporting functionality using Feedback API for PhotoModule and CaptureModule when captured pictures don't save to the device." into ub-camera-haleakala
|
| c35c29fc64bd7597fdf0f7d68d71047e5d46005a |
25-Feb-2015 |
Senpo Hu <senpo@google.com> |
Merge "[CaptureIntent] fix review image shift issue." into ub-camera-haleakala
|
| 83d86d3aad276b0c15bfc2767d27c9f0354a104d |
25-Feb-2015 |
Senpo Hu <senpo@google.com> |
[CaptureIntent] fix review image shift issue.
Bug: 19510803
Change-Id: I817a00f6ed56311dbbf3e257ec23da6dc139ff14
ndroid/camera/captureintent/CaptureIntentModule.java
ndroid/camera/captureintent/CaptureIntentModuleUI.java
ndroid/camera/captureintent/state/StateReadyForCapture.java
ndroid/camera/captureintent/state/StateReviewingPicture.java
|
| 734122e8fe6c621a8510043839f05a0adff4c3a4 |
06-Feb-2015 |
zafir <zafir@google.com> |
Adding reporting functionality using Feedback API for PhotoModule and CaptureModule when captured pictures don't save to the device.
Bug: 19231841
Change-Id: I7d66db1e4c273dc7ec082f40a80b349bd91a7e8b
ndroid/camera/CameraActivity.java
ndroid/camera/MediaSaverImpl.java
ndroid/camera/PhotoModule.java
ndroid/camera/Storage.java
ndroid/camera/exif/ExifInterface.java
ndroid/camera/one/v2/imagesaver/YuvImageBackendImageSaver.java
ndroid/camera/session/CaptureSessionImpl.java
ndroid/camera/session/PlaceholderManager.java
ndroid/camera/session/StackSaver.java
ndroid/camera/session/StackSaverImpl.java
ndroid/camera/util/CameraUtil.java
|
| 1353ff4af747ace3364843dc128e3dea180427bf |
25-Feb-2015 |
Andy Huibers <andyhuibers@google.com> |
Merge "Log API2 preview repeat failures." into ub-camera-haleakala
|
| 9b2e78294a9dc91e871b8363e521250efbc3a20a |
24-Feb-2015 |
Andy Huibers <andyhuibers@google.com> |
Log API2 preview repeat failures.
Bug: 19061883
Change-Id: I45a361169e27bc22b5fe36f5d54810fe2abcf6e5
ndroid/camera/one/v2/ZslOneCameraFactory.java
ndroid/camera/one/v2/errorhandling/RepeatFailureDetector.java
|
| 1d518e63212290741d66aaf34356bd3897bb609e |
24-Feb-2015 |
Senpo Hu <senpo@google.com> |
Fix preview transform issue when switching between back/front camera.
Move preview related logic to StateStartingPreview.
Add more documentation.
Bug: 18726217
Change-Id: I839c243656daa40773da6631359b91808c2d98f8
ndroid/camera/captureintent/state/ResourceCaptureTools.java
ndroid/camera/captureintent/state/ResourceConstructed.java
ndroid/camera/captureintent/state/ResourceOpenedCamera.java
ndroid/camera/captureintent/state/ResourceSurfaceTexture.java
ndroid/camera/captureintent/state/StateForegroundWithSurfaceTexture.java
ndroid/camera/captureintent/state/StateOpeningCamera.java
ndroid/camera/captureintent/state/StateReadyForCapture.java
ndroid/camera/captureintent/state/StateReviewingPicture.java
ndroid/camera/captureintent/state/StateStartingPreview.java
|
| 10036f046819f3ce527eb9fad5133c2c2b3c16bc |
24-Feb-2015 |
Senpo Hu <senpo@google.com> |
Merge "Fix resource leak when CaptureIntentModule goes to StateBackground." into ub-camera-haleakala
|
| 80aed3c513dc6a6670e25ef6e11bc71ab6a2d9fd |
23-Feb-2015 |
Senpo Hu <senpo@google.com> |
Fix resource leak when CaptureIntentModule goes to StateBackground.
Make RefCountBase more solid.
Bug: 18726217
Change-Id: Ibb5d731f8891627e832d5961f0e736aaaaff7078
ndroid/camera/async/RefCountBase.java
ndroid/camera/captureintent/state/ResourceCaptureTools.java
ndroid/camera/captureintent/state/ResourceConstructed.java
ndroid/camera/captureintent/state/ResourceOpenedCamera.java
ndroid/camera/captureintent/state/ResourceSurfaceTexture.java
ndroid/camera/captureintent/state/StateBackground.java
ndroid/camera/captureintent/state/StateForeground.java
ndroid/camera/captureintent/state/StateForegroundWithSurfaceTexture.java
ndroid/camera/captureintent/state/StateOpeningCamera.java
ndroid/camera/captureintent/state/StateReadyForCapture.java
ndroid/camera/captureintent/state/StateReviewingPicture.java
ndroid/camera/captureintent/state/StateSavingPicture.java
ndroid/camera/captureintent/state/StateStartingPreview.java
ndroid/camera/one/v2/sharedimagereader/imagedistributor/ImageDistributorImpl.java
ndroid/camera/one/v2/sharedimagereader/imagedistributor/RefCountedImageProxy.java
|
| 64205841ceb7c0ada169497b0d21ce044b922b25 |
24-Feb-2015 |
Alan Newberger <alann@google.com> |
Merge "Make module scope prefix a static agent value" into ub-camera-haleakala
|
| f2399a5148ec6f101e9e0b3f137d33b443b79b8c |
24-Feb-2015 |
Alan Newberger <alann@google.com> |
Make module scope prefix a static agent value
This removes the multiple "PhotoModule" strings across
the codebase and allows for retrieval of a module's string
scope prefix as part of its static ModuleAgent properties
rather than as a property of the module itself.
Bug: 19482146
Change-Id: I2c36878dd070106149909f19f98bcae221b94012
ndroid/camera/CameraActivity.java
ndroid/camera/CaptureModule.java
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.java
ndroid/camera/app/ModuleManager.java
ndroid/camera/captureintent/CaptureIntentConfig.java
ndroid/camera/captureintent/CaptureIntentModule.java
ndroid/camera/module/ModuleController.java
ndroid/camera/module/ModulesInfo.java
ndroid/camera/settings/AppUpgrader.java
ndroid/camera/settings/SettingsScopeNamespaces.java
|
| b68886f8055aa22458bbe7009a617c45800eb2b1 |
24-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Limit ZSL images to 100ms look-back" into ub-camera-haleakala
|
| 95dcd9ec6538be24cdfab90003708e4a3bd53081 |
24-Feb-2015 |
I-Jong Lin <ijonglin@google.com> |
Merge "Refactor PreviewTransform into CaptureModule" into ub-camera-haleakala
|
| e121849f9a77b3a1e385b2aee382e0d66411fe40 |
23-Feb-2015 |
I-Jong Lin <ijonglin@google.com> |
Refactor PreviewTransform into CaptureModule
Propogate the refactoring of the Preview Transformation into
CaptureModule so that we can have consistent cross-module
implementation. Stepping stone CL on the way to fix the aspect
ratio.
Bug: 19271661
Change-Id: Ib3e09ed0c4c5cef9e94bcd0f89228c1b2990f489
ndroid/camera/CaptureModule.java
|
| 01b4a1bb336aba3cc0648f964377ba7594c761fc |
24-Feb-2015 |
Alan Newberger <alann@google.com> |
Merge "Only copy preferences files on upgrade if they previously exist" into ub-camera-haleakala
|
| 8d0178ea8ea318e52dd8bd3ed5f3c8e697383304 |
23-Feb-2015 |
Alan Newberger <alann@google.com> |
Only copy preferences files on upgrade if they previously exist
If no data exists in an old module format, there's no need to
upgrade it. This is only a partial fix to the below bug, but
will allow for fresh installs to work. Full fix requires all
modules (or rather, their scope) to be created programmatically.
Bug: 19482146
Change-Id: I50918eefc4ae9dcb472d2fc79cb1c5de710c5806
ndroid/camera/settings/AppUpgrader.java
|
| f8d390731abd88cc86354b377e1cb8beab0561af |
21-Feb-2015 |
Senpo Hu <senpo@google.com> |
Introduce CaptureIntentSession and CaptureIntentSessionFactory.
The capture intent module needs its own custom CaptureSession
implementation.
This also adds two new methods in CaptureSessionManager.SessionListener
in order to allow CaptureIntentModule receive the thumbnail image
and compressed picture data byte array.
Bug: 18726217
Change-Id: If823846fa4f37d9fc7ee8becde7c95ed559b4200
ndroid/camera/CameraActivity.java
ndroid/camera/captureintent/CaptureIntentModule.java
ndroid/camera/captureintent/CaptureIntentSession.java
ndroid/camera/captureintent/CaptureIntentSessionFactory.java
ndroid/camera/session/CaptureSessionManager.java
ndroid/camera/session/CaptureSessionManagerImpl.java
ndroid/camera/session/SessionNotifier.java
|
| d1d87341f89058f0804a8577dcb0e0ebe1b08e56 |
23-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Limit ZSL images to 100ms look-back
Bug: 19244733
Change-Id: Ic537a627aeda3c32112c41d9de9026c93e277d85
ndroid/camera/one/v2/photo/ZslPictureTakerFactory.java
ndroid/camera/one/v2/photo/zsl/ZslImageCaptureCommand.java
|
| 5e45ec6f8d5bd986e4894ddd1e3e81faf90ad1c3 |
23-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Fix log tags with length greater than 20 chars
Change-Id: Ie7d3c0d47af1b53eba7015be4b958bd3f45599a1
ndroid/camera/one/v2/commands/CameraCommandExecutor.java
ndroid/camera/one/v2/errorhandling/RepeatFailureDetector.java
|
| 1909b45aa33ac03b53bfd7c431f27ab72475dcb2 |
23-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Add metadata to ImageSaver interface" into ub-camera-haleakala
|
| d0316626dd2c2f4bd37ac7a198dbfe9e0ce2277f |
20-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Add metadata to ImageSaver interface
ImageSavers are now provided with a future to metadata
(TotalCaptureResult) for full-size images.
This change also implements a proper .equals() and .hashCode() for
ImageProxy.
Bug: 19443252
Change-Id: I16aec5edcd7ad64ea71e457d1de7976fc7e27c72
ndroid/camera/one/v2/camera2proxy/AndroidImageProxy.java
ndroid/camera/one/v2/camera2proxy/ForwardingImageProxy.java
ndroid/camera/one/v2/camera2proxy/ImageProxy.java
ndroid/camera/one/v2/imagesaver/ImageSaver.java
ndroid/camera/one/v2/imagesaver/JpegImageBackendImageSaver.java
ndroid/camera/one/v2/imagesaver/MostRecentImageSaver.java
ndroid/camera/one/v2/imagesaver/SingleImageSaver.java
ndroid/camera/one/v2/imagesaver/YuvImageBackendImageSaver.java
ndroid/camera/one/v2/photo/ConvergedImageCaptureCommand.java
ndroid/camera/one/v2/photo/MetadataFuture.java
ndroid/camera/one/v2/photo/SimpleImageCaptureCommand.java
ndroid/camera/one/v2/photo/zsl/ZslImageCaptureCommand.java
|
| 44167c98e7848b60a539cf31bac3eaabb3086161 |
21-Feb-2015 |
Alan Newberger <alann@google.com> |
Merge "Reduce memory footprint of session bitmap cache." into ub-camera-haleakala
|
| 995083b53be47e1e27133e403da0b63a03d07ea7 |
20-Feb-2015 |
Alan Newberger <alann@google.com> |
Reduce memory footprint of session bitmap cache.
Convert storage bitmap cache to an LRU cache to have a fixed
upper bound on usage. Evict bitmaps after a session is complete.
Bug: 19124117
Change-Id: I4a5dd9f15c3b986601c4a92477edf9346f190de1
ndroid/camera/CameraActivity.java
ndroid/camera/Storage.java
ndroid/camera/data/PhotoItem.java
ndroid/camera/data/SessionItem.java
ndroid/camera/session/CaptureSession.java
ndroid/camera/session/CaptureSessionImpl.java
ndroid/camera/session/CaptureSessionManager.java
ndroid/camera/session/CaptureSessionManagerImpl.java
ndroid/camera/session/PlaceholderManager.java
ndroid/camera/session/SessionNotifier.java
|
| 8f51086c8177056345de996963515c4bd3415254 |
19-Feb-2015 |
Sascha Haeberling <haeberling@google.com> |
Centralize logic for Camera API feature determination.
Bug: 19179276
This captures camera capabilities in a centralized class and allows
them to be overridden by GServices in the field or using adb.
Since this is not it's own class it would be trivial to create another
instance for testing and pass that into CameraActivity or even to change
these values using a UI before the actual Activity is started.
Change-Id: I74262c8467f631c7b5e42b02d269d5f401d4e9e7
ndroid/camera/CameraActivity.java
ndroid/camera/CaptureModule.java
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.java
ndroid/camera/app/AppController.java
ndroid/camera/app/CameraApp.java
ndroid/camera/app/CameraController.java
ndroid/camera/app/MemoryManagerImpl.java
ndroid/camera/burst/BurstFacadeFactory.java
ndroid/camera/debug/DebugPropertyHelper.java
ndroid/camera/hardware/HardwareSpecImpl.java
ndroid/camera/module/ModulesInfo.java
ndroid/camera/one/OneCameraManager.java
ndroid/camera/one/config/OneCameraFeatureConfig.java
ndroid/camera/one/config/OneCameraFeatureConfigCreator.java
ndroid/camera/one/v2/OneCameraFactory.java
ndroid/camera/one/v2/OneCameraManagerImpl.java
ndroid/camera/one/v2/SimpleOneCameraFactory.java
ndroid/camera/one/v2/ZslOneCameraFactory.java
ndroid/camera/util/ApiHelper.java
|
| e17a39b6bef8264956e48d7dbf7139fbe738dbe2 |
21-Feb-2015 |
Senpo Hu <senpo@google.com> |
Merge "Assign an initial state for the state machine." into ub-camera-haleakala
|
| 4908a11eefa7f69129891bc9859029d6b2504efa |
21-Feb-2015 |
Senpo Hu <senpo@google.com> |
Assign an initial state for the state machine.
Bug: 18726217
Change-Id: I357a0565697ee7e7ec0473b8906362fc63d79c4f
ndroid/camera/captureintent/state/State.java
ndroid/camera/captureintent/state/StateMachine.java
|
| 4974105403bee9b2de0e5d59c86bb50e505409cf |
21-Feb-2015 |
Paul Rohde <codelogic@google.com> |
Merge "HDR Scene mode support for CaptureModule." into ub-camera-haleakala
|
| f82fe68f0481ce569ad3870f298586dc46aafc2a |
21-Feb-2015 |
Senpo Hu <senpo@google.com> |
Merge "Instantiate CaptureIntentModule in ModulesInfo." into ub-camera-haleakala
|
| 01e482a30cca945821e9a0c9ab927d66d34b2ac5 |
21-Feb-2015 |
Senpo Hu <senpo@google.com> |
Instantiate CaptureIntentModule in ModulesInfo.
Bug: 18726217
Change-Id: I93397322843a7b1258b881e19ae90a7f6fb55e3b
ndroid/camera/CameraActivity.java
ndroid/camera/app/ModuleManager.java
ndroid/camera/module/ModulesInfo.java
ndroid/camera/settings/AppUpgrader.java
|
| 0db8a2fd5cc02753d42f34a1c858b980c6c277bb |
20-Feb-2015 |
Paul Rohde <codelogic@google.com> |
HDR Scene mode support for CaptureModule.
Bug: 18622877 N4 HDR Scene support.
Bug: 19269257 HDR+ flash setting persistance.
Change-Id: Ibac3d6513a1e14d8a2ffaf6208509133d31a8fb8
ndroid/camera/CaptureModule.java
ndroid/camera/one/AbstractOneCamera.java
ndroid/camera/one/OneCamera.java
ndroid/camera/one/OneCameraCharacteristics.java
ndroid/camera/one/v1/OneCameraCharacteristicsImpl.java
ndroid/camera/one/v2/OneCameraCharacteristicsImpl.java
ndroid/camera/one/v2/OneCameraFactory.java
ndroid/camera/one/v2/SimpleOneCameraFactory.java
ndroid/camera/one/v2/ZslOneCameraFactory.java
ndroid/camera/one/v2/common/BasicCameraFactory.java
ndroid/camera/one/v2/common/FlashBasedAEMode.java
ndroid/camera/one/v2/common/HdrSettingBasedSceneMode.java
ndroid/camera/one/v2/initialization/InitializedOneCameraFactory.java
|
| abe810e55965009846e23e0ea631b6f9f32dd452 |
21-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Fix build breakage due to incorrect import
Change-Id: I2c13c343fd83d97e3205510fd4634ae0b941cf14
ndroid/camera/one/v2/commands/CameraCommandExecutor.java
|
| 56ca4d2ba87f0d9fc97d9e9f15a1ae0f0ed7586b |
21-Feb-2015 |
Senpo Hu <senpo@google.com> |
Merge "Introduce CaptureIntentModule" into ub-camera-haleakala
|
| 1893a030b6b68feb859f99900fc13e5e79e539ae |
21-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Reset the camera after detecting repeated failure" into ub-camera-haleakala
|
| 24be7cc6d138129b4087ef28f114701de54aba3c |
19-Feb-2015 |
Senpo Hu <senpo@google.com> |
Introduce CaptureIntentModule
Continue with ag/618042.
===================
Improve the UX by adopting ZSL and showing fast intermediate thumbnail.
Try to implement this from scratch, this module has an
event driven and state machine design.
* the state machine is thread safe.
* Event is implemented with guava's Function.
* The event processing uses Strategy pattern.
State Machine Chart:
https://docs.google.com/presentation/d/1LA30__ZNnzO6HWju1kA0geJ5LBsMs3hvdTf6_IPn9Y0/edit#slide=id.p
Bug: 18726217
Change-Id: Ie869c84bfe2f02145e5cb5c9e9af270fd82048d6
ndroid/camera/CameraActivity.java
ndroid/camera/app/AppController.java
ndroid/camera/app/OrientationManager.java
ndroid/camera/app/OrientationManagerImpl.java
ndroid/camera/async/RefCountBase.java
ndroid/camera/burst/BurstFacadeFactory.java
ndroid/camera/captureintent/CaptureIntentConfig.java
ndroid/camera/captureintent/CaptureIntentModule.java
ndroid/camera/captureintent/CaptureIntentModuleUI.java
ndroid/camera/captureintent/PreviewTransformCalculator.java
ndroid/camera/captureintent/state/Event.java
ndroid/camera/captureintent/state/ResourceCaptureTools.java
ndroid/camera/captureintent/state/ResourceConstructed.java
ndroid/camera/captureintent/state/ResourceOpenedCamera.java
ndroid/camera/captureintent/state/ResourceSurfaceTexture.java
ndroid/camera/captureintent/state/State.java
ndroid/camera/captureintent/state/StateBackground.java
ndroid/camera/captureintent/state/StateFatal.java
ndroid/camera/captureintent/state/StateForeground.java
ndroid/camera/captureintent/state/StateForegroundWithSurfaceTexture.java
ndroid/camera/captureintent/state/StateIntentCompleted.java
ndroid/camera/captureintent/state/StateMachine.java
ndroid/camera/captureintent/state/StateOpeningCamera.java
ndroid/camera/captureintent/state/StateReadyForCapture.java
ndroid/camera/captureintent/state/StateReviewingPicture.java
ndroid/camera/captureintent/state/StateSavingPicture.java
ndroid/camera/captureintent/state/StateStartingPreview.java
ndroid/camera/settings/CameraFacingSetting.java
ndroid/camera/settings/ResolutionSetting.java
|
| 6645855f2f0989254e2edf72f330e2d30dcef564 |
20-Feb-2015 |
Senpo Hu <senpo@google.com> |
Merge "Add captureintent.PictureDecoder." into ub-camera-haleakala
|
| fff20fbff842da0deb6d314071742119592c5b47 |
20-Feb-2015 |
Senpo Hu <senpo@google.com> |
Merge "Move resources allocation in CameraActivity to the front in onCreateTasks." into ub-camera-haleakala
|
| 7486e9b01d635bafd9e36b8aebf088f42637d64e |
20-Feb-2015 |
Senpo Hu <senpo@google.com> |
Move resources allocation in CameraActivity to the front in onCreateTasks.
The new capture intent module requires several resource in its
constructor. This CL addresses the need.
Bug: 18726217
Change-Id: Ic2c0966151b58b23b4ac4be882067bf9362177f7
ndroid/camera/CameraActivity.java
|
| 00a764a3b6d9072413d18b441c759d4a604223b4 |
20-Feb-2015 |
Senpo Hu <senpo@google.com> |
Add captureintent.PictureDecoder.
Extract the logic from PhotoModule so it be reused by the new capture
intent module.
Bug: 18726217
Change-Id: I7c3b2f6f556dd40bbc02d0624117bf4675e85a02
ndroid/camera/PhotoUI.java
ndroid/camera/captureintent/PictureDecoder.java
ndroid/camera/util/CameraUtil.java
|
| c3b6ca1d07a73274be8917c1d051122f9f36eb3b |
20-Feb-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Remove CanSwipeInFullScreen attribute." into ub-camera-haleakala
|
| 270990a7e3fcd1cf71b652c9ad1cc46598ddf4b3 |
19-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Reset the camera after detecting repeated failure
Bug: 19061883
Change-Id: I913334e19fc248010bdeb2dab4ae1a6d05427f40
ndroid/camera/one/v2/SimpleOneCameraFactory.java
ndroid/camera/one/v2/ZslOneCameraFactory.java
ndroid/camera/one/v2/autofocus/ManualAutoFocusFactory.java
ndroid/camera/one/v2/camera2proxy/AndroidCameraCaptureSessionProxy.java
ndroid/camera/one/v2/camera2proxy/AndroidCameraDeviceProxy.java
ndroid/camera/one/v2/camera2proxy/CameraDeviceProxy.java
ndroid/camera/one/v2/commands/CameraCommandExecutor.java
ndroid/camera/one/v2/common/BasicCameraFactory.java
ndroid/camera/one/v2/core/ResponseListener.java
ndroid/camera/one/v2/core/TagDispatchCaptureSession.java
ndroid/camera/one/v2/errorhandling/RepeatFailureDetector.java
ndroid/camera/util/Provider.java
|
| f0ff1a9aa44d04f680af7cec8b97c3b01d3e76bd |
18-Feb-2015 |
Sascha Haeberling <haeberling@google.com> |
Refactors the CaptureSession API by splitting out notifier interface.
This will remove the need to pass in an *Impl instead of an interface
and will therefore make the capture intent refactor cleaner as well.
Change-Id: I4d3b272e9cde1548c8ef1ad235a31bf420fe4f74
ndroid/camera/session/CaptureSessionFactory.java
ndroid/camera/session/CaptureSessionFactoryImpl.java
ndroid/camera/session/CaptureSessionImpl.java
ndroid/camera/session/CaptureSessionManager.java
ndroid/camera/session/CaptureSessionManagerImpl.java
ndroid/camera/session/SessionNotifier.java
|
| b6a8810b7a5ac0df1e19efd26628c01bcb32b97b |
19-Feb-2015 |
Paul Rohde <codelogic@google.com> |
Remove CanSwipeInFullScreen attribute.
This fixes the swipe guesture problem by removing the mostly
unused canSwipeInFullScreen attribute on filmstrip items and
checking existing usages to ensure they still work.
Bug: 18948437
Change-Id: I7d8c9fba4b0cf3db6fc3d60afe37d527c0732318
ndroid/camera/data/CameraFilmstripDataAdapter.java
ndroid/camera/data/FilmstripItemAttributes.java
ndroid/camera/data/FixedFirstProxyAdapter.java
ndroid/camera/data/FixedLastProxyAdapter.java
ndroid/camera/data/PhotoItem.java
ndroid/camera/data/PlaceholderItem.java
ndroid/camera/data/VideoItem.java
ndroid/camera/filmstrip/FilmstripDataAdapter.java
ndroid/camera/widget/FilmstripView.java
|
| 90b584400dc5d7535de84f6a2601e3d3e6825764 |
19-Feb-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Lock opacity of filmstrip items at 100% when scaling." into ub-camera-haleakala
|
| 83b241e447a2b1a6da8fc2f4f40ac2ae3bcf4152 |
19-Feb-2015 |
Paul Rohde <codelogic@google.com> |
Fix accidental import.
Change-Id: Ia6bb08c1d1c690510faf1b8fd45b128685908821
ndroid/camera/CaptureModule.java
|
| d34df829eba68c977ef4c77e3f6830fbbc8d01bf |
21-Jan-2015 |
Paul Rohde <codelogic@google.com> |
Create log and guard profilers.
Change-Id: I824e0f65be05e3681189802610656955ba14d5bf
ndroid/camera/CameraActivity.java
ndroid/camera/CaptureModule.java
ndroid/camera/app/CameraApp.java
ndroid/camera/app/FirstRunDetector.java
ndroid/camera/stats/profiler/GuardingProfile.java
ndroid/camera/stats/profiler/GuardingProfiler.java
ndroid/camera/stats/profiler/LoggingProfile.java
ndroid/camera/stats/profiler/LoggingProfiler.java
ndroid/camera/stats/profiler/Profile.java
ndroid/camera/stats/profiler/ProfileBase.java
ndroid/camera/stats/profiler/Profiler.java
ndroid/camera/stats/profiler/Profilers.java
ndroid/camera/stats/profiler/Writer.java
|
| e7263f7ea45cf31d3948984ba8514e03ef86627e |
19-Feb-2015 |
Paul Rohde <codelogic@google.com> |
Lock opacity of filmstrip items at 100% when scaling.
Bug: 19252309
Change-Id: Ia82714649e7fac7b1cce2adc21c36832e055f9f6
ndroid/camera/widget/FilmstripView.java
|
| 025b23f1dd9bd2dc92db4b42d67026e154d11aaf |
19-Feb-2015 |
Senpo Hu <senpo@google.com> |
Merge "Introduce CaptureSessionFactory interface." into ub-camera-haleakala
|
| b20ba94a5df96aef8857fbed18e93ca0a1a2b754 |
18-Feb-2015 |
Paul Rohde <codelogic@google.com> |
Fix location of PreviewSizeSelector.
Change-Id: I7645ef27e46e5652a427a2a19ab9df8a3055cb40
ndroid/camera/one/PreviewSizeSelector.java
ndroid/camera/one/v2/PreviewSizeSelector.java
|
| 251c60cbdfc6b221510a43dd25543ea16f9f582b |
17-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Disable AE precapture trigger when flash is off
Bug: 19407066
Change-Id: I9d5ec0271510fe6ff5615767fc3523ba5e287bc3
ndroid/camera/one/v2/SimpleOneCameraFactory.java
ndroid/camera/one/v2/photo/ConvergedImageCaptureCommand.java
ndroid/camera/one/v2/photo/PictureTakerFactory.java
ndroid/camera/one/v2/photo/ZslPictureTakerFactory.java
|
| 6dabcd78a044233c1f308611e6209aa8371e3295 |
18-Feb-2015 |
Sascha Haeberling <haeberling@google.com> |
Merge "Make sure shutter button is inactive before the preview was started." into ub-camera-haleakala
|
| 8ad02daf72adbc700743d2c949558acbd4f4233d |
18-Feb-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Add a PreviewSizeSelector interface." into ub-camera-haleakala
|
| 249b796a6be8eb0761faa8d59ca8840919f5d734 |
18-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Fix resource leak" into ub-camera-haleakala
|
| da9d37d2fcc37e071fb2cab15bbc2b860d443347 |
18-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Fix resource leak
Bug: 19407130
Change-Id: Ia08013c1240a2e3e4b9a55d0a08be06d3f4f91b3
ndroid/camera/one/v2/sharedimagereader/imagedistributor/ImageDistributorFactory.java
|
| 9b0205056c30372f8e3fae2a67b20f238319f503 |
18-Feb-2015 |
Andy Huibers <andyhuibers@google.com> |
Make sure ringer/sound silencing does not interfere with recording
start and stop sounds.
Bug: 19210666
Change-Id: I16b3cb4df62b05903ad53044ac66d69efffb5f74
ndroid/camera/VideoModule.java
|
| 6ba8eeea4758e29318c615e978c63599c30438b4 |
18-Feb-2015 |
Paul Rohde <codelogic@google.com> |
Add a PreviewSizeSelector interface.
This removes the required context object for the utility objects
in both CameraUtil and CaptureModuleUtil. Adding an interface
for PreviewSizeSelection clears the way for future work to move
the preview size selection code into a dedicated class and to have
api specific versions of preview selection code for startup
speed improvements.
Change-Id: I92e58dad23b08057eb10984c31d04947a376ac6d
ndroid/camera/CaptureModuleUtil.java
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.java
ndroid/camera/one/v2/OneCameraImpl.java
ndroid/camera/one/v2/OneCameraZslImpl.java
ndroid/camera/one/v2/PreviewSizeSelector.java
ndroid/camera/one/v2/initialization/Camera2PreviewSizeSelector.java
ndroid/camera/one/v2/initialization/GenericOneCameraImpl.java
ndroid/camera/one/v2/initialization/InitializedOneCameraFactory.java
ndroid/camera/one/v2/initialization/PreviewSizeSelector.java
ndroid/camera/util/CameraUtil.java
|
| 71332e70c750948343a93600aa68ebd6fc43ad68 |
18-Feb-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Fix NaN in LinearScale" into ub-camera-haleakala
|
| 5c401f50563dde4ea3d28fd37bd396abf93b2a5c |
18-Feb-2015 |
Paul Rohde <codelogic@google.com> |
Fix NaN in LinearScale
Change-Id: Ie3cc20f713940aba7426ce54dbb2fad32cda45bf
ndroid/camera/ui/motion/LinearScale.java
|
| 6a7c7722d1eb49418b8ee02df0018f03719a8c61 |
13-Feb-2015 |
I-Jong Lin <ijonglin@google.com> |
N4 Capture Module Rotation/EXIF fix
Finally, have some understanding what values are supposed to be
passed to the session vs. what are supposed to be put in the EXIF
flags. Although they are similar, they are used for slightly
different purposes. This CL has been tested on both N5 and N4
and seems to give filmstrip behavior and forwards the correct
EXIF values.
Bug: 19378973
Change-Id: Ie8b41b6d8e03e0a5392da8f0e7b52f65383b4e4f
ndroid/camera/processing/imagebackend/TaskCompressImageToJpeg.java
|
| 5fb629902527b7c688358ece3ef1f181322fc2ab |
17-Feb-2015 |
Senpo Hu <senpo@google.com> |
Introduce CaptureSessionFactory interface.
Currently CaptureSessionManagerImpl always creates CaptureSessionImpl.
However, the capture intent module needs a mechanism to create its
custom CaptureSession objects.
Bug: 18726217
Change-Id: I30b3e01dc27f7c5f14d783c83bcdab76e823f0a6
ndroid/camera/app/CameraServicesImpl.java
ndroid/camera/session/CaptureSessionFactory.java
ndroid/camera/session/CaptureSessionFactoryImpl.java
ndroid/camera/session/CaptureSessionManager.java
ndroid/camera/session/CaptureSessionManagerImpl.java
|
| 160293ecf8e17d418e6ac0b2bd49470f5e8052b3 |
17-Feb-2015 |
Sascha Haeberling <haeberling@google.com> |
Merge "Allow for the thumbnail to be updated and refreshed." into ub-camera-haleakala
|
| 01369b2e64f347f4425286ac5f4762db97b490cb |
17-Feb-2015 |
Sascha Haeberling <haeberling@google.com> |
Merge "Add method to detect L MR1 or higher for NPF compatability." into ub-camera-haleakala
|
| a8c7362bad737952f671cc6b26f12209c8a514a5 |
17-Feb-2015 |
Sascha Haeberling <haeberling@google.com> |
Add method to detect L MR1 or higher for NPF compatability.
Bug: 1939424:
Change-Id: I60470e4ddfa81004db6f3efe4ea470f89579baa5
ndroid/camera/util/ApiHelper.java
|
| b6c4a314d0a0a185e6d987298ef9b7f4db8a6a2f |
11-Feb-2015 |
Senpo Hu <senpo@google.com> |
Enable exposure compensation in CaptureModule.
* Expose camera exposure compensation capabilities in OneCameraCharacteristics.
* Turn off exposure compensation on Nexus 6 (API level 21).
Bug: 18523154
Change-Id: I551f19945f5a64a09a76b3a0777664d16a9b2ba2
ndroid/camera/CaptureModule.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/one/OneCameraCharacteristics.java
ndroid/camera/one/v1/OneCameraCharacteristicsImpl.java
ndroid/camera/one/v2/OneCameraCharacteristicsImpl.java
ndroid/camera/one/v2/OneCameraFactory.java
ndroid/camera/one/v2/SimpleOneCameraFactory.java
ndroid/camera/one/v2/ZslOneCameraFactory.java
ndroid/camera/one/v2/common/BasicCameraFactory.java
ndroid/camera/util/ApiHelper.java
ndroid/camera/widget/ModeOptions.java
ndroid/camera/widget/ModeOptionsOverlay.java
|
| 401990916915791be14c65694ce3507eac3ec82d |
17-Feb-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Read focus range from CameraCharacteristics." into ub-camera-haleakala
|
| 636bce5ed9771df424a5ca46586648a11018179b |
14-Feb-2015 |
Sascha Haeberling <haeberling@google.com> |
Allow for the thumbnail to be updated and refreshed.
Bug: 19325176
Change-Id: Icc0f08b4c8b20e1b6d3e66fa420efea9e24faf73
ndroid/camera/CameraActivity.java
ndroid/camera/session/CaptureSession.java
ndroid/camera/session/CaptureSessionImpl.java
ndroid/camera/session/CaptureSessionManager.java
ndroid/camera/session/CaptureSessionManagerImpl.java
|
| 1226e43679d40427257e280c50cbdd4c83c8db00 |
13-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Fix bug in which exposure and AE settings were not applied to AF scans" into ub-camera-haleakala
|
| 3bfc4b9613c758e3852e147cd9910231c5637adf |
13-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Fix bug in which exposure and AE settings were not applied to AF scans
Change-Id: I2b495bab4221f231835219173edade26f3e4e896
ndroid/camera/one/v2/autofocus/ManualAutoFocusFactory.java
ndroid/camera/one/v2/common/BasicCameraFactory.java
|
| ec980898dd0dc712a3d6373c06a13f8646a0eebc |
13-Feb-2015 |
Alan Newberger <alann@google.com> |
Remove flicker from view items added to hierarchy as visible
With view items made visible right when added to hierarchy,
under certain use cases the view would then get drawn before
layout puts them offscreen and turns visibility off again. One
example is delete -- once a deletion drag finishes, a view is
added to the end of the 5-item array set to visible, and when
dragging would briefly get shown. This CL ensures views only
become visible when properly positioned.
Bug: 17905863
Change-Id: I860dbee421f5bf6acb3cd9f5c09e4130eb9bc3c9
ndroid/camera/widget/FilmstripView.java
|
| 7a72d72e97fe280fd88127b7891efe9112bcaeac |
12-Feb-2015 |
I-Jong Lin <ijonglin@google.com> |
N4 CaptureModule Memory Optimization
Although functionally correct, there was some processing that was
wasteful of memory in N4 Capture Module. The two major culprits
are the implicit full-size JPEG decoding for the thumbnail, and
using the capacity (instead of the limit) of the byte buffers when
making a memory copy of the JPEG data. Fixes include a explicit
subsample value for thumbnail and a tighter memory allocation based on
the limit.
Bug: 19354120
Change-Id: Ibd94c30974753e426254ac002e795b5d1de8bcba
ndroid/camera/one/v2/imagesaver/JpegImageBackendImageSaver.java
ndroid/camera/processing/imagebackend/TaskCompressImageToJpeg.java
|
| 718c88615444f2b9e68f27dd51b46eb740d1aaff |
13-Feb-2015 |
Sascha Haeberling <haeberling@google.com> |
Merge "Route all thumbnail updates through CaptureSession" into ub-camera-haleakala
|
| 660550fea5aec2c1131c7f5d15bd679a48196b60 |
13-Feb-2015 |
Andy Huibers <andyhuibers@google.com> |
Merge "Simplify double onResume workaround and allow different delays for secure and non secure lock screen." into ub-camera-haleakala
|
| 9fc67f9d5c7a31e828e52f4621054dd9ac170826 |
13-Feb-2015 |
Shashi Shekhar <shashishekhar@google.com> |
Merge "Fix setting surface texture." into ub-camera-haleakala
|
| 75c8abdce334f195fb6a1423495fe9d20e5139bd |
12-Feb-2015 |
Shashi Shekhar <shashishekhar@google.com> |
Fix setting surface texture.
Related to removal of FrameDistributor in http://ag/616209
BUG: 19368123
Change-Id: Ie49c5303db72d457493d7967ec2ee5e8638e1956
ndroid/camera/CaptureModule.java
|
| 6dd5840e86bffecba8a7f52327b9c1085caeb7d2 |
10-Feb-2015 |
Sascha Haeberling <haeberling@google.com> |
Route all thumbnail updates through CaptureSession
Bug: 19326495
Bug: 19310525
This removes the thumbnail ready callback that was hooked directly into
the ImageBackend from the CaptureModule before since it's now
unnecessary.
Client of CaptureSession can no optionally specify whether the updated
thumbnail is to be used to update the capture indicator. Default is
'yes' so that Lens Blur, Photo Sphere and HDR+ don't need to change.
Change-Id: I94adb50f875ccee214492f03f00ed2a67d400da1
ndroid/camera/CameraActivity.java
ndroid/camera/CaptureModule.java
ndroid/camera/PhotoModule.java
ndroid/camera/one/OneCamera.java
ndroid/camera/one/v2/imagesaver/JpegImageBackendImageSaver.java
ndroid/camera/one/v2/imagesaver/YuvImageBackendImageSaver.java
ndroid/camera/session/CaptureSession.java
ndroid/camera/session/CaptureSessionImpl.java
ndroid/camera/session/CaptureSessionManager.java
ndroid/camera/session/CaptureSessionManagerImpl.java
|
| 55c5150ff358665f3dc3f1a22b6d6c5c5b1ef034 |
12-Feb-2015 |
Andy Huibers <andyhuibers@google.com> |
Simplify double onResume workaround and allow different delays for secure
and non secure lock screen.
Bug: 17925205
Change-Id: Ia7cf1d3e134cb7aa725fdeed71235825969d0f89
ndroid/camera/util/QuickActivity.java
|
| aca904e29aea542b6e6a4fcc837759a57a270a49 |
12-Feb-2015 |
Paul Rohde <codelogic@google.com> |
Read focus range from CameraCharacteristics.
- Remove hardcoded focus range values.
- Explicitly provide a lens range and range checks.
Bug: 19356651
Change-Id: Ied2513b5a654a00af07e76a66e72aac50ffc9c42
ndroid/camera/one/OneCamera.java
ndroid/camera/one/OneCameraCharacteristics.java
ndroid/camera/one/v1/OneCameraCharacteristicsImpl.java
ndroid/camera/one/v2/OneCameraCharacteristicsImpl.java
ndroid/camera/one/v2/OneCameraImpl.java
ndroid/camera/one/v2/OneCameraZslImpl.java
ndroid/camera/one/v2/SimpleOneCameraFactory.java
ndroid/camera/one/v2/ZslOneCameraFactory.java
ndroid/camera/one/v2/initialization/GenericOneCameraImpl.java
ndroid/camera/one/v2/initialization/InitializedOneCameraFactory.java
ndroid/camera/ui/focus/FocusController.java
ndroid/camera/ui/focus/LensRangeCalculator.java
ndroid/camera/ui/motion/LinearScale.java
|
| 5a49a792186082177ba00eff6d381927e056d258 |
12-Feb-2015 |
I-Jong Lin <ijonglin@google.com> |
N4 Shutter Regression Fix
The fix to allow the OnCameraAvailable Listener synchronization
causes a regression failure in enabling the shutter button properly.
Remove that fix, but now I can enable CaptureModule N4 by default,
since it actually works now.
Bug: 19355923
Change-Id: I60fbc38010535cd750a2a74b9b6ead12df80e366
ndroid/camera/async/ListenableConcurrentState.java
ndroid/camera/module/ModulesInfo.java
|
| eb0aa6a261bd2b2009efb279c29c5bed97b9a334 |
12-Feb-2015 |
I-Jong Lin <ijonglin@google.com> |
Merge "N4 CaptureModule not closing" into ub-camera-haleakala
|
| b4b27f2c7738cd5e3f31a281d66a33f4698810b3 |
16-Jan-2015 |
Shashi Shekhar <shashishekhar@google.com> |
Port burst to use FrameServer.
Port burst to frameserver
- simplifies burst interfaces
- removes burst methods from OneCamera.
- locks orientation when burst is running.
- Deletes most old code for burst integration.
- Removes frame distributor preview forwarding, instead frames are
streamed using a surface texture the Surface for which is passed
as a output target to the create capture session.
- Deletes FrameDistributor, now the low-res frames are streamed to a new
surface specifically setup for burst.
Change-Id: I50f2955bb48610a7e284f9609cd70b8e4e1f1059
ndroid/camera/CaptureModule.java
ndroid/camera/burst/BurstCaptureCommand.java
ndroid/camera/burst/BurstConfiguration.java
ndroid/camera/burst/BurstController.java
ndroid/camera/burst/BurstFacade.java
ndroid/camera/burst/BurstFacadeFactory.java
ndroid/camera/burst/BurstFacadeImpl.java
ndroid/camera/burst/BurstImage.java
ndroid/camera/burst/BurstResultsSaver.java
ndroid/camera/burst/BurstTaker.java
ndroid/camera/burst/BurstTakerImpl.java
ndroid/camera/burst/EvictionHandler.java
ndroid/camera/burst/OrientationLockController.java
ndroid/camera/burst/ResultsAccessor.java
ndroid/camera/burst/RingBuffer.java
ndroid/camera/burst/SurfaceTextureContainer.java
ndroid/camera/burst/ToastingBurstFacadeDecorator.java
ndroid/camera/gl/CopyShader.java
ndroid/camera/gl/FrameDistributor.java
ndroid/camera/gl/FrameDistributorImpl.java
ndroid/camera/gl/FrameDistributorWrapper.java
ndroid/camera/gl/GLToolbox.java
ndroid/camera/gl/RenderTarget.java
ndroid/camera/gl/SurfaceTextureConsumer.java
ndroid/camera/one/AbstractOneCamera.java
ndroid/camera/one/OneCamera.java
ndroid/camera/one/OneCameraManager.java
ndroid/camera/one/v1/OneCameraManagerImpl.java
ndroid/camera/one/v2/ImageCaptureManager.java
ndroid/camera/one/v2/OneCameraFactory.java
ndroid/camera/one/v2/OneCameraManagerImpl.java
ndroid/camera/one/v2/OneCameraZslImpl.java
ndroid/camera/one/v2/SimpleOneCameraFactory.java
ndroid/camera/one/v2/ZslOneCameraFactory.java
ndroid/camera/one/v2/initialization/GenericOneCameraImpl.java
ndroid/camera/one/v2/sharedimagereader/ZslSharedImageReaderFactory.java
|
| f27cf91653d6be413e14c362a0887d3bf1f5ca50 |
12-Feb-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Fix several focus indicator edge cases." into ub-camera-haleakala
|
| 3ac7a551f005d43f86617ae400b7a203c552b386 |
11-Feb-2015 |
Paul Rohde <codelogic@google.com> |
Futures2 async join functions.
Change-Id: I4dd62570df4886276e0be0e4e589e5685bcfa856
ndroid/camera/async/Futures2.java
|
| 25de24b2930d176a3957cb6865564e9e334175d6 |
12-Feb-2015 |
I-Jong Lin <ijonglin@google.com> |
N4 CaptureModule not closing
N4 CaptureModule was not wired up properly to close the device when it
closed. There's still an issue that the synchronization is incorrect,
i.e. we don't guarentee close has completed before we open it again.
There's a fix so that we can use OnCameraAvailable listener to only open
the camera when it is available.
Bug: 19332637
Change-Id: Ie88acb3a9f75a5896606dd660c005de0dc82dc3c
ndroid/camera/async/ListenableConcurrentState.java
ndroid/camera/module/ModulesInfo.java
ndroid/camera/one/v2/SimpleOneCameraFactory.java
ndroid/camera/one/v2/initialization/GenericOneCameraImpl.java
|
| 3969cc29e63b999501324aefbe2e0b74fb8fdbae |
11-Feb-2015 |
Paul Rohde <codelogic@google.com> |
Add a shutdown mechanism to the camera lifecycle.
Change-Id: I68676dfb52dec4bba97275b46e0a99d0974028f6
ndroid/camera/device/MultiCameraDeviceLifecycle.java
|
| 2c2ce5c75980fea0d39dc95725413404b686ade8 |
11-Feb-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Adjust device lifecycle log messages to be more consistent." into ub-camera-haleakala
|
| d552f16540c59b28073e526e99fbcfe7dfa5ef09 |
11-Feb-2015 |
Paul Rohde <codelogic@google.com> |
Adjust device lifecycle log messages to be more consistent.
Change-Id: Iaeed1c0746f05aedcd1ee0554b0904256a28e623
ndroid/camera/device/Camera2Actions.java
ndroid/camera/device/CameraDeviceKey.java
ndroid/camera/device/LegacyCameraActions.java
ndroid/camera/device/PortabilityCameraActions.java
ndroid/camera/device/SingleDeviceStateMachine.java
|
| 469dafb8cf229524e85b3bcb8093297c9fecc07d |
11-Feb-2015 |
Alan Newberger <alann@google.com> |
Remove overlays from Capture UI, partial revert of overdraw improvements
This partially reverts ag/631666, keeping overdraw improvements for
filmstrip but adding overdraw back in for capture to remove overlays
which have landscape issues in video/photosphere. Keeping
MarginDrawable in codebase for now in hopes of re-adding the overlay
soon.
Bug: 19352143
Change-Id: I7c75a7dcfa1643c7e4783742bfe5da49443a1848
ndroid/camera/app/CameraAppUI.java
|
| 4c7278d85c3398c97f941efb245df6e3ccde22c4 |
31-Jan-2015 |
Paul Rohde <codelogic@google.com> |
Fix several focus indicator edge cases.
Bug: 19213609
Bug: 18949556
Bug: 19214672
Bug: 19213602
Change-Id: I0d5c5ce8b4a62f98b44f6ae02ef1ac81d1d7f178
ndroid/camera/CaptureModule.java
ndroid/camera/FocusOverlayManager.java
ndroid/camera/VideoModule.java
ndroid/camera/ui/focus/AutoFocusRing.java
ndroid/camera/ui/focus/FocusController.java
ndroid/camera/ui/focus/FocusRing.java
ndroid/camera/ui/focus/FocusRingRenderer.java
ndroid/camera/ui/focus/FocusRingView.java
ndroid/camera/ui/focus/ManualFocusRing.java
ndroid/camera/ui/motion/LinearScale.java
ndroid/camera/util/DebugBoundsRenderer.java
|
| 07a37cae38cb971c0bccb2d76db82467242c6456 |
11-Feb-2015 |
Andy Huibers <andyhuibers@google.com> |
Merge "Don't assume OneCamera implementation is ready to take a shot after startup." into ub-camera-haleakala
|
| affc49eb57fbd1223d8659f022862ddde7167150 |
10-Feb-2015 |
Alan Newberger <alann@google.com> |
Merge "Remove app background and reduce 1 layer of overdraw" into ub-camera-haleakala
|
| b69e9bbc7dd762e980c42d3f09498543a3485c44 |
10-Feb-2015 |
I-Jong Lin <ijonglin@google.com> |
Merge "Add JPEG Orientation into N4 CaptureRequests" into ub-camera-haleakala
|
| f68a39a0ad362ff0543e11e3f0ce11741a7de48c |
05-Feb-2015 |
I-Jong Lin <ijonglin@google.com> |
Add JPEG Orientation into N4 CaptureRequests
Wired up the SimpleOneCameraFactory to dynamically decorate
the JPEG capture request with the proper orientation so that
the framework does the proper orientation.
Paired with ag/629241.
Bug: 19122922
Change-Id: If206b0d18979ddc4ed9ab6df7ce4d22ba01534a8
ndroid/camera/CaptureModule.java
ndroid/camera/module/ModulesInfo.java
ndroid/camera/one/v2/SimpleOneCameraFactory.java
ndroid/camera/one/v2/imagesaver/JpegImageBackendImageSaver.java
ndroid/camera/one/v2/imagesaver/YuvImageBackendImageSaver.java
ndroid/camera/one/v2/photo/ImageRotationCalculator.java
ndroid/camera/one/v2/photo/ImageRotationCalculatorImpl.java
ndroid/camera/processing/imagebackend/TaskCompressImageToJpeg.java
|
| 0079bc118851fd3d7d9cf73b46f7a3057cef1aec |
10-Feb-2015 |
Andy Huibers <andyhuibers@google.com> |
Don't assume OneCamera implementation is ready to take a shot after startup.
Bug: 18114636
Change-Id: I1b4366dcef4a7f02a3240768508b39296db9b0b9
ndroid/camera/CaptureModule.java
|
| d7064a6c6f1eb0748de8f56b8a1e006d60ab0f7e |
10-Feb-2015 |
Alan Newberger <alann@google.com> |
Remove app background and reduce 1 layer of overdraw
Set the app background to null. This saves one full layer of
overdraw in the filmstrip. The capture UI is more dependent
on the window background, both for gaps in the preview and
screen edges, and behind the shutter button when it is
made transparent when the mode list is open. The preview
is a large portion of screen and to remove one overdraw,
we instead fill gaps around the preview with a
MarginDrawable overlay. This CL leaves a background behind
the shutter button when opaque, to allow for it becoming
transparent during mode list view.
Bug: 18596159
Change-Id: I2a9083a2413944c6244e2f0528164e8852ae3d8e
ndroid/camera/CameraActivity.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/BottomBar.java
ndroid/camera/ui/MarginDrawable.java
|
| b350c0beb091086526c6ca8985a1beebc0d7c74d |
10-Feb-2015 |
Andy Huibers <andyhuibers@google.com> |
Log service requests taking longer than a threshold.
Bug: 19269341
Change-Id: I1d199b7e53890214ab2d9fabb0e82219ed7b5699
ndroid/camera/util/AndroidServices.java
|
| 444bd470a7e1c7475798b89b567f0c34b4b42d92 |
10-Feb-2015 |
Sascha Haeberling <haeberling@google.com> |
Fish crash due to null session bitmap
Bug: 19310525
Change-Id: I3701f18ba4080f2414bdb84141d8bf9597d9ab3b
ndroid/camera/data/SessionItem.java
|
| 8a8534566eed80d85b472adfe25d5c21822ffcf2 |
10-Feb-2015 |
Sascha Haeberling <haeberling@google.com> |
Fix capture indicators not showing caused by refactoring last month.
Bug: 19310525
This was caused by http://ag/607738 which refactored the data classes.
Change-Id: Idbbaf1b40c9aaf5ea241408125fa97bb2e6c36b2
ndroid/camera/data/SessionItem.java
|
| 49ad739cea7758555940ba8dd1c4cbf9bf0eb55d |
09-Feb-2015 |
Alan Newberger <alann@google.com> |
Merge "gray cleanup to 1b1b1b" into ub-camera-haleakala
|
| 8992a26dd589310b2f45cbb01c158f324fd10289 |
07-Feb-2015 |
Alan Newberger <alann@google.com> |
gray cleanup to 1b1b1b
During Material update, filmstrip background was intentionally made
1b1b1b. Capture button and mode covers were slightly off from a previous
gray design. Unifying all to one color constant. There are other, unused
background specified from older times, removing them as part of cleanup.
Confirmed with UX that all these colors should be 1b1b1b.
Change-Id: I3da07e9828546d2c9d30a8ac756a0bbb89d6376c
ndroid/camera/app/CameraAppUI.java
ndroid/camera/widget/FilmstripLayout.java
|
| 1966f422391c2478abffb2dad2006a9c7f7c2042 |
07-Feb-2015 |
Sascha Haeberling <haeberling@google.com> |
Make sure shutter button is inactive before the preview was started.
Bug: 19285609
Change-Id: I7ef4cd5a80bdc151d743ece99aa1528ffe09ed20
ndroid/camera/CaptureModule.java
|
| b3774e8135e1b61d97166194aa466123a265bf4d |
06-Feb-2015 |
Andy Huibers <andyhuibers@google.com> |
Access KeyguardManager from AndroidServices.
Bug: 17925205
Change-Id: I29bd61eb49f5c8a5ec3ac7d9c2357d742e1929d1
ndroid/camera/util/AndroidServices.java
ndroid/camera/util/QuickActivity.java
|
| c3adc0558139f6b7424f8be1116c246455bdf6ab |
06-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Implement ready-state for non-zsl cameras
Bug: 18934542
Change-Id: I028177a0ea02d8477083ffca8b40d03be5f444ac
ndroid/camera/one/v2/SimpleOneCameraFactory.java
|
| adf3b29e69726175761fa2a5558c545822024bed |
06-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Minor cleanup
Change-Id: I1c8a953762fc51ddaabd0b3b0a82ec2a95e4757d
ndroid/camera/async/ConcurrentState.java
ndroid/camera/one/v2/ZslOneCameraFactory.java
ndroid/camera/one/v2/sharedimagereader/ringbuffer/AvailableTicketCounter.java
|
| 11bdc0f19a00094b8003155e89ffcbe12ad0536a |
06-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Implement ready state" into ub-camera-haleakala
|
| da01fd85202bc46645166723f2495387411d5997 |
06-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Rename ImageStreamFactory to ManagedImageReader" into ub-camera-haleakala
|
| 63204dc989dbd0eba56f65086fde0ebe29ed6bdb |
31-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Implement ready state
Bug: 18934542
Change-Id: I1dc27eb3f8fb1ef156ae8643b2b5e92f013c4e4b
ndroid/camera/async/ConcurrentState.java
ndroid/camera/async/Observables.java
ndroid/camera/one/v2/ZslOneCameraFactory.java
ndroid/camera/one/v2/sharedimagereader/ZslSharedImageReaderFactory.java
ndroid/camera/one/v2/sharedimagereader/metadatasynchronizer/MetadataPool.java
ndroid/camera/one/v2/sharedimagereader/ringbuffer/AvailableTicketCounter.java
ndroid/camera/one/v2/sharedimagereader/ringbuffer/DynamicRingBuffer.java
ndroid/camera/one/v2/sharedimagereader/ringbuffer/DynamicRingBufferFactory.java
ndroid/camera/one/v2/sharedimagereader/ringbuffer/QueueFlusher.java
ndroid/camera/one/v2/sharedimagereader/ringbuffer/TicketPoolPrioritizer.java
|
| 1318feb043f89f8309a7d4cf53ccaa7a58939c98 |
06-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Rename ImageStreamFactory to ManagedImageReader
Improves documentation for the internal camera2 wrapper API.
Change-Id: I62d0c9aa52f5254c45fc06f2792f92b9b90e3e31
ndroid/camera/one/v2/SimpleOneCameraFactory.java
ndroid/camera/one/v2/core/CaptureStream.java
ndroid/camera/one/v2/photo/ConvergedImageCaptureCommand.java
ndroid/camera/one/v2/photo/LegacyPictureTakerFactory.java
ndroid/camera/one/v2/photo/PictureTakerFactory.java
ndroid/camera/one/v2/photo/SimpleImageCaptureCommand.java
ndroid/camera/one/v2/photo/ZslPictureTakerFactory.java
ndroid/camera/one/v2/sharedimagereader/ImageStreamFactory.java
ndroid/camera/one/v2/sharedimagereader/ManagedImageReader.java
ndroid/camera/one/v2/sharedimagereader/SharedImageReaderFactory.java
ndroid/camera/one/v2/sharedimagereader/ZslSharedImageReaderFactory.java
ndroid/camera/one/v2/sharedimagereader/imagedistributor/ImageStream.java
|
| 8351c3f3db70796a04380265a9cf17c6c6b559c4 |
05-Feb-2015 |
Spike Sprague <spikuru@google.com> |
Merge "in secure camera, prevent swiping to filmstrip when no photo has been taken." into ub-camera-haleakala
|
| b5338e7a69d31984c22e9acabb279d2111a7ef2a |
05-Feb-2015 |
Spike Sprague <spikuru@google.com> |
in secure camera, prevent swiping to filmstrip when no photo has been taken.
bug: 19279388
Change-Id: I92c23dd5546aa31166df2ce40d19e374808d83d3
ndroid/camera/widget/FilmstripLayout.java
|
| ce53fbf4adc50a7feb9e0937b0d5906bdbd6f200 |
05-Feb-2015 |
Senpo Hu <senpo@google.com> |
Merge "Use MainThread in CaptureModule and FocusController." into ub-camera-haleakala
|
| 2a489b8b2b6a43e17376e5c9bd8c0d60c1840551 |
05-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Cancel implicit AE lock after AE precapture sequence" into ub-camera-haleakala
|
| 7057dbbbc1c75894ec48b03299914a4bfa7c30e1 |
05-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Cancel implicit AE lock after AE precapture sequence
After taking, or attempting to take a flash photo, the app currently
sends a CONTROL_AF_TRIGGER_CANCEL to release the AF lock. On some
devices (N6), there appears to be an implicit AE lock set by the
CONTROL_AE_PRECAPTURE_TRIGGER, which is unlocked when a flash photo
is captured (with INTENT_STILL_CAPTURE). In the event that the app
is interrupted before sending the still capture request, it must
still cancel the implicit AE lock. As a workaround, sending
a request with AE_LOCK=true followed by AE_LOCK=false appears
to reset this implicit AE lock.
Workaround for Bug: 19265647
Change-Id: Ie76a81c1a138fb2334de736b315796e869378bf4
ndroid/camera/one/v2/photo/ConvergedImageCaptureCommand.java
|
| fc6e6dc57be148e20b989c00b9673877a3957512 |
05-Feb-2015 |
Sascha Haeberling <haeberling@google.com> |
Revert N4 to PhotoModule until ImageBackend can handle EXIF rotation.
Bug: 19281550
Change-Id: I8a87b8e4815b2f16d42c28a0cd9887379b742f75
ndroid/camera/module/ModulesInfo.java
|
| 0f404c49c140212e1a0ab15a8508d63ee07efc48 |
05-Feb-2015 |
Senpo Hu <senpo@google.com> |
Use MainThread in CaptureModule and FocusController.
Change-Id: I9de2aa619edc3cc1d686b297776cdf8ab2a65ce7
ndroid/camera/CaptureModule.java
ndroid/camera/ui/focus/FocusController.java
|
| 196c2183b4e7537b2ea4cfe6f2ceffb7114841e3 |
05-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Add support for non-ZSL, non-legacy cameras" into ub-camera-haleakala
|
| 5d54ef4379592758a28c225347029096c8259b13 |
05-Feb-2015 |
Andy Huibers <andyhuibers@google.com> |
Merge "Control some chatty logging with a boolean." into ub-camera-haleakala
|
| dfe19d2fedee0a3af39d335402ff9dc7e774e8bd |
05-Feb-2015 |
Sascha Haeberling <haeberling@google.com> |
Merge "Make sure to null SurfaceTexture when destroyed." into ub-camera-haleakala
|
| d119b0ab2f700de33259ddc2ece7fb3cc1f305a2 |
05-Feb-2015 |
Andy Huibers <andyhuibers@google.com> |
Control some chatty logging with a boolean.
Bug: 19269341
Change-Id: Ifb90a06a8022cadc47cbe67b852dc2d0f5da2571
ndroid/camera/util/AndroidServices.java
|
| a6bddcf608dc387f64ab196163e5e313a82ef752 |
05-Feb-2015 |
Andy Huibers <andyhuibers@google.com> |
Merge "Use KeyguardManager.isKeyguardLocked() to fire double-onResume lock screen launch workaround. Previously we were only doing workaround for INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE." into ub-camera-haleakala
|
| 82a5c17b22c8b29ee1b601d362a3742de75fece7 |
05-Feb-2015 |
Sascha Haeberling <haeberling@google.com> |
Make sure to null SurfaceTexture when destroyed.
Bug: 19149830
This will prevent unnecessary camera open events. We assume that when a
SurfaceTexture is present at the time we resume, that it is usable and
we can initialize the camera. Not nulling it causes the camera to be
initialized on a potentially invalid Surface. Once the Surface becomes
available, we'd close and re-open the camera, which slows down our
resume times.
By nulling the SurfaceTexture when it gets destroyed we make sure to not
initialize the camera in resume an instead wait for the proper callback.
This might get rid of the HDR+ resume issue we've been seeing as well.
Change-Id: I71837aeda79c2f7516e64bdb10c12d39f728c0ca
ndroid/camera/CaptureModule.java
|
| 60d252d03fcd4a9dc22ea2ff292db563a83c5f6f |
05-Feb-2015 |
Andy Huibers <andyhuibers@google.com> |
Use KeyguardManager.isKeyguardLocked() to fire double-onResume lock screen launch workaround.
Previously we were only doing workaround for INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE.
Bug: 17925205
Change-Id: I63206aa268fb41897da6fe37fc967bf12c3f4e7b
ndroid/camera/util/QuickActivity.java
|
| 5cbdddd3ba0241b60dbd7a0ab44cfc08dc5e8fc9 |
05-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Add support for non-ZSL, non-legacy cameras
Bug: 19178315
Change-Id: Icc73563cdf708efe70bfc814c279850e1a690cf3
ndroid/camera/one/OneCameraCharacteristics.java
ndroid/camera/one/v1/OneCameraCharacteristicsImpl.java
ndroid/camera/one/v2/OneCameraCharacteristicsImpl.java
ndroid/camera/one/v2/SimpleOneCameraFactory.java
ndroid/camera/one/v2/common/BasicCameraFactory.java
ndroid/camera/one/v2/photo/PictureTakerFactory.java
|
| 054ccbf10949437349140f3285d33250e2e28136 |
05-Feb-2015 |
Alan Newberger <alann@google.com> |
Merge "Remove elevations from filmstrip" into ub-camera-haleakala
|
| 6fc611a9e7f756953c9fbd3857c86b5a1a6aac01 |
05-Feb-2015 |
Alan Newberger <alann@google.com> |
Merge "Address black flash on filmstrip items by loading placeholder consistently" into ub-camera-haleakala
|
| d70b22919f8d212bf11abd6e6724b3a395ef02c1 |
04-Feb-2015 |
Alan Newberger <alann@google.com> |
Remove elevations from filmstrip
Elevations were not applied to SessionItems causing bad z-order
behavior. As the shadows are not really visible, just removing
elevation entirely, this also seems to improve performance.
Bug: 17742801
Change-Id: I8fedad3b6c083f7cde349e51021f928d719edb40
ndroid/camera/data/PhotoItem.java
ndroid/camera/widget/FilmstripView.java
|
| f7fb23cde49a62b116c678c7c1dd4d3f44e656d7 |
05-Feb-2015 |
zafir <zafir@google.com> |
Merge "Implemented Report functionality using GMS Core Feedback API. Implemented stubs for Camera2." into ub-camera-haleakala
|
| d251aa45da226d9fde64a481a22023adc6be43b0 |
05-Feb-2015 |
Alan Newberger <alann@google.com> |
Address black flash on filmstrip items by loading placeholder consistently
Refactor removed placeholder (gray rectangle) from large image builder in
glide, but it's necessary there. Moved default placeholder to builders,
behavior looks correct now.
Change-Id: Ib154c5f5db0d2b7d4f861366bfe4e156fabad45d
ndroid/camera/data/GlideFilmstripManager.java
|
| 6f7432515b81245d77a2592f06cb032cf6dac547 |
05-Feb-2015 |
I-Jong Lin <ijonglin@google.com> |
Merge "Nexus 4 Camera Start-up Fix" into ub-camera-haleakala
|
| 61eeaa75d8bf863e53c7a308ea7ee29e2cc90202 |
04-Feb-2015 |
I-Jong Lin <ijonglin@google.com> |
Nexus 4 Camera Start-up Fix
Issue revolves around the fact that the camera ZSL template was invalid for
Nexus4, and Nexus4 did not support ConvergedImage Picture taker. Turned
those things off for the Nexus 4 and now it works.
Bug: 19123014
Change-Id: I5aef58a0f0c7e9396e999d6b7ab2736e4565b73f
ndroid/camera/module/ModulesInfo.java
ndroid/camera/one/v2/SimpleOneCameraFactory.java
ndroid/camera/one/v2/photo/PictureTakerFactory.java
|
| 91bdb7fa1084af44c36dd7072033a90f4823ef5a |
05-Feb-2015 |
Senpo Hu <senpo@google.com> |
Merge "Adjust capture indicator position while open/close mode options." into ub-camera-haleakala
|
| 54ac03ba6ae3e739df74c6d9e35fda9017be07d7 |
02-Feb-2015 |
Senpo Hu <senpo@google.com> |
Adjust capture indicator position while open/close mode options.
This CL also fixes the layout issue in landscape mode when
mode option indicators are visible.
Bug: 18866551
Bug: 18317565
Bug: 18905659
Change-Id: I34ca5aa77aa9d37a7f0ad3d2d7efbed92fe94f2b
ndroid/camera/ui/StickyBottomCaptureLayout.java
ndroid/camera/ui/motion/InterpolatorHelper.java
ndroid/camera/widget/ModeOptions.java
ndroid/camera/widget/ModeOptionsOverlay.java
ndroid/camera/widget/RoundedThumbnailView.java
|
| 29f491385647ba4ce18297d7dbdde9fcb1e16ac4 |
05-Feb-2015 |
I-Jong Lin <ijonglin@google.com> |
Merge "Remove UNKNOWN Orientation values" into ub-camera-haleakala
|
| 4e68cbcc312ff9b70a57b2cf635d7a1d94d43012 |
05-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Use CONTROL_CAPTURE_INTENT_STILL_CAPTURE
Fixes issue in which flash may not fire when set to on or auto.
Bug: 19151455
Change-Id: If5cb82bea3e882224ad9afe2b3a69d5e5596ee36
ndroid/camera/one/v2/photo/ConvergedImageCaptureCommand.java
|
| db34aa1f60ba88b904cfbc00cf4cddfa1c8e0896 |
04-Feb-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Multi camera device lifecycle management." into ub-camera-haleakala
|
| ec604214008248f7858b3a8b66d70919947399a9 |
04-Feb-2015 |
I-Jong Lin <ijonglin@google.com> |
Remove UNKNOWN Orientation values
UNKNOWN Orientation is causing some strange crashes in the Camera App,
in certain situation when the phone starts up while faceup on a table,
i.e. an unknown orientation. This CL is to make sure that we stop
any UNKOWN orientations propogating through the system and causes these
sorts of crashes.
Bug: 19049293
Change-Id: I4f403bda1b6b23f2bbe5ee590e23d0fc078543b7
ndroid/camera/app/OrientationManager.java
ndroid/camera/app/OrientationManagerImpl.java
ndroid/camera/processing/imagebackend/TaskCompressImageToJpeg.java
|
| 88988ccd197b9b3139943dfb90ca08ce7e8a4e04 |
04-Feb-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Fix filmstrip jank on N4." into ub-camera-haleakala
|
| 77d9f023e76816e5da7bd067ad46cc0e9c98623f |
03-Feb-2015 |
Paul Rohde <codelogic@google.com> |
Fix filmstrip jank on N4.
Bug: 19164291
Bug: 19220382
Bug: 19020507
Change-Id: Id1c2011b29b1cee206593fb395d9b4a4c89e71ab
ndroid/camera/CameraActivity.java
ndroid/camera/data/CameraFilmstripDataAdapter.java
ndroid/camera/data/FilmstripItem.java
ndroid/camera/data/FilmstripItemBase.java
ndroid/camera/data/FixedFirstProxyAdapter.java
ndroid/camera/data/FixedLastProxyAdapter.java
ndroid/camera/data/GlideFilmstripManager.java
ndroid/camera/data/PhotoItem.java
ndroid/camera/data/PhotoItemFactory.java
ndroid/camera/data/PlaceholderItem.java
ndroid/camera/data/SessionItem.java
ndroid/camera/data/VideoItem.java
ndroid/camera/data/VideoItemFactory.java
ndroid/camera/filmstrip/FilmstripDataAdapter.java
ndroid/camera/widget/FilmstripView.java
|
| b886235598704fafb9c09723544e78464a0de7b4 |
04-Feb-2015 |
Spike Sprague <spikuru@google.com> |
minor comment fix.
Change-Id: I284a6b4485dd972faef725cd7fd598afc9b83378
ndroid/camera/widget/FilmstripLayout.java
|
| 27d31d88e64a2075c87bb6f3969bdd99cd9ceaea |
04-Feb-2015 |
Spike Sprague <spikuru@google.com> |
Merge "Fix for CL ag/627135" into ub-camera-haleakala
|
| e08c469a48a347ba02e3c246370757e16b2bbad0 |
04-Feb-2015 |
Spike Sprague <spikuru@google.com> |
Fix for CL ag/627135
Move logic to open filmstrip from onUp() to onFling(), mimicking logic in ModeListView fling handling. Limit fling handling to entering Filmstip from the Preview.
bug: 18904319
Change-Id: I51960dbb427345eb69a2d4a4a84d74479361be96
ndroid/camera/widget/FilmstripLayout.java
|
| e4e15811211d6470a6182f4a1d080b962caa9ae4 |
04-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Implement tracking of FrameServer availability
To track the "ready state" of the camera, it is necessary to track
whether or not a new command can immediately acquire an exclusive lock
on the FrameServer.
Bug: 18934542
Change-Id: Ie87fe8ac0a60662e0889ca6569d6f2f8ffcfb362
ndroid/camera/one/v2/commands/PreviewCommand.java
ndroid/camera/one/v2/core/FrameServer.java
ndroid/camera/one/v2/core/FrameServerFactory.java
ndroid/camera/one/v2/core/FrameServerImpl.java
ndroid/camera/one/v2/core/ObservableFrameServer.java
ndroid/camera/one/v2/core/ResponseListenerBroadcaster.java
ndroid/camera/one/v2/core/ResponseListeners.java
|
| 7a2678faaa49df9a7acc1c4d95a7c9ee3b8580aa |
04-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Fix build breakage
Removes import of deleted class.
Change-Id: I998fcd37a6db8ab9e2338c729ef49d116c4d96a4
ndroid/camera/one/v2/common/BasicCameraFactory.java
|
| 5ded8d33969af7586687063df4b006f8d89df798 |
04-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Change/simplify Observable interface" into ub-camera-haleakala
|
| e606c4d68b74293e7d7725aecbaa9c915751cd43 |
04-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Change/simplify Observable interface
Previously, the Observable interface allowed registering callbacks to
receive each update to a value, in a thread-safe way. However, this adds
unnecessary complexity and greatly complicates the implementation of
callbacks to track the camera ready-state.
Replacing Callback<T> with Runnables, which can simply call
Observable.get() to retrieve the latest value makes implementing
ready-state significantly simpler.
Bug: 18934542
Change-Id: I00d512f3c380148c0e9cb52352b2f304494e5e5a
ndroid/camera/async/CallbackRunnable.java
ndroid/camera/async/ConcurrentState.java
ndroid/camera/async/FilteredCallback.java
ndroid/camera/async/ForwardingObservable.java
ndroid/camera/async/ListenableConcurrentState.java
ndroid/camera/async/Observable.java
ndroid/camera/async/ObservableCombiner.java
ndroid/camera/async/Observables.java
ndroid/camera/one/v2/common/BasicCameraFactory.java
ndroid/camera/settings/SettingObserver.java
|
| 4e550eef4dd2936e493554217619a33b4a3b4b52 |
04-Feb-2015 |
Alan Newberger <alann@google.com> |
Merge "Revert "Move logic to open filmstrip from onUp() to onFling(), mimicking logic in ModeListView fling handling."" into ub-camera-haleakala
|
| 5f4f329d7d1780c6ea052bdaa64680e86bf74181 |
04-Feb-2015 |
Alan Newberger <alann@google.com> |
Revert "Move logic to open filmstrip from onUp() to onFling(), mimicking logic in ModeListView fling handling."
This reverts commit e3fd993f9e85acc7963673ee338ed4f1ba5dacbc.
Change-Id: Idd51a11192640f9f20699b754b121262b3f51cc3
ndroid/camera/ui/ModeListView.java
ndroid/camera/widget/FilmstripLayout.java
|
| 983fbebe0cbcedb6e4515f4240ec2d6034e4a7d9 |
04-Feb-2015 |
Alan Newberger <alann@google.com> |
Merge "Ensure right non-neighbors are invisible during filmstrip item scaling" into ub-camera-haleakala
|
| 2eb1f8531b4879b836206cbde0e57335e300b445 |
03-Feb-2015 |
I-Jong Lin <ijonglin@google.com> |
Fix for Capture Indicator Animation Listeners
Issue arose when Capture Indicator was hidden from the screen, and
animations were NOT finished. Current listeners were unregistered,
but never re-registered when capture indicator was shown again.
Simplest solution is to null out the references to the animators in
the RoundThumbnailView to signal animators to be re-created.
Bug: 19034435
Change-Id: I94b74c0ea8f385d348dd981ebe8d9402140c3248
ndroid/camera/widget/RoundedThumbnailView.java
|
| 69c897f767f327722efd3314bf679c5a5dd64bb8 |
30-Jan-2015 |
zafir <zafir@google.com> |
Implemented Report functionality using GMS Core Feedback API. Implemented stubs for Camera2.
Bug: 18188247
Change-Id: Ic47bf432dca326bb454d0e4408b6b58f645a3fa4
ndroid/camera/CameraActivity.java
ndroid/camera/settings/CameraSettingsActivity.java
ndroid/camera/util/CameraUtil.java
|
| 4e3fcaaf751be8221a6a08352ac3ce6f842d21b1 |
03-Feb-2015 |
Sascha Haeberling <haeberling@google.com> |
Merge "Move CaptureSession into it's own file and clean up interface." into ub-camera-haleakala
|
| b62fa4716df6bcc526f575006822e06dd8ea9b83 |
03-Feb-2015 |
Sascha Haeberling <haeberling@google.com> |
Move CaptureSession into it's own file and clean up interface.
Change-Id: Iaca24e22b541aec898cdf1d3246c98ed72cd85ca
ndroid/camera/MediaSaverImpl.java
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.java
ndroid/camera/app/CameraServicesImpl.java
ndroid/camera/app/MediaSaver.java
ndroid/camera/session/CaptureSessionImpl.java
ndroid/camera/session/CaptureSessionManagerImpl.java
ndroid/camera/tinyplanet/TinyPlanetFragment.java
|
| 087f6d917758bd3cd982fcecd4230ab670eb995b |
03-Feb-2015 |
I-Jong Lin <ijonglin@google.com> |
Merge "ImageBackend Service Integration, Pass 2" into ub-camera-haleakala
|
| 5f384e153b6b1e9b15178b5edc457f7916006d3a |
03-Feb-2015 |
I-Jong Lin <ijonglin@google.com> |
Merge "Fix centering issue of the Fast Thumbnail Preview" into ub-camera-haleakala
|
| 24ae21924dac251bd11d2ccbcf2679f23baeb8a0 |
28-Jan-2015 |
I-Jong Lin <ijonglin@google.com> |
Fix centering issue of the Fast Thumbnail Preview
Circular Fast thumbnail doesn't seem to be quite centered, even though
picture is centered in the viewfinder. Y channel horizontal offset
in memory was not being calculated correctly from the specified
pixel strides. Also, added an offset of 1/2 of the downsample so that
the image can be more centered.
Bug: 19132967
Change-Id: I406172beda8b383d513c539ae5963400f57cdd42
ndroid/camera/processing/imagebackend/TaskConvertImageToRGBPreview.java
|
| 0a155c041cde83720825386fb4f5ce3e4a9aaf75 |
03-Feb-2015 |
Spike Sprague <spikuru@google.com> |
Merge "Move logic to open filmstrip from onUp() to onFling(), mimicking logic in ModeListView fling handling." into ub-camera-haleakala
|
| e3fd993f9e85acc7963673ee338ed4f1ba5dacbc |
03-Feb-2015 |
Spike Sprague <spikuru@google.com> |
Move logic to open filmstrip from onUp() to onFling(), mimicking logic in ModeListView fling handling.
bug: 18904319
Change-Id: I8e2b1db72eceab1b5ba14f3ecf3aa35ba35df046
ndroid/camera/ui/ModeListView.java
ndroid/camera/widget/FilmstripLayout.java
|
| 259fa6b34f93b5312948c67df2b0fcbe7a6c3f83 |
03-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Fix race condition in MetadataPool implementation" into ub-camera-haleakala
|
| e265ca85ba762062461126471ed1f3053907cfef |
03-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Fix race condition in MetadataPool implementation
Existing code synchronized on the wrong object.
Bug: 19237665
Change-Id: Icd50b3b0dee8a03dfb0696af01351323493d7b0c
ndroid/camera/one/v2/sharedimagereader/metadatasynchronizer/MetadataPoolImpl.java
|
| ab8b067ce585a471c373a3e108322e592cc8ee20 |
02-Feb-2015 |
Alan Newberger <alann@google.com> |
Merge "Log suppression for JVM tests" into ub-camera-haleakala
|
| 6ce2f41ca6338c8b0055d1e79bc61a434ba91006 |
02-Feb-2015 |
Alan Newberger <alann@google.com> |
Ensure Glide signatures include MediaStore metadata
We add MediaStore metadata to Glide signatures to ensure cache keys
get correctly updated when MediaStore items are updated.
Bug: 19199401
Change-Id: Iaf4db5ad58c33aab454b29e120fe25c5b3accb65
ndroid/camera/data/FilmstripItemBase.java
|
| abac2a23443f13b58951d88bf4b972f31a562e3d |
15-Jan-2015 |
I-Jong Lin <ijonglin@google.com> |
ImageBackend Service Integration, Pass 2
ImageBackend now emulates its processing by submitting shadow tasks
onto the Processing Service queue, submitting one ImageShadowTask
for every call to Imagebackend::receiveImage. Actual processing is
still handled by the ImageBackend object, but this shadow task
emulation allows the ProcessingServiceManager to deferment Long
running tasks of Photosphere and Lens blur when there is current
ImageBackend processing. However, ImageBackend does NOT defer any
of its task to Photosphere and Lens Blur and runs all its tasks
asynchronously on its own thread pools. The image shadow tasks
that ImageBackend submits merely block until processing on an image
is finished with processing.
Bug: 18906477
Change-Id: Ia8e89c03a5e64ebb1b980111c9e3b8cc4eaeda4f
ndroid/camera/processing/ProcessingServiceManager.java
ndroid/camera/processing/ProcessingTaskConsumer.java
ndroid/camera/processing/imagebackend/ImageBackend.java
ndroid/camera/processing/imagebackend/ImageConsumer.java
ndroid/camera/processing/imagebackend/ImageShadowTask.java
|
| b6a4d96a310a1dee22ddea89b09130bcda206bb3 |
22-Jan-2015 |
Paul Rohde <codelogic@google.com> |
Multi camera device lifecycle management.
- Generic device open lifecycle.
- Generic device open / close states.
- Camera specific single device lifecycle.
- Camera2 specific single device actions.
- Portibility specific single device actions.
- Legacy Camera specific single device actions.
- Combined multi-camera lifecycle layer.
Related Bugs:
Bug: 17905863 - Filmstrip Jank
Bug: 18414621 - Startup Latency
Bug: 17925205 - Cold start Latency
Change-Id: I13e1e5909f05617485c7303c82d3baed20b6cd1c
ndroid/camera/device/Camera2ActionProvider.java
ndroid/camera/device/Camera2Actions.java
ndroid/camera/device/CameraDeviceActionProvider.java
ndroid/camera/device/CameraDeviceKey.java
ndroid/camera/device/CameraDeviceLifecycle.java
ndroid/camera/device/CameraModuleHelper.java
ndroid/camera/device/CameraOpenException.java
ndroid/camera/device/LegacyCameraActionProvider.java
ndroid/camera/device/LegacyCameraActions.java
ndroid/camera/device/MultiCameraDeviceLifecycle.java
ndroid/camera/device/PortabilityCameraActionProvider.java
ndroid/camera/device/PortabilityCameraActions.java
ndroid/camera/device/SingleDeviceActions.java
ndroid/camera/device/SingleDeviceCloseListener.java
ndroid/camera/device/SingleDeviceLifecycle.java
ndroid/camera/device/SingleDeviceOpenListener.java
ndroid/camera/device/SingleDeviceRequest.java
ndroid/camera/device/SingleDeviceShutdownListener.java
ndroid/camera/device/SingleDeviceStateMachine.java
|
| 63a8c9467824ef8aa2039b7e27831b0533d8e5d9 |
29-Jan-2015 |
Sascha Haeberling <haeberling@google.com> |
Only create temp session file when necessary.
Bug: 19148484
This also removes the IOException that could happen when a new session
is created and moves it to where a module actually needs the temporary
output file.
Change-Id: Ifc1f1ba2735557580c1302f8658a07bb13cc3c3e
ndroid/camera/CaptureModule.java
ndroid/camera/processing/ProcessingService.java
ndroid/camera/session/CaptureSession.java
ndroid/camera/session/CaptureSessionManager.java
ndroid/camera/session/CaptureSessionManagerImpl.java
ndroid/camera/session/SessionStorageManager.java
ndroid/camera/session/SessionStorageManagerImpl.java
ndroid/camera/session/TemporarySessionFile.java
|
| 34ac66e6d0bb849fb24a6255328390aba204abe3 |
31-Jan-2015 |
Alan Newberger <alann@google.com> |
Ensure right non-neighbors are invisible during filmstrip item scaling
Only the immediate right hand neighbor should fade out and translate to
center when drag-scaling the centered filmstrip item. Regression from G
to H, this CL ensures only the immediate neighbor is visible.
Bug: 19127110
Change-Id: I4023b91c384abd2b139b04124167cce8cb50c618
ndroid/camera/widget/FilmstripView.java
|
| 67d715c632d3d8261623974247f91fda65c06ebc |
31-Jan-2015 |
Senpo Hu <senpo@google.com> |
Merge "Suppress capture indicator while recording video." into ub-camera-haleakala
|
| ecb546aca4093beb60a3d40171b5038693dc7d05 |
30-Jan-2015 |
Senpo Hu <senpo@google.com> |
Suppress capture indicator while recording video.
Bug: 18908730
Change-Id: I2acd06f792c630b5ddac769c07edbefa94d9e110
ndroid/camera/VideoModule.java
ndroid/camera/app/CameraAppUI.java
|
| cb6c50a45d68749b2e7e4ee3f05683687df2511d |
30-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Enable tracking of image availability" into ub-camera-haleakala
|
| e919a48fb40b9d6c698a495acf40adbc0e320431 |
22-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Enable tracking of image availability
To allow updating the UI whenever image reader space is exhausted, we
must be able to track whether or not non-zsl images can be allocated at
any given time. This CL implements this for the general case of both
single images as well as for finite bursts.
Bug: 18934542
Change-Id: Ia8c6e03f631cf47e4385cb8da1e3f6d74e7901a2
ndroid/camera/async/ConcurrentState.java
ndroid/camera/async/FilteredCallback.java
ndroid/camera/async/ForwardingObservable.java
ndroid/camera/async/NoOp.java
ndroid/camera/async/Observable.java
ndroid/camera/async/ObservableCombiner.java
ndroid/camera/async/Observables.java
ndroid/camera/async/Updatables.java
ndroid/camera/one/v2/sharedimagereader/SharedImageReaderFactory.java
ndroid/camera/one/v2/sharedimagereader/ZslSharedImageReaderFactory.java
ndroid/camera/one/v2/sharedimagereader/ringbuffer/TicketPoolPrioritizer.java
ndroid/camera/one/v2/sharedimagereader/ticketpool/FiniteTicketPool.java
ndroid/camera/one/v2/sharedimagereader/ticketpool/ReservableTicketPool.java
ndroid/camera/one/v2/sharedimagereader/ticketpool/TicketPool.java
ndroid/camera/one/v2/sharedimagereader/ticketpool/TicketProvider.java
ndroid/camera/one/v2/stats/PreviewFpsListener.java
ndroid/camera/settings/SettingObserver.java
ndroid/camera/util/Callback.java
|
| 9c0835fc31c48c2122fb75675c05314cb8203b1d |
30-Jan-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Disable the touch to focus sound." into ub-camera-haleakala
|
| d4b2e9e0838d21adddd1ee3c492e5b11a7c2b509 |
30-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Fix build break
Android's Exception class is missing a constructor which was added in
java 7.
Change-Id: Idab9bf40d59c5816d2431edb8302e350df748ead
ndroid/camera/one/v2/camera2proxy/CameraCaptureSessionClosedException.java
|
| 71cdc139c2e2840929c51c38701e3c25f1b4ecdc |
30-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Translate API IllegalStateException into checked exceptions
Fixes AndroidCameraCaptureSessionProxy to actually translate
IllegalStateExceptions into CameraCaptureSessionClosedException.
CameraCaptureSessionProxy already declared this as a possible checked exception,
but the AndroidCameraCaptureSessionProxy implementation never actually
did the correct translation.
As a result, extremely-misleading error-level logs can be output when
the app is paused.
Change-Id: I3f1e39bda079a04500988447dd6c24fa679cd2d0
ndroid/camera/one/v2/camera2proxy/AndroidCameraCaptureSessionProxy.java
ndroid/camera/one/v2/camera2proxy/CameraCaptureSessionClosedException.java
ndroid/camera/one/v2/camera2proxy/CameraCaptureSessionProxy.java
|
| c47442db477392e296bfb18e3ac953df0e16d5c5 |
30-Jan-2015 |
Paul Rohde <codelogic@google.com> |
Disable the touch to focus sound.
Bug: 18898692
Change-Id: Idd9485971dd6bd9a8175f79455691ef1e56e89f8
ndroid/camera/ui/focus/FocusController.java
|
| 529f3777bf514020de0455820639bb32cd1631a6 |
30-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Fix bug in counting open images" into ub-camera-haleakala
|
| 1738db31add0aea5a6a6f2c137ca6fc476a10237 |
30-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Fix bug in counting open images
Bug: 19156045
AndroidImageReaderProxy previously would return an instance of itself
via onImageAvailable. This caused a problem because it bypassed the
LoggingImageReaderProxy and CloseWhenDoneImageReaderProxy decorators.
This change also includes additional minor fixes for potential issues,
specifically, it also synchronizes access to each android.media.Image
and ImageReader because they are not thread-safe.
Change-Id: I0d76c07ae37b09cdec40f7d7789b49f7397fb414
ndroid/camera/debug/Loggers.java
ndroid/camera/one/v2/CloseWhenDoneImageReader.java
ndroid/camera/one/v2/LoggingImageReader.java
ndroid/camera/one/v2/SimpleOneCameraFactory.java
ndroid/camera/one/v2/ZslOneCameraFactory.java
ndroid/camera/one/v2/camera2proxy/AndroidImageProxy.java
ndroid/camera/one/v2/camera2proxy/AndroidImageReaderProxy.java
ndroid/camera/one/v2/camera2proxy/ForwardingImageProxy.java
ndroid/camera/one/v2/camera2proxy/ImageProxy.java
ndroid/camera/one/v2/camera2proxy/ImageReaderProxy.java
ndroid/camera/one/v2/sharedimagereader/imagedistributor/ImageDistributorFactory.java
ndroid/camera/one/v2/sharedimagereader/imagedistributor/ImageDistributorOnImageAvailableListener.java
ndroid/camera/one/v2/sharedimagereader/imagedistributor/RefCountedImageProxy.java
ndroid/camera/one/v2/sharedimagereader/metadatasynchronizer/MetadataReleasingImageQueue.java
ndroid/camera/one/v2/sharedimagereader/util/TicketImageProxy.java
|
| a9be9d1a30c594e1489505d36e83cf91e332c60b |
30-Jan-2015 |
Senpo Hu <senpo@google.com> |
Merge "Trigger hit state animation when clicking on capture indicator." into ub-camera-haleakala
|
| cb8f66b4953e4fed4a0cd5133c2914b26097c133 |
28-Jan-2015 |
Senpo Hu <senpo@google.com> |
Trigger hit state animation when clicking on capture indicator.
Bug: 18905659
Change-Id: I78131ded35e7663e159ec378a50603fa4cc23434
ndroid/camera/app/CameraAppUI.java
ndroid/camera/widget/RoundedThumbnailView.java
|
| 57adcfae20e3466425f5c26777922fc491d08890 |
30-Jan-2015 |
Alan Newberger <alann@google.com> |
Merge "Avoid building FilmstripItems when data is null" into ub-camera-haleakala
|
| 93a8139a1c8c1fd738ad71918585268b5a5beba3 |
29-Jan-2015 |
Alan Newberger <alann@google.com> |
Log suppression for JVM tests
Allow JVM tests to suppress logs, and thus any calls to Android
specific classes. Static accessors to logs is a common idiom in
Android, rather than overhaul the entire app to inject Loggers,
take advantage of our existing proxy and allow tests to suppress
Android specific class calls (to Context and android.util.Log).
Change-Id: I1b0d266326fc3ecc4791b9bc4b3b69eac8110dc2
ndroid/camera/debug/Log.java
|
| 539eff07760146baebb2331156a4e22a4b1472a4 |
29-Jan-2015 |
Alan Newberger <alann@google.com> |
Avoid building FilmstripItems when data is null
Items should not have null data. Code exists to handle null
items generated, and skip them, but if data is null, items
are still added to caches and cause exceptions later.
Bug: 19097423
Change-Id: I171ec40369cdcc5a5567968380a600943d4991e4
ndroid/camera/data/FilmstripContentQueries.java
ndroid/camera/data/PhotoDataFactory.java
ndroid/camera/data/PhotoItemFactory.java
ndroid/camera/data/VideoItemFactory.java
|
| 6c3a702472798d446049bd6241851f3ae8775b57 |
27-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Fix flash implementation
Bug: 19132962
Change-Id: Ifdf4c9694bc503c8b902386f380ae1a39e7824d0
ndroid/camera/one/v2/ZslOneCameraFactory.java
ndroid/camera/one/v2/autofocus/AETriggerResult.java
ndroid/camera/one/v2/autofocus/AETriggerStateMachine.java
ndroid/camera/one/v2/autofocus/AFTriggerResult.java
ndroid/camera/one/v2/autofocus/AFTriggerStateMachine.java
ndroid/camera/one/v2/autofocus/FullAFScanCommand.java
ndroid/camera/one/v2/autofocus/TriggerStateMachine.java
ndroid/camera/one/v2/photo/ConvergedImageCaptureCommand.java
|
| 795e2b520b9469638b1170a76a4f5087b2fd760b |
28-Jan-2015 |
Sascha Haeberling <haeberling@google.com> |
Merge "Make sure to always use ZSL frames for capture." into ub-camera-haleakala
|
| a9b1dfc158c60fa985bb92c83e348288da6ee066 |
28-Jan-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Convert Logger from a class to an interface." into ub-camera-haleakala
|
| 5529153df9ab23a2f47cb4f8b49279e8381aeddd |
28-Jan-2015 |
Sascha Haeberling <haeberling@google.com> |
Make sure to always use ZSL frames for capture.
Bug: 19166357
This fixes an issue on the N9 which does SW NR with
TEMPLATE_STILL_CAPTURE, which stalls the whole camera image reading
pipeline for a long time.
And in general we should probably not take pictures with potentially
differenty qualities for ZSL and while waiting for 3A to converge.
M will solve this issue with the introduction of the reprocessing
pipeline.
Change-Id: Ic444884f5dad6ecff44d0a6b7c7a118f0242bef2
ndroid/camera/one/v2/photo/ConvergedImageCaptureCommand.java
ndroid/camera/one/v2/photo/PictureTakerFactory.java
ndroid/camera/one/v2/photo/ZslPictureTakerFactory.java
|
| e2e8678196dba840e9da8f6bd698d0f269514827 |
28-Jan-2015 |
Spike Sprague <spikuru@google.com> |
Merge "set default flashMode and focusMode onto Camera Settings add null checks when accessing flashMode and focusMode" into ub-camera-haleakala
|
| a19ffced0ec4d1392b5abd31a47001b279d25f8b |
28-Jan-2015 |
Spike Sprague <spikuru@google.com> |
set default flashMode and focusMode onto Camera Settings
add null checks when accessing flashMode and focusMode
bug: 18200939
Change-Id: I622deed48764ff42b5db9a7313c5bdf3253d3f69
ndroid/camera/PhotoModule.java
|
| 1e123ea83881996b6c5ac3e29702050cc42d43ad |
28-Jan-2015 |
Paul Rohde <codelogic@google.com> |
Convert Logger from a class to an interface.
This set of changes makes it easier to insert any Logger implementation into a method and to ask for instances during object creation so that objects that require logging and testing can be easily tested.
- Add Loggers for individual Logger types.
- Add static methods for existing TagLogger.
- Add NoOp logger implementation.
Change-Id: I30c03667c88214cff03521d0a1f6fa3b00851a68
ndroid/camera/debug/Logger.java
ndroid/camera/debug/Loggers.java
ndroid/camera/one/v2/LoggingImageReader.java
ndroid/camera/one/v2/ZslOneCameraFactory.java
|
| d674f58cae699f644333ec4a15a391d8bf59c9fd |
28-Jan-2015 |
Spike Sprague <spikuru@google.com> |
Merge "Hide accessibility buttons in Intent Capture Hide options button during Intent Review" into ub-camera-haleakala
|
| 7958adbe3efde0b05283772fd7a8a5d95f80e6ca |
28-Jan-2015 |
Spike Sprague <spikuru@google.com> |
Merge "Fix content description for video intent review playback button." into ub-camera-haleakala
|
| c989d417a53341b144e9f78304270ac66f8f5813 |
28-Jan-2015 |
Spike Sprague <spikuru@google.com> |
Fix content description for video intent review playback button.
bug: 18760510
Change-Id: I59773006d8075e957451082ca0fcc11c3c417f30
ndroid/camera/ButtonManager.java
ndroid/camera/app/CameraAppUI.java
|
| b45f618d4a3aa068766be8741213080532feaaff |
13-Jan-2015 |
Spike Sprague <spikuru@google.com> |
Hide accessibility buttons in Intent Capture
Hide options button during Intent Review
bug: 18739652
Change-Id: I6ea912f811e3363c5e1454ad62c6645d7669003f
ndroid/camera/app/CameraAppUI.java
|
| 9e287572634591b2c81a09ad6c50ed293a40715d |
28-Jan-2015 |
I-Jong Lin <ijonglin@google.com> |
Merge "Fix for Ripple on Fast Thumbnail Indicator" into ub-camera-haleakala
|
| ef9d4ef785e0b2671ef7fc47a347a53f027bb8a9 |
28-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Ignore duplicate calls to Image.close()" into ub-camera-haleakala
|
| 326495c5c02876984c6ef5fd7531b7139eaa5dd7 |
28-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Ignore duplicate calls to Image.close()
Bug: 19156045
Change-Id: I78d4dea216b50c0edd3f8784a5aaafc4647568d0
ndroid/camera/one/v2/CloseWhenDoneImageReader.java
|
| 04f6bcb60fde3cfd12097509a1fb0b57a4248660 |
27-Jan-2015 |
I-Jong Lin <ijonglin@google.com> |
Fix for Ripple on Fast Thumbnail Indicator
There was a cute optimization was to start the ripple animation, and
then fill in the bitmap in 30ms after the bitmap was computed.
However, when the system is overloaded, the bitmap is not necessarily
computed in 30ms, and an empty ripple can result. Put in a more
conservative fix, when the ripple only starts when the bitmap has
already been computed.
Bug: 19132963
Change-Id: Id39257a1d75342c78385bac8682462e8875d97f7
ndroid/camera/CaptureModule.java
ndroid/camera/one/OneCamera.java
ndroid/camera/one/v2/imagesaver/JpegImageBackendImageSaver.java
ndroid/camera/one/v2/imagesaver/YuvImageBackendImageSaver.java
ndroid/camera/processing/imagebackend/TaskConvertImageToRGBPreview.java
|
| 18f47b3f23123037a9d49cf220c90a6bfd372228 |
24-Jan-2015 |
Spike Sprague <spikuru@google.com> |
Make CaptureModule obey camera characteristics when reporting flash support
bug: 19018131
Change-Id: If891bc410a99452dfe0fadc6545e41c3853f5639
ndroid/camera/CaptureModule.java
|
| 9a06f14042dd3a2896a33f47afb8fded1789d74f |
27-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Consolidate camera logging
Consolidates logging and removes misleading stack traces when commands
are interrupted due to an application pause.
Bug: 19156045
Change-Id: I92eea8df1d3bbce048bac02689a14d2240aad2be
ndroid/camera/one/v2/commands/LoggingCameraCommand.java
ndroid/camera/one/v2/photo/PictureTakerImpl.java
|
| 3c2c50c761de241085c81886b21575cfdec169b8 |
27-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Change/fix flash behavior when taking photos
* Ignore ZSL images when flash is ON (Bug: 19151455)
* Ignore AE state when flash is OFF (Bug: 19151502)
Change-Id: I2e27eb9b7573beab352fba89c02805447d009c80
ndroid/camera/one/v2/ZslOneCameraFactory.java
ndroid/camera/one/v2/photo/FlashBasedPhotoCommand.java
ndroid/camera/one/v2/photo/FrameExposureResponseListener.java
ndroid/camera/one/v2/photo/ZslPictureTakerFactory.java
ndroid/camera/one/v2/photo/zsl/AcceptableZslImageFilter.java
ndroid/camera/one/v2/photo/zsl/ZslImageCaptureCommand.java
ndroid/camera/one/v2/photo/zsl/ZslImageCaptureCommandFactory.java
|
| 5175aa7004ce87bf87763e22c4fc938463161cc8 |
24-Jan-2015 |
Senpo Hu <senpo@google.com> |
Merge "Fix NPE crash in RoundedThumbnailView." into ub-camera-haleakala
|
| 30eda38142fd279e0f10796e39f469d97f2a5b43 |
24-Jan-2015 |
Senpo Hu <senpo@google.com> |
Fix NPE crash in RoundedThumbnailView.
Bug: 19003975
Change-Id: I4839696e1f5c4e9b7a768ed24ad5951764cd9d66
ndroid/camera/widget/RoundedThumbnailView.java
|
| 51cafa0a35546a42c573357aa7a031a79cf9ba1b |
23-Jan-2015 |
Alan Newberger <alann@google.com> |
Fix Video thumbnail filmstrip size
Video size comes in asynchronously, and after refactor wasn't
wired up to query the metadata instead of the initial mediastore
size. This CL hides FilmstripItemData dimensions behind FilmstripItem
so that VideoItem can override and provide a Size via its existing
methods that use metadata if present.
Bug: 19000322
Change-Id: Ifddd6c90169c80d9fd69a1549e1086d5f1abfd85
ndroid/camera/data/FilmstripItem.java
ndroid/camera/data/FilmstripItemBase.java
ndroid/camera/data/FilmstripItemData.java
ndroid/camera/data/PlaceholderItem.java
ndroid/camera/data/SessionItem.java
ndroid/camera/data/VideoItem.java
ndroid/camera/widget/FilmstripView.java
|
| 410e8a8ea9df5826a943af156cb62992bc5342cb |
23-Jan-2015 |
Spike Sprague <spikuru@google.com> |
Merge "add isFlashSUpported() to OneCameraCharacteristics, make it work with API 1 and API 2" into ub-camera-haleakala
|
| 88559ffac9fe0d3b00614475b45417e74c7d0678 |
23-Jan-2015 |
Spike Sprague <spikuru@google.com> |
add isFlashSUpported() to OneCameraCharacteristics,
make it work with API 1 and API 2
bug: 19018131
Change-Id: I0d4157688e6219f9d6f5827c19938e90d3831bdf
ndroid/camera/CameraActivity.java
ndroid/camera/CaptureModule.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/one/OneCameraCharacteristics.java
ndroid/camera/one/OneCameraManager.java
ndroid/camera/one/v1/OneCameraCharacteristicsImpl.java
ndroid/camera/one/v1/OneCameraManagerImpl.java
ndroid/camera/one/v2/OneCameraCharacteristicsImpl.java
|
| abf1e994d236a65180eecfcb6997003ab12795df |
21-Jan-2015 |
Sascha Haeberling <haeberling@google.com> |
CaptureSession can now be started with an empty placeholder.
Bug: 19014774
Bug: 18853119
Bug: 18979823
Being able to start with an empty placeholder and then updating that
placeholder allows us to add a visual entry to the filmstrip early on.
This avoid jarring effects where after taking many apid fire shots and
going to filmstrip, the entries are appearing one after the other.
This was caused by sessions only getting started when the thumbnail was
produced, which can take a while when multiple shots are in the
encoding pipeline.
Also contains changes that make CaptureSession testable.
Change-Id: I3d44704099be81524f8e165f3f09de6eebfc147b
ndroid/camera/CaptureModule.java
ndroid/camera/Storage.java
ndroid/camera/app/CameraServicesImpl.java
ndroid/camera/data/FilmstripItem.java
ndroid/camera/data/FilmstripItemBase.java
ndroid/camera/data/SessionItem.java
ndroid/camera/one/v2/OneCameraImpl.java
ndroid/camera/one/v2/OneCameraZslImpl.java
ndroid/camera/one/v2/imagesaver/JpegImageBackendImageSaver.java
ndroid/camera/one/v2/imagesaver/YuvImageBackendImageSaver.java
ndroid/camera/processing/ProcessingService.java
ndroid/camera/session/CaptureSession.java
ndroid/camera/session/CaptureSessionManager.java
ndroid/camera/session/CaptureSessionManagerImpl.java
ndroid/camera/session/PlaceholderManager.java
ndroid/camera/session/SessionStorageManager.java
ndroid/camera/session/SessionStorageManagerImpl.java
|
| a6bfec1e1e6eec96fa33a1e40ae9841e95a24280 |
23-Jan-2015 |
Alan Newberger <alann@google.com> |
Merge "Remove placeholders from filmstrip methods, add PhotoItem/SessionItem integration" into ub-camera-haleakala
|
| 5e1069fed3d2067a9dbcd8a76b46c60a2d4743dc |
23-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Fix build breakage" into ub-camera-haleakala
|
| e313156adda85d4977d6ce7d7d0875bcecd2806b |
23-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Fix build breakage
Fix build breakage due to "Enable testing of ZslSharedImageReaderFactory"
Change-Id: I0e1da855a71f5ab83c65bdfb8b1e76cfd9199e3c
ndroid/camera/one/v2/core/FrameServerFactory.java
|
| 2edaa2079a342f6411e07528576f54a8720f80e1 |
23-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Enable testing of ZslSharedImageReaderFactory" into ub-camera-haleakala
|
| a8c94d5c059db2598caca676f0cab47a997ef631 |
23-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Enable testing of ZslSharedImageReaderFactory
* Migrate from CloseableHandlerThread to HandlerFactory to remove all
direct dependencies on the platform.
Change-Id: I3d6aca94cd6f9559596d157b86c174bfb8801f90
ndroid/camera/async/CloseableHandlerThread.java
ndroid/camera/one/v2/SimpleOneCameraFactory.java
ndroid/camera/one/v2/ZslOneCameraFactory.java
ndroid/camera/one/v2/sharedimagereader/SharedImageReaderFactory.java
ndroid/camera/one/v2/sharedimagereader/ZslSharedImageReaderFactory.java
ndroid/camera/one/v2/sharedimagereader/imagedistributor/ImageDistributorFactory.java
|
| 005bb2f26e73c4c9daad41b615f6dd414396f625 |
23-Jan-2015 |
Alan Newberger <alann@google.com> |
Remove placeholders from filmstrip methods, add PhotoItem/SessionItem integration
In this CL we add the ability for a PhotoItem to use a Session bitmap as a
placeholder. We also move general placeholder management out of the method
call stack, moving a single static initialization in CameraActivity into a
field in FilmstripItemBase for use by FilmstripItems.
Bug: 18977838
Change-Id: Ic1b0dc11fd0e4c85b9b310235e6d3122cf1543ce
ndroid/camera/CameraActivity.java
ndroid/camera/data/CameraFilmstripDataAdapter.java
ndroid/camera/data/FilmstripItem.java
ndroid/camera/data/FilmstripItemBase.java
ndroid/camera/data/FixedFirstProxyAdapter.java
ndroid/camera/data/FixedLastProxyAdapter.java
ndroid/camera/data/PhotoItem.java
ndroid/camera/data/PlaceholderItem.java
ndroid/camera/data/SessionItem.java
ndroid/camera/data/VideoItem.java
|
| 5c1db74d807c64e7917d927b532cd109c697ce35 |
20-Jan-2015 |
Paul Rohde <codelogic@google.com> |
Make most app services lazy.
Change-Id: I476914b1ed399f8ad727ac33782229cdf39d378f
ndroid/camera/CameraActivity.java
ndroid/camera/CaptureModule.java
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.java
ndroid/camera/app/CameraApp.java
ndroid/camera/app/CameraServicesImpl.java
ndroid/camera/processing/ProcessingService.java
ndroid/camera/processing/ProcessingServiceManager.java
ndroid/camera/settings/ManagedSwitchPreference.java
ndroid/camera/tinyplanet/TinyPlanetFragment.java
ndroid/camera/util/CameraUtil.java
|
| e956d1a46cb6edd6ab78f65f446b2120dd9b8940 |
23-Jan-2015 |
Alan Newberger <alann@google.com> |
Merge "Reduce view add/removes when loading photos" into ub-camera-haleakala
|
| 91fbd8cb64a5aa9ec67e04c94c76a94c82033406 |
23-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Wait for AE/AF convergence before taking pictures" into ub-camera-haleakala
|
| 4dc301a073dab22b9bc12e0b846530d3a80bf8f7 |
15-Jan-2015 |
I-Jong Lin <ijonglin@google.com> |
Image Backend Integration w/ Simple Camera
Wiring for cameras that only deliver compressed JPEG artifacts.
This CL was tested by enabling it on the Nexus 5.
Currently, the code in this CL is NOT exposed in any known
Nexus Camera model. The two unexposed bugs are as follows: an camera
initialization bug on Nexus 4, and a cross-device functional issue
with the SimpleCameraOneFactory object in that it doesn't request
a JPEG compression artifact from the HAL with zero orientation.
Bug: 18908116
Change-Id: If7080c4e8e52a329fb9a6fed52f7c31541758afb
ndroid/camera/CaptureModule.java
ndroid/camera/module/ModulesInfo.java
ndroid/camera/one/OneCameraManager.java
ndroid/camera/one/v1/OneCameraManagerImpl.java
ndroid/camera/one/v2/OneCameraManagerImpl.java
ndroid/camera/one/v2/imagesaver/JpegImageBackendImageSaver.java
ndroid/camera/one/v2/imagesaver/YuvImageBackendImageSaver.java
ndroid/camera/processing/imagebackend/ImageBackend.java
ndroid/camera/processing/imagebackend/ImageConsumer.java
ndroid/camera/processing/imagebackend/TaskChainedCompressImageToJpeg.java
ndroid/camera/processing/imagebackend/TaskCompressImageToJpeg.java
ndroid/camera/processing/imagebackend/TaskConvertImageToRGBPreview.java
ndroid/camera/processing/imagebackend/TaskPreviewChainedJpeg.java
ndroid/camera/util/ApiHelper.java
|
| f0eda77c4651a436420d8b9a958f8f83e1e89800 |
23-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Close ImageReaders after the camera is closed" into ub-camera-haleakala
|
| 8e29072ca69229a25dc4a856e3635d131613f4ca |
22-Jan-2015 |
Alan Newberger <alann@google.com> |
Reduce view add/removes when loading photos
Two fixes to reduce flicker when loading images. First, adjust
ViewItem instances in-place instead of creating new ViewItems
which included adding and removing views from the hierarchy.
It turned out we were doing an update for every photo due to
touching PanoramaMetadata and reporting back that metadata
was adjusted, whether or not a photo was a panorama. Now
that data is reported. New photo captures are essentially
added and removed from the view hierarchy three times before
this change, after an ImageView is added once, with its
contents changed as the photo is loaded.
More testing is needed but I cannot repro the elusive filmstrip
flicker with these changes.
Bug: 18977838
Bug: 17905863
Change-Id: I5a42c0baf87a8cef0ee4dbcf9f03d40715e6aa2d
ndroid/camera/data/MetadataLoader.java
ndroid/camera/data/PanoramaMetadataLoader.java
ndroid/camera/data/RgbzMetadataLoader.java
ndroid/camera/data/VideoRotationMetadataLoader.java
ndroid/camera/widget/FilmstripView.java
|
| b8397360d318edf3093b20b2b102207d76730e1b |
14-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Close ImageReaders after the camera is closed
Bug: 18841114
Change-Id: Ifc0b79e70059efd8f8ace2c29243406b524ad918
ndroid/camera/async/ForwardingBufferQueue.java
ndroid/camera/async/ForwardingObservable.java
ndroid/camera/debug/Logger.java
ndroid/camera/one/v2/CloseWhenDoneImageReader.java
ndroid/camera/one/v2/LoggingImageReader.java
ndroid/camera/one/v2/SimpleOneCameraFactory.java
ndroid/camera/one/v2/ZslOneCameraFactory.java
ndroid/camera/one/v2/camera2proxy/AndroidImageProxy.java
ndroid/camera/one/v2/camera2proxy/AndroidImageReaderProxy.java
ndroid/camera/one/v2/camera2proxy/CameraDeviceProxy.java
ndroid/camera/one/v2/camera2proxy/ForwardingImageProxy.java
ndroid/camera/one/v2/camera2proxy/ForwardingImageReader.java
ndroid/camera/one/v2/camera2proxy/ImageReaderProxy.java
ndroid/camera/one/v2/initialization/InitializedOneCameraFactory.java
ndroid/camera/one/v2/sharedimagereader/SharedImageReaderFactory.java
ndroid/camera/one/v2/sharedimagereader/ZslSharedImageReaderFactory.java
ndroid/camera/one/v2/sharedimagereader/imagedistributor/ImageDistributorFactory.java
ndroid/camera/one/v2/sharedimagereader/imagedistributor/ImageDistributorOnImageAvailableListener.java
|
| 875d9fff24e283efa5d95ad75c3fab074e489fa4 |
15-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Wait for AE/AF convergence before taking pictures
Bug: 18997124
Change-Id: I27b06186acde05c81d31042f330b6dabeac865cf
ndroid/camera/async/Observables.java
ndroid/camera/async/UpdatableCountDownLatch.java
ndroid/camera/one/v2/autofocus/AETriggerStateMachine.java
ndroid/camera/one/v2/autofocus/AFTriggerStateMachine.java
ndroid/camera/one/v2/autofocus/FullAFScanCommand.java
ndroid/camera/one/v2/autofocus/TriggerStateMachine.java
ndroid/camera/one/v2/autofocus/TriggeredAFScanStateResponseListener.java
ndroid/camera/one/v2/camera2proxy/CameraDeviceProxy.java
ndroid/camera/one/v2/commands/LoggingCameraCommand.java
ndroid/camera/one/v2/common/FrameworkFailureResponseListener.java
ndroid/camera/one/v2/common/TimestampResponseListener.java
ndroid/camera/one/v2/common/TotalCaptureResultResponseListener.java
ndroid/camera/one/v2/core/RequestBuilder.java
ndroid/camera/one/v2/core/ResponseListener.java
ndroid/camera/one/v2/core/ResponseListeners.java
ndroid/camera/one/v2/photo/ConvergedImageCaptureCommand.java
ndroid/camera/one/v2/photo/FlashBasedPhotoCommand.java
ndroid/camera/one/v2/photo/FrameExposureResponseListener.java
ndroid/camera/one/v2/photo/LegacyPictureTakerFactory.java
ndroid/camera/one/v2/photo/PictureTakerFactory.java
ndroid/camera/one/v2/photo/SimpleImageCaptureCommand.java
ndroid/camera/one/v2/photo/ZslPictureTakerFactory.java
ndroid/camera/one/v2/sharedimagereader/AllocatingImageStream.java
ndroid/camera/one/v2/sharedimagereader/ImageStreamFactory.java
ndroid/camera/one/v2/sharedimagereader/SingleAllocationImageStream.java
|
| 93864cf39dfe25c27b41fb327d590dc31ff69fe5 |
22-Jan-2015 |
Alan Newberger <alann@google.com> |
Merge "Add typing to cursor item factories" into ub-camera-haleakala
|
| 5e5d6b7101a0d7bc1877c899c9a95c6dc05b0f7d |
22-Jan-2015 |
Paul Rohde <codelogic@google.com> |
Extended logging utilities.
Change-Id: I4a49a0694495f9c03c55a9ea8fad0ed22bc45bfc
ndroid/camera/async/MainThread.java
ndroid/camera/debug/Log.java
ndroid/camera/debug/LogUtil.java
|
| 71dd56f86579b953bf13ee2617989c8ff5042eda |
22-Jan-2015 |
Alan Newberger <alann@google.com> |
Add typing to cursor item factories
Add a bit of generic typing to allow clients to directly use
PhotoItem or VideoItem without casting, particularly in
CameraActivity.onSessionDone where explicit calls are made
to the PhotoItem factory.
Bug: 18977838
Change-Id: Ib5ecff2342d73ec3ce817a5f7e7fe42733ed8a71
ndroid/camera/CameraActivity.java
ndroid/camera/data/CameraFilmstripDataAdapter.java
ndroid/camera/data/FilmstripContentQueries.java
ndroid/camera/data/FilmstripItemList.java
ndroid/camera/data/PhotoItemFactory.java
ndroid/camera/data/VideoItemFactory.java
|
| 8be316c7a8caf962cf3fcf5e49d332fb2718319f |
20-Jan-2015 |
Paul Rohde <codelogic@google.com> |
Make it possible for singletons that rely on application context to be
initalized lazily.
* Add AndroidContext
* Add AndroidServices
* Make LogHelper ues thread safe lazy initialization
* Convert several unused fields into local variables in CameraApp.
Change-Id: I9c73e9b91efb49a01d848a8cca1e8e65f059b5d0
ndroid/camera/CameraActivity.java
ndroid/camera/CaptureModule.java
ndroid/camera/CaptureModuleUtil.java
ndroid/camera/OnScreenHint.java
ndroid/camera/PhotoModule.java
ndroid/camera/TextureViewHelper.java
ndroid/camera/VideoModule.java
ndroid/camera/app/CameraApp.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/app/CameraController.java
ndroid/camera/app/LegacyLocationProvider.java
ndroid/camera/app/MemoryManagerImpl.java
ndroid/camera/app/OrientationManagerImpl.java
ndroid/camera/debug/Log.java
ndroid/camera/one/v2/OneCameraManagerImpl.java
ndroid/camera/processing/ProcessingService.java
ndroid/camera/settings/ResolutionUtil.java
ndroid/camera/ui/MainActivityLayout.java
ndroid/camera/ui/ModeListView.java
ndroid/camera/util/AndroidContext.java
ndroid/camera/util/AndroidServices.java
ndroid/camera/util/CameraUtil.java
ndroid/camera/widget/RoundedThumbnailView.java
|
| 33726afb96b7bc93df7549cd74600240d00cf257 |
22-Jan-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Move first run detection into its own object." into ub-camera-haleakala
|
| 67063a294955285efd6b3f038aafecc92293f803 |
22-Jan-2015 |
Paul Rohde <codelogic@google.com> |
Move first run detection into its own object.
Change-Id: I82f109e970ac871c9de54ff551176c2cd29070b4
ndroid/camera/app/CameraApp.java
ndroid/camera/app/FirstRunDetector.java
|
| f00bc6d1f9d76ab649384825b66110bdb2b1b1ba |
22-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Add missing copyright header
Change-Id: Ia0198b9661ef5882e998ac0a6bb17cffc013057a
ndroid/camera/one/v2/sharedimagereader/ticketpool/ReservableTicketPool.java
|
| 70e853e4c6a7d78aaa3cff9c2efd17a3a1c34d38 |
20-Jan-2015 |
Radford Juang <radford@google.com> |
Merge "Fix issue where holding down shutter button sometimes does not trigger burst." into ub-camera-haleakala
|
| 704484c1e816f136f4d4e183245caaa55fb1bdab |
20-Jan-2015 |
Alan Newberger <alann@google.com> |
Preserve zoom on touch to focus
During the full AF scan the crop region is missing from the request,
so you see the preview snap back to no zoom, then back when the delayed
reset occurs. This CL works, I think it's sound per AF/AE metering as
they were already monitoring the crop region in their calculations, this
just feeds the crop region to the request as well.
Bug: 19064291
Change-Id: I5b2b90147f29abda68df80fed66685aca90a515c
ndroid/camera/one/v2/autofocus/ManualAutoFocusFactory.java
|
| 660f1fe07e090b678d3a01495fb75cdd1f3b3507 |
17-Jan-2015 |
Alan Newberger <alann@google.com> |
Merge "Check for null camera within proxy" into ub-camera-haleakala
|
| 30996b9b6b9db1f411b87d13906ee8db6388d488 |
17-Jan-2015 |
Alan Newberger <alann@google.com> |
Check for null camera within proxy
Companion cl to ag/614134, ensures now may have a null camera
rather than a potentially stale one, ensure we don't pass one
into the MediaRecorder.
Bug: 18414095
Change-Id: I215cd10e4322109019ea710b155121d375f82712
ndroid/camera/VideoModule.java
ndroid/camera/debug/DebugCameraProxy.java
|
| e5343ae752f63129ef4a235daaabffba75d5ad9b |
16-Jan-2015 |
Radford Juang <radford@google.com> |
Fix issue where holding down shutter button sometimes does not trigger burst.
This can occur when the user intends to do a long-press but finger
budges slightly (e.g., 1 pixel) triggering an ACTION_MOVE event. This
fix disables ACTION_MOVE events from being sent to gesture detector,
allowing the long tap event to occur when slight finger movement occurs.
Change-Id: Id13a7121f0a899291f031509983050d472566c80
ndroid/camera/ShutterButton.java
|
| 31a39a07a2ac48462c14553bbd4164627675476b |
17-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Delete obsolete/unused interface" into ub-camera-haleakala
|
| 9a034a1119fbba2fa82362de74dcb671d2ce6c19 |
16-Jan-2015 |
I-Jong Lin <ijonglin@google.com> |
Framerate fix for ZSL Nexus 5, Redux
Screwed up the merge last time. Need to redo this fix.
Bug: 19017062
Change-Id: I52b5bb71dea71f52c7c5d3379df798931b1976c5
ndroid/camera/one/v2/ZslOneCameraFactory.java
|
| af7ff468e4c4429c35e205ff8eed08b9de09b84f |
16-Jan-2015 |
I-Jong Lin <ijonglin@google.com> |
Fix for Camera2 Build
Unfortunately, introduced in ag/612015.
Change-Id: Ic4e17f8093272f7b531c526607ca974b2d456737
ndroid/camera/one/v2/imagesaver/YuvImageBackendImageSaver.java
|
| 5ce957f63f1ba49be5b68deab3c335a4cd4a3ad8 |
16-Jan-2015 |
Senpo Hu <senpo@google.com> |
Merge "Fix capture indicator on non-zsl modules." into ub-camera-haleakala
|
| 78276fbe6c30265d5e52df9ececb275ce898e684 |
16-Jan-2015 |
I-Jong Lin <ijonglin@google.com> |
Revert "Optimize Framerate Workaround for ZSL on Nexus 5"
This reverts commit 3ec132c4429683871ffd652e2563459e5c866065.
Change-Id: I269f26ce801dc730055307226479af1d6f6effd5
ndroid/camera/one/v2/ZslOneCameraFactory.java
|
| d3f4c08da939e6a74eabec8991b28e978100c7d0 |
16-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Delete obsolete/unused interface
Change-Id: I5c79e3372c9950fde6d6a86e647cf38dee79c9af
ndroid/camera/one/OneCamera.java
|
| 3ec132c4429683871ffd652e2563459e5c866065 |
16-Jan-2015 |
I-Jong Lin <ijonglin@google.com> |
Optimize Framerate Workaround for ZSL on Nexus 5
Through experimentation, we have found that the framerate range
[7,29] does NOT reproduce the preview jank, but still allows
ZSL to be run.
Bug: 19017062
Change-Id: I99f71385640f103a05f86d7a194f36712b1841d8
ndroid/camera/one/v2/ZslOneCameraFactory.java
|
| ad38daf0897acce9f6b4a5a69e6032faf0e70aff |
16-Jan-2015 |
I-Jong Lin <ijonglin@google.com> |
Merge "Route ImageBackend JPEG Thumbnail To Wear" into ub-camera-haleakala
|
| 9c98680a61cc88592d96010b863c3e0adb9abbe1 |
16-Jan-2015 |
Senpo Hu <senpo@google.com> |
Fix capture indicator on non-zsl modules.
The logic is accidentally changed by ag/607738.
Let's revert it here.
Bug: 19022139
Change-Id: Idc6fd91ff5352a464bc128b367c54ba971b16b28
ndroid/camera/CameraActivity.java
|
| 9eab2cdc9f38f06586f342ef5cf5418ebc317db8 |
13-Jan-2015 |
I-Jong Lin <ijonglin@google.com> |
Route ImageBackend JPEG Thumbnail To Wear
Sends the results of JPEG compression task to a wear device if
available. Need to do a little plumbing on the
OneCamera.PictureSaverCallback.
Bug: 18841900
Change-Id: Iec86a82d9b99e8ff9fecd208d27bfbc563af73f6
ndroid/camera/CaptureModule.java
ndroid/camera/one/OneCamera.java
ndroid/camera/one/v2/imagesaver/YuvImageBackendImageSaver.java
|
| 891a9e536a44f83ffd227e14823da4fd8700c48b |
16-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Apply flash setting changes to the AE mode" into ub-camera-haleakala
|
| 386c5b885b99f67f9c0a7380f4be153f28333089 |
09-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Apply flash setting changes to the AE mode
Bug: 17216526
Change-Id: If6c03102f04ad2ba54e1a045a3ab7445aaa5b595
ndroid/camera/CaptureModule.java
ndroid/camera/app/AppController.java
ndroid/camera/async/ExecutorCallback.java
ndroid/camera/async/ForwardingObservable.java
ndroid/camera/async/HandlerExecutor.java
ndroid/camera/async/MainThread.java
ndroid/camera/async/Observables.java
ndroid/camera/one/FlashSetting.java
ndroid/camera/one/OneCamera.java
ndroid/camera/one/v2/OneCameraFactory.java
ndroid/camera/one/v2/OneCameraZslImpl.java
ndroid/camera/one/v2/SimpleOneCameraFactory.java
ndroid/camera/one/v2/ZslOneCameraFactory.java
ndroid/camera/one/v2/commands/CameraCommandExecutor.java
ndroid/camera/one/v2/common/BasicCameraFactory.java
ndroid/camera/one/v2/imagesaver/YuvImageBackendImageSaver.java
ndroid/camera/one/v2/photo/PictureTakerFactory.java
ndroid/camera/one/v2/photo/PictureTakerImpl.java
ndroid/camera/one/v2/photo/ZslPictureTakerFactory.java
ndroid/camera/settings/Setting.java
ndroid/camera/settings/SettingObserver.java
ndroid/camera/settings/SettingsManager.java
|
| d7aab1856f58f13905b7e2705108795f6c2567a4 |
16-Jan-2015 |
Andy Huibers <andyhuibers@google.com> |
Move stats to new package.
Change-Id: Idfab1a24c91ff4c96515f3520283c7a0512d0514
ndroid/camera/CameraActivity.java
ndroid/camera/CaptureModule.java
ndroid/camera/FocusOverlayManager.java
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.java
ndroid/camera/app/CameraApp.java
ndroid/camera/ui/MainActivityLayout.java
ndroid/camera/ui/ModeListView.java
|
| d5cdb7f36cbfc5497973e066123bd11f37e635cb |
16-Jan-2015 |
Senpo Hu <senpo@google.com> |
Merge "Move FirstRunDialog to app layer." into ub-camera-haleakala
|
| 5e1d854711992d2d89fe22f948b1528f063ac6b3 |
16-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Add method for preallocating image-reader space" into ub-camera-haleakala
|
| fb0496133a0b4b526dc70f6447bd4b97d95de95f |
12-Jan-2015 |
Senpo Hu <senpo@google.com> |
Move FirstRunDialog to app layer.
The first run logic should live in CameraActivity. This refactoring
could clean up CaptureModule and PhotoModule.
* Introduce ResolutionSetting class.
* Introduce OneCameraManagerImpl for camera API 1.
Tested and verified this works on K / L devices.
Change-Id: I11a968a9346b520dee23fc4591a73bb483c43246
ndroid/camera/CameraActivity.java
ndroid/camera/CaptureModule.java
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
ndroid/camera/app/AppController.java
ndroid/camera/app/FirstRunDialog.java
ndroid/camera/one/OneCameraManager.java
ndroid/camera/one/v1/OneCameraCharacteristicsImpl.java
ndroid/camera/one/v1/OneCameraManagerImpl.java
ndroid/camera/one/v2/OneCameraManagerImpl.java
ndroid/camera/settings/Keys.java
ndroid/camera/settings/ResolutionSetting.java
ndroid/camera/settings/ResolutionUtil.java
ndroid/camera/settings/SettingsUtil.java
ndroid/camera/util/ApiHelper.java
|
| 3d9639a1b93ee245c53bc7948ec12be4119ff08c |
16-Jan-2015 |
Alan Newberger <alann@google.com> |
Merge "Add Camera cover equivalent to windowBackground to smooth lockscreen startup" into ub-camera-haleakala
|
| 31f89504302fcecf25cad7b5f71de1978bdf877a |
14-Jan-2015 |
Alan Newberger <alann@google.com> |
Add Camera cover equivalent to windowBackground to smooth lockscreen startup
This CL adds a windowBackground drawable equivalent to the covers shown by lockscreen
and app, to remove the black screen in between. With this CL I mostly see no artifacts
when opening camera from lockscreen. Some issues:
* to improve memory usage in system UI holding the lockscreen preview, a vector
camera blanket was added in ag/587418 to ic_camera_blanket. That works transparently
everywhere so far but not in resource drawables that can only handle bitmaps in
layer-list items. Split the vector and bitmaps here, which means only the lockscreen
uses the vector -- this also surfaced a color mismatch between the vector and our PNG
bitmaps, corrected in the new ic_camera_blanket_vector resource. This is a bit fragile
as we rely on pixel match of the two resources, would like a cleaner solution but the
layer-list limitation is tough -- without this change the app crashes at runtime within
BitmapDrawable when the windowBackground is loaded.
* likewise both the lockscreen and app covers explicitly size the bitmap, there are no
provisions to do so within layer-list. Will follow up with a refactor of in-app cover
(ModeTransitionView) to remove explicit sizing and then all will rely on bitmap size
(per above will still need vector file size coordinated with bitmap).
* current implementation relies upon a black window background, we restore that in onCreate.
* Both secure camera and v21 main camera currently use the windowBackground, will submit
just for secure then introduce for main camera when we always start into Camera mode.
* For L explicitly set android:windowDrawsSystemBarBackgrounds to false to ensure the
system preview into the DecorView doesn't take the navigation bar into account when
vertically centering the cover bitmap, to make the preview identical to the other covers.
Bug: 18369862
Change-Id: Ia481e2d1d94bdc5a5d39b4d35b32c29a75bf99ec
ndroid/camera/CameraActivity.java
|
| 67f1358059efee259a94f50e9b094a809e7cd121 |
16-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Add method for preallocating image-reader space
For non-zsl picture-taking, it is critical that image-reader
space be allocated prior to starting the precapture AF/AE sequence.
Bug: 18997124
Change-Id: Id931d687c4034dadab3aee60142b096f298216a7
ndroid/camera/one/v2/sharedimagereader/ImageStreamFactory.java
|
| db7db57204b8c32b523c406e28f24234671468a4 |
15-Jan-2015 |
Sascha Haeberling <haeberling@google.com> |
Change visibility to allow for continuous testing.
Bug: 19034273
Background: Dexmaker (through Mockito) is not able to mock
package-protected classes:
https://code.google.com/p/dexmaker/issues/detail?id=34
This can be reverted once we have a build system that doesn't require us
wrapping JUnit tests into an APK.
Change-Id: I7de59e36fa7645f9e1616e4d9c4fdda8e612e9bc
ndroid/camera/one/v2/core/TagDispatchCaptureSession.java
|
| a1ea88071be696ea8dee99c7bdb4007128ed60ef |
15-Jan-2015 |
I-Jong Lin <ijonglin@google.com> |
Fix for JPEG Compression w/ Unknown Orientation
TaskCompressImageToJpeg blindly passed the orientation from the camera to
JpegUtilNative.compressJpegFromYUV420Image, which then threw a run-time
exception. Behavior for TaskCompressImageToJpeg with an image of
UNKNOWN orientation is to treat it as CLOCKWISE_0 for purposes of
JPEG compression. Instead of crashing, the camera now receives a JPEG
of the dark image of one's tabletop.
Bug: 19000723
Change-Id: I412fb6fed5d80035b180db7f6e8504d6d36b4fcc
ndroid/camera/processing/imagebackend/TaskCompressImageToJpeg.java
|
| bbdfed96b232615ee3ae5d45a8b8c7ce12c5529e |
15-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Make SettingsManager thread-safe" into ub-camera-haleakala
|
| d85912a55e0a3cd7ca75337b2ee45644260f57e9 |
15-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Filter ZSL images based on frame metadata" into ub-camera-haleakala
|
| 84bfe7508a7ae592d3b436c7b6d2f8889218113f |
14-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Make SettingsManager thread-safe
Required to fix bug: 17216526
Change-Id: I4e0d8dfc613a8022982d48f2086e2539f3db9596
ndroid/camera/settings/SettingsManager.java
|
| 8d3552d334196a09e20c83a5296f0b373041032c |
14-Jan-2015 |
Paul Rohde <codelogic@google.com> |
Check filmstrip scroll controller as well when deciding to load the full resolution image.
b/18947934
Change-Id: I6e9558bbd8a9b5ae52207cbb9af3b575123eda1f
ndroid/camera/widget/FilmstripView.java
|
| 4961ad31d9a877e3a68566fb5d4b33b7f79ce44e |
08-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Filter ZSL images based on frame metadata
Introduces a new metadatasynchronizer package with functionality for
retrieving metadata (TotalCaptureResults) for images which have been added to
the zsl ringbuffer.
To enable unit-testing, proxy objects for CaptureRequest, CaptureResult,
and TotalCaptureResult have been added, so they can now be mocked.
Bug: 18964540
Change-Id: I8374350e09d33f54ff241f23fd005013ed26dab0
ndroid/camera/async/BufferQueueController.java
ndroid/camera/async/ConcurrentBufferQueue.java
ndroid/camera/async/ConcurrentState.java
ndroid/camera/async/CountableBufferQueue.java
ndroid/camera/async/FilteredUpdatable.java
ndroid/camera/async/Futures2.java
ndroid/camera/async/NoOp.java
ndroid/camera/async/RefCountedBufferQueueController.java
ndroid/camera/async/Updatable.java
ndroid/camera/async/UpdatableCountDownLatch.java
ndroid/camera/one/v2/SimpleOneCameraFactory.java
ndroid/camera/one/v2/ZslOneCameraFactory.java
ndroid/camera/one/v2/camera2proxy/CaptureRequestProxy.java
ndroid/camera/one/v2/camera2proxy/CaptureResultProxy.java
ndroid/camera/one/v2/camera2proxy/TotalCaptureResultProxy.java
ndroid/camera/one/v2/common/TotalCaptureResultResponseListener.java
ndroid/camera/one/v2/initialization/CameraStarter.java
ndroid/camera/one/v2/initialization/GenericOneCameraImpl.java
ndroid/camera/one/v2/initialization/MetadataCallback.java
ndroid/camera/one/v2/photo/FrameExposureResponseListener.java
ndroid/camera/one/v2/photo/ImageCaptureCommand.java
ndroid/camera/one/v2/photo/PictureCallbackAdapter.java
ndroid/camera/one/v2/photo/PictureTakerImpl.java
ndroid/camera/one/v2/photo/SimpleImageCaptureCommand.java
ndroid/camera/one/v2/photo/ZslImageCaptureCommand.java
ndroid/camera/one/v2/photo/ZslPictureTakerFactory.java
ndroid/camera/one/v2/photo/zsl/AcceptableZslImageFilter.java
ndroid/camera/one/v2/photo/zsl/ZslImageCaptureCommand.java
ndroid/camera/one/v2/photo/zsl/ZslImageCaptureCommandFactory.java
ndroid/camera/one/v2/sharedimagereader/TicketRequiredFilter.java
ndroid/camera/one/v2/sharedimagereader/ZslSharedImageReaderFactory.java
ndroid/camera/one/v2/sharedimagereader/metadatasynchronizer/MetadataPool.java
ndroid/camera/one/v2/sharedimagereader/metadatasynchronizer/MetadataPoolFactory.java
ndroid/camera/one/v2/sharedimagereader/metadatasynchronizer/MetadataPoolImpl.java
ndroid/camera/one/v2/sharedimagereader/metadatasynchronizer/MetadataReleasingImageQueue.java
ndroid/camera/one/v2/sharedimagereader/ringbuffer/DynamicRingBuffer.java
ndroid/camera/settings/Setting.java
|
| 4af002c781c7a85d5026e65cadf1078d49094f31 |
14-Jan-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Load full resolution images for newly inserted images." into ub-camera-haleakala
|
| c14b6ba434575b7d795a8cd681821f86a39bc371 |
14-Jan-2015 |
Paul Rohde <codelogic@google.com> |
Load full resolution images for newly inserted images.
- Update log messages to remove filmstrip log spam.
b/18947934
Change-Id: I7ee26e45ab2991ada148ce52d04899fc1d164784
ndroid/camera/widget/FilmstripView.java
|
| 0745f6eb1a8cbed85761e02839367ed8b2ff6ef6 |
14-Jan-2015 |
I-Jong Lin <ijonglin@google.com> |
Turn off message spam on ImageBackend
Change-Id: Id31cb1571f7ed135c7aa74fbca37270c401ca9c1
ndroid/camera/processing/imagebackend/ImageBackend.java
|
| 1ff2ce2a1dcb1a08cd133a450c26374bf21bad48 |
14-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Change ImageSaver interface to support processing bursts and thumbnails" into ub-camera-haleakala
|
| 4660e6c1011c47ad7f604ad1b7f5f2227171a694 |
13-Jan-2015 |
Alan Newberger <alann@google.com> |
Merge "Remove exception when releasing a requested, not yet opened camera" into ub-camera-haleakala
|
| 8a09cc29b273e35128a03794e82dd4f329d35cc9 |
08-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Change ImageSaver interface to support processing bursts and thumbnails
Bug: 18908116
Change-Id: I14863011de5c3a575bfb54758824ccfaa04cf200
ndroid/camera/CaptureModule.java
ndroid/camera/one/OneCameraManager.java
ndroid/camera/one/v1/OneCameraManagerImpl.java
ndroid/camera/one/v2/OneCameraFactory.java
ndroid/camera/one/v2/OneCameraManagerImpl.java
ndroid/camera/one/v2/SimpleOneCameraFactory.java
ndroid/camera/one/v2/ZslOneCameraFactory.java
ndroid/camera/one/v2/imagesaver/ImageSaver.java
ndroid/camera/one/v2/imagesaver/MostRecentImageSaver.java
ndroid/camera/one/v2/imagesaver/SingleImageSaver.java
ndroid/camera/one/v2/imagesaver/YuvImageBackendImageSaver.java
ndroid/camera/one/v2/photo/ImageCaptureCommand.java
ndroid/camera/one/v2/photo/ImageSaver.java
ndroid/camera/one/v2/photo/PictureTakerFactory.java
ndroid/camera/one/v2/photo/PictureTakerImpl.java
ndroid/camera/one/v2/photo/SimpleImageCaptureCommand.java
ndroid/camera/one/v2/photo/YuvImageBackendImageSaver.java
ndroid/camera/one/v2/photo/ZslImageCaptureCommand.java
ndroid/camera/one/v2/photo/ZslPictureTakerFactory.java
|
| ee58ed7df88c10a77c3648c6d69e99941c08ce9d |
13-Jan-2015 |
Radford Juang <radford@google.com> |
Merge "Fix crash that occurs when two consecutive smartburst captures taken." into ub-camera-haleakala
|
| 54fd406458c01fec7711dea3c7af3fba9d96f9ec |
12-Jan-2015 |
Shashi Shekhar <shashishekhar@google.com> |
Merge "Save media items in burst with sequential timestamps." into ub-camera-haleakala
|
| f3bcfa9d5981f3afefed19aa86dd49c428de53a4 |
12-Jan-2015 |
I-Jong Lin <ijonglin@google.com> |
Merge "Enable ZSL for Nexus 5 Back Camera, 1 of 2, Redux" into ub-camera-haleakala
|
| 593a03b147a0388530cc63ca83e23fea6107693f |
12-Jan-2015 |
I-Jong Lin <ijonglin@google.com> |
Enable ZSL for Nexus 5 Back Camera, 1 of 2, Redux
Allow ZSL implementation to be used with Nexus 5. We still
need to drop the frame rate, if the current camera is facing back.
Screwed up last submission. Will always build locally next time
no matter how small the change.
Bug: 18964282
Change-Id: I975129d7262b904f8b0b31a4cdbe95526e88a521
ndroid/camera/one/v2/ZslOneCameraFactory.java
|
| 662082d70ce8dc5f679a25322a00c2733f0339f2 |
12-Jan-2015 |
Alan Newberger <alann@google.com> |
Remove exception when releasing a requested, not yet opened camera
From monkey tests, we see a spike in an exception from new device
which is likely due to slow close performance. If we camera B is
open, and we request camera A, B will be closed then A opened. If
we release A during this process but B is not yet closed, don't
crash, just let the pending underlying open of A happen and release
the request. Preserve the exception for application errors where
truly unrequested cameras are released.
Bug: 17975345
Change-Id: I9aa3b0575e130f516cea6a3df120e4812df55bce
ndroid/camera/app/CameraController.java
|
| 39cc6d07fa2f798b3915848087d6baf77a28874f |
12-Jan-2015 |
I-Jong Lin <ijonglin@google.com> |
Merge "Revert "Enable ZSL for Nexus 5 Back Camera, 1 of 2"" into ub-camera-haleakala
|
| 7f876055505ae9a82734580dbc872cec9a9f838b |
12-Jan-2015 |
I-Jong Lin <ijonglin@google.com> |
Revert "Enable ZSL for Nexus 5 Back Camera, 1 of 2"
This reverts commit f7803cb20b39aa48dd399c5768902593a22d3104.
Change-Id: Ic9ebea1d723dc51c07bda01edd83cb2ac23dfe26
ndroid/camera/one/v2/ZslOneCameraFactory.java
|
| cd040eb890472b749615154c2ae9e342efe769d6 |
12-Jan-2015 |
I-Jong Lin <ijonglin@google.com> |
Merge "Enable ZSL for Nexus 5 Back Camera, 1 of 2" into ub-camera-haleakala
|
| f7803cb20b39aa48dd399c5768902593a22d3104 |
12-Jan-2015 |
I-Jong Lin <ijonglin@google.com> |
Enable ZSL for Nexus 5 Back Camera, 1 of 2
Allow ZSL implementation to be used with Nexus 5. We still
need to drop the frame rate, if the current camera is facing back.
Bug: 18964282
Change-Id: Ia733cbc7bd8766245bf668e8f9141b1ec6d5eaaf
ndroid/camera/one/v2/ZslOneCameraFactory.java
|
| ce42965cff3c292b64de73545717bf2e696f233f |
10-Jan-2015 |
Alan Newberger <alann@google.com> |
Merge "Ensure button callbacks check lifecycle" into ub-camera-haleakala
|
| f2b96b1e2325724f2a6251ec76636d26de37e730 |
10-Jan-2015 |
Senpo Hu <senpo@google.com> |
Merge "Add HeadingSensor." into ub-camera-haleakala
|
| 8b2a3ef10a7eea3e703397a3d94766029b0c5581 |
10-Jan-2015 |
Senpo Hu <senpo@google.com> |
Add HeadingSensor.
A small step to clean up PhotoModule and CaptureModule...
Bug: 17985028
Change-Id: Ic79dd5e2582479d8ed9705e8150c4438e39116c8
ndroid/camera/CaptureModule.java
ndroid/camera/PhotoModule.java
ndroid/camera/hardware/HeadingSensor.java
|
| 22662ec73aed82eddb8e119f3f7b4a08d6a7af29 |
12-Dec-2014 |
Shashi Shekhar <shashishekhar@google.com> |
Save media items in burst with sequential timestamps.
Save media items with at least one second difference for burst.
Change-Id: I332a4f19ef754dcf4e82ee9c5725e09ef147bb24
ndroid/camera/burst/BurstFacadeImpl.java
|
| 30ef96534cc65c0ba4665f6da2fc36e879edf196 |
08-Jan-2015 |
I-Jong Lin <ijonglin@google.com> |
Passing an intermediate preview to the session.
Generalized the image thumbnail preview task to create artifacts of
multiple shape. Added this task before the full-sized JPEG decode.
Added a field in the TaskInfo to specify the purpose of the imaging
artifacts on the listener, since the processing of an image may result
in multiple uncompressed/compress artifacts and need extra
explicit identification to be properly routed by listener. Changed the
default behavior of the ImageBackend to produce an intermediate-sized
preview on job submission. Routed this intermediate-sized preview to
the CaptureSession for an earlier Filmstrip update.
Bug: 18841584
Change-Id: I8db2d3a7c30cddd1e0e9ddf0709b7867f841b056
ndroid/camera/one/v2/photo/YuvImageBackendImageSaver.java
ndroid/camera/processing/imagebackend/ImageBackend.java
ndroid/camera/processing/imagebackend/ImageProcessorProxyListener.java
ndroid/camera/processing/imagebackend/TaskChainedCompressImageToJpeg.java
ndroid/camera/processing/imagebackend/TaskCompressImageToJpeg.java
ndroid/camera/processing/imagebackend/TaskConvertImageToRGBPreview.java
ndroid/camera/processing/imagebackend/TaskImageContainer.java
ndroid/camera/processing/imagebackend/TaskJpegEncode.java
ndroid/camera/processing/imagebackend/TaskPreviewChainedJpeg.java
|
| 2356bd78cfeb51977845155b580104ce959083f2 |
10-Jan-2015 |
Alan Newberger <alann@google.com> |
Ensure button callbacks check lifecycle
The button callbacks are asynchronous behind animators. Most in the codebase
(i.e., all in CaptureModule) do paused checks, but the one in CameraAppUI
for grid lines did not and is causing lots of feedback reports with null
SettingsManagers (done in the activity onDestroy). Audited codebase, these
two instances were the only ones not checking.
Bug: 17905718
Change-Id: I31c26088ef1e7d600b4e3be42950b0ca70613e20
ndroid/camera/VideoModule.java
ndroid/camera/app/CameraAppUI.java
|
| 04c72e48f9b0a4600b8ecf4fbd57d4b9b4185e35 |
09-Jan-2015 |
Shashi Shekhar <shashishekhar@google.com> |
Merge "Change IllegalStateException to a log." into ub-camera-haleakala
|
| bc735745e301191389d95c3e46e4cc2f78b424d0 |
09-Jan-2015 |
Senpo Hu <senpo@google.com> |
Add OneCamera.PictureSaverCallback.
Remove the undesirable dependency between ImageBackend and CameraAppUI.
Create a new interface rather than using PictureCallback since
at some points we might consider retiring it.
Change-Id: I6e02564c9ca9990aa847902d86806f8bbd9cd652
ndroid/camera/CameraActivity.java
ndroid/camera/CaptureModule.java
ndroid/camera/one/OneCamera.java
ndroid/camera/one/v2/photo/ImageSaver.java
ndroid/camera/one/v2/photo/PictureTakerImpl.java
ndroid/camera/one/v2/photo/YuvImageBackendImageSaver.java
ndroid/camera/processing/imagebackend/ImageBackend.java
|
| ed16f0c6b8bf7424054675d861ec29b3107826de |
09-Jan-2015 |
Shashi Shekhar <shashishekhar@google.com> |
Change IllegalStateException to a log.
Change SurfaceTextureConsumer to ignore new frames when wrapped surface
is null.
Change-Id: I952bdb96c0debc53a0f1548fb66b3221f65f6f7f
ndroid/camera/gl/SurfaceTextureConsumer.java
|
| fc1394dd9690497178ae1088468e08d13bf0423a |
09-Jan-2015 |
Senpo Hu <senpo@google.com> |
Fix placeholder bug.
Bug: 18947927
Change-Id: I08542d614b15f31398150ea52caa6055ec63ccfb
ndroid/camera/processing/imagebackend/TaskCompressImageToJpeg.java
|
| 5d3ba3ed6a4046904237cac0b60189025209da16 |
08-Jan-2015 |
Radford Juang <radford@google.com> |
Fix crash that occurs when two consecutive smartburst captures taken.
Change-Id: I771afdd180a0d162b2a8b3c0fc4b8e4cb04baaf0
ndroid/camera/burst/BurstFacadeImpl.java
|
| 10ab1989c2475d137a6db36a4d78d8b68fadf96b |
08-Jan-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Refactor the filmstrip backing data." into ub-camera-haleakala
|
| e250f88bc01267f03ae3ae192698b0f07c9e425b |
08-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Fix bug in ReservableTicketPool not being fair
Calls to acquire() by multiple threads could previously violate fairness
and result in starvation in extreme cases. The associated unit-test
was previously flaky and failed only occasionally.
Change-Id: I7ae9bead2ac3cb6d7e81e88076bef2ea08e7d368
ndroid/camera/one/v2/sharedimagereader/ticketpool/ReservableTicketPool.java
|
| f0e0f1fe9608ba829e1d6d44086fc063d7e98d9a |
08-Jan-2015 |
Senpo Hu <senpo@google.com> |
Merge "Instantiate a ImageSaver.Builder in CaptureModule." into ub-camera-haleakala
|
| 5aa7eb2930b813c97f3754d93fe7fa978651887b |
08-Jan-2015 |
Senpo Hu <senpo@google.com> |
Instantiate a ImageSaver.Builder in CaptureModule.
We will need different image savers for capture intent.
Since we plan to create a separate module for capture intent,
this change allows modules to be able to choose a different builder.
Bug: 18726217
Change-Id: I5871263123b06958d902cc8e3a4d911f14c83e66
ndroid/camera/CaptureModule.java
ndroid/camera/one/OneCameraManager.java
ndroid/camera/one/v1/OneCameraManagerImpl.java
ndroid/camera/one/v2/OneCameraFactory.java
ndroid/camera/one/v2/OneCameraManagerImpl.java
ndroid/camera/one/v2/SimpleOneCameraFactory.java
ndroid/camera/one/v2/ZslOneCameraFactory.java
ndroid/camera/processing/imagebackend/TaskCompressImageToJpeg.java
ndroid/camera/processing/imagebackend/TaskJpegEncode.java
|
| 24145c4efbd4c48ca0558967b0bf02022b70e878 |
08-Jan-2015 |
I-Jong Lin <ijonglin@google.com> |
Merge "Image Plane Proxy for Image Content Testability" into ub-camera-haleakala
|
| 6e981cafa9cc57ebc7100cb84f68fb74dbd163da |
07-Jan-2015 |
I-Jong Lin <ijonglin@google.com> |
Image Plane Proxy for Image Content Testability
Adds in an Image Plane wrapper level so that image content can be
decoupled from the native Android Image objects whose constructors
are privated and cannot be extended.
Change-Id: Ia16418d18010e672f6c3e5db64bb7f6a9b3b2f3e
ndroid/camera/one/v2/ImageCaptureManager.java
ndroid/camera/one/v2/camera2proxy/AndroidImageProxy.java
ndroid/camera/one/v2/camera2proxy/ForwardingImageProxy.java
ndroid/camera/one/v2/camera2proxy/ImageProxy.java
ndroid/camera/processing/imagebackend/TaskChainedCompressImageToJpeg.java
ndroid/camera/processing/imagebackend/TaskConvertImageToRGBPreview.java
ndroid/camera/processing/imagebackend/TaskJpegEncode.java
ndroid/camera/util/JpegUtilNative.java
ndroid/camera/widget/FilmstripView.java
|
| 8ee16b8a323ffa20e6fb1270d498ec445f64defc |
18-Dec-2014 |
Paul Rohde <codelogic@google.com> |
Refactor the filmstrip backing data.
- Remove unused fields and code.
- Rename classes and methods to be consistent with usage
- Make data more immutable
- Add Location and Metadata classes for typed data access.
- Use Date instead of long for DateTime representations.
- Filmstrip prefix for filmstrip specific code.
- Cleaner Glide implementations.
- Initialize Glide bitmap pool.
- Eagerly load large image sizes when scroll stops.
Change-Id: I3b51d42416ca076c80bf7db441d257659174b47d
ndroid/camera/CameraActivity.java
ndroid/camera/MediaSaverImpl.java
ndroid/camera/Storage.java
ndroid/camera/burst/BurstFacadeImpl.java
ndroid/camera/data/AbstractLocalDataAdapterWrapper.java
ndroid/camera/data/CameraDataAdapter.java
ndroid/camera/data/CameraFilmstripDataAdapter.java
ndroid/camera/data/FilmstripContentObserver.java
ndroid/camera/data/FilmstripContentQueries.java
ndroid/camera/data/FilmstripDataAdapterProxy.java
ndroid/camera/data/FilmstripItem.java
ndroid/camera/data/FilmstripItemAttributes.java
ndroid/camera/data/FilmstripItemBase.java
ndroid/camera/data/FilmstripItemData.java
ndroid/camera/data/FilmstripItemList.java
ndroid/camera/data/FilmstripItemType.java
ndroid/camera/data/FilmstripItemUtils.java
ndroid/camera/data/FixedFirstDataAdapter.java
ndroid/camera/data/FixedFirstProxyAdapter.java
ndroid/camera/data/FixedLastDataAdapter.java
ndroid/camera/data/FixedLastProxyAdapter.java
ndroid/camera/data/LocalData.java
ndroid/camera/data/LocalDataAdapter.java
ndroid/camera/data/LocalDataList.java
ndroid/camera/data/LocalDataQuery.java
ndroid/camera/data/LocalDataUtil.java
ndroid/camera/data/LocalDataViewType.java
ndroid/camera/data/LocalFilmstripDataAdapter.java
ndroid/camera/data/LocalMediaData.java
ndroid/camera/data/LocalMediaObserver.java
ndroid/camera/data/LocalSessionData.java
ndroid/camera/data/Location.java
ndroid/camera/data/MediaDetails.java
ndroid/camera/data/Metadata.java
ndroid/camera/data/MetadataLoader.java
ndroid/camera/data/NewestFirstComparator.java
ndroid/camera/data/PanoramaMetadataLoader.java
ndroid/camera/data/PhotoData.java
ndroid/camera/data/PhotoDataFactory.java
ndroid/camera/data/PhotoDataQuery.java
ndroid/camera/data/PhotoItem.java
ndroid/camera/data/PhotoItemFactory.java
ndroid/camera/data/PlaceholderItem.java
ndroid/camera/data/RgbzMetadataLoader.java
ndroid/camera/data/SessionItem.java
ndroid/camera/data/SimpleViewData.java
ndroid/camera/data/VideoData.java
ndroid/camera/data/VideoDataFactory.java
ndroid/camera/data/VideoDataQuery.java
ndroid/camera/data/VideoItem.java
ndroid/camera/data/VideoItemData.java
ndroid/camera/data/VideoItemFactory.java
ndroid/camera/data/VideoRotationMetadataLoader.java
ndroid/camera/filmstrip/DataAdapter.java
ndroid/camera/filmstrip/FilmstripController.java
ndroid/camera/filmstrip/FilmstripDataAdapter.java
ndroid/camera/filmstrip/ImageData.java
ndroid/camera/one/v2/photo/PictureCallbackAdapter.java
ndroid/camera/one/v2/photo/PictureCallbackAdaptor.java
ndroid/camera/one/v2/photo/PictureTakerImpl.java
ndroid/camera/session/CaptureSessionManagerImpl.java
ndroid/camera/ui/ZoomView.java
ndroid/camera/util/CameraUtil.java
ndroid/camera/widget/FilmstripLayout.java
ndroid/camera/widget/FilmstripView.java
|
| e066c34825af2b3b41894030bed5dde6be6e0af0 |
07-Jan-2015 |
Alan Newberger <alann@google.com> |
Merge "Stop recording location in onPause" into ub-camera-haleakala
|
| 4708b9cf90be27eb425f9f06fb106039d7531515 |
07-Jan-2015 |
Alan Newberger <alann@google.com> |
Stop recording location in onPause
This is a legitimate bug where the Legacy provider actually documents a
no-op in disconnect with an intention to stop updates on pause, which
never occurred. This also improves lifecycle of location updates for
other providers.
Bug: 14989298
Change-Id: If963241b01af83ab63bd8c1bccfcf1b5a1a616fa
ndroid/camera/CameraActivity.java
ndroid/camera/app/LegacyLocationProvider.java
|
| d2c7167019693fbd14fda64f2aa7362e7626f194 |
07-Jan-2015 |
Senpo Hu <senpo@google.com> |
Merge "Avoid using fast_out_slow_in on K devices." into ub-camera-haleakala
|
| 2fd316a867ac44421c6f3f7dc87cee20e1534d6b |
07-Jan-2015 |
Senpo Hu <senpo@google.com> |
Merge "Fix NPE crash in RoundedThumbnailView." into ub-camera-haleakala
|
| daea74c9c1708908ae801d53ef3288500cc9532f |
02-Jan-2015 |
Senpo Hu <senpo@google.com> |
Fix NPE crash in RoundedThumbnailView.
Bug: 18851937
Change-Id: I63f3084cd2ae7cd8bbb73507aefcf4192ed7bfd0
ndroid/camera/widget/RoundedThumbnailView.java
|
| e376f016b93724d4776aa9397e7bb4409503b793 |
06-Jan-2015 |
I-Jong Lin <ijonglin@google.com> |
YUV Color conversion fix
Bug: 18902605
More foolproof way of calculating the YUV multipliers at compile time.
Fixes a previous off-by-one error that translated into an incorrect 2x
in chroma magnitude (U,V components) by manual calculation.
Change-Id: I0732ed0c5a1bf4b901f9eb86c6a20e09872134dc
ndroid/camera/processing/imagebackend/TaskConvertImageToRGBPreview.java
|
| 522d87380bdc8f4b8cdfe4b6f8337911d2cbc07f |
06-Jan-2015 |
Alan Newberger <alann@google.com> |
Adjust aspect ratio matching threshold for all devices
Broadening a fix from Glacier now that we have time to test across
devices.
Bug: 18241645
Change-Id: Ic3a65a659009d0301255b608d4540bd15e9bd0fb
ndroid/camera/util/ApiHelper.java
ndroid/camera/util/CameraUtil.java
|
| 1408a7844cddfa357de224233c3181318f824fc2 |
06-Jan-2015 |
I-Jong Lin <ijonglin@google.com> |
Merge "Interface ImageTaskManager for Image-based Tasks" into ub-camera-haleakala
|
| 3c7b7ec6aa2e51859718a6d6dead3c12d10ea370 |
05-Jan-2015 |
I-Jong Lin <ijonglin@google.com> |
Interface ImageTaskManager for Image-based Tasks
Clearly defined with relationship between derived ImageTasks and the
respective ImageBackend. Once tasks are derived from
TaskImageContainer, they should only have limited functionality back
to the ImageBackend to spawn new tasks to describe their internal task
graph and manage their image references. The new class ImageTaskManager
defines this relationship and implies that most of functionality should
be internal to the task itself rather than the ImageBackend.
Also, included clean-up of some unused parameters in ImageConsumer
interface as well.
Change-Id: I6a0a5f72aea55adc8b846eb3cd945b61bc6d2a93
ndroid/camera/processing/imagebackend/ImageBackend.java
ndroid/camera/processing/imagebackend/ImageConsumer.java
ndroid/camera/processing/imagebackend/ImageTaskManager.java
ndroid/camera/processing/imagebackend/TaskChainedCompressImageToJpeg.java
ndroid/camera/processing/imagebackend/TaskCompressImageToJpeg.java
ndroid/camera/processing/imagebackend/TaskConvertImageToRGBPreview.java
ndroid/camera/processing/imagebackend/TaskImageContainer.java
ndroid/camera/processing/imagebackend/TaskJpegEncode.java
ndroid/camera/processing/imagebackend/TaskWriteImageToDisk.java
|
| d8463954727c9f8b688e69476439830cadb7b45a |
30-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Refactor camera factories to reduce code duplication
Change-Id: I5f5c899f595dbbaa9fa181c5caa092d4bad69f07
ndroid/camera/async/HandlerFactory.java
ndroid/camera/async/MainThreadExecutor.java
ndroid/camera/async/Observable.java
ndroid/camera/one/OneCamera.java
ndroid/camera/one/OneCameraCharacteristics.java
ndroid/camera/one/OneCameraManager.java
ndroid/camera/one/v2/OneCameraCharacteristicsImpl.java
ndroid/camera/one/v2/OneCameraFactory.java
ndroid/camera/one/v2/OneCameraImpl.java
ndroid/camera/one/v2/OneCameraManagerImpl.java
ndroid/camera/one/v2/OneCameraZslImpl.java
ndroid/camera/one/v2/SimpleJpegOneCameraFactory.java
ndroid/camera/one/v2/SimpleOneCameraFactory.java
ndroid/camera/one/v2/SimpleYuvOneCameraFactory.java
ndroid/camera/one/v2/ZslOneCameraFactory.java
ndroid/camera/one/v2/autofocus/AEMeteringRegion.java
ndroid/camera/one/v2/autofocus/AFMeteringRegion.java
ndroid/camera/one/v2/autofocus/ManualAutoFocusFactory.java
ndroid/camera/one/v2/common/BasicCameraFactory.java
ndroid/camera/one/v2/common/ZoomedCropRegion.java
ndroid/camera/one/v2/core/FrameServerFactory.java
ndroid/camera/one/v2/initialization/CameraStarter.java
ndroid/camera/one/v2/initialization/GenericOneCameraImpl.java
ndroid/camera/one/v2/initialization/InitializedOneCameraFactory.java
ndroid/camera/one/v2/initialization/PreviewSizeSelector.java
ndroid/camera/one/v2/photo/ImageRotationCalculatorImpl.java
ndroid/camera/one/v2/photo/PictureTakerFactory.java
ndroid/camera/one/v2/photo/PictureTakerImpl.java
ndroid/camera/one/v2/photo/YuvImageBackendImageSaver.java
ndroid/camera/one/v2/photo/ZslPictureTakerFactory.java
|
| 8897101881c0df691970deabd866d8ff96f07b0c |
06-Jan-2015 |
Senpo Hu <senpo@google.com> |
Avoid using fast_out_slow_in on K devices.
Bug: 18895268
Change-Id: I9bcd799c5a27b2e05cf45bb5923dcf8e7d0f7123
ndroid/camera/widget/FilmstripLayout.java
|
| 20aa834e03da0af6d3d9c64086efb4a1f6f424b5 |
05-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Fix possible ConcurrentModificationException
Bug: 18895233
Change-Id: Iece6bd467c74082e2ea48df2ff9bb51767b75c17
ndroid/camera/one/v2/sharedimagereader/imagedistributor/ImageDistributor.java
ndroid/camera/one/v2/sharedimagereader/imagedistributor/ImageDistributorImpl.java
|
| da46b2eb1d33522d781db0982c7e4799008035c2 |
05-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Delete unused/unnecessary interfaces" into ub-camera-haleakala
|
| 465462e82b3f2855d41d2d8c2e7427287ebbb8b9 |
03-Jan-2015 |
Senpo Hu <senpo@google.com> |
Merge "Break the dependency from CaptureModuleUI to CaptureModule." into ub-camera-haleakala
|
| 6a4a38d2320ab4e840cf4ad2ffb9714b0d7c1539 |
31-Dec-2014 |
Paul Rohde <codelogic@google.com> |
Detect slow frames and provide smoothed preview FPS.
Change-Id: Ie1a8feeb8d69f213791cd8b86e0f2e10e5b8cc08
ndroid/camera/async/NoOp.java
ndroid/camera/one/v2/ZslOneCameraFactory.java
ndroid/camera/one/v2/stats/PreviewFpsListener.java
|
| 8e8d3088e057df3a866e67b6d20ec950f9d4e4f6 |
23-Dec-2014 |
Senpo Hu <senpo@google.com> |
Break the dependency from CaptureModuleUI to CaptureModule.
This doesn't change any logic. Mainly just moving things around.
Change-Id: Ia130f3d0e5821095605219e50cc16008bc7ac143
ndroid/camera/CameraModule.java
ndroid/camera/CaptureModule.java
ndroid/camera/CaptureModuleUI.java
ndroid/camera/PhotoUI.java
ndroid/camera/VideoUI.java
ndroid/camera/ui/PreviewStatusListener.java
|
| 596ee58f6b9c6563f388566b29f1731f7ca42800 |
02-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Delete unused/unnecessary interfaces
Change-Id: Ic3cdad63236cf98db5eaeb45287393d4ec16fc0a
ndroid/camera/async/BlockingCloseable.java
ndroid/camera/async/BoundedBufferQueue.java
|
| a9f8690dec58c14a453bf3628d672d58b0132a40 |
02-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Fix race condition in which close() may deadlock
Change-Id: I422471ed47216dafd7f3114fc3d1ea7f47d281c3
ndroid/camera/one/v2/sharedimagereader/ImageStreamImpl.java
ndroid/camera/one/v2/sharedimagereader/SingleAllocationImageStream.java
|
| 9ad0984f36ff9cd133c61c4e979032988b77a995 |
31-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Replace Pollable with Guava Supplier
Change-Id: Ibd4359cf5f0c7dbacb534dcb098d77a1f2f36133
ndroid/camera/async/ConcurrentState.java
ndroid/camera/async/ConstantPollable.java
ndroid/camera/async/Observable.java
ndroid/camera/async/Pollable.java
ndroid/camera/one/v2/SimpleJpegOneCameraFactory.java
ndroid/camera/one/v2/SimpleYuvOneCameraFactory.java
ndroid/camera/one/v2/ZslOneCameraFactory.java
ndroid/camera/one/v2/autofocus/AEMeteringRegion.java
ndroid/camera/one/v2/autofocus/AFMeteringRegion.java
ndroid/camera/one/v2/autofocus/ManualAutoFocusFactory.java
ndroid/camera/one/v2/autofocus/MeteringParameters.java
ndroid/camera/one/v2/common/FlashBasedAEMode.java
ndroid/camera/one/v2/common/ZoomedCropRegion.java
ndroid/camera/one/v2/core/RequestTemplate.java
ndroid/camera/one/v2/initialization/GenericOneCameraImpl.java
ndroid/camera/one/v2/initialization/InitializedOneCameraFactory.java
ndroid/camera/one/v2/initialization/PreviewStarter.java
ndroid/camera/one/v2/photo/FlashBasedPhotoCommand.java
ndroid/camera/one/v2/photo/PictureCallbackAdaptor.java
ndroid/camera/one/v2/sharedimagereader/ringbuffer/DynamicRingBufferFactory.java
ndroid/camera/one/v2/sharedimagereader/ringbuffer/TicketPoolPrioritizer.java
ndroid/camera/settings/Setting.java
|
| 5b4a6731387bbf8a405de9da973b113b5abea1df |
31-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Replace FutureResult with guava SettableFuture" into ub-camera-haleakala
|
| 45e44632665ebac1d42de50b6d5173a65c7404dc |
31-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Fix bug in CountableBufferQueue.getNext" into ub-camera-haleakala
|
| 92b2512020983a79fa5e4837c2ee9ac868612c0a |
30-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Replace FutureResult with guava SettableFuture
Change-Id: I2439909e2c6dd663b1bc31a828e7744e18a6daaf
ndroid/camera/async/FutureResult.java
ndroid/camera/one/v2/initialization/CaptureSessionCreator.java
ndroid/camera/one/v2/initialization/InitializedOneCameraFactory.java
ndroid/camera/one/v2/initialization/PreviewStarter.java
|
| 4007e751d3903dc319f764d54194abd8d0338e6f |
30-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Fix bug in CountableBufferQueue.getNext
Change-Id: I2eb19a692acb9e41da0c172364fdb285061de2e6
ndroid/camera/async/CountableBufferQueue.java
|
| 54bc2a2b15060c2cda8d03249588cfe22c1744eb |
30-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Only run non-zsl fallback if the ring buffer is empty
Change-Id: I5d85aa1a3bbb0035189fa0f178a6a0077740ae46
ndroid/camera/one/v2/photo/ZslImageCaptureCommand.java
|
| 49b177beff5ed10e04f90c7615c273496fd3ba9b |
30-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Rename to RequestTemplate" into ub-camera-haleakala
|
| 3c82bd08314c7599a1c261ee2f2afee3be2ec9eb |
30-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Remove unused parameter to OneCamera.close" into ub-camera-haleakala
|
| fba96c1611ecfb054a28287a7cf305c389e3b8f2 |
30-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Simplify ImageSaver interface" into ub-camera-haleakala
|
| 2830a7261d786b9d024081b3c47fc38303709470 |
30-Dec-2014 |
Sascha Haeberling <haeberling@google.com> |
'Fix' ANR in holiday build happening frequently from lockscreen.
Bug: 18854352
Note: This is more of a hack around the already pretty hacky camera
open-close lock. Proper fix is to refactor the code to not require this
lock anymore. But to get the holiday droidfood going further, this is
a quick for now.
Change-Id: Ib69821d4e6cb3b82f438aeee28c807cc7c33dd25
ndroid/camera/CaptureModule.java
|
| 0cd4a4481272ff00780291410237bcddd31c96a6 |
30-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Simplify ImageSaver interface
Change-Id: I92bdade418f39d852e972f18f58e5620d38067aa
ndroid/camera/one/v2/SimpleJpegOneCameraFactory.java
ndroid/camera/one/v2/SimpleYuvOneCameraFactory.java
ndroid/camera/one/v2/ZslOneCameraFactory.java
ndroid/camera/one/v2/photo/ImageSaver.java
ndroid/camera/one/v2/photo/PictureTakerImpl.java
ndroid/camera/one/v2/photo/YuvImageBackendImageSaver.java
ndroid/camera/one/v2/photo/ZslImageSaverImpl.java
|
| 11c72fc1a0645db28c04edc89429c8b82777520a |
29-Dec-2014 |
Sascha Häberling <haeberling@google.com> |
Revert "'Fix' ANR in holiday build happening frequently from lockscreen."
This doesn't work well and introduces an issue with HDR+.
This reverts commit 7b81135c88f01cb2ac7a958dcb66c0d2d2bde7c4.
Change-Id: Ib7e412221c216d0cf6116817599d28a4d4afa3ef
ndroid/camera/CaptureModule.java
|
| c7251753978f80dc40131e7676f69f7e86208fd1 |
29-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Remove unused parameter to OneCamera.close
Change-Id: Iea5dcb41eb5c387a7f19db280ea9c681e2aabc7e
ndroid/camera/CaptureModule.java
ndroid/camera/one/OneCamera.java
ndroid/camera/one/v2/OneCameraImpl.java
ndroid/camera/one/v2/OneCameraZslImpl.java
ndroid/camera/one/v2/initialization/GenericOneCameraImpl.java
|
| 7b81135c88f01cb2ac7a958dcb66c0d2d2bde7c4 |
29-Dec-2014 |
Sascha Haeberling <haeberling@google.com> |
'Fix' ANR in holiday build happening frequently from lockscreen.
Bug: 18854352
Note: This is more of a hack around the already pretty hacky camera
open-close lock. Proper fix is to refactor the code to not require this
lock anymore. But to get the holiday droidfood going further, this is
a quick for now.
Change-Id: Iad974e91aae6ede3897ce3bb7d69f8764d9fd08a
ndroid/camera/CaptureModule.java
|
| 7f4a37d1885b2652b569291661120c1c1d415fe2 |
29-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Rename to RequestTemplate
Change-Id: I4f1dd9ac41d8c35c50eaead4be211d3bb108bc73
ndroid/camera/one/v2/SimpleJpegOneCameraFactory.java
ndroid/camera/one/v2/SimpleYuvOneCameraFactory.java
ndroid/camera/one/v2/ZslOneCameraFactory.java
ndroid/camera/one/v2/autofocus/ManualAutoFocusFactory.java
ndroid/camera/one/v2/core/DecoratingRequestBuilderBuilder.java
ndroid/camera/one/v2/core/RequestTemplate.java
|
| f3573e6e39161d3e136d309a502f4078f96ea1b4 |
23-Dec-2014 |
Sascha Haeberling <haeberling@google.com> |
Make sure session is copied into ImageSaver.
This prevents references to CaptureSession being basically randomly called.
Change-Id: Ic63308a23c22a21ffe7572397697772c3f65ccfa
ndroid/camera/one/v2/photo/ZslImageSaverImpl.java
|
| 09d1f4473af1494572d77949ad87b95e21028135 |
23-Dec-2014 |
Sascha Haeberling <haeberling@google.com> |
Rotate images before storing them so that rotation for reading is always 0.
This also fixed the filmstrip loading slowness issue.
Change-Id: I920f5f136576c6812522d99bfed5063357593206
ndroid/camera/processing/imagebackend/TaskCompressImageToJpeg.java
ndroid/camera/util/Size.java
|
| f7fa8392f881eb0c8aa329977d77ce45eafde017 |
23-Dec-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Fix bug in FirstRunDialog detection and re-enable CaptureModule on N9." into ub-camera-haleakala
|
| e083a34da38a89f580c562e696da9180c373a009 |
23-Dec-2014 |
Sascha Haeberling <haeberling@google.com> |
Fix bug in FirstRunDialog detection and re-enable CaptureModule on N9.
Bug: 18840830
Change-Id: I22abae32c5e55f779b5c645324f1f3a8421e4bde
ndroid/camera/CaptureModule.java
ndroid/camera/module/ModulesInfo.java
|
| fd32492b6e86f30f4f87028154c23059cae61a04 |
23-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Add logging to track the total number of open images." into ub-camera-haleakala
|
| 84427a8d1cf3fed4fd3937a24df101745c64cfda |
23-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Add logging to track the total number of open images.
Change-Id: I62e4cf54c856c537bebd557efc7215481ac6e383
ndroid/camera/one/v2/sharedimagereader/imagedistributor/ImageDistributorFactory.java
ndroid/camera/one/v2/sharedimagereader/imagedistributor/ImageDistributorOnImageAvailableListener.java
|
| 0038fc10f61f10a715fad3411f0d55a45d8ae50f |
23-Dec-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "CaptureModule is not yet working on N9, so switch it to PhotoModule." into ub-camera-haleakala
|
| f6eb9329fe0d42a930ed2b599ea4407414a1cadf |
23-Dec-2014 |
Sascha Haeberling <haeberling@google.com> |
CaptureModule is not yet working on N9, so switch it to PhotoModule.
Change-Id: I58aee4b7704840b0d89c8c2c0d96f54a2347c42b
ndroid/camera/module/ModulesInfo.java
|
| b9aac76c3d6de7ec6b17c3f4d9d899e1d52b3418 |
23-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Added shutter sound to CaptureModule for non-HDR cameras
Change-Id: I11beb99633e116b8e0328f0021e09100e6d031e6
ndroid/camera/CaptureModule.java
|
| 5178d51d37e25bd314d17b188f33085d3b6936a3 |
23-Dec-2014 |
Senpo Hu <senpo@google.com> |
Merge "Fix NPE crash in RoundedThumbnailView." into ub-camera-haleakala
|
| 3b22eba411176d884e09d23544e69b8ec20f6677 |
23-Dec-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Store ZSL images in correct orientation and show progress in filmstrip." into ub-camera-haleakala
|
| 68d834ff57c8e20a8c040cdcbf50d0e3332d6385 |
23-Dec-2014 |
Senpo Hu <senpo@google.com> |
Fix NPE crash in RoundedThumbnailView.
Bug: 18835171
Change-Id: Ib77e15cfeb93e3d73cf14e2459dfcdbe54d92073
ndroid/camera/widget/RoundedThumbnailView.java
|
| 3830d419691ef865f01b362fee9618bac2aa8888 |
20-Dec-2014 |
Sascha Haeberling <haeberling@google.com> |
Store ZSL images in correct orientation and show progress in filmstrip.
Added an ImageRotationCalculator which calcuates the image rotation
based on camera characteristics and the device orientation at the time
of the shot.
Also moves the image backend code into its own sub-package.
Change-Id: I4b6b83e3e3cebece83215c19d0aff826ff853352
ndroid/camera/CameraActivity.java
ndroid/camera/CaptureModule.java
ndroid/camera/TextureViewHelper.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/app/OrientationManager.java
ndroid/camera/one/v2/SimpleJpegOneCameraFactory.java
ndroid/camera/one/v2/SimpleYuvOneCameraFactory.java
ndroid/camera/one/v2/ZslOneCameraFactory.java
ndroid/camera/one/v2/initialization/DeferredPictureTaker.java
ndroid/camera/one/v2/initialization/InitializedOneCameraFactory.java
ndroid/camera/one/v2/photo/ImageRotationCalculator.java
ndroid/camera/one/v2/photo/ImageRotationCalculatorImpl.java
ndroid/camera/one/v2/photo/PictureTakerImpl.java
ndroid/camera/one/v2/photo/ZslImageSaverImpl.java
ndroid/camera/processing/ImageBackend.java
ndroid/camera/processing/ImageConsumer.java
ndroid/camera/processing/ImageProcessorListener.java
ndroid/camera/processing/ImageProcessorProxyListener.java
ndroid/camera/processing/ProcessingServiceManager.java
ndroid/camera/processing/TaskChainedCompressImageToJpeg.java
ndroid/camera/processing/TaskCompressImageToJpeg.java
ndroid/camera/processing/TaskConvertImageToRGBPreview.java
ndroid/camera/processing/TaskImageContainer.java
ndroid/camera/processing/TaskJpegEncode.java
ndroid/camera/processing/TaskWriteImageToDisk.java
ndroid/camera/processing/imagebackend/ImageBackend.java
ndroid/camera/processing/imagebackend/ImageConsumer.java
ndroid/camera/processing/imagebackend/ImageProcessorListener.java
ndroid/camera/processing/imagebackend/ImageProcessorProxyListener.java
ndroid/camera/processing/imagebackend/ImageToProcess.java
ndroid/camera/processing/imagebackend/TaskChainedCompressImageToJpeg.java
ndroid/camera/processing/imagebackend/TaskCompressImageToJpeg.java
ndroid/camera/processing/imagebackend/TaskConvertImageToRGBPreview.java
ndroid/camera/processing/imagebackend/TaskImageContainer.java
ndroid/camera/processing/imagebackend/TaskJpegEncode.java
ndroid/camera/processing/imagebackend/TaskWriteImageToDisk.java
ndroid/camera/session/CaptureSession.java
ndroid/camera/session/CaptureSessionManagerImpl.java
|
| 17fc13a74ff71e3c721218624815c244dccc33f7 |
22-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Added thread-safe SettingsManager wrapper
Change-Id: Ie2d2bb14e0dd4760e8f8d47e7a988ab20c8567fe
ndroid/camera/async/ConcurrentState.java
ndroid/camera/async/Observable.java
ndroid/camera/settings/Setting.java
|
| 2db2f7917997f5aa67ddfd09a7cf7c8bd93d7d11 |
20-Dec-2014 |
Sascha Haeberling <haeberling@google.com> |
Until Camera2-based JPEG camera is ready, N4 uses PhotoModule.
Change-Id: I3fc9503ae254a4d3975d9387f13f78e387ab0361
ndroid/camera/module/ModulesInfo.java
|
| ec1ce0f53e3f747a9f61aa5b093dc2027ad2c38f |
20-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Do not disableModeOptions() on shutter click" into ub-camera-haleakala
|
| 2aa9e849483b0706b3c613ffba6c39630c68b1fa |
20-Dec-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Changes to support complete disabling of Burst." into ub-camera-haleakala
|
| 0d32f29b2a82c2afa87b46e309c38f67f8b5e54c |
20-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Do not disableModeOptions() on shutter click
Change-Id: Ib4b226417ab992358231cbe96cf7d46c27926c7e
ndroid/camera/app/CameraAppUI.java
|
| 03bf6e15f06caba2cc9e3abcea380eae65944b02 |
20-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Added non-zsl YUV OneCamera implementation
Change-Id: Iea389f274ea453b81c3fba39c65e0ec2dc1ee5c6
ndroid/camera/one/v2/SimpleYuvOneCameraFactory.java
|
| 30ccdac56450e5b1927e14a6eede2b86a30c42eb |
19-Dec-2014 |
I-Jong Lin <ijonglin@google.com> |
Full end-to-end integration for ZSL
Full end-to-end functionality using the ZSL integrated with
the ImageBackend. Still some outstanding issues regarding image
orientation, but the full pipeline is plumbed for ZSL.
Change-Id: I636944fbd57e7d1bf6b1ef24e1e2c1317afdd28d
ndroid/camera/CameraActivity.java
ndroid/camera/one/v2/OneCameraImpl.java
ndroid/camera/one/v2/OneCameraZslImpl.java
ndroid/camera/one/v2/SimpleJpegOneCameraFactory.java
ndroid/camera/one/v2/ZslOneCameraFactory.java
ndroid/camera/one/v2/photo/ImageSaver.java
ndroid/camera/one/v2/photo/PictureTakerImpl.java
ndroid/camera/one/v2/photo/ZslImageSaverImpl.java
ndroid/camera/processing/ImageBackend.java
ndroid/camera/processing/ImageConsumer.java
ndroid/camera/processing/ImageProcessorProxyListener.java
ndroid/camera/processing/ProcessingServiceManager.java
ndroid/camera/processing/TaskChainedCompressImageToJpeg.java
ndroid/camera/processing/TaskCompressImageToJpeg.java
ndroid/camera/processing/TaskConvertImageToRGBPreview.java
ndroid/camera/processing/TaskImageContainer.java
ndroid/camera/processing/TaskJpegEncode.java
ndroid/camera/processing/TaskWriteImageToDisk.java
ndroid/camera/util/JpegUtilNative.java
|
| c51a121f0b4139e73ee7df23581ef551ff44e276 |
20-Dec-2014 |
Sascha Haeberling <haeberling@google.com> |
Changes to support complete disabling of Burst.
Have the stub burst controller retain a reference to the preview surface
texture.
Change-Id: Iaf86f8cd30ac862b1f29f9edeca65fd20e825b52
ndroid/camera/CaptureModule.java
ndroid/camera/burst/BurstFacadeFactory.java
|
| e0fe29b2477c8fd2c44be2547bcc5183ed2f7235 |
20-Dec-2014 |
Sascha Häberling <haeberling@google.com> |
Merge "Revert "Changes to support complete disabling of Burst."" into ub-camera-haleakala
|
| 0de97e1c2b9fadb27c3c08f5dde2d9f353714bec |
20-Dec-2014 |
Sascha Häberling <haeberling@google.com> |
Revert "Changes to support complete disabling of Burst."
This reverts commit 8565f7695f41f0150ba096a75591ad7b2fe5de81.
This crashes pre-MR1 devices. Will fix and re-submit.
Change-Id: Ie645a63270e73b451d0a484928c98cf5104e320a
ndroid/camera/CaptureModule.java
ndroid/camera/burst/BurstFacadeFactory.java
|
| 71a42845d8b7302325abfc4e1314d099f7df9e00 |
20-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Implement callbacks for focus indicator on zsl" into ub-camera-haleakala
|
| 0e08cd20de04edc8ad8a8aa7f677b7cc708f21d3 |
20-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Implement callbacks for focus indicator on zsl
Change-Id: I5348192a76222ac41923b680acb58ac6480affcf
ndroid/camera/one/OneCamera.java
ndroid/camera/one/v2/SimpleJpegOneCameraFactory.java
ndroid/camera/one/v2/ZslOneCameraFactory.java
ndroid/camera/one/v2/initialization/CameraStarter.java
ndroid/camera/one/v2/initialization/InitializedOneCameraFactory.java
ndroid/camera/one/v2/initialization/MetadataCallback.java
|
| 1fcb7a9b2b8b4fcac5547d63de08ba1703fd7897 |
20-Dec-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Changes to support complete disabling of Burst." into ub-camera-haleakala
|
| 8565f7695f41f0150ba096a75591ad7b2fe5de81 |
20-Dec-2014 |
Sascha Haeberling <haeberling@google.com> |
Changes to support complete disabling of Burst.
Have the stub burst controller retain a reference to the preview surface
texture.
Change-Id: I9a966a87aac2c21cd6050f511ea4e648b6267744
ndroid/camera/CaptureModule.java
ndroid/camera/burst/BurstFacadeFactory.java
|
| 2fa1cc1b0d9a4f614dd84b34f41d9212d7fd7e41 |
19-Dec-2014 |
Alan Newberger <alann@google.com> |
Merge "Restore activity lifecycle when OneCameraManager fails to initialize" into ub-camera-haleakala
|
| 4540b9fd5af80bd9508cb56f526560a38780b186 |
19-Dec-2014 |
Alan Newberger <alann@google.com> |
Restore activity lifecycle when OneCameraManager fails to initialize
The return in onCreateTasks when OneCameraManager catches an exception, cause
camera crashes instead of showing the failure dialog as intended. The exception
is an NPE in PanoramaViewHelper but is due to assumptions of things init'ed
in onCreate not holding due to the return when onStart is executed. While we
could proof out every object to assume lifecycle events exit, I prefer to
maintain lifecycle and remove the return, and make anything that relies on
OneCameraManager know that it could be null. This also moves the handling of the
error dialog down to CaptureModule, in the unlikely case an API1 module would
still work this enables it while preserving the same intended behavior for
CaptureModule.
Bug: 18048591
Change-Id: Ib81f8b42eaa26daae2d3354bae1ef5127a9cbcf1
ndroid/camera/CameraActivity.java
ndroid/camera/CaptureModule.java
|
| d2e29c342d49c47790c5f98b508bf6f00f54c04e |
19-Dec-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Refactor the interface of CaptureModule to Burst to allow disabling." into ub-camera-haleakala
|
| 0f989bab3bda93546d3eafd0a065e1162f83d8f0 |
19-Dec-2014 |
Sascha Haeberling <haeberling@google.com> |
Refactor the interface of CaptureModule to Burst to allow disabling.
Change-Id: I87164c0cd8961ad929a63ff34248a12690f7d4d1
ndroid/camera/CaptureModule.java
ndroid/camera/burst/BurstFacade.java
ndroid/camera/burst/BurstFacadeFactory.java
ndroid/camera/burst/BurstFacadeImpl.java
ndroid/camera/burst/ToastingBurstFacadeDecorator.java
|
| c57c79fccfedeeaf34c1847861464fb041260ddc |
19-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Enable AE and fix metering regions for ZSL camera
Change-Id: Icaf3bfe9b004e032e43ae600fb3e10ce201ce545
ndroid/camera/one/v2/ZslOneCameraFactory.java
ndroid/camera/one/v2/autofocus/ManualAutoFocusFactory.java
|
| bed08ec6585a2cc7d909afa5843307d461928a9d |
19-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Fix potential NPE in ConcurrentBufferQueue.getNext()" into ub-camera-haleakala
|
| 86b49644dba70ff37d1715feffa4a56a28e3bde7 |
19-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Fix potential NPE in ConcurrentBufferQueue.getNext()
Change-Id: Ieb6101d0cf9466f3ec3e1bff32797a247b0ecba3
ndroid/camera/async/ConcurrentBufferQueue.java
|
| 8d40d27547bccab77d448af2e92b4059b2e6d206 |
19-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Fix ConcurrentModificationException in ImageDistributor
Change-Id: Ibf250795189d2113b00f89a9d58bb78581c0dc0f
ndroid/camera/one/v2/sharedimagereader/imagedistributor/ImageDistributor.java
ndroid/camera/one/v2/sharedimagereader/imagedistributor/ImageDistributorImpl.java
|
| 48fbf15e2c8806fc518f4c881ab17b1b548887d9 |
19-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Fix bug in which double close() increased ticket count
Change-Id: Ic534cb436755cbb3fada8769e0f7f81e6167eb5f
ndroid/camera/one/v2/ZslOneCameraFactory.java
ndroid/camera/one/v2/sharedimagereader/ticketpool/ReservableTicketPool.java
ndroid/camera/one/v2/sharedimagereader/util/TicketImageProxy.java
|
| 3a7921d7712e56afc1745c80d346435b225f6a28 |
19-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Added zero-shutter-lag capture implementation over the FrameServer" into ub-camera-haleakala
|
| c75207e527f480c3afea3c0afcb7c1f95e67e586 |
19-Dec-2014 |
Sascha Haeberling <haeberling@google.com> |
Don't use glide if we have a bitmap already as a placeholder.
Change-Id: I8e9676675c025cbfcd36e8c1b899a33d1b20f2d1
ndroid/camera/data/LocalSessionData.java
|
| 829afc7dfd69866beebb09052db3d228b916f352 |
19-Dec-2014 |
Sascha Haeberling <haeberling@google.com> |
Change placholder API to use Bitmap's instead of JPEG bytes.
Change-Id: Id6f3b1e604bee56f3372b891bc44d8716b06478d
ndroid/camera/CameraActivity.java
ndroid/camera/Storage.java
ndroid/camera/data/LocalSessionData.java
ndroid/camera/session/CaptureSessionManagerImpl.java
ndroid/camera/session/PlaceholderManager.java
|
| 12f608f3d2089439a108788a1908941eea4277b9 |
11-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Added zero-shutter-lag capture implementation over the FrameServer
Change-Id: Ia01244dba7013c5f81152dd90adc8d87e7004dd2
ndroid/camera/async/ConcurrentBufferQueue.java
ndroid/camera/async/CountableBufferQueue.java
ndroid/camera/async/ForwardingBufferQueue.java
ndroid/camera/async/Lifetime.java
ndroid/camera/async/ResettingDelayedExecutor.java
ndroid/camera/async/Updatable.java
ndroid/camera/one/v2/SimpleJpegOneCameraFactory.java
ndroid/camera/one/v2/ZslOneCameraFactory.java
ndroid/camera/one/v2/autofocus/AEMeteringRegion.java
ndroid/camera/one/v2/autofocus/AFMeteringRegion.java
ndroid/camera/one/v2/autofocus/AFScanHoldResetCommand.java
ndroid/camera/one/v2/autofocus/FullAFScanCommand.java
ndroid/camera/one/v2/autofocus/ManualAutoFocus.java
ndroid/camera/one/v2/autofocus/ManualAutoFocusFactory.java
ndroid/camera/one/v2/autofocus/ManualAutoFocusImpl.java
ndroid/camera/one/v2/autofocus/MeteringParameters.java
ndroid/camera/one/v2/autofocus/TriggeredAFScanStateResponseListener.java
ndroid/camera/one/v2/camera2proxy/CameraDeviceProxy.java
ndroid/camera/one/v2/camera2proxy/CameraDeviceRequestBuilderFactory.java
ndroid/camera/one/v2/commands/AFScanHoldReset.java
ndroid/camera/one/v2/commands/CameraCommand.java
ndroid/camera/one/v2/commands/CameraCommandExecutor.java
ndroid/camera/one/v2/commands/FlashBasedPhotoCommand.java
ndroid/camera/one/v2/commands/FullAFScanCommand.java
ndroid/camera/one/v2/commands/LoggingCameraCommand.java
ndroid/camera/one/v2/commands/PreviewCommand.java
ndroid/camera/one/v2/commands/StaticPictureCommand.java
ndroid/camera/one/v2/common/CaptureSessionCreator.java
ndroid/camera/one/v2/common/DeferredManualAutoFocus.java
ndroid/camera/one/v2/common/DeferredPictureTaker.java
ndroid/camera/one/v2/common/FlashBasedAEMode.java
ndroid/camera/one/v2/common/FrameworkFailureResponseListener.java
ndroid/camera/one/v2/common/FullSizeAspectRatioProvider.java
ndroid/camera/one/v2/common/GenericOneCameraImpl.java
ndroid/camera/one/v2/common/ManualAutoFocusImpl.java
ndroid/camera/one/v2/common/MetadataResponseListener.java
ndroid/camera/one/v2/common/MeteringParameters.java
ndroid/camera/one/v2/common/PictureCallbackAdaptor.java
ndroid/camera/one/v2/common/PollableAEMode.java
ndroid/camera/one/v2/common/PollableAERegion.java
ndroid/camera/one/v2/common/PollableAFRegion.java
ndroid/camera/one/v2/common/PollableZoomedCropRegion.java
ndroid/camera/one/v2/common/PreviewSizeSelector.java
ndroid/camera/one/v2/common/SensorOrientationProvider.java
ndroid/camera/one/v2/common/SimpleCaptureStream.java
ndroid/camera/one/v2/common/SupportedPreviewSizeProvider.java
ndroid/camera/one/v2/common/TimestampResponseListener.java
ndroid/camera/one/v2/common/TotalCaptureResultResponseListener.java
ndroid/camera/one/v2/common/ZoomedCropRegion.java
ndroid/camera/one/v2/core/CaptureStream.java
ndroid/camera/one/v2/core/DecoratingRequestBuilderBuilder.java
ndroid/camera/one/v2/core/FrameExposureResponseListener.java
ndroid/camera/one/v2/core/FrameServer.java
ndroid/camera/one/v2/core/FrameServerFactory.java
ndroid/camera/one/v2/core/FrameServerImpl.java
ndroid/camera/one/v2/core/FrameworkFailureResponseListener.java
ndroid/camera/one/v2/core/MetadataResponseListener.java
ndroid/camera/one/v2/core/RefCountedImageProxy.java
ndroid/camera/one/v2/core/Request.java
ndroid/camera/one/v2/core/RequestBuilder.java
ndroid/camera/one/v2/core/ResourceAcquisitionFailedException.java
ndroid/camera/one/v2/core/ResponseListenerBroadcaster.java
ndroid/camera/one/v2/core/SimpleCaptureStream.java
ndroid/camera/one/v2/core/SingleCloseImageProxy.java
ndroid/camera/one/v2/core/TagDispatchCaptureSession.java
ndroid/camera/one/v2/core/TimestampResponseListener.java
ndroid/camera/one/v2/core/TotalCaptureResultResponseListener.java
ndroid/camera/one/v2/core/TriggeredAFScanStateResponseListener.java
ndroid/camera/one/v2/initialization/CameraStarter.java
ndroid/camera/one/v2/initialization/CaptureSessionCreator.java
ndroid/camera/one/v2/initialization/DeferredManualAutoFocus.java
ndroid/camera/one/v2/initialization/DeferredPictureTaker.java
ndroid/camera/one/v2/initialization/GenericOneCameraImpl.java
ndroid/camera/one/v2/initialization/InitializedOneCameraFactory.java
ndroid/camera/one/v2/initialization/PreviewSizeSelector.java
ndroid/camera/one/v2/initialization/PreviewStarter.java
ndroid/camera/one/v2/photo/FlashBasedPhotoCommand.java
ndroid/camera/one/v2/photo/FrameExposureResponseListener.java
ndroid/camera/one/v2/photo/ImageCaptureCommand.java
ndroid/camera/one/v2/photo/ImageSaver.java
ndroid/camera/one/v2/photo/PictureCallbackAdaptor.java
ndroid/camera/one/v2/photo/PictureTaker.java
ndroid/camera/one/v2/photo/PictureTakerFactory.java
ndroid/camera/one/v2/photo/PictureTakerImpl.java
ndroid/camera/one/v2/photo/SimpleImageCaptureCommand.java
ndroid/camera/one/v2/photo/ZslImageCaptureCommand.java
ndroid/camera/one/v2/photo/ZslPictureTakerFactory.java
ndroid/camera/one/v2/sharedimagereader/BoundedImageBufferQueue.java
ndroid/camera/one/v2/sharedimagereader/ImageDistributor.java
ndroid/camera/one/v2/sharedimagereader/ImageDistributorOnImageAvailableListener.java
ndroid/camera/one/v2/sharedimagereader/ImageStreamFactory.java
ndroid/camera/one/v2/sharedimagereader/ImageStreamImpl.java
ndroid/camera/one/v2/sharedimagereader/SharedImageReader.java
ndroid/camera/one/v2/sharedimagereader/SharedImageReaderFactory.java
ndroid/camera/one/v2/sharedimagereader/SingleAllocationImageStream.java
ndroid/camera/one/v2/sharedimagereader/TicketRequiredFilter.java
ndroid/camera/one/v2/sharedimagereader/ZslSharedImageReaderFactory.java
ndroid/camera/one/v2/sharedimagereader/imagedistributor/ImageDistributor.java
ndroid/camera/one/v2/sharedimagereader/imagedistributor/ImageDistributorFactory.java
ndroid/camera/one/v2/sharedimagereader/imagedistributor/ImageDistributorImpl.java
ndroid/camera/one/v2/sharedimagereader/imagedistributor/ImageDistributorOnImageAvailableListener.java
ndroid/camera/one/v2/sharedimagereader/imagedistributor/ImageStream.java
ndroid/camera/one/v2/sharedimagereader/imagedistributor/RefCountedImageProxy.java
ndroid/camera/one/v2/sharedimagereader/imagedistributor/SingleCloseImageProxy.java
ndroid/camera/one/v2/sharedimagereader/ringbuffer/DynamicRingBuffer.java
ndroid/camera/one/v2/sharedimagereader/ringbuffer/DynamicRingBufferFactory.java
ndroid/camera/one/v2/sharedimagereader/ringbuffer/QueueFlusher.java
ndroid/camera/one/v2/sharedimagereader/ringbuffer/TicketPoolPrioritizer.java
ndroid/camera/one/v2/sharedimagereader/ticketpool/FiniteTicketPool.java
ndroid/camera/one/v2/sharedimagereader/ticketpool/ReservableTicketPool.java
ndroid/camera/one/v2/sharedimagereader/ticketpool/Ticket.java
ndroid/camera/one/v2/sharedimagereader/ticketpool/TicketPool.java
ndroid/camera/one/v2/sharedimagereader/ticketpool/TicketProvider.java
ndroid/camera/one/v2/sharedimagereader/util/ImageCloser.java
ndroid/camera/one/v2/sharedimagereader/util/TicketImageProxy.java
ndroid/camera/util/ScopedFactory.java
|
| 415db11a3fd1300d67a4484b683f39e6d10d8353 |
19-Dec-2014 |
Senpo Hu <senpo@google.com> |
Merge "Tune open filmstrip animation for capture indicator in Haleakala." into ub-camera-haleakala
|
| d498ee7a23a4f04239909bdfc7b122d34ad13bca |
17-Dec-2014 |
Senpo Hu <senpo@google.com> |
Tune open filmstrip animation for capture indicator in Haleakala.
Confirmed with zray@. UX team wants a smoother animation with
fast_out_slow_in interpolator to open filmstrip.
Change-Id: I8c7b82cf22f43df24bb27280364b2aacc97e46b3
ndroid/camera/widget/FilmstripLayout.java
|
| 2272f8a6bfc8adca8ada7a215bef038d45256085 |
16-Dec-2014 |
Senpo Hu <senpo@google.com> |
CaptureModule first run dialog.
* Introduce FirstRunDialog.
* Add OneCameraCharacteristics so we can query camera properties without
opening the camera.
* Refactor AspectRatioDialogLayout and LocationDialogLayout to clean up.
* Refactor to move away from portability/Size class in Camera2.
Bug: 18623223
Change-Id: I05f4eefe3ee2feeaa47b6296f8926f6be8e83051
ndroid/camera/CameraActivity.java
ndroid/camera/CaptureModule.java
ndroid/camera/CaptureModuleUI.java
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
ndroid/camera/VideoModule.java
ndroid/camera/app/AppController.java
ndroid/camera/app/FirstRunDialog.java
ndroid/camera/exif/Rational.java
ndroid/camera/one/OneCameraAccessException.java
ndroid/camera/one/OneCameraCharacteristics.java
ndroid/camera/one/OneCameraManager.java
ndroid/camera/one/v1/OneCameraManagerImpl.java
ndroid/camera/one/v2/OneCameraCharacteristicsImpl.java
ndroid/camera/one/v2/OneCameraManagerImpl.java
ndroid/camera/settings/AppUpgrader.java
ndroid/camera/settings/CameraPictureSizesCacher.java
ndroid/camera/settings/CameraSettingsActivity.java
ndroid/camera/settings/ResolutionUtil.java
ndroid/camera/settings/SettingsManager.java
ndroid/camera/settings/SettingsUtil.java
ndroid/camera/util/ApiHelper.java
ndroid/camera/util/CameraUtil.java
ndroid/camera/util/Size.java
ndroid/camera/widget/AspectRatioDialogLayout.java
ndroid/camera/widget/AspectRatioSelector.java
ndroid/camera/widget/LocationDialogLayout.java
|
| 01d56038a53487a9b7989bd17c732b8919da64f1 |
18-Dec-2014 |
Paul Rohde <codelogic@google.com> |
Delete unused code.
Change-Id: I55e6da712199cb106781bea8a51cf98fd5ed7e31
ndroid/camera/CameraActivity.java
ndroid/camera/IntArray.java
ndroid/camera/OnClickAttr.java
ndroid/camera/PhotoModule.java
ndroid/camera/Storage.java
ndroid/camera/ToggleImageButton.java
ndroid/camera/VideoModule.java
ndroid/camera/app/AppUi.java
ndroid/camera/drawable/TextDrawable.java
ndroid/camera/one/v2/ImageCaptureManager.java
ndroid/camera/one/v2/OneCameraZslImpl.java
ndroid/camera/ui/CheckedLinearLayout.java
ndroid/camera/ui/ExpandedGridView.java
ndroid/camera/ui/FaceView.java
ndroid/camera/ui/FocusIndicator.java
ndroid/camera/ui/OnIndicatorEventListener.java
ndroid/camera/ui/RotateImageView.java
ndroid/camera/ui/Switch.java
ndroid/camera/ui/TwoStateImageView.java
ndroid/camera/util/AccessibilityUtils.java
ndroid/camera/util/Callback.java
ndroid/camera/util/DoneHandler.java
ndroid/camera/util/Gusterpolator.java
ndroid/camera/util/ImageLoader.java
ndroid/camera/util/MotionEventHelper.java
ndroid/camera/util/Size.java
ndroid/camera/widget/FilmstripView.java
|
| dfceadee0ac331d147263280d5d6ee0c09101c76 |
18-Dec-2014 |
Paul Rohde <codelogic@google.com> |
Merge "Refactor Photo and Video Data into seperate classes Delete unused RotationTask" into ub-camera-haleakala
|
| 3a8c31c09850dd75b28337003773b442e8097a0c |
18-Dec-2014 |
Paul Rohde <codelogic@google.com> |
Refactor Photo and Video Data into seperate classes
Delete unused RotationTask
Change-Id: I9c21d712546d7e8fae81704ac6e79314b4749be0
ndroid/camera/CameraActivity.java
ndroid/camera/data/CameraDataAdapter.java
ndroid/camera/data/LocalData.java
ndroid/camera/data/LocalDataQuery.java
ndroid/camera/data/LocalMediaData.java
ndroid/camera/data/PhotoData.java
ndroid/camera/data/RotationTask.java
ndroid/camera/data/VideoData.java
|
| d14b8f3aeea6ff567fc709b03c98808ca8eb9ca6 |
18-Dec-2014 |
I-Jong Lin <ijonglin@google.com> |
Merge "Second Pass at Integration of ImageBackend" into ub-camera-haleakala
|
| ed68932f91b4b4ad6766e4e38732deb8be772426 |
12-Dec-2014 |
I-Jong Lin <ijonglin@google.com> |
Second Pass at Integration of ImageBackend
Implementation of single service to centralize task submission and
execution of Android Image dependent tasks to minimize the locking
of system resources and to prioritize processing with thread
priority and enforced temporal dependence. This implementation
is ready to support the plumbing for Lucky Shot. Currently, the
object are isolated and not wired into the Camera App itself.
The integration of these objects will occur in a subsequent CL.
The unit tests for these object are contained in a separate,
but related CL: ag/602679 .
Change-Id: Ia51d46651ed02ea2d5a014943d17cadb56e9006f
ndroid/camera/processing/ImageBackend.java
ndroid/camera/processing/ImageConsumer.java
ndroid/camera/processing/ImageProcessorListener.java
ndroid/camera/processing/ImageProcessorProxyListener.java
ndroid/camera/processing/TaskChainedCompressImageToJpeg.java
ndroid/camera/processing/TaskCompressImageToJpeg.java
ndroid/camera/processing/TaskConvertImageToRGBPreview.java
ndroid/camera/processing/TaskImageContainer.java
ndroid/camera/processing/TaskJpegEncode.java
ndroid/camera/processing/TaskWriteImageToDisk.java
|
| 987ee64612e2510004fdf08536746c87234d01c1 |
05-Dec-2014 |
Paul Rohde <codelogic@google.com> |
Drop new focus indicator into Camera2.
* Create a new custom focus view that interacts with physical lens diopter changes.
* Replace all occurances of the old focus indicator with the new one.
Change-Id: Ia02646ce4d1eb059ecb8a1dfccc15dfc9c167e1b
ndroid/camera/CaptureModule.java
ndroid/camera/CaptureModuleUI.java
ndroid/camera/FocusOverlayManager.java
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
ndroid/camera/SoundPlayer.java
ndroid/camera/VideoModule.java
ndroid/camera/VideoUI.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/one/AbstractOneCamera.java
ndroid/camera/one/OneCamera.java
ndroid/camera/one/v2/ImageCaptureManager.java
ndroid/camera/one/v2/OneCameraImpl.java
ndroid/camera/one/v2/OneCameraZslImpl.java
ndroid/camera/one/v2/SimpleJpegOneCameraFactory.java
ndroid/camera/one/v2/common/GenericOneCameraImpl.java
ndroid/camera/ui/FocusOverlay.java
ndroid/camera/ui/focus/AutoFocusRing.java
ndroid/camera/ui/focus/CameraCoordinateTransformer.java
ndroid/camera/ui/focus/FocusController.java
ndroid/camera/ui/focus/FocusRing.java
ndroid/camera/ui/focus/FocusRingRenderer.java
ndroid/camera/ui/focus/FocusRingView.java
ndroid/camera/ui/focus/FocusSound.java
ndroid/camera/ui/focus/ManualFocusRing.java
ndroid/camera/ui/motion/AnimationClock.java
ndroid/camera/ui/motion/DampedSpring.java
ndroid/camera/ui/motion/DynamicAnimation.java
ndroid/camera/ui/motion/DynamicAnimator.java
ndroid/camera/ui/motion/InterpolateUtils.java
ndroid/camera/ui/motion/Invalidator.java
ndroid/camera/ui/motion/UnitBezier.java
ndroid/camera/ui/motion/UnitCurve.java
ndroid/camera/ui/motion/UnitCurves.java
ndroid/camera/util/CameraUtil.java
ndroid/camera/widget/FilmstripView.java
|
| b79279f49e365cc6da75c1bc44b4c786036d0aa7 |
17-Dec-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Adding stack support and hooking SmartBurst up to the new API." into ub-camera-haleakala
|
| 24069e7a9cc9b4f908f18a71301285ccf5e164f6 |
09-Dec-2014 |
Sascha Haeberling <haeberling@google.com> |
Adding stack support and hooking SmartBurst up to the new API.
Change-Id: Icc023aed65e1e31f0b808de648067b3628fff838
ndroid/camera/CameraActivity.java
ndroid/camera/CaptureModule.java
ndroid/camera/Storage.java
ndroid/camera/app/CameraApp.java
ndroid/camera/burst/BurstFacade.java
ndroid/camera/burst/BurstFacadeFactory.java
ndroid/camera/burst/BurstFacadeImpl.java
ndroid/camera/burst/BurstReadyStateChangeListener.java
ndroid/camera/burst/ToastingBurstFacadeDecorator.java
ndroid/camera/data/LocalMediaData.java
ndroid/camera/session/CaptureSession.java
ndroid/camera/session/CaptureSessionManager.java
ndroid/camera/session/CaptureSessionManagerImpl.java
ndroid/camera/session/StackSaver.java
ndroid/camera/session/StackSaverFactory.java
ndroid/camera/session/StackSaverImpl.java
|
| b530f7d637117e7c014d72d7692579d9dda6caa9 |
16-Dec-2014 |
Senpo Hu <senpo@google.com> |
Merge "Bug fixes for capture indicator UI." into ub-camera-haleakala
|
| 1321823277e30b0be46f4911418b7b64cfc7d1c0 |
08-Dec-2014 |
Radford Juang <radford@google.com> |
Setting AF mode for SmartBurst to CONTINUOUS_VIDEO to prevent focus
issues when capturing action with SmartBurst.
(Note: b/16984793 prevents this from working properly on Nexus 5)
Change-Id: I3b046030ccf1264a339fa1e8dc15ae92d7157e7f
ndroid/camera/one/v2/OneCameraZslImpl.java
|
| 367d13813ff5b72824b20df84989074dd48e4a6c |
11-Dec-2014 |
Sascha Haeberling <haeberling@google.com> |
Make sure to only silence if the mediarecorder was started.
Bug: 11538882
Change-Id: I43991b40fb9312cc59b34132457b5e6b201a8c19
ndroid/camera/VideoModule.java
|
| a45abcb3cfc48f1718b77a616e000d1678fbd85b |
11-Dec-2014 |
Senpo Hu <senpo@google.com> |
Bug fixes for capture indicator UI.
* Don't show capture indicator in Photo Sphere.
* Fix the layout on Nexus 6.
* Don't transform thumbnail image if the size is matched.
Change-Id: I03c9c09071b63ed8143236a242b6435b4ea19018
ndroid/camera/CameraActivity.java
ndroid/camera/widget/RoundedThumbnailView.java
|
| 331366164fe985d5fc6671f5544fa1da7a6b1276 |
11-Dec-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Disable systems sounds and vibrations during video recording." into ub-camera-haleakala
|
| 92217bd306b612336ccbd0bac348defc09f49dd3 |
11-Dec-2014 |
Sascha Haeberling <haeberling@google.com> |
Disable systems sounds and vibrations during video recording.
Bug: 11538882
Change-Id: If06bdc33ee68d079b581a2e97879dae5c34492fd
ndroid/camera/VideoModule.java
|
| aec3613f416e910ea3638c6c44bb75035eef4fe3 |
10-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Initial frameserver/OneCamera integration" into ub-camera-haleakala
|
| 3d653d3254d9f4411f0b7a4dd56fd739bacd255d |
10-Dec-2014 |
Senpo Hu <senpo@google.com> |
Merge "New capture indicator design for Haleakala." into ub-camera-haleakala
|
| 427a915be4bcc84fa1c32d9e9e1b7473c522f732 |
20-Nov-2014 |
Senpo Hu <senpo@google.com> |
New capture indicator design for Haleakala.
* Introduce RoundedThumbnailView and retire PeekView.
* Rename BottomBarModeOptionsWrapper to StickyBottomCaptureLayout.
* Verified on K and L devices.
Thumbnail cropping:
* 100% width and vertically centered for portrait.
* 100% height and horizontally centered for landscape.
General behavior spec:
* Hide the capture indicatorby fading out using fast_out_linear_in (150ms):
1) User open filmstrip.
2) User switch module.
3) User switch front/back camera.
4) User close app.
Behavior spec for non-photo modules:
* Photosphere is stripped of UI so there is no need to show capture
indicator. When a photo sphere is taken (and user is in another mode),
the preview frame used in filmstrip is used in the capture indicator.
* Video: show in viewfinder prior or after capture. Hide during capture.
When a video is taken, the preview frame used in filmstrip is used in
the capture indicator.
* Panorama: Show in viewfinder prior or after capture. Hide during
capture. When a panorama is taken, the preview frame used in filmstrip
is used in the capture indicator.
* Lens blue: Show in viewfinder prior or after capture. Hide during
capture. When a lens blur is taken, the preview frame used in filmstrip
is used in the capture indicator.
Visual spec:
A 12dp spacing between mode option overlay and thumbnail.
1. A circular mask that excludes the corners of the preview image.
2. A solid white layer that sits on top of the preview and is also masked
by (1).
3. The preview image.
4. A 'ripple' which is just a white circular stroke.
Animation spec:
(1) only the scale animates, from 50%(24dp) to 114%(54dp) in 200ms then
falls back to 100%(48dp) in 200ms. Both steps use the same easing:
fast_out_slow_in.
(2) opacity, from 50% to 0% over 150ms, easing is exponential.
(3) doesn't animate.
(4) starts animating after 100ms, when (1) is at its peak radius and all
animations take 200ms, using linear_out_slow in. Opacity goes from 40%
to 0%, radius goes from 40dp to 70dp, stroke width goes from 5dp to 1dp.
Bug: 18317565
Change-Id: Ib8d4f065b98fc3b9b0b627633232ce8cee96eb61
ndroid/camera/CameraActivity.java
ndroid/camera/CaptureModule.java
ndroid/camera/PhotoModule.java
ndroid/camera/VideoController.java
ndroid/camera/VideoModule.java
ndroid/camera/VideoUI.java
ndroid/camera/app/AppController.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/BottomBarModeOptionsWrapper.java
ndroid/camera/ui/ModeListView.java
ndroid/camera/ui/StickyBottomCaptureLayout.java
ndroid/camera/widget/RoundedThumbnailView.java
|
| 1009712bc3d2406c9df3811c5caf5a1883d19eee |
09-Dec-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Clean up unused CameraPreviewData." into ub-camera-haleakala
|
| f671a3f23d1591b1aeeb549f5ceed509e432430d |
09-Dec-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Remove unused SoundClips class." into ub-camera-haleakala
|
| fcbe0bdf25571217bea08c980a654295bee57217 |
09-Dec-2014 |
Alan Newberger <alann@google.com> |
am a8923a75: Avoid resetting touch to focus in onPreviewStarted for N4
* commit 'a8923a75b4c1ffa2158687221fd679b2dea60013':
Avoid resetting touch to focus in onPreviewStarted for N4
|
| a8923a75b4c1ffa2158687221fd679b2dea60013 |
09-Dec-2014 |
Alan Newberger <alann@google.com> |
Avoid resetting touch to focus in onPreviewStarted for N4
N4 HAL stability issues seem to be exacerbated by resetting focus
in onPreviewStarted. Removing this call yields OK performance for
N4 and removes any repros for the known issue.
Bug: 18681082
Change-Id: I7f78ad648ff55dee412abb18560276cba99ab988
ndroid/camera/FocusOverlayManager.java
|
| 0d1764dcd9f21de0647831713e4e6094f9566641 |
09-Dec-2014 |
Sascha Haeberling <haeberling@google.com> |
Remove unused SoundClips class.
Change-Id: I71e5cedb8e70d33172fc0c48fcf3bebfd6e35f88
ndroid/camera/SoundClips.java
ndroid/camera/SoundPlayer.java
|
| 9c94ab32a69a1ad3642a0f1e38e68bcfd97d3511 |
02-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Initial frameserver/OneCamera integration
Change-Id: I2fe0d8acf9ce927a6a0a1dea599299c715503462
ndroid/camera/async/BlockingCloseable.java
ndroid/camera/async/BufferQueueController.java
ndroid/camera/async/CallbackRunnable.java
ndroid/camera/async/CloseableHandlerThread.java
ndroid/camera/async/ConcurrentBufferQueue.java
ndroid/camera/async/ConcurrentState.java
ndroid/camera/async/ConstantPollable.java
ndroid/camera/async/FilteredUpdatable.java
ndroid/camera/async/FutureResult.java
ndroid/camera/async/HandlerExecutor.java
ndroid/camera/async/Listenable.java
ndroid/camera/async/ListenableConcurrentState.java
ndroid/camera/async/Pollable.java
ndroid/camera/async/RefCountedBufferQueueController.java
ndroid/camera/async/ResettingDelayedExecutor.java
ndroid/camera/async/SafeCloseable.java
ndroid/camera/async/Updatable.java
ndroid/camera/async/UpdatableCountDownLatch.java
ndroid/camera/one/AbstractOneCamera.java
ndroid/camera/one/OneCamera.java
ndroid/camera/one/v2/SimpleJpegOneCameraFactory.java
ndroid/camera/one/v2/camera2proxy/AndroidCameraCaptureSessionProxy.java
ndroid/camera/one/v2/camera2proxy/AndroidImageProxy.java
ndroid/camera/one/v2/camera2proxy/CameraCaptureSessionClosedException.java
ndroid/camera/one/v2/camera2proxy/CameraCaptureSessionProxy.java
ndroid/camera/one/v2/camera2proxy/CameraDeviceProxy.java
ndroid/camera/one/v2/camera2proxy/ForwardingImageProxy.java
ndroid/camera/one/v2/camera2proxy/ImageProxy.java
ndroid/camera/one/v2/commands/AFScanHoldReset.java
ndroid/camera/one/v2/commands/CameraCommand.java
ndroid/camera/one/v2/commands/CameraCommandExecutor.java
ndroid/camera/one/v2/commands/FlashBasedPhotoCommand.java
ndroid/camera/one/v2/commands/FullAFScanCommand.java
ndroid/camera/one/v2/commands/LoggingCameraCommand.java
ndroid/camera/one/v2/commands/PreviewCommand.java
ndroid/camera/one/v2/commands/RunnableCameraCommand.java
ndroid/camera/one/v2/commands/StaticPictureCommand.java
ndroid/camera/one/v2/common/CaptureSessionCreator.java
ndroid/camera/one/v2/common/DeferredManualAutoFocus.java
ndroid/camera/one/v2/common/DeferredPictureTaker.java
ndroid/camera/one/v2/common/FullSizeAspectRatioProvider.java
ndroid/camera/one/v2/common/GenericOneCameraImpl.java
ndroid/camera/one/v2/common/ManualAutoFocusImpl.java
ndroid/camera/one/v2/common/MeteringParameters.java
ndroid/camera/one/v2/common/PictureCallbackAdaptor.java
ndroid/camera/one/v2/common/PollableAEMode.java
ndroid/camera/one/v2/common/PollableAERegion.java
ndroid/camera/one/v2/common/PollableAFRegion.java
ndroid/camera/one/v2/common/PollableZoomedCropRegion.java
ndroid/camera/one/v2/common/PreviewSizeSelector.java
ndroid/camera/one/v2/common/SensorOrientationProvider.java
ndroid/camera/one/v2/common/SupportedPreviewSizeProvider.java
ndroid/camera/one/v2/components/AutoFocusMonitor.java
ndroid/camera/one/v2/components/CameraCommand.java
ndroid/camera/one/v2/components/FullAFScanCommand.java
ndroid/camera/one/v2/components/ImageSaver.java
ndroid/camera/one/v2/components/PreviewCommand.java
ndroid/camera/one/v2/components/StaticPictureCommand.java
ndroid/camera/one/v2/core/DecoratingRequestBuilderBuilder.java
ndroid/camera/one/v2/core/DecoratingRequestBuilderFactory.java
ndroid/camera/one/v2/core/FrameExposureResponseListener.java
ndroid/camera/one/v2/core/FrameServer.java
ndroid/camera/one/v2/core/FrameworkFailureResponseListener.java
ndroid/camera/one/v2/core/MetadataChangeResponseListener.java
ndroid/camera/one/v2/core/MetadataResponseListener.java
ndroid/camera/one/v2/core/RefCountedImageProxy.java
ndroid/camera/one/v2/core/RequestBuilder.java
ndroid/camera/one/v2/core/ResponseListener.java
ndroid/camera/one/v2/core/ResponseListenerBroadcaster.java
ndroid/camera/one/v2/core/SingleCloseImageProxy.java
ndroid/camera/one/v2/core/TagDispatchCaptureSession.java
ndroid/camera/one/v2/core/TimestampResponseListener.java
ndroid/camera/one/v2/core/TotalCaptureResultResponseListener.java
ndroid/camera/one/v2/core/TriggeredAFScanStateResponseListener.java
ndroid/camera/one/v2/sharedimagereader/BoundedImageBufferQueue.java
ndroid/camera/one/v2/sharedimagereader/ImageDistributor.java
ndroid/camera/one/v2/sharedimagereader/ImageDistributorOnImageAvailableListener.java
ndroid/camera/one/v2/sharedimagereader/SharedImageReader.java
ndroid/camera/util/ScopedFactory.java
|
| 2fda232c3f89a5f42fa804fd083cbe1750402e0c |
06-Dec-2014 |
Shashi Shekhar <shashishekhar@google.com> |
Merge "Fix orientation for preview frames in burst." into ub-camera-haleakala
|
| a7216e47fcfae70fd65a25753a93ec246be3633f |
04-Dec-2014 |
Shashi Shekhar <shashishekhar@google.com> |
Fix orientation for preview frames in burst.
Fix orientation of preview frames in burst. Set the correct orientation
when starting the burst.
BUG: 18117847
Change-Id: I4ed2f0387a5a35a5f43f0528d179b273828ea699
ndroid/camera/burst/BurstFacadeImpl.java
|
| 092082a18e23713b4dc66efe1f5a6d1896b52d34 |
05-Dec-2014 |
Sascha Haeberling <haeberling@google.com> |
Clean up unused CameraPreviewData.
Change-Id: I86d60a553d84e0f625fa596c1029394ff110c5d0
ndroid/camera/data/CameraPreviewData.java
|
| f100ab2f2e0ea16c45658d7c227a3cdfbee71b13 |
05-Dec-2014 |
Shashi Shekhar <shashishekhar@google.com> |
Fix some timestamp issues with burst.
1. Set timezone to UTC, as the timestamp is in UTC.
2. Use timestamp from mediaItem.getTimestamp()
3. Change the format of filename to include artifact as well as
mediaitem index.
BUG: 18625548
Change-Id: I91196fefda780c3a262619e97c6684086adf845d
ndroid/camera/burst/BurstFacadeImpl.java
|
| a88887f4f586f69b71aa61c38a3b997ce076eed1 |
04-Dec-2014 |
Alan Newberger <alann@google.com> |
Merge "When checking for scene mode, use NO_SCENE_MODE in addition to AUTO" into ub-camera-haleakala
|
| 529d5f670e363fdfd76b05634faf1169a821a3ec |
04-Dec-2014 |
Alan Newberger <alann@google.com> |
When checking for scene mode, use NO_SCENE_MODE in addition to AUTO
Some devices don't have any scene modes, in that case don't try to
override parameters like flash, a code path that should only be
used for actual scene modes active.
Bug: 18600226
Change-Id: If094d8be6bb4f9d8bc66d033374e17898ed98bee
ndroid/camera/PhotoModule.java
|
| 94053036462de5df6982ef3efa15bf9055e8ea1f |
04-Dec-2014 |
Senpo Hu <senpo@google.com> |
Merge "Fix the orientation issue for front camera." into ub-camera-haleakala
|
| bc3b9f1bf63dd70ef11e54ea6d4687a5174f5ddf |
02-Dec-2014 |
Senpo Hu <senpo@google.com> |
Fix the orientation issue for front camera.
This bug is introduced by the refactoring done in ag/589395.
Bug: 18520267
Change-Id: If0df6a7d6fe3ca630839ef92dccaa78f0136bb7d
ndroid/camera/util/CameraUtil.java
|
| 61408dd1fc96641fee532fe7c3a19dce1b58ab2f |
27-Nov-2014 |
Sam Hasinoff <hasinoff@google.com> |
Add support to dump LensShadingMap metadata, related cleanup
- Add custom toString() for LensShadingMap to workaround
b/16899576.
- Remove several now-unneeded custom toString() methods,
since lmp-release provides them in:
frameworks/base/core/java/android/hardware/camera2/params/
- Picky formatting fix.
Bug: 16899576
Change-Id: Iebf0b03ea27f291bc0f633b3760d5bd696df906d
ndroid/camera/util/CaptureDataSerializer.java
|
| 5777607add70d227aa194635a2c93d03f81ab7fe |
27-Nov-2014 |
Shashi Shekhar <shashishekhar@google.com> |
Bump memory limit for saving images.
Bump the memory limit for saving images in MediaSaver from 20 to 30 MB.
Allows bursts to be saved without hitting memory limit issues.
Change-Id: I5795cd1b2870a9a4e48738fe5d60c1b819011d23
ndroid/camera/MediaSaverImpl.java
|
| dd7c15c4b89a7410545f9efe62e2dea18cd1aaa8 |
26-Nov-2014 |
Sascha Haeberling <haeberling@google.com> |
Make sure we only show the toast when burst was actually stopped.
Change-Id: I057bd7217d09f4754584f77c3911749d2ac0fa5f
ndroid/camera/CaptureModule.java
ndroid/camera/burst/BurstFacade.java
ndroid/camera/burst/BurstFacadeFactory.java
ndroid/camera/burst/BurstFacadeImpl.java
ndroid/camera/burst/ToastingBurstFacadeDecorator.java
|
| 06c2b7f396e3d575b43e9e938fee04ff3ff87ba5 |
26-Nov-2014 |
Sascha Haeberling <haeberling@google.com> |
Add a temporary toast message decorator so users know when a burst is on.
Change-Id: If6164f636f60de6f7303a5d54f432648a25e012a
ndroid/camera/CaptureModule.java
ndroid/camera/burst/ToastingBurstFacadeDecorator.java
|
| 913d2ba7ee1b404e58e9287dbc37ffbc3ae604bb |
26-Nov-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Move async package to com.android.camera" into ub-camera-haleakala
|
| de15a5ad14da2e9069642e6f616b66b4ae660e01 |
25-Nov-2014 |
Puneet Lall <puneetl@google.com> |
Move async package to com.android.camera
Change-Id: I937dbdc07fde9fa134f169538243e8c5ee1b6a46
ndroid/camera/async/BoundedBufferQueue.java
ndroid/camera/async/BufferQueue.java
ndroid/camera/async/BufferQueueController.java
ndroid/camera/async/ConcurrentBufferQueue.java
ndroid/camera/async/FutureResult.java
ndroid/camera/async/RefCountBase.java
ndroid/camera/async/RefCountedBufferQueueController.java
ndroid/camera/async/SafeCloseable.java
ndroid/camera/one/v2/async/BoundedBufferQueue.java
ndroid/camera/one/v2/async/BufferQueue.java
ndroid/camera/one/v2/async/BufferQueueController.java
ndroid/camera/one/v2/async/ConcurrentBufferQueue.java
ndroid/camera/one/v2/async/FutureResult.java
ndroid/camera/one/v2/async/RefCountBase.java
ndroid/camera/one/v2/async/RefCountedBufferQueueController.java
ndroid/camera/one/v2/async/SafeCloseable.java
ndroid/camera/one/v2/camera2proxy/ImageProxy.java
ndroid/camera/one/v2/components/FullAFScanCommand.java
ndroid/camera/one/v2/components/StaticPictureCommand.java
ndroid/camera/one/v2/core/CaptureStream.java
ndroid/camera/one/v2/core/FrameworkFailureResponseListener.java
ndroid/camera/one/v2/core/MetadataChangeResponseListener.java
ndroid/camera/one/v2/core/RefCountedImageProxy.java
ndroid/camera/one/v2/core/RequestBuilder.java
ndroid/camera/one/v2/core/SimpleCaptureStream.java
ndroid/camera/one/v2/core/TimestampResponseListener.java
ndroid/camera/one/v2/core/TotalCaptureResultResponseListener.java
ndroid/camera/one/v2/sharedimagereader/BoundedImageBufferQueue.java
ndroid/camera/one/v2/sharedimagereader/ImageDistributor.java
ndroid/camera/one/v2/sharedimagereader/SharedImageReader.java
|
| 5f074b68846bbb420be9ad55f1d5c367f75f07e1 |
25-Nov-2014 |
Alan Newberger <alann@google.com> |
Merge "Separate enable/disable and show/hide logic in ButtonManager" into ub-camera-haleakala
|
| 9ceed0d5535e8453f8b5f77959134760dac01ec5 |
25-Nov-2014 |
Puneet Lall <puneetl@google.com> |
Refactor OneCamera
* Removed CaptureParameter "sanityCheck"
* Removed unused OneCamera interface methods
Change-Id: I2464cedf4ad9122e6ca72055e1cc8c0ba633a164
ndroid/camera/CaptureModule.java
ndroid/camera/burst/BurstFacadeImpl.java
ndroid/camera/one/CameraDirectionProvider.java
ndroid/camera/one/OneCamera.java
ndroid/camera/one/v2/OneCameraImpl.java
ndroid/camera/one/v2/OneCameraZslImpl.java
|
| e29804fdace7b653932314407a5bdcf58569e590 |
25-Nov-2014 |
Alan Newberger <alann@google.com> |
Separate enable/disable and show/hide logic in ButtonManager
Show/hide occurs during module init, and should not be overridden
during operation when buttons are enabled/disabled. Rather than
make all enabling code handle the complexity of button visibility,
this change just configures buttons to be visible once. Addresses
bug where flash button becomes visible on devices without flash
when toggling HDR, due to logic that enables/disables flash and
HDR together.
Bug: 18376973
Change-Id: I787858ccde1fed9833fd24ac51d3b0bd3cc90df7
ndroid/camera/ButtonManager.java
ndroid/camera/PhotoModule.java
|
| a2c1b41da5f169fb9c816449e1dedc32d2335c4a |
24-Nov-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Initial Frameserver Implementation" into ub-camera-haleakala
|
| 5d4fb6accab3bcbe737d52747c328de5cc092d02 |
31-Oct-2014 |
Puneet Lall <puneetl@google.com> |
Initial Frameserver Implementation
Change-Id: Ia683adb31136030b98e7ec429163987ae32da0c2
ndroid/camera/one/v2/async/BoundedBufferQueue.java
ndroid/camera/one/v2/async/BufferQueue.java
ndroid/camera/one/v2/async/BufferQueueController.java
ndroid/camera/one/v2/async/ConcurrentBufferQueue.java
ndroid/camera/one/v2/async/FutureResult.java
ndroid/camera/one/v2/async/RefCountBase.java
ndroid/camera/one/v2/async/RefCountedBufferQueueController.java
ndroid/camera/one/v2/async/SafeCloseable.java
ndroid/camera/one/v2/camera2proxy/CameraDeviceRequestBuilderFactory.java
ndroid/camera/one/v2/camera2proxy/CaptureRequestBuilderProxy.java
ndroid/camera/one/v2/camera2proxy/ImageProxy.java
ndroid/camera/one/v2/components/AutoFocusMonitor.java
ndroid/camera/one/v2/components/CameraCommand.java
ndroid/camera/one/v2/components/FullAFScanCommand.java
ndroid/camera/one/v2/components/ImageSaver.java
ndroid/camera/one/v2/components/PreviewCommand.java
ndroid/camera/one/v2/components/StaticPictureCommand.java
ndroid/camera/one/v2/core/CaptureStream.java
ndroid/camera/one/v2/core/DecoratingRequestBuilderFactory.java
ndroid/camera/one/v2/core/FrameServer.java
ndroid/camera/one/v2/core/FrameworkFailureResponseListener.java
ndroid/camera/one/v2/core/MetadataChangeResponseListener.java
ndroid/camera/one/v2/core/RefCountedImageProxy.java
ndroid/camera/one/v2/core/Request.java
ndroid/camera/one/v2/core/RequestBuilder.java
ndroid/camera/one/v2/core/ResponseListener.java
ndroid/camera/one/v2/core/ResponseListenerBroadcaster.java
ndroid/camera/one/v2/core/SimpleCaptureStream.java
ndroid/camera/one/v2/core/SingleCloseImageProxy.java
ndroid/camera/one/v2/core/TagDispatchCaptureSession.java
ndroid/camera/one/v2/core/TimestampResponseListener.java
ndroid/camera/one/v2/core/TotalCaptureResultResponseListener.java
ndroid/camera/one/v2/sharedimagereader/BoundedImageBufferQueue.java
ndroid/camera/one/v2/sharedimagereader/ImageDistributor.java
ndroid/camera/one/v2/sharedimagereader/SharedImageReader.java
|
| 659cb59fcaf2ab49a6087ca7d10ab5be16503bf3 |
20-Nov-2014 |
Alan Newberger <alann@google.com> |
am fdefc726: Add renderscript helper value
* commit 'fdefc72616d55de5f4e13a3e60fb9561cc8488cb':
Add renderscript helper value
|
| fdefc72616d55de5f4e13a3e60fb9561cc8488cb |
20-Nov-2014 |
Alan Newberger <alann@google.com> |
Add renderscript helper value
Capture new architecture/API-level constraints on renderscript in
the ApiHelper.
Bug: 18435492
Change-Id: I4d06a0c8448cde587f8a9cb3a042768a4a61872a
ndroid/camera/util/ApiHelper.java
|
| 82d592f64966766ac4e4181e08b0d2989d4ed9c3 |
12-Nov-2014 |
Shashi Shekhar <shashishekhar@google.com> |
Hook burst controller to the shutter button long press.
Hooks up the shutter button long press to start the burst.
Introduces a BurstManager to interact with burst.
Provides an implementation of BurstManager that listens to burst and
saves results when burst is complete.
The burst eviction handler is now installed on the ring buffer
on shutter button press and uninstalled on shutter button release.
The ring buffer is cleared before starting and after completion of the
burst.
Also provides a stub implementation of the BurstController that has a
static method which controls if burst is enabled or not.
Bug: 18332704
Change-Id: I1098937bf348af7acbf55da1a5eeb423c30fb901
ndroid/camera/CameraModule.java
ndroid/camera/CaptureModule.java
ndroid/camera/MediaSaverImpl.java
ndroid/camera/ShutterButton.java
ndroid/camera/Storage.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/app/MediaSaver.java
ndroid/camera/burst/BurstController.java
ndroid/camera/burst/BurstFacade.java
ndroid/camera/burst/BurstFacadeFactory.java
ndroid/camera/burst/BurstFacadeImpl.java
ndroid/camera/data/LocalData.java
ndroid/camera/one/AbstractOneCamera.java
ndroid/camera/one/OneCamera.java
ndroid/camera/one/v2/ImageCaptureManager.java
ndroid/camera/one/v2/OneCameraZslImpl.java
ndroid/camera/util/ConcurrentSharedRingBuffer.java
ndroid/camera/widget/ModeOptionsOverlay.java
|
| 0bdc4b54a18c18d7094b2e4cea1e238005c5c4a2 |
18-Nov-2014 |
Senpo Hu <senpo@google.com> |
Unify orientation calculation logic.
Camera API takes clockwise degrees for JPEG rotation and
OrientationEventListener reports clockwise device orientation.
The easiest formula of calculating output image rotation degree is:
"camera sensor orientation" + "device orientation"
Since front cameras face in opposite direction. The result needs to be mirrored
for front camera.
Detailed changes:
* Refactor OrientationManager to remove unnecessary complexity.
* Add OrientationManager.DeviceOrientation enum and
OrientationManager.getDeviceOrientation
* Remove CameraUtil.roundOrientation.
* Fix the weird calculation which is hard to understand in
CameraUtil.getJpegRotation and add CameraUtil.getImageRotation
* Clean up image rotation logic in all modules:
* Always look up the current device orientation via OrientationManager.getDeviceOrientation
* Fix the doc for copyImagePlaneToBitmap() which actually rotates image
counterclockwise.
* Clean up CameraActivity:
* Remove CameraActivity.onOrientationChanged and
ModuleController.onOrientationChanged. Any individual module which
wants to listen orientation change should register itself to
OrientationManager. Now only VideoModule needs to do that.
Bug: 17443789
Change-Id: I6d54cac5bde950acae0c3226448c27a816266df0
ndroid/camera/CameraActivity.java
ndroid/camera/CaptureModule.java
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.java
ndroid/camera/VideoUI.java
ndroid/camera/app/OrientationManager.java
ndroid/camera/app/OrientationManagerImpl.java
ndroid/camera/module/ModuleController.java
ndroid/camera/one/v2/OneCameraZslImpl.java
ndroid/camera/util/CameraUtil.java
ndroid/camera/util/JpegUtilNative.java
ndroid/camera/widget/VideoRecordingHints.java
|
| 0180fd43f41d5ec4771579d5249f295ee8c683a5 |
18-Nov-2014 |
Shashi Shekhar <shashishekhar@google.com> |
Wrap FrameDistributor in a thread safe accessor.
Wrap FrameDistributo in a thread safe accessor and make the instance to
accessor a final field in CaptureModule. This should help in avoiding
null checks and NPEs.
BUG: 18414956
Change-Id: I8d25c5a2923a7382f98c523e88f7547f16217a6f
ndroid/camera/CaptureModule.java
ndroid/camera/gl/FrameDistributorImpl.java
ndroid/camera/gl/FrameDistributorWrapper.java
|
| 9ae303df246577ee1293ef8e731e18ae63f4d3c9 |
11-Nov-2014 |
Shashi Shekhar <shashishekhar@google.com> |
Merge "Initial version of new module to distribute camera frames to consumers." into ub-camera-haleakala
|
| 57c233a21fbe50611c1ea8162e9a2ad0b84493b3 |
07-Nov-2014 |
Shashi Shekhar <shashishekhar@google.com> |
Initial version of new module to distribute camera frames to consumers.
Add FrameDistributor class, that allows passing frames from a
SurfaceTexture to multiple consumers in an efficient manner.
In the CaptureModule, this distributor is used to handle frames
coming from the Camera. It then hooks up a single FrameConsumer
to render frames into a SurfaceTexture.
Note, that this particular FrameConsumer is atypical in the sense
that it reuses the FrameDistributors GL context for efficiency.
Other consumers will typically use their own GL contexts and threads
for processing.
Bug: 18142762
Change-Id: Iee258d108004c23b7d9777204b58c013a9999215
ndroid/camera/CaptureModule.java
ndroid/camera/burst/BurstController.java
ndroid/camera/gl/CopyShader.java
ndroid/camera/gl/FrameDistributor.java
ndroid/camera/gl/FrameDistributorImpl.java
ndroid/camera/gl/GLToolbox.java
ndroid/camera/gl/RenderTarget.java
ndroid/camera/gl/SurfaceTextureConsumer.java
|
| c6da1a12fe8b78e2fbebe1af5efee514bc8e25ee |
06-Nov-2014 |
Sascha Haeberling <haeberling@google.com> |
Add experimental RAW(DNG) support.
Bug: 18272977
This adds RAW writing behind a new debug property:
adb shell setprop persist.camera.capture_dng 1
This will switch to the non-ZSL implementation of one Camera.
The resulting files are stored in a "DNG" folder under DCIM/Camera.
Caveats:
- Preview aspect ratio will not match.
- No item in filmstrip
Change-Id: I9d990de119f22a12d37b22d36d84dc15aeee9340
ndroid/camera/CaptureModuleUtil.java
ndroid/camera/debug/DebugPropertyHelper.java
ndroid/camera/one/OneCamera.java
ndroid/camera/one/v2/OneCameraImpl.java
ndroid/camera/one/v2/OneCameraZslImpl.java
ndroid/camera/util/CameraUtil.java
|
| 87ffa1c9505cea14d498ac2baf7212e7a6b037d7 |
06-Nov-2014 |
Shashi Shekhar <shashishekhar@google.com> |
Merge "Initial interface for the burst module." into ub-camera-haleakala
|
| 17dfcd5d149e3532d2c40f10b225ceb8f53fc1e7 |
06-Nov-2014 |
Andy Huibers <andyhuibers@google.com> |
Merge "Center zoom UI." into ub-camera-haleakala
|
| fda210123a0570a3c0cb4ef9210c47bd980cbc53 |
17-Oct-2014 |
Shashi Shekhar <shashishekhar@google.com> |
Initial interface for the burst module.
Interface for the burst module.
Burst module controls the internal camera buffer and keeps images that
best represent a burst at any given point in time.
The burst module decides which frames to keep by analyzing low-res
preview frames and then keeping corresponding high-res images in the
internal camera buffer.
At the end of the burst, the burst module retrieves results from the
internal camera buffer and can do post processing on the results.
Change-Id: I09d4031ad1566232a5d4641084523c3e3e0aace6
ndroid/camera/burst/BurstArtifact.java
ndroid/camera/burst/BurstConfiguration.java
ndroid/camera/burst/BurstController.java
ndroid/camera/burst/BurstImage.java
ndroid/camera/burst/BurstMediaItem.java
ndroid/camera/burst/BurstResult.java
ndroid/camera/burst/BurstResultsListener.java
ndroid/camera/burst/ResultsAccessor.java
|
| e4d31fbb23ce5ab88474a22d81d0b1c315e2fd5d |
04-Nov-2014 |
Alan Newberger <alann@google.com> |
am 8dd164a3: Merge "Relax aspect ratio matching tolerance for devices with 1.347 ratios" into ub-camera-glacier
* commit '8dd164a39a43cdf1a5de5f1e178b42d471316cac':
Relax aspect ratio matching tolerance for devices with 1.347 ratios
|
| 8dd164a39a43cdf1a5de5f1e178b42d471316cac |
04-Nov-2014 |
Alan Newberger <alann@google.com> |
Merge "Relax aspect ratio matching tolerance for devices with 1.347 ratios" into ub-camera-glacier
|
| 2ebdbd55522df5ceb93c2a0c423e3515c030bd05 |
04-Nov-2014 |
Alan Newberger <alann@google.com> |
Relax aspect ratio matching tolerance for devices with 1.347 ratios
Our .01 tolerance omits valid 4:3 previews when the image capture is
more than 0.01 over true 4:3. Relax matching in Glacier just for
affected builds.
Bug: 18241645
Change-Id: I5868bc9535e4c9bb886f0de0daf0e83cd2f4dc78
ndroid/camera/util/ApiHelper.java
ndroid/camera/util/CameraUtil.java
|
| d8bcdbe3162aee50b3a56039d2e678f130727c2e |
04-Nov-2014 |
Alan Newberger <alann@google.com> |
am 5a64d117: move size parameter setting before other settings
* commit '5a64d117ceccc8572a426e7d27306d81aa5c5663':
move size parameter setting before other settings
|
| 5a64d117ceccc8572a426e7d27306d81aa5c5663 |
04-Nov-2014 |
Alan Newberger <alann@google.com> |
move size parameter setting before other settings
Update picture size before applying parameters prior to starting preview.
This is required to avoid a 640x480 default picture stream on the Nexus 4
which is causing lowered preview frame rates (for unknown reasons).
Bug: 18227551
Change-Id: I2b7648146ff57d5a7d78a22f884643c6d62497e6
ndroid/camera/PhotoModule.java
|
| f96cc4efbef89edb3c11930eea078aed324a99f6 |
29-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
am 06a4e103: Forcefully drop 4k recording from pre-L releases.
* commit '06a4e103aefa3303a6995d465a53c81d6581995f':
Forcefully drop 4k recording from pre-L releases.
|
| 06a4e103aefa3303a6995d465a53c81d6581995f |
29-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
Forcefully drop 4k recording from pre-L releases.
Bug: 18172081
Change-Id: I26b09f19757e059d3567b3cb707592696531d0b3
ndroid/camera/settings/SettingsUtil.java
|
| 2e7e1355adde8b4de6a9c75cef3b87a5fa2bf5e4 |
28-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
am 1332fc02: Remove additional dependencies on FloatMath
* commit '1332fc023ea9941ff4afac0a43d13930d5b59771':
Remove additional dependencies on FloatMath
|
| 3120e645372058a0e6bc28f60839cc381623bbc1 |
28-Oct-2014 |
Andy Huibers <andyhuibers@google.com> |
Center zoom UI.
Bug: 18153777
Change-Id: I27fc0d0ceb8a707214d7dda821a2d5b8c25c955b
ndroid/camera/ui/PreviewOverlay.java
|
| 1332fc023ea9941ff4afac0a43d13930d5b59771 |
28-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
Remove additional dependencies on FloatMath
See frameworks/base commit 33253a4baa6279f81a73425b49dfb6abe5f5416e
for details.
Bug: https://code.google.com/p/android/issues/detail?id=36199
Change-Id: I70a3ad8a9264c320b5e2d6a9097a05d473e4fcfa
ndroid/camera/util/CameraUtil.java
|
| 90b300e86f90a51f1c5227333ed21aa649dc4f06 |
28-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
am c7beaf11: Fix wear interaction of CaptureModule
* commit 'c7beaf110667df54d7ef97cc73e0fe28e31149de':
Fix wear interaction of CaptureModule
|
| 8055989ea8496b68c429469f9fdb2c46e93f9f90 |
28-Oct-2014 |
I-Jong Lin <ijonglin@google.com> |
am e11795bf: Merge "Volantis Device Identifier Helper" into ub-camera-glacier
* commit 'e11795bf44b2c0e5668c7ef6660cffb94b690a9b':
Volantis Device Identifier Helper
|
| a0be86aaad41aad562f54d928992f9ff5e935e08 |
28-Oct-2014 |
Spike Sprague <spikuru@google.com> |
am 7d7d12b2: Merge "Prevent unnecessary setVisibility calls in Filmstrip while zooming" into ub-camera-glacier
* commit '7d7d12b23cb246c5aa8ebf03a98d189d5b6e0f30':
Prevent unnecessary setVisibility calls in Filmstrip while zooming
|
| 9d25217c83967682cf580e8360be2883be232e01 |
28-Oct-2014 |
Alan Newberger <alann@google.com> |
am 8644ffce: Align id selection from QueryTask to sort order from Media query
* commit '8644ffceaa0968cb3c4e8736d37ef1683aa30977':
Align id selection from QueryTask to sort order from Media query
|
| c7beaf110667df54d7ef97cc73e0fe28e31149de |
28-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
Fix wear interaction of CaptureModule
Bug: 18121865
- Make sure we announce that the module is exiting.
- Send postview image to wear device.
- Make sure we can take a picture when timer is on.
Change-Id: I1cbc2e9a1725fdd6d8724ce93f547c87eab8b4aa
ndroid/camera/CaptureModule.java
ndroid/camera/one/OneCamera.java
|
| e11795bf44b2c0e5668c7ef6660cffb94b690a9b |
28-Oct-2014 |
I-Jong Lin <ijonglin@google.com> |
Merge "Volantis Device Identifier Helper" into ub-camera-glacier
|
| 838095ae165f8a16bde986a9853c1d835358aea9 |
27-Oct-2014 |
I-Jong Lin <ijonglin@google.com> |
Volantis Device Identifier Helper
Bug: 17868158
Part of a multi-project commit, along with ag/575889
Adds a helper function to identify when the Android device
is a Nexus 9.
Change-Id: I36c3b6e4472d08d1be7b1197fd62f4766fcc81ed
ndroid/camera/util/ApiHelper.java
|
| 7d7d12b23cb246c5aa8ebf03a98d189d5b6e0f30 |
27-Oct-2014 |
Spike Sprague <spikuru@google.com> |
Merge "Prevent unnecessary setVisibility calls in Filmstrip while zooming" into ub-camera-glacier
|
| 9351e87558b7cb6cbc21d817a585ef769567e347 |
27-Oct-2014 |
Spike Sprague <spikuru@google.com> |
Prevent unnecessary setVisibility calls in Filmstrip while zooming
bug: 18122644
Change-Id: I2681e5f104527553c4f6d71d96c0b659685813fa
ndroid/camera/widget/FilmstripView.java
|
| 8644ffceaa0968cb3c4e8736d37ef1683aa30977 |
27-Oct-2014 |
Alan Newberger <alann@google.com> |
Align id selection from QueryTask to sort order from Media query
In QueryTask we pick the id from the first result and consider it
the max id, yet we query ordered by date taken. On most phones
they're the same but by correcting the query to satisfy the
assumption in QueryTask, we remove costly scenarios where most
photos are reprocessed in LoadNewPhotosTask. One line fix in
LocalMediaData with more verbose logging added in CameraDataAdapter.
Bug: 17437217
Change-Id: Ia643f38d1bfb77ff0beaba989f0effe9a4dec31c
ndroid/camera/data/CameraDataAdapter.java
ndroid/camera/data/LocalMediaData.java
|
| ab07ad8b9974b0ff772a58285f09658ee44a0eb9 |
24-Oct-2014 |
Spike Sprague <spikuru@google.com> |
am f4857ffa: Merge "When option buttons are disabled, make sure the HDR / HDR+ button has the correct icons." into ub-camera-glacier
* commit 'f4857ffa50a4fe6fcead0abde524376c0e9d6a5a':
When option buttons are disabled, make sure the HDR / HDR+ button has the correct icons.
|
| 5c4d018437beafa654622c660e08e2817a62c28a |
24-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge commit '770c2b3e' into stuff1
Conflicts:
src/com/android/camera/data/LocalSessionData.java
Change-Id: Id7113ce6ba3b95ac78511dbbb8391b3bf2a17ecd
|
| f77470f781c85eda535a98be430b8a3d016b281e |
24-Oct-2014 |
Alan Newberger <alann@google.com> |
am 47e9f17a: Merge "Clean up orientation logging" into ub-camera-glacier
* commit '47e9f17a13b391554c8121aae049e91b553688cf':
Clean up orientation logging
|
| f4857ffa50a4fe6fcead0abde524376c0e9d6a5a |
24-Oct-2014 |
Spike Sprague <spikuru@google.com> |
Merge "When option buttons are disabled, make sure the HDR / HDR+ button has the correct icons." into ub-camera-glacier
|
| 770c2b3e82326d6272b1d2f65a65e5330c951abb |
24-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
Introduce ActionCallback for LocalData items.
Bug: 18105354
Fixes the bug where we try to cast a context to an activity.
Change-Id: I3e82a2cda5fe004768276a4d48c07d75738b2a5e
ndroid/camera/data/CameraDataAdapter.java
ndroid/camera/data/FixedFirstDataAdapter.java
ndroid/camera/data/FixedLastDataAdapter.java
ndroid/camera/data/LocalData.java
ndroid/camera/data/LocalMediaData.java
ndroid/camera/data/LocalSessionData.java
ndroid/camera/data/SimpleViewData.java
ndroid/camera/filmstrip/DataAdapter.java
ndroid/camera/widget/FilmstripView.java
|
| f3d360e4d97e724286a530e30cba9fa19e2304d8 |
24-Oct-2014 |
Spike Sprague <spikuru@google.com> |
When option buttons are disabled, make sure the HDR / HDR+ button has the correct icons.
bug: 18104680
Change-Id: Ifd56369ca8177d40317f6af76bbc55a2110d6f5c
ndroid/camera/ButtonManager.java
ndroid/camera/MultiToggleImageButton.java
|
| 097c9fb1e8850521502efabd41b22daa5e2fbf2c |
23-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge commit '5aad0cb4' into stuff1
Conflicts:
src/com/android/camera/CameraActivity.java
src/com/android/camera/one/OneCameraManager.java
Change-Id: I9495daa600356ffcef21bba506dc5a3fce365af3
|
| dff4bbdd81a63a3861c5ff288630a84458e39f01 |
23-Oct-2014 |
Alan Newberger <alann@google.com> |
am f7a18c7f: Merge "Null check for buildItemFromData" into ub-camera-glacier
* commit 'f7a18c7feaeef3c8398376aaeea22e39dc1bbf5d':
Null check for buildItemFromData
|
| 0b6a64b2ca46dcda8fc8f9c078f92605c86e3fbf |
23-Oct-2014 |
Alan Newberger <alann@google.com> |
am f4084e35: Check for null when deleting preference groups
* commit 'f4084e35eac8a8b86e807573647d4a7b43852a59':
Check for null when deleting preference groups
|
| a6faa5522973dfa693c181e8189105b6f6eee7cc |
23-Oct-2014 |
Alan Newberger <alann@google.com> |
am 05edd2ee: Increase VERBOSE logging for PhotoModule orientation use
* commit '05edd2eec40d2a3ce7a76dc9f4d7dfe65e576ab7':
Increase VERBOSE logging for PhotoModule orientation use
|
| 8d4187ccf00f40fe66f59a0cf76b5320fdbfbe81 |
23-Oct-2014 |
I-Jong Lin <ijonglin@google.com> |
am b20cf71a: Merge "Secure Camera App survives phone unlock screen" into ub-camera-glacier
* commit 'b20cf71a817e1835a5ea8d084c9896c2aae706d9':
Secure Camera App survives phone unlock screen
|
| 11a6282bac98cf55a50fca620f5d638d75ac5ec2 |
23-Oct-2014 |
Alan Newberger <alann@google.com> |
am 7eeb897b: Merge "Catch exceptions in settings remove helpers" into ub-camera-glacier
* commit '7eeb897bc342f3f0d201464f37d5e6bfa7fe8b37':
Catch exceptions in settings remove helpers
|
| 1d69742c23f06bceb4b5c96ae7b9dce4e62c4ea0 |
23-Oct-2014 |
I-Jong Lin <ijonglin@google.com> |
am 783fe31b: Merge "Button fix for torch when no flash available in hw" into ub-camera-glacier
* commit '783fe31b1d6ed43c3c2ed24db2ecd78c14578ddf':
Button fix for torch when no flash available in hw
|
| 04142851d4e31456fc3cf5e486025ad255ec9287 |
23-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
am ea77c6b2: Don\'t release resources until camera is closed.
* commit 'ea77c6b2f9a602712c19ed0f441c6439b2f168de':
Don't release resources until camera is closed.
|
| 732e5c323f495346a7d938b31c180741f95a4a48 |
17-Oct-2014 |
Radford Juang <radford@google.com> |
Changes to enable previewing animated GIFs in Camera. Also additional
refactoring to incorporate updated Glide.
Change-Id: Ied4170884cbc70805a7145adc84bcd14fc8dda2c
ndroid/camera/data/LocalDataUtil.java
ndroid/camera/data/LocalMediaData.java
|
| 47e9f17a13b391554c8121aae049e91b553688cf |
23-Oct-2014 |
Alan Newberger <alann@google.com> |
Merge "Clean up orientation logging" into ub-camera-glacier
|
| e9f7b2dd640eb893e682413ddbebc4cd88582300 |
23-Oct-2014 |
Alan Newberger <alann@google.com> |
Clean up orientation logging
Making it a bit easier to compare rotation vs capture metrics.
Bug: 18055323
Change-Id: I15904a00fcb463739b5d7e4c2ca7627be2ecb2b7
ndroid/camera/PhotoModule.java
|
| 5aad0cb47483e4896303cff3a84547dd83948cf8 |
22-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Stop activity leaks" into ub-camera-glacier
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/FocusOverlayManager.java
ndroid/camera/PhotoModule.java
ndroid/camera/one/OneCameraManager.java
ndroid/camera/widget/FilmstripView.java
ndroid/camera/widget/VideoRecordingHints.java
|
| f7a18c7feaeef3c8398376aaeea22e39dc1bbf5d |
22-Oct-2014 |
Alan Newberger <alann@google.com> |
Merge "Null check for buildItemFromData" into ub-camera-glacier
|
| 61c5f9f86b5fd8937fac3d082398086bac0d8db6 |
22-Oct-2014 |
Alan Newberger <alann@google.com> |
Null check for buildItemFromData
This can return null in some scenarios and other invocations do
null checks, one was missing here.
Bug: 18005946
Change-Id: I14c4b31569ace7e84886228a638757ab1cd4710f
ndroid/camera/widget/FilmstripView.java
|
| f4084e35eac8a8b86e807573647d4a7b43852a59 |
22-Oct-2014 |
Alan Newberger <alann@google.com> |
Check for null when deleting preference groups
No glacier incidents but with hundreds of Fishlake incidents
implying that sometimes we fail to find the preference to
remove, protect against nulls here to avoid crashing in
Settings.
Bug: 14625519
Change-Id: Iebc1a103abae7524e6ab0aca96d5c2479e62d9ee
ndroid/camera/settings/CameraSettingsActivity.java
|
| ffc9b8805b1d7033122e5fed5059040eeab8629f |
22-Oct-2014 |
Alan Newberger <alann@google.com> |
Update to latest Glide
Fixes compile and runtime compatibility issues with the latest
Glide update into external/glide
Bug: 18059638
Change-Id: I73dfc37d726284864a07d347015b13d32e084cc0
ndroid/camera/CameraActivity.java
ndroid/camera/data/LocalMediaData.java
ndroid/camera/data/LocalSessionData.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
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoModule.java
|
| b20cf71a817e1835a5ea8d084c9896c2aae706d9 |
21-Oct-2014 |
I-Jong Lin <ijonglin@google.com> |
Merge "Secure Camera App survives phone unlock screen" into ub-camera-glacier
|
| 7eeb897bc342f3f0d201464f37d5e6bfa7fe8b37 |
20-Oct-2014 |
Alan Newberger <alann@google.com> |
Merge "Catch exceptions in settings remove helpers" into ub-camera-glacier
|
| 0aa8c2564832770570002be8b2933412d1b9b19d |
20-Oct-2014 |
Alan Newberger <alann@google.com> |
Catch exceptions in settings remove helpers
Saw just one case of this and my hypothesis is that it was due to
another now-fixed exception resulting in a partial upgrade. But
in no case should these remove issues fail, so fixing to remove and
return the default if the underlying value is not readable. There
is some possibility for behavior error in this case since perhaps e.g.
a String-based 'true' was written and we upgrade instead to a default
'false', but allowing users to enter camera is better and I've audited
all uses of these, behavior should be fine/recoverable vs and
preferable to startup crash.
Bug: 18042161
Change-Id: If2453a819311bfd9233fdf65d7a97d8a243b393a
ndroid/camera/settings/SettingsUpgrader.java
|
| 783fe31b1d6ed43c3c2ed24db2ecd78c14578ddf |
20-Oct-2014 |
I-Jong Lin <ijonglin@google.com> |
Merge "Button fix for torch when no flash available in hw" 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
ndroid/camera/CameraActivity.java
|
| 0784a835e917e1dab7bb963cb9a9b92b506fba94 |
17-Oct-2014 |
I-Jong Lin <ijonglin@google.com> |
Button fix for torch when no flash available in hw
Bug: 17952997
The logic to show and disable the flash button was NOT paired
with the torch button and sometimes allowed the enabled
torch button to be shown, even the flash button was disabled.
A bit confusing, since the torch and flash button look exactly
the same.
Torch button logic to show/hide and enable/disable now follows the flash
logic.
Change-Id: Ie14b07815b6d5e1f8d7ce792ef9ee36dfdf8e3ad
ndroid/camera/app/CameraAppUI.java
|
| ea77c6b2f9a602712c19ed0f441c6439b2f168de |
17-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
Don't release resources until camera is closed.
Bug: 17788328
Change-Id: Id7112b698c8d49f9816e5e1bf6a133272fa2f65a
ndroid/camera/CaptureModule.java
|
| edc92b0a0e2554574210adaff0f20bb1a0b6a9ce |
17-Oct-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Fix orientation for front-facing cameras using CaptureModule" into ub-camera-haleakala
|
| 2b06c90bbd9a72414aa55a354a82958a8b7cb26b |
17-Oct-2014 |
Puneet Lall <puneetl@google.com> |
Fix orientation for front-facing cameras using CaptureModule
Change-Id: Ibf4a9c7601fbc3e42ec03d18c54a23b604d42249
ndroid/camera/CaptureModule.java
|
| 81471c40e896fbe5cc4d2619cae83364f1a5b87e |
17-Oct-2014 |
Puneet Lall <puneetl@google.com> |
Enable shutter button when preview is started
Change-Id: I93d378976c1c34dc05ce40cfb93310572f2ada98
ndroid/camera/CaptureModule.java
|
| 9aaa1444c47515d04af510b9b41688cf6c2f84dd |
16-Oct-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Rename ListenerCombiner" into ub-camera-haleakala
|
| c2387dc7fa82fafb2dd2eac0e7280ff71dece0f4 |
16-Oct-2014 |
Puneet Lall <puneetl@google.com> |
Rename ListenerCombiner
Change-Id: Id293c9cd3a04229524a4fc5047d69e6b37837e62
ndroid/camera/one/v2/OneCameraZslImpl.java
ndroid/camera/util/ConjunctionListenerMux.java
ndroid/camera/util/ListenerCombiner.java
|
| 2b7e02e60c30e4920cb7173676227e098b58dbc1 |
16-Oct-2014 |
Spike Sprague <spikuru@google.com> |
am e6649574: Merge "disable startup shimmy on sd card error" into ub-camera-glacier
* commit 'e664957471663effaa0cf1998b5a1134f5e19aa4':
disable startup shimmy on sd card error
|
| e664957471663effaa0cf1998b5a1134f5e19aa4 |
16-Oct-2014 |
Spike Sprague <spikuru@google.com> |
Merge "disable startup shimmy on sd card error" into ub-camera-glacier
|
| 4c96d840aeff669011a9e8697cbac77fe8f4eda2 |
16-Oct-2014 |
Spike Sprague <spikuru@google.com> |
disable startup shimmy on sd card error
bug: 15841887
Change-Id: If1cbb463a9de916b9fdd2926d8b47db04934535c
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/ModeListView.java
|
| d3313e8e2fcdca937f1b8be38b7d5770301409af |
16-Oct-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Enable CaptureModule/ZSL" into ub-camera-haleakala
|
| 9cd94d77bcafad38f15b318ea5c9dbc0849c1ecd |
14-Oct-2014 |
Puneet Lall <puneetl@google.com> |
Enable CaptureModule/ZSL
* Close the image reader in ZSL impl
* Enable CaptureModule for API2
* Set ZSL ring-buffer to 10 images
Change-Id: I19eb6bf9102ba8397fa073c98b1a3b5f84b74601
ndroid/camera/debug/DebugPropertyHelper.java
ndroid/camera/module/ModulesInfo.java
ndroid/camera/one/OneCameraManager.java
ndroid/camera/one/v2/OneCameraImpl.java
ndroid/camera/one/v2/OneCameraZslImpl.java
|
| 2ffef84cb9d1330d59b54b0e1eefcec8296c8823 |
16-Oct-2014 |
Alan Newberger <alann@google.com> |
am 7dabda68: Show capturing UI before review UI in intent countdown timer
* commit '7dabda684367122fa2dc2097e198ac6241279bcd':
Show capturing UI before review UI in intent countdown timer
|
| 7dabda684367122fa2dc2097e198ac6241279bcd |
16-Oct-2014 |
Alan Newberger <alann@google.com> |
Show capturing UI before review UI in intent countdown timer
Going prematurely to the review UI means you can hit the checkbox
before we have JPEG data. With this change, after countdown you
see a grayed out capture button like normal capture animation,
then the checkbox review UI when the picture is ready.
Bug: 18002016
Change-Id: Ieddd71636f962c127aa470ec0f150987d3d287ab
ndroid/camera/CaptureModule.java
ndroid/camera/PhotoModule.java
|
| 3ee2cc0ded3de20341eb21e0f3f55bda4a60fefe |
15-Oct-2014 |
I-Jong Lin <ijonglin@google.com> |
am 1cf0679c: Merge "Fix for crash when PhotoApp deletes last Cam pic" into ub-camera-glacier
* commit '1cf0679c861c280f4bdb801e42ba4882851d3e63':
Fix for crash when PhotoApp deletes last Cam pic
|
| 1cf0679c861c280f4bdb801e42ba4882851d3e63 |
15-Oct-2014 |
I-Jong Lin <ijonglin@google.com> |
Merge "Fix for crash when PhotoApp deletes last Cam pic" into ub-camera-glacier
|
| 4f55a065cdece81f1da7c81d8e43cc3a4ad3fc20 |
15-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
am 20a5930f: Merge "Make string comparison robust against null values." into ub-camera-glacier
* commit '20a5930f5e7de203e8a8cbb2f19e87cf0a57d592':
Make string comparison robust against null values.
|
| 20a5930f5e7de203e8a8cbb2f19e87cf0a57d592 |
15-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Make string comparison robust against null values." into ub-camera-glacier
|
| 47008b2595452102ff8389b84e44509f0389bef5 |
15-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
Make string comparison robust against null values.
Bug: 17999505
Change-Id: Ic255603a5664e7d9be80d9e18435924e18d4ba66
ndroid/camera/util/QuickActivity.java
|
| 9efa64a16a691e6aeb56dc844aa00c8ea057ef99 |
15-Oct-2014 |
I-Jong Lin <ijonglin@google.com> |
Fix for crash when PhotoApp deletes last Cam pic
Bug: 17496363
This crash occurs when there is only one picture in the Camera
filmstrip. When you switch out of the Camera App into the
Photo App and delete it, and then switch back, the Filmstrip
attempts to draw a removal animation with invalid data, and
crashes via trying to call functions on null object. This fix
is simple and catches the null object and does NOT attempt to
draw the invalid object.
The larger issue may be that the Camera App is buffering/caching
invalid or stale data that it is illegally trying to act on.
I've left a warning message in the code to warn on any bad
behavior, but we should catch the invariant that's being violated
and fix the deeper problem.
Change-Id: I2487f753b5c7bb57e34c65d687a2236fa3a23f9f
ndroid/camera/widget/FilmstripView.java
|
| c75d0b4c9d634afc234aea08448dace460de6edf |
15-Oct-2014 |
Senpo Hu <senpo@google.com> |
am 828081f5: Merge "Log camera exception via UsageStatistics." into ub-camera-glacier
* commit '828081f5f947abb8930f084386492efde8c5b83b':
Log camera exception via UsageStatistics.
|
| 828081f5f947abb8930f084386492efde8c5b83b |
15-Oct-2014 |
Senpo Hu <senpo@google.com> |
Merge "Log camera exception via UsageStatistics." into ub-camera-glacier
|
| 9047a60aabd5cccd124065bcf4ca39894872925d |
14-Oct-2014 |
Spike Sprague <spikuru@google.com> |
am c6a48876: Merge "disable shutter button as soon as possible to avoid double shutter presses" into ub-camera-glacier
* commit 'c6a488761b2b9deb11bdcac051dfeacd212ee90f':
disable shutter button as soon as possible to avoid double shutter presses
|
| 58738e64e05b96f4246a6cc5040997b3f3a34757 |
14-Oct-2014 |
Alan Newberger <alann@google.com> |
am 54985c97: Merge "Revert "Make CameraDataAdapter background new data loading and post to listener"" into ub-camera-glacier
* commit '54985c973140b896db75f086ac0f904d0228f8aa':
Revert "Make CameraDataAdapter background new data loading and post to listener"
|
| af10e78ab07ea1cc3f37b98ed7f180c07e6aa350 |
14-Oct-2014 |
Alan Newberger <alann@google.com> |
am 3972da65: Merge "Migrate Settings Fragment to use arguments" into ub-camera-glacier
* commit '3972da65f958edcfed26f1c32e0cf4e8361306e7':
Migrate Settings Fragment to use arguments
|
| 74b723c7093e5d8acf6f7170dd98f813a2185442 |
14-Oct-2014 |
Senpo Hu <senpo@google.com> |
Log camera exception via UsageStatistics.
Change-Id: I2b80338dd489ece87d94e20a303c5e43e972c3b0
ndroid/camera/CameraActivity.java
|
| c6a488761b2b9deb11bdcac051dfeacd212ee90f |
14-Oct-2014 |
Spike Sprague <spikuru@google.com> |
Merge "disable shutter button as soon as possible to avoid double shutter presses" into ub-camera-glacier
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/data/CameraDataAdapter.java
|
| 3972da65f958edcfed26f1c32e0cf4e8361306e7 |
14-Oct-2014 |
Alan Newberger <alann@google.com> |
Merge "Migrate Settings Fragment to use arguments" into ub-camera-glacier
|
| bda2da2ec52bf2cc4c4df058bac20be6eb9ceab3 |
14-Oct-2014 |
Alan Newberger <alann@google.com> |
Migrate Settings Fragment to use arguments
Fix error in settings fragment using a constructor vs argument bundle.
Bug: 17626333
Change-Id: I5842706a3b5060dac1f997ca4035b4cc31ce0287
ndroid/camera/settings/CameraSettingsActivity.java
|
| 0fa0bacef1edf450e358f0574bcaf9436b70ddc7 |
14-Oct-2014 |
Senpo Hu <senpo@google.com> |
am 7a3ce60c: Merge "Prevent NullPointerException of PhotoModule in quick resume-pause." into ub-camera-glacier
* commit '7a3ce60cfe7f5a554ab8edeb08c203196b17b164':
Prevent NullPointerException of PhotoModule in quick resume-pause.
|
| 7a3ce60cfe7f5a554ab8edeb08c203196b17b164 |
14-Oct-2014 |
Senpo Hu <senpo@google.com> |
Merge "Prevent NullPointerException of PhotoModule in quick resume-pause." into ub-camera-glacier
|
| 9746ebec86df2f276ee18eeaf070ff0fc4ad06ec |
14-Oct-2014 |
Senpo Hu <senpo@google.com> |
Prevent NullPointerException of PhotoModule in quick resume-pause.
Bug: 17984743
Change-Id: Ie597dbddb383004deace8933f51f091029c0a9b4
ndroid/camera/PhotoModule.java
|
| a3fb78f030bdb92d1f46bde935e3a1a5bed24f2e |
14-Oct-2014 |
I-Jong Lin <ijonglin@google.com> |
am 4ed861a7: Preview vs Video Camera Resolution Mismatch
* commit '4ed861a70de7db31a7d4b9227b523bef684d7eed':
Preview vs Video Camera Resolution Mismatch
|
| 4ed861a70de7db31a7d4b9227b523bef684d7eed |
11-Oct-2014 |
I-Jong Lin <ijonglin@google.com> |
Preview vs Video Camera Resolution Mismatch
Bug: 17458889
This bug is programmatic and reproduces on all devices. Basically,
the current app defaults to the highest resolution preview that
matches the aspect ratio of the recording, even if the recording
video resolution is lower. Since it is more important to be WYSIWYG,
in the cases where the preview show at the same resolution of
the recording video resolution, we should preview at same resolution
for truest (but not necessarily best) quality that most faithfully
represents the content that is to be recorded under the constraint
of the UI resolution.
Change-Id: I0ec5a76834cbffa59f0e144f1fe271de25e92523
ndroid/camera/VideoModule.java
ndroid/camera/util/CameraUtil.java
|
| 8d1ac99f4c6f43fc093f787128f729ba12aa9332 |
13-Oct-2014 |
Spike Sprague <spikuru@google.com> |
disable shutter button as soon as possible
to avoid double shutter presses
bug: 17939465
Change-Id: Iac19b8fa78774b525fbaf0d4742d97764d401b78
ndroid/camera/PhotoModule.java
|
| 4e2da33b49e44c54a1ae3757f19cd02cb3c7d414 |
14-Oct-2014 |
Puneet Lall <puneetl@google.com> |
am e9dedb39: Merge "Don\'t re-open the camera if already open" into ub-camera-glacier
* commit 'e9dedb39b240e87e854918d544de66820b41700c':
Don't re-open the camera if already open
|
| e9dedb39b240e87e854918d544de66820b41700c |
14-Oct-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Don't re-open the camera if already open" into ub-camera-glacier
|
| f289ee11203f19d36235246504d90d0081a0c970 |
14-Oct-2014 |
Alan Newberger <alann@google.com> |
am b7378210: Merge "Make CameraDataAdapter background new data loading and post to listener" into ub-camera-glacier
* commit 'b7378210663a1ac9c6692b9a0d8ae5e414da9370':
Make CameraDataAdapter background new data loading and post to listener
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/data/CameraDataAdapter.java
|
| 0e0c55a11c5bc47b14023054f2c5597ea5197fa8 |
14-Oct-2014 |
Puneet Lall <puneetl@google.com> |
Don't re-open the camera if already open
Bug: 17870967
Change-Id: Ibafc8c563b6188c4c743a60a3b42b93e107523bc
ndroid/camera/CaptureModule.java
|
| a2ebb87daf7de427bd1a58470f082079322a6758 |
14-Oct-2014 |
Senpo Hu <senpo@google.com> |
am a5db8beb: Merge "Refine camera fatal error handling in CameraActivity." into ub-camera-glacier
* commit 'a5db8bebb51ff666b4fa4bbadc3d0457f36041f2':
Refine camera fatal error handling in CameraActivity.
|
| a5db8bebb51ff666b4fa4bbadc3d0457f36041f2 |
14-Oct-2014 |
Senpo Hu <senpo@google.com> |
Merge "Refine camera fatal error handling in CameraActivity." into ub-camera-glacier
|
| 68b906d74512117e1a4b5936ab1cd47bcd729da5 |
13-Oct-2014 |
Alan Newberger <alann@google.com> |
am 890ab9be: Merge "Refine in-place conversion semantics for Settings" into ub-camera-glacier
* commit '890ab9beb8642bc9278f9914013be2fd65d740f8':
Refine in-place conversion semantics for Settings
|
| 890ab9beb8642bc9278f9914013be2fd65d740f8 |
13-Oct-2014 |
Alan Newberger <alann@google.com> |
Merge "Refine in-place conversion semantics for Settings" into ub-camera-glacier
|
| 6293c579bce8356f10cda31637917537a4501437 |
13-Oct-2014 |
Alan Newberger <alann@google.com> |
Refine in-place conversion semantics for Settings
Since settings are now stored as strings, avoid app crashes
for settings which are still around as other types, and just
treat it as if those settings are absent (return default). This
requires re-working the version number tracker itself, which
is done by making it a new key and migrating just the old
key in the getLastVersion override. This is somewhat cleaner
and overall the change should increase stability given the
change to use in place values of different types.
Bug: 17949433
Change-Id: Icaf0d9653eabb9e144f3946a51b4038d3ed48ea9
ndroid/camera/settings/AppUpgrader.java
ndroid/camera/settings/Keys.java
ndroid/camera/settings/SettingsManager.java
|
| df93cdd91f8f47794f26a066be3630e178b9ce36 |
13-Oct-2014 |
Alan Newberger <alann@google.com> |
am 7839867c: Merge "Update to use real L codename." into ub-camera-glacier
* commit '7839867c4c6eb837d5e7c1c5851741d4933f5fb1':
Update to use real L codename.
|
| 7839867c4c6eb837d5e7c1c5851741d4933f5fb1 |
13-Oct-2014 |
Alan Newberger <alann@google.com> |
Merge "Update to use real L codename." into ub-camera-glacier
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/util/CameraUtil.java
|
| 2d450e66c32c4a928ad59928428114f85df77927 |
13-Oct-2014 |
Spike Sprague <spikuru@google.com> |
am 89ac2e10: Merge "change cahching Drawables to caching ConstantStates, also apply CircelDrawable as necessary at runtime" into ub-camera-glacier
* commit '89ac2e10477b03fbd5addb7da46933626748ed3a':
change cahching Drawables to caching ConstantStates, also apply CircelDrawable as necessary at runtime
|
| 89ac2e10477b03fbd5addb7da46933626748ed3a |
13-Oct-2014 |
Spike Sprague <spikuru@google.com> |
Merge "change cahching Drawables to caching ConstantStates, also apply CircelDrawable as necessary at runtime" into ub-camera-glacier
|
| 5219b73ee64296a38d0fa93f7eb1faf1e0a5a101 |
13-Oct-2014 |
Spike Sprague <spikuru@google.com> |
am eb81de1d: Merge "Native 16x9 viewfinder stream for Gcam to reduce switching jank and eliminate black bar overlay hack." into ub-camera-glacier
* commit 'eb81de1d250a5c61f378428f590238ce5c7e16a4':
Native 16x9 viewfinder stream for Gcam to reduce switching jank and eliminate black bar overlay hack.
|
| 85d0eee0e7da3790a116d61780b8a8d65adb5df0 |
13-Oct-2014 |
Puneet Lall <puneetl@google.com> |
am 6a07363b: Always close the camera
* commit '6a07363be15d11735b0b47059bf8d0e9998693ef':
Always close the camera
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/CaptureModule.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/util/ApiHelper.java
|
| 6a07363be15d11735b0b47059bf8d0e9998693ef |
11-Oct-2014 |
Puneet Lall <puneetl@google.com> |
Always close the camera
Previous logic had a race condition in which the camera may not be
closed if it was in the process of being opened.
Bug: 17939709
Change-Id: Ife9d96b73dac17625b3344fcf8553d181a74024e
ndroid/camera/app/CameraController.java
|
| fcc9143368d134ce26dec7d904f21e06676b2a02 |
10-Oct-2014 |
Spike Sprague <spikuru@google.com> |
change cahching Drawables to caching ConstantStates,
also apply CircelDrawable as necessary at runtime
bug: 17907551
Change-Id: I9bddfc599f15c3e0b09b98f14a9804296d51015b
ndroid/camera/ui/BottomBar.java
|
| aabe27d57568b4aa303c83888650159fb8d845a0 |
11-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Make temp session directory creation more robust and efficient." into ub-camera-haleakala
|
| 8111aa0a298688da560dcac6bc4c3f92b878dbc7 |
09-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
Make temp session directory creation more robust and efficient.
Also rename some methods for clarity.
Change-Id: Ic6d3e7902ae5396f33231f1471df9eae89234132
ndroid/camera/session/CaptureSession.java
ndroid/camera/session/CaptureSessionManagerImpl.java
ndroid/camera/session/SessionStorageManagerImpl.java
|
| f4b6e53b71309d70c0b5aab6b850cb4146bdcb36 |
11-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
am 4d4585da: Merge "Pass NamedEntity to saveFinalPhoto since it can be nulled in pause()." into ub-camera-glacier
* commit '4d4585da32d9b5a47bffad1deeb08fc5cd128311':
Pass NamedEntity to saveFinalPhoto since it can be nulled in pause().
|
| eb6fa710251cc38867c7d6dac272f92596a5afcf |
11-Oct-2014 |
Senpo Hu <senpo@google.com> |
am ac9070ee: Migrate old CameraErrorCallback class to agent\'s CameraExceptionHandler.
* commit 'ac9070ee24d2db6e7804cdd26df578e7ab76895e':
Migrate old CameraErrorCallback class to agent's CameraExceptionHandler.
|
| 4d4585da32d9b5a47bffad1deeb08fc5cd128311 |
11-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Pass NamedEntity to saveFinalPhoto since it can be nulled in pause()." into ub-camera-glacier
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/CameraErrorCallback.java
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.java
ndroid/camera/debug/DebugCameraProxy.java
|
| ce90f7b459272f16be1983012ec118f4069a3766 |
11-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
Pass NamedEntity to saveFinalPhoto since it can be nulled in pause().
Bug: 15289634
Change-Id: I551f73f5f0ceecf2d8a1e3b379dd34fd06b044d8
ndroid/camera/PhotoModule.java
|
| 53e6ff4b908a79eca819d558b602018249c896e3 |
10-Oct-2014 |
Alan Newberger <alann@google.com> |
am 4fe4680c: Merge "Add verbose logging for os/apk debug builds" into ub-camera-glacier
* commit '4fe4680cca29994e0c070b9b5ea5ef9bcf087a65':
Add verbose logging for os/apk debug builds
|
| 4fe4680cca29994e0c070b9b5ea5ef9bcf087a65 |
10-Oct-2014 |
Alan Newberger <alann@google.com> |
Merge "Add verbose logging for os/apk debug builds" into ub-camera-glacier
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/debug/Log.java
|
| b24e1aa6fe599c56c9e37e962237ed19f29737bb |
09-Oct-2014 |
Alan Newberger <alann@google.com> |
Merge "resolved conflicts for merge of d0927687 to lmp-mr1-dev-plus-aosp" into ub-camera-haleakala
|
| 345fd4a5fc7702d49b802a707712a4366714229b |
09-Oct-2014 |
Puneet Lall <puneetl@google.com> |
am 59d337b4: Use a separate activity for capture intents
* commit '59d337b422cc373666609fb0ef7fcc422884b683':
Use a separate activity for capture intents
|
| 59d337b422cc373666609fb0ef7fcc422884b683 |
09-Oct-2014 |
Puneet Lall <puneetl@google.com> |
Use a separate activity for capture intents
Bug: 17911061
Change-Id: Id5d3e5347c1830dc43b8962c1494bb4bf5195136
ndroid/camera/CaptureActivity.java
|
| 43d66a0cac75bbb0adb0933124002e1eb1f439b9 |
08-Oct-2014 |
Dianne Hackborn <hackbod@google.com> |
Update to use real L codename.
Change-Id: If6e5f02f693848f6cb0014084dccf910be4c958d
ndroid/camera/one/v2/ImageCaptureManager.java
ndroid/camera/one/v2/OneCameraZslImpl.java
ndroid/camera/util/ApiHelper.java
ndroid/camera/widget/FilmstripView.java
|
| 5b24860169c509c5c89a8c992e4c74951354953a |
08-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
am e11ad6d6: Make sure a null mimetype is not crashing the app.
* commit 'e11ad6d67ad95a9ecab8a594bcb55a05708abc0f':
Make sure a null mimetype is not crashing the app.
|
| e11ad6d67ad95a9ecab8a594bcb55a05708abc0f |
08-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
Make sure a null mimetype is not crashing the app.
Bug: 17398971
Though at this point something else is already horribly wrong with
mediaserver, otherwise this cannot happen.
Change-Id: I837dfd5992611ded0c34ea7cc1e677ac1456c0c0
ndroid/camera/data/LocalDataUtil.java
|
| 2f0ec76794038c577bffc6b0900668c038ff8a24 |
08-Oct-2014 |
Puneet Lall <puneetl@google.com> |
am 0d4cdba2: Revert "More lockscreen tuning"
* commit '0d4cdba26b5fe4b7ca03796c5a2644a09e2c7144':
Revert "More lockscreen tuning"
|
| 0d4cdba26b5fe4b7ca03796c5a2644a09e2c7144 |
08-Oct-2014 |
Puneet Lall <puneetl@google.com> |
Revert "More lockscreen tuning"
This reverts commit 7ac13f5f3644c8de53ebd625f195d757166bf9c9.
Change-Id: I3c59f4d71efe80290731e55421011c16e5dd4a41
ndroid/camera/util/QuickActivity.java
|
| 2ae123a72584cc8cacb4d462889e0e710e715d18 |
08-Oct-2014 |
Spike Sprague <spikuru@google.com> |
am fe7eb164: reverting b/559979
* commit 'fe7eb1640b1aca8500b2cab152648a699833d6fd':
reverting b/559979
|
| fe7eb1640b1aca8500b2cab152648a699833d6fd |
08-Oct-2014 |
Spike Sprague <spikuru@google.com> |
reverting b/559979
Change-Id: If4e58c67d4424ade68198a16c1d2d21595504efd
ndroid/camera/ui/BottomBar.java
|
| bf5a1d3a587cef3a36e05df300759ddd0d47533d |
08-Oct-2014 |
Jiawen Chen <jiawen@google.com> |
am fd8c804c: Merge "Tweaked constants for Gcam." into ub-camera-glacier
* commit 'fd8c804c9429f150f6028c6f371d34352934f964':
Tweaked constants for Gcam.
|
| fd8c804c9429f150f6028c6f371d34352934f964 |
08-Oct-2014 |
Jiawen Chen <jiawen@google.com> |
Merge "Tweaked constants for Gcam." into ub-camera-glacier
|
| 7dc464c4f0e29ddc36c6ce323e208fe773e651e3 |
08-Oct-2014 |
Senpo Hu <senpo@google.com> |
am 2a0e18e2: Adopt the new error handling mechanism in portability.
* commit '2a0e18e280dfe541d4740345511ad299099cda79':
Adopt the new error handling mechanism in portability.
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/app/CameraController.java
ndroid/camera/app/CameraProvider.java
ndroid/camera/debug/DebugCameraProxy.java
|
| 6807832ae4f044e26e7b661c0e76be27028cdae9 |
07-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
am 1b19bc80: Merge "Catch error where framework is broken and returns no cameras." into ub-camera-glacier
* commit '1b19bc806b42ad405a3ea60e5e6c4e278e0aaee2':
Catch error where framework is broken and returns no cameras.
|
| 1b19bc806b42ad405a3ea60e5e6c4e278e0aaee2 |
07-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Catch error where framework is broken and returns no cameras." into ub-camera-glacier
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/one/OneCameraException.java
ndroid/camera/one/OneCameraManager.java
|
| 97339c1bf93e2e6caf24770f2982a4efc7712428 |
07-Oct-2014 |
Puneet Lall <puneetl@google.com> |
am b2f15652: Merge "More lockscreen tuning" into ub-camera-glacier
* commit 'b2f156527da437c1c4901c03bd004eb49eae23f6':
More lockscreen tuning
|
| 7ac13f5f3644c8de53ebd625f195d757166bf9c9 |
07-Oct-2014 |
Puneet Lall <puneetl@google.com> |
More lockscreen tuning
Delay all onResume calls since we cannot always determine if we
will be immediately paused due to a lockscreen start.
Bug: 16035858
Change-Id: I96928814708eb8026bea8d0087341fda4b04bcbc
ndroid/camera/util/QuickActivity.java
|
| 00f555e611f0ef082e7ffa0c9ae1b958126dde98 |
07-Oct-2014 |
Puneet Lall <puneetl@google.com> |
am 3e236cc8: Lockscreen workaround tuning
* commit '3e236cc8e33be40e434e73f7777bd81446277512':
Lockscreen workaround tuning
|
| 3e236cc8e33be40e434e73f7777bd81446277512 |
07-Oct-2014 |
Puneet Lall <puneetl@google.com> |
Lockscreen workaround tuning
* Remove delay of onStartTasks. This fixes b/17868175, and appears to
result in ~50ms improvements to cold starts from the lockscreen and
warm starts from the secure lockscreen.
* Disabled double-onResume() workaround for non-secure lockscreen launches
since this no longer happens when singleTask is enabled.
* Reduced the delay for the double-onResume() workaround by eliminating
the delay on the second call to onResume()
Bug:17868175
Bug:16035858
Change-Id: I7f7611901133e429def9a03d4009e1a99caaabd0
ndroid/camera/util/QuickActivity.java
|
| 604984a518f693b95ef3520104c0c8ae3fbb0bd6 |
07-Oct-2014 |
Spike Sprague <spikuru@google.com> |
am 0dd0d5ef: Merge "disable all user interactions (including mode switching) on SD Card errors" into ub-camera-glacier
* commit '0dd0d5ef549b489d7711d60ea1988834313851a5':
disable all user interactions (including mode switching) on SD Card errors
|
| 0dd0d5ef549b489d7711d60ea1988834313851a5 |
07-Oct-2014 |
Spike Sprague <spikuru@google.com> |
Merge "disable all user interactions (including mode switching) on SD Card errors" into ub-camera-glacier
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/OnScreenHint.java
ndroid/camera/app/CameraAppUI.java
|
| baa56fd8d1d45c54ede2f4e06552d3b76d0e6f85 |
07-Oct-2014 |
Spike Sprague <spikuru@google.com> |
am 39fe5d96: Merge "implement proper mode color for cancel button" into ub-camera-glacier
* commit '39fe5d96cc0787f0ea3f8eb0b18108ef2abd3be6':
implement proper mode color for cancel button
|
| 39fe5d96cc0787f0ea3f8eb0b18108ef2abd3be6 |
07-Oct-2014 |
Spike Sprague <spikuru@google.com> |
Merge "implement proper mode color for cancel button" into ub-camera-glacier
|
| db36c55942b84a6ed09a779ea0340f243be2d081 |
07-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
am 2dcf912d: Merge "Make Camera V2 creation more robust agains failures." into ub-camera-glacier
* commit '2dcf912d17f2ed7197c783d1273ff6200709e6d3':
Make Camera V2 creation more robust agains failures.
|
| 2dcf912d17f2ed7197c783d1273ff6200709e6d3 |
07-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Make Camera V2 creation more robust agains failures." into ub-camera-glacier
|
| 9929d4d47d602c4a32bf75f5c1eef5625298a5e3 |
07-Oct-2014 |
Andy Huibers <andyhuibers@google.com> |
am 877c2b65: Unload timer sounds on pause in PhotoModule; release SoundPLayer on destroy.
* commit '877c2b65415ad43eb424f8a4a27bbeee7771d5bf':
Unload timer sounds on pause in PhotoModule; release SoundPLayer on destroy.
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoModule.java
|
| 0f56c13c06521f091a1222eeafbba5e4a6cf7b41 |
25-Sep-2014 |
Jiawen Chen <jiawen@google.com> |
Tweaked constants for Gcam.
Bug: 17629128
Bug: 17550818
- In HDR+ mode only, change tap-to-expose/focus rectangle to 12% of the
viewfinder - works much better and matches final output.
- Changed post-shot return-to-continuous-AF constant to 1 second (3 seconds was
too long).
Submit together with ag/554414.
Change-Id: I56afb19e4378dbfa25f38376b05293fdb3908d47
ndroid/camera/one/Settings3A.java
ndroid/camera/one/v2/AutoFocusHelper.java
|
| 61d53fb5ddbcd77b19311cac820071ce3732ac17 |
06-Oct-2014 |
Alan Newberger <alann@google.com> |
am 5381549f: Re-run settings files migrations
* commit '5381549fe58cd3c5a28dc18e2416c37d3c2d300b':
Re-run settings files migrations
|
| 5381549fe58cd3c5a28dc18e2416c37d3c2d300b |
06-Oct-2014 |
Alan Newberger <alann@google.com> |
Re-run settings files migrations
Increment version number for upgrade and re-run copying. This will
be a no-op for a first time glacier upgrader, copying runs in the
same sequence for this case. For alpha users who hit crashes, this
will re-run the copy, potentially overwriting some values but
ensuring all values are valid. Tested both N4 and N5 upgrade
scenarios that had previously seen issues, this addresses issues
without the need to clear data.
Bug: 17875895
Change-Id: I37c469c1b03151d03ee0d32ce0ba62983af32a36
ndroid/camera/settings/AppUpgrader.java
|
| 46863d94926686af593571882a22e41e8edd96ec |
06-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
Make Camera V2 creation more robust agains failures.
Bug: 17878708
Change-Id: I9e64f89a1b3eb56e7f3afc774d8823a7666d8208
ndroid/camera/one/OneCameraManager.java
|
| 1a814a409b982bed5288c1920630c311b73fbb3f |
06-Oct-2014 |
Alan Newberger <alann@google.com> |
am 90672aa0: Fix preference copy migration and incorrect HDR+ sticky bit
* commit '90672aa08379e598426c12b529a86afd4b61011e':
Fix preference copy migration and incorrect HDR+ sticky bit
|
| 90672aa08379e598426c12b529a86afd4b61011e |
06-Oct-2014 |
Alan Newberger <alann@google.com> |
Fix preference copy migration and incorrect HDR+ sticky bit
A sticky bit upgrader particularly for HDR+ was looking in
globals but was actually a module setting. The copy migrator
was not properly handling booleans! Modified the copy migrator
to properly handle supported types and removed the custom
incorrect upgrader.
Bug: 17875895
Change-Id: Id36abc429d12a77c5462e5c49ef7786e3d092f2c
ndroid/camera/settings/AppUpgrader.java
ndroid/camera/settings/SettingsManager.java
|
| 4748076136ac638e5482cbb44474f008bbf04c9e |
04-Oct-2014 |
Alan Newberger <alann@google.com> |
am 19597371: Only set preview size before starting preview
* commit '19597371a18921bb03337e4fa24c28dd2d8f06ed':
Only set preview size before starting preview
|
| 19597371a18921bb03337e4fa24c28dd2d8f06ed |
04-Oct-2014 |
Alan Newberger <alann@google.com> |
Only set preview size before starting preview
Remove recursive call to startPreview when updating preview size.
Avoid invoking preview size parameter updates for all calls to
updateCameraParametersPreference, and only adjust preview size
immediately before starting preview. Also added info logging
for all call paths into startPreview() to better diagnose
sequence of events in logs if we still see any races or
ordering issues.
Bug: 17809876
Change-Id: I626c913bb154c54aaffb451c24a63c6750553a52
ndroid/camera/PhotoModule.java
|
| 46e2c9cce99e09f1593504a34734bda492ea9449 |
04-Oct-2014 |
Alan Newberger <alann@google.com> |
am 4032a773: Fix incorrect key translation in Settings refactor
* commit '4032a773c4605894a2b6137590c7124ea16b7ab2':
Fix incorrect key translation in Settings refactor
|
| 4032a773c4605894a2b6137590c7124ea16b7ab2 |
04-Oct-2014 |
Alan Newberger <alann@google.com> |
Fix incorrect key translation in Settings refactor
Bug: 17832052
Change-Id: Ie3ac25a1b9b813295b2bbd6ce723669d30cdb652
ndroid/camera/widget/IndicatorIconController.java
|
| 5dc742580c4f1e355a443cb15291a8bf3f7bc64c |
04-Oct-2014 |
Alan Newberger <alann@google.com> |
am 6c1ef468: Merge "Avoid porting null keys when copying preferences into new system" into ub-camera-glacier
* commit '6c1ef468d480520f706efe3264c5da48238f878d':
Avoid porting null keys when copying preferences into new system
|
| 6c1ef468d480520f706efe3264c5da48238f878d |
04-Oct-2014 |
Alan Newberger <alann@google.com> |
Merge "Avoid porting null keys when copying preferences into new system" into ub-camera-glacier
|
| d560aabf7baef81a14e78341af81994efc1d4f17 |
04-Oct-2014 |
Alan Newberger <alann@google.com> |
Avoid porting null keys when copying preferences into new system
Testing on Fishlake shows certain preferences are of 'null' type
in shared preferences. Avoid an NPE on porting a null. From testing,
this can happen with focus mode, best to just skip porting the key
and let the app use a default.
Bug: 17829562
Change-Id: I483cb5beb160d3fb7fc8a42aa5085531e3fccb63
ndroid/camera/settings/AppUpgrader.java
|
| 346373007da08005d92b3a5778c01dcd804bd1ec |
04-Oct-2014 |
Puneet Lall <puneetl@google.com> |
am 64cb0bf0: Merge "Use singleTask to improve unsecure lockscreen startup" into ub-camera-glacier
* commit '64cb0bf0e5c3efb62b34cd2871723a56f3cc7787':
Use singleTask to improve unsecure lockscreen startup
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/CaptureModule.java
ndroid/camera/PhotoModule.java
ndroid/camera/util/QuickActivity.java
|
| 3d31b167f0c2c00f530ee7698fe41ee6363dd573 |
03-Oct-2014 |
Alan Newberger <alann@google.com> |
am 365ef4ca: Suppress \'help feedback\' message pre-L in secure camera
* commit '365ef4ca63d2c3e988cb54887f0f58a33d92aacc':
Suppress 'help feedback' message pre-L in secure camera
|
| 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
ndroid/camera/CameraActivity.java
|
| 2fda5303b73e01ecc976ad66db8ad40a3f2c90d5 |
03-Oct-2014 |
Andy Huibers <andyhuibers@google.com> |
am edb2c4bb: Merge "Add zoom value and timer duration to capture parameters, for logging." into ub-camera-glacier
* commit 'edb2c4bb2acbc0dcfbb32ef9c14cdede37868662':
Add zoom value and timer duration to capture parameters, for logging.
|
| edb2c4bb2acbc0dcfbb32ef9c14cdede37868662 |
03-Oct-2014 |
Andy Huibers <andyhuibers@google.com> |
Merge "Add zoom value and timer duration to capture parameters, for logging." into ub-camera-glacier
|
| 30036280b41db7cc09e62144fa6acb94b6767aa7 |
03-Oct-2014 |
Puneet Lall <puneetl@google.com> |
am 42c6acb6: Merge "Close dangling camera proxy" into ub-camera-glacier
* commit '42c6acb68103692ce4142d1b013dfced203c2271':
Close dangling camera proxy
|
| 42c6acb68103692ce4142d1b013dfced203c2271 |
03-Oct-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Close dangling camera proxy" into ub-camera-glacier
|
| 626e4272456e9478b59b503d6fbd56c8339e0cad |
03-Oct-2014 |
Puneet Lall <puneetl@google.com> |
Close dangling camera proxy
Bug: 17677971
Change-Id: I2cf2df7a12a44b3f9f33d0d9eac479c5281da356
ndroid/camera/app/CameraController.java
|
| 7a02c1146cd465aa89e4f7249d60bf52ac596dc5 |
02-Oct-2014 |
Andy Huibers <andyhuibers@google.com> |
Add zoom value and timer duration to capture parameters, for logging.
Bug: 17204955
Change-Id: I13e087a8e87c9722b83b83d90af491966ff30c9e
ndroid/camera/CaptureModule.java
ndroid/camera/one/OneCamera.java
|
| bfec41e5a5b57715e91ca273d3d1bde65bbcc154 |
02-Oct-2014 |
Spike Sprague <spikuru@google.com> |
implement proper mode color for cancel button
bug: 17780517
Change-Id: I522fb223b4aa78d1acd8f18ebf20dbfe20ea8c99
ndroid/camera/ui/BottomBar.java
|
| cfa5fbf08303fe7edf08ac0fe5d678d6c55419d0 |
02-Oct-2014 |
Alan Newberger <alann@google.com> |
am 4d0fe41c: Trap CameraAgentFactory RTEs during recycle
* commit '4d0fe41c92819ac4c70b5d0e75ec544be6cdfbb1':
Trap CameraAgentFactory RTEs during recycle
|
| 4d0fe41c92819ac4c70b5d0e75ec544be6cdfbb1 |
02-Oct-2014 |
Alan Newberger <alann@google.com> |
Trap CameraAgentFactory RTEs during recycle
Bug: 17759456
Change-Id: I5d6577f4175963168bb4186d70dd7cee68b5466e
ndroid/camera/CameraActivity.java
|
| 23e7ad375f694c11285a7e82c7698b40749d1e78 |
02-Oct-2014 |
Alan Newberger <alann@google.com> |
am 48d4c8f1: Trap camera close exceptions on pause
* commit '48d4c8f1856503d88f4e2e42fa729f2556173694':
Trap camera close exceptions on pause
|
| 48d4c8f1856503d88f4e2e42fa729f2556173694 |
02-Oct-2014 |
Alan Newberger <alann@google.com> |
Trap camera close exceptions on pause
Bug: 17759456
Change-Id: I5e5fd39829bd0ebf3f37b354ca380cf6396bef55
ndroid/camera/CameraActivity.java
|
| 6e13821ab4fcc2eb27de3d838094c76d6187b8d0 |
02-Oct-2014 |
Alan Newberger <alann@google.com> |
am 437a1869: Use NEW_DOCUMENT vs NEW_TASK when starting Activities from Camera
* commit '437a186929173ad576e0eac04bd5b79939816158':
Use NEW_DOCUMENT vs NEW_TASK when starting Activities from Camera
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/util/CameraUtil.java
|
| 8d01bf7a3af6362ba186a9a7f178568014db215d |
01-Oct-2014 |
Alan Newberger <alann@google.com> |
am 5c9d7f34: Fix error in settings key from refactor
* commit '5c9d7f34039ac96b3a136ccd6b16162e3b220848':
Fix error in settings key from refactor
|
| 5c9d7f34039ac96b3a136ccd6b16162e3b220848 |
01-Oct-2014 |
Alan Newberger <alann@google.com> |
Fix error in settings key from refactor
PANO_ORIENTATION indicator icon was using an
incorrect key to sync state.
Bug: 17752154
Change-Id: I587b2ee7eeab3758b05386540f62b79ca48299f2
ndroid/camera/widget/IndicatorIconController.java
|
| 5f7b1c8c3657f4102ff5462224bfb29b18efd076 |
01-Oct-2014 |
Alan Newberger <alann@google.com> |
am 5db8e20d: Only allow one draw call pending at a time
* commit '5db8e20db77bf86eba25ec713c76da783dd98b19':
Only allow one draw call pending at a time
|
| 5db8e20db77bf86eba25ec713c76da783dd98b19 |
30-Sep-2014 |
Alan Newberger <alann@google.com> |
Only allow one draw call pending at a time
If modules call draw aggressively, there should only be one pending
at a time. If we get another, just drop it, there will be a draw
momentarily.
Bug: 17703978
Change-Id: I60b3b9e257ae4e064287a97973b1de878ce66de1
ndroid/camera/SurfaceTextureRenderer.java
|
| 0b079c62b13e71545cfd68246b49d9f52c4e80b0 |
30-Sep-2014 |
Senpo Hu <senpo@google.com> |
am 31d816f6: Merge "Stability: call stopPreview() before switching off video module." into ub-camera-glacier
* commit '31d816f64eebfd24e662ff21f611a70b957d4859':
Stability: call stopPreview() before switching off video module.
|
| 31d816f64eebfd24e662ff21f611a70b957d4859 |
30-Sep-2014 |
Senpo Hu <senpo@google.com> |
Merge "Stability: call stopPreview() before switching off video module." into ub-camera-glacier
|
| b150c84dec9e90f6b555c12678479a4aa8a869c7 |
30-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am c19d97b3: Let VideoModule override default mode options enable/disable
* commit 'c19d97b385261312399b67b538f8faa074314beb':
Let VideoModule override default mode options enable/disable
|
| c19d97b385261312399b67b538f8faa074314beb |
22-Sep-2014 |
Spike Sprague <spikuru@google.com> |
Let VideoModule override default mode options enable/disable
bug: 17553759
Change-Id: Iadb2690d81e3efce4e84c8c49f6e684a700c247b
ndroid/camera/VideoModule.java
ndroid/camera/app/CameraAppUI.java
|
| 36e045a43d9b8949d9a219b84cf894cf21f8e98a |
30-Sep-2014 |
Senpo Hu <senpo@google.com> |
Stability: call stopPreview() before switching off video module.
If the preview is not stopped, the following camera operations posted
by other modules such as "apply settings" will turn camera object
in turmoil. The camera object could start throwing exception and eventually
hang.
Bug: 16300704
Bug: 17403384
Change-Id: Idd2360869d51b9dfc06309f8ac185a65add8d0c9
ndroid/camera/VideoModule.java
|
| 39201eef313d305d9551483e0ce81bec6da1a756 |
30-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am 7c703ced: Cleanup: Move api check to ApiHelper
* commit '7c703ced0248d6a368a216e9d7699ab8e9565415':
Cleanup: Move api check to ApiHelper
|
| 7c703ced0248d6a368a216e9d7699ab8e9565415 |
26-Sep-2014 |
Puneet Lall <puneetl@google.com> |
Cleanup: Move api check to ApiHelper
Change-Id: Ifc0b080713329d09cdeaeec5ccdf88d8515e5543
ndroid/camera/one/OneCameraManager.java
ndroid/camera/util/ApiHelper.java
|
| a5eaaff7c3fcdf3d57e045bc3573cc4c23e48c72 |
30-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 2d512cc6: Merge "for intent capture and pano, fix the redo/ok/cancel button sizes so touch ripples show up right." into ub-camera-glacier
* commit '2d512cc688a6e46bb8b34e293e87d2f0088a1abb':
for intent capture and pano, fix the redo/ok/cancel button sizes so touch ripples show up right.
|
| a9c5db3a329f66315e7893ed63504d7143328950 |
30-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 5ea5dc09: Merge "tweaking peephole animation time from 350 to 500, per in-person request" into ub-camera-glacier
* commit '5ea5dc090151f857ba3787e8c29d1269e3dd6da4':
tweaking peephole animation time from 350 to 500, per in-person request
|
| 2d512cc688a6e46bb8b34e293e87d2f0088a1abb |
30-Sep-2014 |
Spike Sprague <spikuru@google.com> |
Merge "for intent capture and pano, fix the redo/ok/cancel button sizes so touch ripples show up right." into ub-camera-glacier
|
| 5ea5dc090151f857ba3787e8c29d1269e3dd6da4 |
30-Sep-2014 |
Spike Sprague <spikuru@google.com> |
Merge "tweaking peephole animation time from 350 to 500, per in-person request" into ub-camera-glacier
|
| 7dae6bb5ec44da5d7b51a4b98c45821ee5e2860e |
30-Sep-2014 |
Spike Sprague <spikuru@google.com> |
tweaking peephole animation time from 350 to 500, per in-person request
Change-Id: I13cd63b00217f8beb079a3ea219d878971756c67
ndroid/camera/ui/ModeListView.java
|
| bcf7285021aad0891099dfa07d9ded198b7274be |
30-Sep-2014 |
Alan Newberger <alann@google.com> |
am 535eed78: Merge "Avoid building filmstrip item data if activity is destroyed" into ub-camera-glacier
* commit '535eed78310ff5774f544c8c8bb584585304e7ec':
Avoid building filmstrip item data if activity is destroyed
|
| 281624c713fb29d4be690fc980d2001efcf20daf |
25-Sep-2014 |
Alan Newberger <alann@google.com> |
Avoid building filmstrip item data if activity is destroyed
Multiple AsyncTasks result in Glide execution after CameraActivity
is destroyed, via FilmstripView.buildItemData. Return early if
destroyed so that no Glide tasks are initiated and no views are
added to the hierarchy.
Bug: 17527470
Bug: 17339652
Change-Id: I7d24197791df812dc012d8b4fadff9246b289b81
ndroid/camera/widget/FilmstripView.java
|
| b34fe6bea0dfee2ee89c6730e6f2bb6e3b4e7cce |
29-Sep-2014 |
Alan Newberger <alann@google.com> |
am a530b688: Merge "WIP: Add recursive thumbnail call to LocalMediaData" into ub-camera-glacier
* commit 'a530b688ce6e5b61e7cea8dc500fd2642ccdb82c':
WIP: Add recursive thumbnail call to LocalMediaData
|
| a530b688ce6e5b61e7cea8dc500fd2642ccdb82c |
29-Sep-2014 |
Alan Newberger <alann@google.com> |
Merge "WIP: Add recursive thumbnail call to LocalMediaData" into ub-camera-glacier
|
| aa8e3eb7a1cfcfc2c3c54e475a942fdd5b5b765c |
29-Sep-2014 |
Senpo Hu <senpo@google.com> |
am 2d3475ae: Fix crash in VideoModule - Method called after release()
* commit '2d3475ae1f045a2062119f352bec874cd78e9d3b':
Fix crash in VideoModule - Method called after release()
|
| 2d3475ae1f045a2062119f352bec874cd78e9d3b |
28-Sep-2014 |
Senpo Hu <senpo@google.com> |
Fix crash in VideoModule - Method called after release()
Completely eliminate the runtime exception caused by monkey.
Sample stack trace:
java.lang.RuntimeException: Method called after release()
at android.media.MediaRecorder.setCamera(Native Method)
at com.android.camera.VideoModule.initializeRecorder(VideoModule.java:1101)
at com.android.camera.VideoModule.access$2000(VideoModule.java:88)
at com.android.camera.VideoModule$10.onStorageUpdateDone(VideoModule.java:1320)
at com.android.camera.CameraActivity$20.onPostExecute(CameraActivity.java:2014)
Bug: 17313985
Change-Id: I7ecaf375c26ebd1608d7098599ab1528609287ce
ndroid/camera/VideoModule.java
|
| f3fed29b0f471e3c937193f954f5a26968b7f864 |
27-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am 022ce61e: Synchronize CaptureModule camera open/close operations
* commit '022ce61e1c4f338a79585e8656ab57990ecd32c1':
Synchronize CaptureModule camera open/close operations
|
| 022ce61e1c4f338a79585e8656ab57990ecd32c1 |
26-Sep-2014 |
Puneet Lall <puneetl@google.com> |
Synchronize CaptureModule camera open/close operations
This fixes a race condition in which CaptureModule gets a pause()
immediately after it is asked to open the camera. pause() MUST
wait/block to close the camera to ensure that we can later open it (a
fast open()->pause() sequence is reproducible via the lockscreen under
certain cases when we get a rapid onResume()->onPause()->onResume),
so this adds the necessary threading logic to wait, if necessary,
for the camera to finish opening so that it can be closed.
Bug: 17642065
Change-Id: Ic88bd32fc5acc2b333de367019085a8cd539c5a5
ndroid/camera/CaptureModule.java
ndroid/camera/one/OneCamera.java
ndroid/camera/one/OneCameraManager.java
ndroid/camera/one/v1/OneCameraManagerImpl.java
ndroid/camera/one/v2/OneCameraManagerImpl.java
|
| 6d6925e7a614e99a3fa92ec6cddcd195d198a5e2 |
26-Sep-2014 |
Senpo Hu <senpo@google.com> |
am feb07ea4: Merge "Stability: add null check for all CameraProxy obj references in VideoModule." into ub-camera-glacier
* commit 'feb07ea4e32c7dcc4488515220a4a1881b5e6585':
Stability: add null check for all CameraProxy obj references in VideoModule.
|
| feb07ea4e32c7dcc4488515220a4a1881b5e6585 |
26-Sep-2014 |
Senpo Hu <senpo@google.com> |
Merge "Stability: add null check for all CameraProxy obj references in VideoModule." into ub-camera-glacier
|
| 4ba2829246afa91db18d4ed41d08eddac8d91bc0 |
26-Sep-2014 |
Senpo Hu <senpo@google.com> |
Stability: add null check for all CameraProxy obj references in
VideoModule.
Bug: 17657161
Bug: 17653725
Change-Id: Icca2b9dffdfe954e979d9af7e47d78b539dc2b9d
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.java
|
| 1cfbbf2d4741cadb03eeada24141c7bf6ab0f004 |
26-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am ad12363e: Revert app workaround for bug 17614203 now that HAL is fixed. This reverts ag/543302.
* commit 'ad12363ecaba370c2425677eef6e562bf7c98e3e':
Revert app workaround for bug 17614203 now that HAL is fixed. This reverts ag/543302.
|
| ad12363ecaba370c2425677eef6e562bf7c98e3e |
26-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
Revert app workaround for bug 17614203 now that HAL is fixed.
This reverts ag/543302.
Bug: 17614203
Bug: 17145703
Change-Id: I3ec21902e59156ea30c181ecd6a7728f7262110a
ndroid/camera/PhotoModule.java
|
| 4cab79861178af52948a4b05d63eaf6eaed7e9ff |
25-Sep-2014 |
Alan Newberger <alann@google.com> |
am 47c4474e: Merge "Force filmstrip images to generate in JPEG compression format" into ub-camera-glacier
* commit '47c4474ea9e51a58f2ba1795de90c9aaf135f442':
Force filmstrip images to generate in JPEG compression format
|
| 47c4474ea9e51a58f2ba1795de90c9aaf135f442 |
25-Sep-2014 |
Alan Newberger <alann@google.com> |
Merge "Force filmstrip images to generate in JPEG compression format" into ub-camera-glacier
|
| b861d6221c438e119297e119370c8fe020573dc4 |
25-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am 4d2f3bf4: Merge "Recreate a OneCameraManager instance for each Activity." into ub-camera-glacier
* commit '4d2f3bf448d8546920a3d94ce15033357388d2cc':
Recreate a OneCameraManager instance for each Activity.
|
| a66160ff7a470bd5bcb1523071cea888f6208d29 |
25-Sep-2014 |
Senpo Hu <senpo@google.com> |
am ee3123ba: Stability: add null check for all CameraProxy obj references in PhotoModule.
* commit 'ee3123ba4b4cc107423441bb8d687c14a2dc4b9a':
Stability: add null check for all CameraProxy obj references in PhotoModule.
|
| 65ab02000f65a8677adf9fab5c296e0d3ef64cbc |
25-Sep-2014 |
Alan Newberger <alann@google.com> |
Force filmstrip images to generate in JPEG compression format
Due to https://github.com/bumptech/glide/issues/156, we sometimes
were getting PNG cache image generation which greatly increased
latency and introduced jank. As workaround, explicitly forcing
images to utilize JPEG format.
Bug: 17597861
Change-Id: I49d7266d4ff0173d253877612b3076489a6b385a
ndroid/camera/data/LocalMediaData.java
|
| 4d2f3bf448d8546920a3d94ce15033357388d2cc |
25-Sep-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Recreate a OneCameraManager instance for each Activity." into ub-camera-glacier
|
| ee3123ba4b4cc107423441bb8d687c14a2dc4b9a |
25-Sep-2014 |
Senpo Hu <senpo@google.com> |
Stability: add null check for all CameraProxy obj references in PhotoModule.
Bug: 17643705
Bug: 17604028
Change-Id: I6073f32bae286168c040f5667494ede1384ce3fc
ndroid/camera/PhotoModule.java
|
| e67bcfdb989f80c8e0870bd6a74b7e2a2cf1181a |
25-Sep-2014 |
Puneet Lall <puneetl@google.com> |
Recreate a OneCameraManager instance for each Activity.
Bug: 17484715
Change-Id: If484e3b40ef32324fa77629b1687cd4317466e2e
ndroid/camera/CameraActivity.java
ndroid/camera/one/OneCameraManager.java
|
| 6f9115deafdb18312a578ecafc1c5d1190f2d00a |
25-Sep-2014 |
Alan Newberger <alann@google.com> |
am da6f3acc: Skip disk caching for session data
* commit 'da6f3accc02c942b1f2dd1c248edb6a0bd66ee10':
Skip disk caching for session data
|
| da6f3accc02c942b1f2dd1c248edb6a0bd66ee10 |
25-Sep-2014 |
Alan Newberger <alann@google.com> |
Skip disk caching for session data
Bring back full color depth but don't bother with a disk cache
for temporary session images, since they will go away and be
replaced by mediastore entries anyway.
Bug: 17642071
Change-Id: I1a8483b71d69967033074fc4d8c69c9dfb17651e
ndroid/camera/data/LocalSessionData.java
|
| fdf694fc4db7e97ff20d2822e5d116a7ed793850 |
25-Sep-2014 |
Alan Newberger <alann@google.com> |
am 6b2d1e0b: Merge "Revert temporary session images in filmstrip to RGB_565" into ub-camera-glacier
* commit '6b2d1e0b660e931c6cbc91a25ec85df070712e65':
Revert temporary session images in filmstrip to RGB_565
|
| 56942877229b252b6d00242a5c021a1b3c341b21 |
25-Sep-2014 |
Alan Newberger <alann@google.com> |
am 347dccbe: Ensure Camera doesn\'t attempt access of back camera on Nakasi
* commit '347dccbe1ed10ceec190af4d3797a197426f1caf':
Ensure Camera doesn't attempt access of back camera on Nakasi
|
| 6b2d1e0b660e931c6cbc91a25ec85df070712e65 |
25-Sep-2014 |
Alan Newberger <alann@google.com> |
Merge "Revert temporary session images in filmstrip to RGB_565" into ub-camera-glacier
|
| 728c6fe4e719976ab4bd7a7937c6b25548418041 |
25-Sep-2014 |
Alan Newberger <alann@google.com> |
Revert temporary session images in filmstrip to RGB_565
A simple way to avoid performance issues for now until we get around
the significant load issues seen in writing ARGB_8888 to disk cache.
Bug: 17642071
Change-Id: I6017980fce6e633b52dce93f3f46931e5bcc3d9c
ndroid/camera/data/LocalSessionData.java
|
| 347dccbe1ed10ceec190af4d3797a197426f1caf |
25-Sep-2014 |
Alan Newberger <alann@google.com> |
Ensure Camera doesn't attempt access of back camera on Nakasi
Bug: 17647004
Change-Id: I823f98cfdfcc7429b6acf98215e4a08787bc1bb9
ndroid/camera/PhotoModule.java
ndroid/camera/app/CameraAppUI.java
|
| a397027ccc69e4ab092f26d8f8bb93d777e5846b |
25-Sep-2014 |
Alan Newberger <alann@google.com> |
am 2631a15a: Don\'t show aspect ratio UI if using API2 portability
* commit '2631a15a37b890f4ee720c5a4bbe3e654524deb6':
Don't show aspect ratio UI if using API2 portability
|
| 2631a15a37b890f4ee720c5a4bbe3e654524deb6 |
24-Sep-2014 |
Alan Newberger <alann@google.com> |
Don't show aspect ratio UI if using API2 portability
Avoid preview size changes due to current state of locking in API2
portability implementation.
Bug: 17462976
Change-Id: I9426380699988d67b21ce86850ef00736e84a5d6
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
ndroid/camera/util/ApiHelper.java
|
| 48453f10a76af8c0b3b649ca9d54f13d3af3b518 |
24-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am eeeed4fa: new sounds for timer ticker and pano / photosphere intermediate captures
* commit 'eeeed4fa00ed842050bc7e0edd3b37c262802a5b':
new sounds for timer ticker and pano / photosphere intermediate captures
|
| eeeed4fa00ed842050bc7e0edd3b37c262802a5b |
27-Aug-2014 |
Spike Sprague <spikuru@google.com> |
new sounds for timer ticker and pano / photosphere intermediate captures
companions CL: ag/534823
bug: 17281234
Change-Id: I9d98d8e869dcefdbd0f7e0b53dea6b8e024a8e3b
ndroid/camera/CaptureModule.java
ndroid/camera/PhotoModule.java
ndroid/camera/SoundClips.java
|
| 2d8f6ed6d821b38f6305a96e7f6997d07e089653 |
24-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 7d1fb593: Merge "monkey test NPE fix, another null check on mCameraDevice" into ub-camera-glacier
* commit '7d1fb593ae26e4f327e47bcbb857057da4ea23a0':
monkey test NPE fix, another null check on mCameraDevice
|
| 2268fbb50d07e327c9ac00642db0a83a49c8f3e3 |
20-Sep-2014 |
Spike Sprague <spikuru@google.com> |
for intent capture and pano,
fix the redo/ok/cancel button sizes so touch ripples show up right.
bug: 17505149
Change-Id: I29d8222ff0588d0410cf1f8a94bed963b4bf32f6
ndroid/camera/ui/BottomBar.java
|
| 7d1fb593ae26e4f327e47bcbb857057da4ea23a0 |
24-Sep-2014 |
Spike Sprague <spikuru@google.com> |
Merge "monkey test NPE fix, another null check on mCameraDevice" into ub-camera-glacier
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/data/LocalMediaData.java
|
| 29aa8adf1972ae2274525e49703983ded22c9db1 |
23-Sep-2014 |
Alan Newberger <alann@google.com> |
am b60af188: Merge "Fix filmstrip item bounds to filmstrip scale" into ub-camera-glacier
* commit 'b60af188e3bc712a7f06700c591c428834237dff':
Fix filmstrip item bounds to filmstrip scale
|
| b60af188e3bc712a7f06700c591c428834237dff |
23-Sep-2014 |
Alan Newberger <alann@google.com> |
Merge "Fix filmstrip item bounds to filmstrip scale" into ub-camera-glacier
|
| 3190d3a8fa271f424d09550fb665b1898637b3e2 |
23-Sep-2014 |
Alan Newberger <alann@google.com> |
am 5f86f7fd: Cleanup gesture UI hide code
* commit '5f86f7fdd19dad9cdf670e0504cfaddefd4a89fc':
Cleanup gesture UI hide code
|
| 0a21e2096c29cfa8a0a260ffed8e225d354da5e1 |
23-Sep-2014 |
Alan Newberger <alann@google.com> |
am b2b0e02c: Clean up unused code
* commit 'b2b0e02cb5f0aba8fed9389193fa98150da75efc':
Clean up unused code
|
| 5f86f7fdd19dad9cdf670e0504cfaddefd4a89fc |
22-Sep-2014 |
Alan Newberger <alann@google.com> |
Cleanup gesture UI hide code
Relocate show/hide of zoom UI in the onScaleBegin/onScaleEnd classes.
Bug: 17613719
Change-Id: I400161c95c08c7f3b6b36487de703296236595bb
ndroid/camera/ui/PreviewOverlay.java
|
| b2b0e02cb5f0aba8fed9389193fa98150da75efc |
22-Sep-2014 |
Alan Newberger <alann@google.com> |
Clean up unused code
This UI code is completely unused, and has no reference from rest of
app. Delete for cleanup.
Bug: 17613719
Change-Id: I1d9d443ef6642cd434725fe71e59fa0220258789
ndroid/camera/PreviewGestures.java
ndroid/camera/ui/OverlayRenderer.java
ndroid/camera/ui/PieItem.java
ndroid/camera/ui/PieMenuButton.java
ndroid/camera/ui/PieRenderer.java
ndroid/camera/ui/RenderOverlay.java
ndroid/camera/ui/ZoomRenderer.java
|
| 5cc48d6032b9412d5825c82ab70f145c3c3056a4 |
22-Sep-2014 |
Spike Sprague <spikuru@google.com> |
monkey test NPE fix, another null check on mCameraDevice
bug: 17604028
Change-Id: I7b45c101045b765562146ebe2c779e227a6227bd
ndroid/camera/PhotoModule.java
|
| a62ed04fc1af31c1fdfa0e9ac9cc0acfec1b1f12 |
22-Sep-2014 |
Alan Newberger <alann@google.com> |
Fix filmstrip item bounds to filmstrip scale
There's no reason to scale filmstrip items to anything other
than the fixed filmstrip scale, and doing otherwise interferes
with Glide caching and introduces flickers upon zoom.
Bug: 17597708
Change-Id: Ia143b4d95a48e9e23bbf36ec0edf93599caaa01b
ndroid/camera/widget/FilmstripView.java
|
| 9652134e6e1b312e348ed3565343741239907f11 |
20-Sep-2014 |
Alan Newberger <alann@google.com> |
resolved conflicts for merge of d0927687 to lmp-mr1-dev-plus-aosp
Change-Id: If3841e2f9946db14bef7244bd29bcd7fd11168f6
(cherry picked from commit e6f258bab71af79e2c6131afaf26def437b110c6)
ndroid/camera/ui/FilmstripGestureRecognizer.java
ndroid/camera/widget/FilmstripLayout.java
ndroid/camera/widget/FilmstripView.java
|
| ff35f85800f42e36c4c766e777b6251edaef33d3 |
20-Sep-2014 |
Jiawen Chen <jiawen@google.com> |
am 30ae8c64: Merge "Changed tap-to-meter rectangle and weights." into ub-camera-glacier
* commit '30ae8c64cec9313fc050daf94ae3fbddedf80b36':
Changed tap-to-meter rectangle and weights.
|
| 30ae8c64cec9313fc050daf94ae3fbddedf80b36 |
20-Sep-2014 |
Jiawen Chen <jiawen@google.com> |
Merge "Changed tap-to-meter rectangle and weights." into ub-camera-glacier
|
| b062ae78a8f85a8143b58d37c930a900465d03ec |
19-Sep-2014 |
Alan Newberger <alann@google.com> |
am e684ea54: Merge "Fix CameraSettingsActivityHelper" into ub-camera-glacier
* commit 'e684ea54121ef885a0aa84cd3bea50c5a345d55e':
Fix CameraSettingsActivityHelper
|
| e684ea54121ef885a0aa84cd3bea50c5a345d55e |
19-Sep-2014 |
Alan Newberger <alann@google.com> |
Merge "Fix CameraSettingsActivityHelper" into ub-camera-glacier
|
| 4c96d4bdeada782c08a993cc1871a03bbd3c1509 |
19-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 8bbb5122: Merge "add null check to updateCameraParametersPreferences to apease the monkey" into ub-camera-glacier
* commit '8bbb51221106c12b0cf7e933fc2af2a63b84b1c1':
add null check to updateCameraParametersPreferences to apease the monkey
|
| 8bbb51221106c12b0cf7e933fc2af2a63b84b1c1 |
19-Sep-2014 |
Spike Sprague <spikuru@google.com> |
Merge "add null check to updateCameraParametersPreferences to apease the monkey" into ub-camera-glacier
|
| ae56c121dcf772e1c7bc77c5e9009b1bc5ee4e44 |
19-Sep-2014 |
Spike Sprague <spikuru@google.com> |
add null check to updateCameraParametersPreferences to apease the monkey
bug: 17580046
Change-Id: I4a109c1134684f6d5b2dafdb138137ef36f208f0
ndroid/camera/PhotoModule.java
|
| d5214254cd05a9695ffc0a39b88b3b2b9692a937 |
19-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 963775c3: portability layer doesn\'t work well with startPreviewWithCallback() here\'s a dirty dirty workaround.
* commit '963775c3092e2553ae8157df9e5d307d4f711de1':
portability layer doesn't work well with startPreviewWithCallback() here's a dirty dirty workaround.
|
| 963775c3092e2553ae8157df9e5d307d4f711de1 |
19-Sep-2014 |
Spike Sprague <spikuru@google.com> |
portability layer doesn't work well with startPreviewWithCallback()
here's a dirty dirty workaround.
bug: 17576554
Change-Id: Ief40b65ce49712153f6ef604a3513348e493d4d9
ndroid/camera/PhotoModule.java
|
| a967b8c13a44128aa358778ab4d4dc19d1e8e329 |
18-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 3c3b31df: mode switch jank fixes
* commit '3c3b31dfd5ec7a43e89cd4695cc8c498afc3a91d':
mode switch jank fixes
|
| 3c3b31dfd5ec7a43e89cd4695cc8c498afc3a91d |
08-Sep-2014 |
Spike Sprague <spikuru@google.com> |
mode switch jank fixes
puts many ValueAnimators news into initialize methods
changes startPreview() calls to startPreviewWithCallback()
puts MultToggleImageButton's bitmap combine into an AsyncTask
bug: 17070332
Change-Id: Idea6396264588b345ed27b9f96f9434ff3e7e77c
ndroid/camera/MultiToggleImageButton.java
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/ModeIconView.java
ndroid/camera/ui/ModeListView.java
ndroid/camera/ui/ModeSelectorItem.java
|
| 0971376b0ddf12c8aa886ad9109f6a8929095154 |
17-Sep-2014 |
Jiawen Chen <jiawen@google.com> |
Changed tap-to-meter rectangle and weights.
Bug: 17417649
- Clarified widths in Settings3A.
- For Gcam only, reduced AE box to 12.25% of the shorter edge of the crop
rectangle. This matches the setting on Nexus 5.
- For Gcam only, changed AE weight to 22 after consultations with Ryan.
- Tested with Gcam and it final shots look great in HDR scenes.
- Does not fully address b/17417649: ISP AE ignores the weight completely and
overcompensates for the tap region.
- Changed AutoFocusHelper to take touch points in normalized portrait
coordinates along with a sensor orientation. The output is a MeteringRectangle
in sensor pixels.
- Fixed a bug where a digital-zoomed tap doesn't work when the rect intersects
edges. It should have been clamp, not check for intersection and return the
full crop rectangle if it doesn't intersect.
- Submit simultaneously with ag/549706.
Change-Id: If084e64ecbfc4a08ece96a7cebfcaf835d92b9d1
ndroid/camera/one/OneCamera.java
ndroid/camera/one/Settings3A.java
ndroid/camera/one/v2/AutoFocusHelper.java
ndroid/camera/one/v2/OneCameraImpl.java
ndroid/camera/one/v2/OneCameraZslImpl.java
ndroid/camera/util/CameraUtil.java
|
| 577e351abe784f3da8074ce3d83f0d2e532a2895 |
17-Sep-2014 |
Alan Newberger <alann@google.com> |
Fix CameraSettingsActivityHelper
Previous hack to allow activity up button to work, interfered with
custom preference merging we use to conditonally add items to
Settings. Now fixed by allowing internal control of whether the
full preference tree is returned by the fragment or just the
desired subtree, so that the Helper can access the full tree.
Bug: 17534830
Change-Id: I11510f365b9e212f07009b2233bb5d8036228774
ndroid/camera/settings/CameraSettingsActivity.java
|
| 63c8f5a66a4e5a6ba380a8df4600a21ec0701842 |
16-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am 6f1dfe69: Merge "Don\'t set mCameraAppUI to null in onDestroy" into ub-camera-glacier
* commit '6f1dfe69b93bfb42c11d456901e9d3ffee826cce':
Don't set mCameraAppUI to null in onDestroy
|
| 6f1dfe69b93bfb42c11d456901e9d3ffee826cce |
15-Sep-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Don't set mCameraAppUI to null in onDestroy" into ub-camera-glacier
|
| 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
ndroid/camera/CameraActivity.java
|
| a609e49f4e0d6855f9f081f66d7d71d7928ea851 |
15-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am a16219d5: set proper alpha on shutter button on mode switch, eliminates a janky alpha flash
* commit 'a16219d51937bda5f3e69c0e77171ae0fb893823':
set proper alpha on shutter button on mode switch, eliminates a janky alpha flash
|
| a16219d51937bda5f3e69c0e77171ae0fb893823 |
13-Sep-2014 |
Spike Sprague <spikuru@google.com> |
set proper alpha on shutter button on mode switch,
eliminates a janky alpha flash
bug: 17487040
Change-Id: I08e66b5be53e58e9e16d32c09ef50081e90e9284
ndroid/camera/app/CameraAppUI.java
|
| 363ef8aab507c125252fea609a1bbd498e78e149 |
12-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am 70a96525: Don\'t send redundant requests to start the preview
* commit '70a96525f16ca6c6abb9a7a9dab26ba1e61235dd':
Don't send redundant requests to start the preview
|
| 70a96525f16ca6c6abb9a7a9dab26ba1e61235dd |
12-Sep-2014 |
Puneet Lall <puneetl@google.com> |
Don't send redundant requests to start the preview
Change-Id: I43d8a2917bbe0140f1e9367cce21f68b19807aa8
ndroid/camera/PhotoModule.java
|
| 9dc23a3526548731abe966fdc33d1ed0f744f203 |
12-Sep-2014 |
Alan Newberger <alann@google.com> |
am 486ba1da: Revert layout change for Camera
* commit '486ba1da145f70b07235617e5f1f64186daa0fc0':
Revert layout change for Camera
|
| fa29fbcffbd6b80feda104299735c748ea90e5d3 |
12-Sep-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Don't force ZSL/Camera2 API" into ub-camera-haleakala
|
| 5fbfab23afb0a76e34c3e2146ec06846fb597c9c |
12-Sep-2014 |
Puneet Lall <puneetl@google.com> |
Don't force ZSL/Camera2 API
Change-Id: Id91ba7697335371a4f68ef87b507d1f4eb71a3a5
ndroid/camera/debug/DebugPropertyHelper.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
ndroid/camera/CameraActivity.java
|
| bd321d2fb0984a005be450df931e8fa66670bd86 |
11-Sep-2014 |
Alan Newberger <alann@google.com> |
am 45f316bc: Establish synchronous camera closing when app utilizes API1/API2
* commit '45f316bcecb8713cbb217507981fd657fcdaa274':
Establish synchronous camera closing when app utilizes API1/API2
|
| 45f316bcecb8713cbb217507981fd657fcdaa274 |
11-Sep-2014 |
Alan Newberger <alann@google.com> |
Establish synchronous camera closing when app utilizes API1/API2
To ensure API1 and API2 portability implementations coordinate together,
if app uses API2 for any mode, lock both modes into synchronouse camera
closing.
Bug: 17464089
Change-Id: If4cf1eb02053ec9e56b7b8df97c21e012467aa3a
ndroid/camera/app/CameraController.java
|
| 337c47be3bdd01111a7733dd62b1ac8fca16d252 |
11-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am e6ebf3d7: If we are using CaptureModule for Gcam only, turn off flash.
* commit 'e6ebf3d73bb3f337413bdde437fbb8fde6cee436':
If we are using CaptureModule for Gcam only, turn off flash.
|
| e6ebf3d73bb3f337413bdde437fbb8fde6cee436 |
11-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
If we are using CaptureModule for Gcam only, turn off flash.
Bug: 17460394
Change-Id: I4743e9c31f516d12537b2ceedc9e1fe35fbd8381
ndroid/camera/CaptureModule.java
|
| 5ee9c8c1827af023ed02f74436cdc8fd2f1b27ac |
11-Sep-2014 |
Alan Newberger <alann@google.com> |
am 0c9af933: Merge "Revert "Delay PhotoModule preview cover removal to address jank"" into ub-camera-glacier
* commit '0c9af933b7227577003f462ddab12a1ca49208fe':
Revert "Delay PhotoModule preview cover removal to address jank"
|
| 0c9af933b7227577003f462ddab12a1ca49208fe |
11-Sep-2014 |
Alan Newberger <alann@google.com> |
Merge "Revert "Delay PhotoModule preview cover removal to address jank"" into ub-camera-glacier
|
| 843e0e18458e9249b2d7364aa09e739eec7e50b3 |
11-Sep-2014 |
Alan Newberger <alann@google.com> |
Revert "Delay PhotoModule preview cover removal to address jank"
This CL introduced PhotoModule state corruption, multiple picture taking was not possible. Need to deal with stopPreview during picture taking vs module initialization.
Bug: 17451185
This reverts commit 49fb93b5517e12606eb747f0a5d218b4d03df821.
Change-Id: I0a1eec8147ce859d2e83ee7bdd17655b4054f904
ndroid/camera/PhotoModule.java
|
| f97ed01ccd64888d35b2eacefecff58524534a43 |
11-Sep-2014 |
Alan Newberger <alann@google.com> |
am 7351415d: Reset aspect ratio on pause
* commit '7351415ddfaf7f563a4a12c9204e6feb20fdf49d':
Reset aspect ratio on pause
|
| 7351415ddfaf7f563a4a12c9204e6feb20fdf49d |
11-Sep-2014 |
Alan Newberger <alann@google.com> |
Reset aspect ratio on pause
When resuming the app we do resize things but the old aspect
ratio is cached, thus skipping a reset of the transform matrices
because the app thinks it is already at the correct aspect ratio.
In certain cases (changing orientation when paused) this leads to
layout bugs.
Bug: 17304671
Change-Id: Ia171190b3c76dc05519bdf4d1947d9664d5fb604
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
ndroid/camera/TextureViewHelper.java
ndroid/camera/VideoModule.java
ndroid/camera/VideoUI.java
|
| 2fcd98c34a77d2d73e93ab3582891046a7b87598 |
11-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 87a2300f: Merge "workaround fix" into ub-camera-glacier
* commit '87a2300ff2b49b8bd6a69815d1e4f3db477fcf4d':
workaround fix
|
| 747356715e55355cdd828a87572c0730a42dac61 |
11-Sep-2014 |
Alan Newberger <alann@google.com> |
am 3096e672: Merge "Delay PhotoModule preview cover removal to address jank" into ub-camera-glacier
* commit '3096e6729b72a47ee3ed0a68a455bc978036de5c':
Delay PhotoModule preview cover removal to address jank
|
| 6db448795f28a7d50854802f47f9c29b9d1542bc |
11-Sep-2014 |
Senpo Hu <senpo@google.com> |
am d3ee86b7: Merge "Return to filmstrip when video playback finishes." into ub-camera-glacier
* commit 'd3ee86b7c1f1973119619f8e1b356d9707dd0493':
Return to filmstrip when video playback finishes.
|
| cfcaefc5e65ee04c4e33d18f77da84912f863f6a |
11-Sep-2014 |
Senpo Hu <senpo@google.com> |
am 5675b8af: Fix the upside-down orienation bug in CaptureModule.
* commit '5675b8af3fddca8d73d0ce0c8aa2f2a38592f556':
Fix the upside-down orienation bug in CaptureModule.
|
| 98cc13dbacb914000febf4f4d6a928f7ce9ad9dd |
11-Sep-2014 |
Alan Newberger <alann@google.com> |
am d79b38d6: Merge "Remove jank on camera options switching" into ub-camera-glacier
* commit 'd79b38d669e9e61a954b02f3aca63810476f6fc5':
Remove jank on camera options switching
|
| 87a2300ff2b49b8bd6a69815d1e4f3db477fcf4d |
11-Sep-2014 |
Spike Sprague <spikuru@google.com> |
Merge "workaround fix" into ub-camera-glacier
|
| 07722e5a91e52ac26aec2503d11645922300fa39 |
11-Sep-2014 |
Jiawen Chen <jiawen@google.com> |
resolved conflicts for merge of 9cefdd49 to ub-camera-haleakala
Change-Id: I5aa115c3469cdff71c410e016155d0c83d6e51c1
|
| 3096e6729b72a47ee3ed0a68a455bc978036de5c |
11-Sep-2014 |
Alan Newberger <alann@google.com> |
Merge "Delay PhotoModule preview cover removal to address jank" into ub-camera-glacier
|
| 49fb93b5517e12606eb747f0a5d218b4d03df821 |
11-Sep-2014 |
Alan Newberger <alann@google.com> |
Delay PhotoModule preview cover removal to address jank
Cover should stay in place at least until startPreview completes.
Since it is async, we should call handlers in a callback.
Bug: 17451185
Change-Id: I220c49b9bb75ad977d92780c6eea0ff126a7dcb8
ndroid/camera/PhotoModule.java
|
| 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
ndroid/camera/CameraActivity.java
|
| d3ee86b7c1f1973119619f8e1b356d9707dd0493 |
11-Sep-2014 |
Senpo Hu <senpo@google.com> |
Merge "Return to filmstrip when video playback finishes." into ub-camera-glacier
|
| be70731da3f2b9ef1ed1bda09d458c779459c772 |
10-Sep-2014 |
Senpo Hu <senpo@google.com> |
Return to filmstrip when video playback finishes.
Bug: 17091348
Change-Id: I9703d014029bf29431b099b129b1ed8bce0ffa03
ndroid/camera/VideoModule.java
ndroid/camera/util/CameraUtil.java
|
| 5675b8af3fddca8d73d0ce0c8aa2f2a38592f556 |
10-Sep-2014 |
Senpo Hu <senpo@google.com> |
Fix the upside-down orienation bug in CaptureModule.
Bug: 17369697
Change-Id: I5beb0ec45f2dbf372dda88ffd8a92b1632b3ab90
ndroid/camera/CaptureModule.java
|
| d79b38d669e9e61a954b02f3aca63810476f6fc5 |
10-Sep-2014 |
Alan Newberger <alann@google.com> |
Merge "Remove jank on camera options switching" into ub-camera-glacier
|
| 9cefdd495332719d987ffb942742ec602793d8d4 |
09-Sep-2014 |
Jiawen Chen <jiawen@google.com> |
Changed double to float. viewFinder -> viewfinder.
Change-Id: I5f10a5e8dae40f56457b863d5e8c703e7bf68e49
ndroid/camera/one/OneCamera.java
ndroid/camera/one/v2/OneCameraImpl.java
ndroid/camera/one/v2/OneCameraZslImpl.java
|
| 7f938d6ecac51e2cd4bda17b9c7d45fd77a18d41 |
10-Sep-2014 |
Alan Newberger <alann@google.com> |
am ffc395d6: Reinitialize shutter button in Camera mode upon preview start
* commit 'ffc395d6e7eaafcdcd283e183188de16aa14aa4c':
Reinitialize shutter button in Camera mode upon preview start
|
| ffc395d6e7eaafcdcd283e183188de16aa14aa4c |
10-Sep-2014 |
Alan Newberger <alann@google.com> |
Reinitialize shutter button in Camera mode upon preview start
VideoModule already does this here, and by adding to PhotoModule we
address a bug where pausing when capturing leaves the button
disabled on resume.
Bug: 17426670
Change-Id: I8333b52a72c0da8b58070d689406975332ae632e
ndroid/camera/PhotoModule.java
|
| 967fbd0875243a5c299a2c61a025218bf6e03c1e |
10-Sep-2014 |
Alan Newberger <alann@google.com> |
am 5c4bd6b5: Reduce logging for unknown camera scope
* commit '5c4bd6b5348a3464783270ea0bb10d4968d3b0cb':
Reduce logging for unknown camera scope
|
| 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
ndroid/camera/CameraActivity.java
|
| efdac383e982fcaf61c847e03f118e25325cad16 |
10-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am a710f371: Merge "This fixes Bitmap.createBitmap offset bug in L, not sure why." into ub-camera-glacier
* commit 'a710f371b8e454d37b8b2be50e001b79e37c67f2':
This fixes Bitmap.createBitmap offset bug in L, not sure why.
|
| 65c0dad8a189bc4cbb59bcf0ac277c5003d3880f |
09-Sep-2014 |
Eino-Ville Talvala <etalvala@google.com> |
DO NOT MERGE: Adjust for camera2 API changes
Add frameNumber to CaptureCallback#onCaptureStarted
Bug: 17421092
Change-Id: I6e66bd1abc2ecec4dd8346cf4313dc7261ffa26b
(cherry picked from commit dd38b94c6f21b528f0de706a69d853f24a9c9561)
ndroid/camera/one/v2/OneCameraImpl.java
|
| a710f371b8e454d37b8b2be50e001b79e37c67f2 |
10-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
Merge "This fixes Bitmap.createBitmap offset bug in L, not sure why." into ub-camera-glacier
|
| fd97c6da954f3e3e6f8547f6f7363cddba6c1b9a |
10-Sep-2014 |
Qiwen Zhao <zhao@google.com> |
Merge "DO NOT MERGE: Adjust for camera2 API changes" into ub-camera-glacier
|
| 32dc1e5bc05eaa7972a628640e91c80bbb9bcc43 |
10-Sep-2014 |
Nicolas Prevot <nprevot@google.com> |
am 42a5ad5a: Merge "Granting read permission in the result intent for VIDEO_CAPTURE." into ub-camera-glacier
* commit '42a5ad5a9c7e660854fd0552b81e025c16db9f05':
Granting read permission in the result intent for VIDEO_CAPTURE.
|
| 42a5ad5a9c7e660854fd0552b81e025c16db9f05 |
10-Sep-2014 |
Nicolas Prevot <nprevot@google.com> |
Merge "Granting read permission in the result intent for VIDEO_CAPTURE." into ub-camera-glacier
|
| 22eb5039c0ef4c057d876b8416230a042ab95a39 |
10-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am 5e3bf4cc: Remove toast. This reverts commit 779414e8bfe23d66de310570ff2314654e45ec9f.
* commit '5e3bf4cc84a186c5e89dfa692f3af95007751877':
Remove toast. This reverts commit 779414e8bfe23d66de310570ff2314654e45ec9f.
|
| c91c8d273b8884468dfd66a5b82526dc8245934e |
10-Sep-2014 |
Alan Newberger <alann@google.com> |
Remove jank on camera options switching
There are two main causes of jank on encountered on options switching:
1. When requesting camera in requestCamera, a portability refactor
introduced a regression where we blocked in the main thread to close
the camera. This main thread blockage is unacceptable as it caused a
preview freeze in addition to the freeze we were trying to create during
the switch, leading to a two-frame preview freeze.
2. The mode options animations which delay the button state transition,
also resulted in preview stutters. Unsure of cause but reverting first
and will assess fixes and reintroduce.
Bug: 17414652
Change-Id: Ib72e331f1bbb5d3b608d8bdc5656c2ff2836ed42
ndroid/camera/MultiToggleImageButton.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/app/CameraController.java
|
| 5e3bf4cc84a186c5e89dfa692f3af95007751877 |
10-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
Remove toast.
This reverts commit 779414e8bfe23d66de310570ff2314654e45ec9f.
Change-Id: Idf04e0bbb69822792327fd17634a4f95f7eb2092
ndroid/camera/CaptureModule.java
|
| 5de493f5a088466e050d53fb5fbd83c1cd5ae471 |
10-Sep-2014 |
Senpo Hu <senpo@google.com> |
am b954b3e8: Merge "Always match camera orientation with device orientation regardless portrait lock." into ub-camera-glacier
* commit 'b954b3e8b9fff8adf82808bd6cac1f9a7ac9505a':
Always match camera orientation with device orientation regardless portrait lock.
|
| b954b3e8b9fff8adf82808bd6cac1f9a7ac9505a |
10-Sep-2014 |
Senpo Hu <senpo@google.com> |
Merge "Always match camera orientation with device orientation regardless portrait lock." into ub-camera-glacier
|
| d29a0163c118c3c0049349deed767eb7ef6619b7 |
10-Sep-2014 |
Senpo Hu <senpo@google.com> |
am 65c00136: Set video quality pref default values at startup.
* commit '65c00136cde07e050d05e3da61876199df90dd18':
Set video quality pref default values at startup.
|
| 65c00136cde07e050d05e3da61876199df90dd18 |
09-Sep-2014 |
Senpo Hu <senpo@google.com> |
Set video quality pref default values at startup.
The problem of the old approach is the default values never got set
until switching on video module.
The caveat of the this CL is that the default value tweak is only applied
for Shamu. Rather than basing on device model string, detecting
CamcorderProfile capability is a better way to get this job done. However,
|CamcorderProfile.hasProfile| needs camera id info so I'd argue this CL
is good enough for the Shamu/L release.
Bug: 17060480
Change-Id: Ia53ff6aecad44fe7a32257fa1415163f167c09bf
ndroid/camera/VideoModule.java
ndroid/camera/settings/Keys.java
|
| bb1c72f7b9b8659071bc74e7949f8a360be0578d |
08-Sep-2014 |
Senpo Hu <senpo@google.com> |
Always match camera orientation with device orientation regardless
portrait lock.
Verified that this CL fixes the orientation issue for portrait/landscape
photos taken in PhotoModule with all configuration combinations such as
Camera API1/API2 devices, K/L devices, front/back camera.
Bug: 17360176
Change-Id: If84244726cf7e2ade470c231b8ac16e9b80366fe
ndroid/camera/PhotoModule.java
ndroid/camera/app/OrientationManagerImpl.java
|
| 0f54d2840314efdccb98fcc48bb1e32d6a774a33 |
09-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
This fixes Bitmap.createBitmap offset bug in L, not sure why.
Bug: 17145703
Change-Id: I18a673a5cac4400a2d6e80a851b1fb12381dc995
ndroid/camera/PhotoModule.java
|
| 44917f6b63804715be666a01ad79b262fb041b80 |
09-Sep-2014 |
Nicolas Prevot <nprevot@google.com> |
Granting read permission in the result intent for VIDEO_CAPTURE.
BUG:17437266
Change-Id: I84d1a69a3d314a05a7e3b5c949c896700426644e
ndroid/camera/VideoModule.java
|
| dd38b94c6f21b528f0de706a69d853f24a9c9561 |
09-Sep-2014 |
Eino-Ville Talvala <etalvala@google.com> |
DO NOT MERGE: Adjust for camera2 API changes
Add frameNumber to CaptureCallback#onCaptureStarted
Bug: 17421092
Change-Id: I6e66bd1abc2ecec4dd8346cf4313dc7261ffa26b
ndroid/camera/one/v2/OneCameraImpl.java
|
| 90aa96b8c71900edfda60ce779b5f71ab7d2566e |
09-Sep-2014 |
Alan Newberger <alann@google.com> |
am f974ba71: Additional logging for CAPTURE intent handling
* commit 'f974ba719a1255b6bda1b214842641fb5736a877':
Additional logging for CAPTURE intent handling
|
| f974ba719a1255b6bda1b214842641fb5736a877 |
08-Sep-2014 |
Alan Newberger <alann@google.com> |
Additional logging for CAPTURE intent handling
Adds verbose logging and some exception log warnings to help diagnose issues
in CAPTURE intents.
Bug: 17421140
Change-Id: Ib0afe4219418b1e7ee5ca4879e39a4448ec13cc0
ndroid/camera/PhotoModule.java
|
| 4a748623618f2bae149c8cf385046666c717a7a9 |
08-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
[try 2] resolved conflicts for merge of 6281a794 to ub-camera-haleakala
Change-Id: Ie98a22f57af23c80e08e47c841e22fef02036799
ndroid/camera/one/v2/OneCameraZslImpl.java
|
| e89b2c119e5167d1f03d207e3e6c62876b57895a |
08-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
resolved conflicts for merge of 6281a794 to ub-camera-haleakala
Change-Id: Ie488ba4103bc69f5a03bff8ef9be23a93aec51f6
|
| 6281a7942de9e55386c20c6f41bfb656b126a364 |
08-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
Merge "In debug_ui mode, show CAF result state, length of AF scan, fps, for camera2 API." into ub-camera-glacier
|
| ca3c564536f154b83e380e37382bc7b9f6049302 |
07-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
In debug_ui mode, show CAF result state, length of AF scan, fps, for camera2 API.
Bug: 17397777
Bug: 17028594
Bug: 17391241
Change-Id: Id5a7fe748f988755cb2d786a2103e375eb97b08f
ndroid/camera/CaptureModule.java
ndroid/camera/CaptureModuleUI.java
ndroid/camera/FocusOverlayManager.java
ndroid/camera/one/OneCamera.java
ndroid/camera/one/v2/OneCameraImpl.java
ndroid/camera/one/v2/OneCameraZslImpl.java
ndroid/camera/ui/FocusOverlay.java
|
| f5c62537715e8ab5e586491b75e8ddff9a3d9f6a |
08-Sep-2014 |
Alan Newberger <alann@google.com> |
DO NOT MERGE Update Camera2 to use latest APIs
Bug: 17423266
Change-Id: I1f1d79619d89971b387a78756b8f3b4d4b45d76e
(cherry picked from commit 76215c98a9a11d87b5ce9d2b4198654c2b8bbddf)
ndroid/camera/one/v2/ImageCaptureManager.java
ndroid/camera/one/v2/OneCameraImpl.java
ndroid/camera/one/v2/OneCameraManagerImpl.java
ndroid/camera/one/v2/OneCameraZslImpl.java
|
| 76215c98a9a11d87b5ce9d2b4198654c2b8bbddf |
08-Sep-2014 |
Alan Newberger <alann@google.com> |
DO NOT MERGE Update Camera2 to use latest APIs
Bug: 17423266
Change-Id: I1f1d79619d89971b387a78756b8f3b4d4b45d76e
ndroid/camera/one/v2/ImageCaptureManager.java
ndroid/camera/one/v2/OneCameraImpl.java
ndroid/camera/one/v2/OneCameraManagerImpl.java
ndroid/camera/one/v2/OneCameraZslImpl.java
|
| 7f7512bdbdca0ebfb6139955ca6eae09d5918f46 |
08-Sep-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Enable more rapid zsl capture" into ub-camera-haleakala
|
| 7691fbf5dbba83a3435e193648a1330182e15423 |
08-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 954b9b1c: Merge "wait for filmstrip bottom panel buttons to finish animating to show clings" into ub-camera-glacier
* commit '954b9b1ce7cd3e7b4a4c0fa35f8ca873fba5ac14':
wait for filmstrip bottom panel buttons to finish animating to show clings
|
| 954b9b1ce7cd3e7b4a4c0fa35f8ca873fba5ac14 |
08-Sep-2014 |
Spike Sprague <spikuru@google.com> |
Merge "wait for filmstrip bottom panel buttons to finish animating to show clings" into ub-camera-glacier
|
| 0df5434d2b4ad20291346085ee48f84e041ea080 |
06-Sep-2014 |
Sascha Häberling <haeberling@google.com> |
DO NOT MERGE Pipe context through to camera
Bug: 17203825
Not merging since a CL depending on this one cannot be merged cleanly into lmp-dev right now: http://ag/541468
Will also apply this one to haleakala.
Change-Id: Ie64f9500fe4e8044797132e3762521f68b5bc80e
ndroid/camera/CaptureModule.java
ndroid/camera/one/OneCameraManager.java
ndroid/camera/one/v2/OneCameraManagerImpl.java
|
| 9534f87cce03ca7ff6b0a175b177dd9b6804746b |
06-Sep-2014 |
Sascha Häberling <haeberling@google.com> |
am bcc384ea: Revert "Pipe context through to camera"
* commit 'bcc384ea15fc9d25ee3efd934c2ac7ec7a059a52':
Revert "Pipe context through to camera"
|
| 13d07d0ecb3bc808fb6f5b65508b1948ab3149d8 |
06-Sep-2014 |
Sascha Häberling <haeberling@google.com> |
DO NOT MERGE Pipe context through to camera
Bug: 17203825
Not merging since a CL depending on this one cannot be merged cleanly into lmp-dev right now: http://ag/541468
Will also apply this one to haleakala.
Change-Id: I7a386b92cf6168185bd28bd02a78d87c5826639a
ndroid/camera/CaptureModule.java
ndroid/camera/one/OneCameraManager.java
ndroid/camera/one/v2/OneCameraManagerImpl.java
|
| bcc384ea15fc9d25ee3efd934c2ac7ec7a059a52 |
06-Sep-2014 |
Sascha Häberling <haeberling@google.com> |
Revert "Pipe context through to camera"
Second half of the CL didn't make it through to lmp-dev due to Camera API change craziness. Reverting this one to unbreak the build and will submit again to G and H Camera branches only.
This reverts commit f6bf65e9442f2fb7042e37ec21bf1c6c4fbd9bb6.
Change-Id: I5e11c5c1b29586110ed504fbb1be2dfe76accab0
ndroid/camera/CaptureModule.java
ndroid/camera/one/OneCameraManager.java
ndroid/camera/one/v2/OneCameraManagerImpl.java
|
| 7bd928c2767d21680fdc291daa14d224d01aaec5 |
06-Sep-2014 |
Sascha Haeberling <haeberling@google.com> |
am f6bf65e9: Pipe context through to camera
* commit 'f6bf65e9442f2fb7042e37ec21bf1c6c4fbd9bb6':
Pipe context through to camera
|
| f6bf65e9442f2fb7042e37ec21bf1c6c4fbd9bb6 |
06-Sep-2014 |
Sascha Haeberling <haeberling@google.com> |
Pipe context through to camera
Bug: 17203825
Also don't just activate the shutter after a picture has been taken
since some cameras might not be ready for another picture yet.
This decision should be up to the camera.
Change-Id: I5991da1d8fc942b48fe085b18ec93b07bfafe889
ndroid/camera/CaptureModule.java
ndroid/camera/one/OneCameraManager.java
ndroid/camera/one/v2/OneCameraManagerImpl.java
|
| 863a5abf144db5c50c459d1c2f66543598aa26fc |
06-Sep-2014 |
Puneet Lall <puneetl@google.com> |
Enable more rapid zsl capture
Change-Id: I0f036a60f2f5f53092e544e8ec4890bbfeb9e659
ndroid/camera/one/v2/OneCameraZslImpl.java
|
| f78afae19d95443cfddf4c1d2df860ad7a4af900 |
06-Sep-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Zsl, handle null CaptureResults, increase ring buffer size" into ub-camera-haleakala
|
| 15238a035da8d0ba8d90a42ce273510e53453edc |
06-Sep-2014 |
Alan Newberger <alann@google.com> |
Merge "DO NOT MERGE Revert "Update camera2 API usage"" into ub-camera-haleakala
|
| 5f04890518b4b9663fd9d1d79b3ae63bf80ecc01 |
06-Sep-2014 |
Alan Newberger <alann@google.com> |
am 200d5f83: Merge "Close the camera when the async open callback runs after pause" into ub-camera-glacier
* commit '200d5f833a70616465fecb200d45bc2726bd1499':
Close the camera when the async open callback runs after pause
|
| 4fc7b8182f0f9b67d77539ff2bffa7ae2cac619f |
06-Sep-2014 |
Alan Newberger <alann@google.com> |
DO NOT MERGE Revert "Update camera2 API usage"
This temporarily reverts commit for unbundled branch 9c84812bba91831e1759c23e8c92082a8a5f44fd.
Change-Id: Ic4767cd27373c36dd77df4469f5006ced8746f9f
(cherry picked from commit 21fdb9db957973fa00777b65787db7e887fc070d)
ndroid/camera/one/v2/ImageCaptureManager.java
ndroid/camera/one/v2/OneCameraImpl.java
ndroid/camera/one/v2/OneCameraManagerImpl.java
ndroid/camera/one/v2/OneCameraZslImpl.java
|
| 9eb0eb55e686c84d0003cdcd60c76e08ed369468 |
06-Sep-2014 |
Alan Newberger <alann@google.com> |
Merge "DO NOT MERGE Revert "Update camera2 API usage"" into ub-camera-glacier
|
| 200d5f833a70616465fecb200d45bc2726bd1499 |
06-Sep-2014 |
Alan Newberger <alann@google.com> |
Merge "Close the camera when the async open callback runs after pause" into ub-camera-glacier
|
| 21fdb9db957973fa00777b65787db7e887fc070d |
06-Sep-2014 |
Alan Newberger <alann@google.com> |
DO NOT MERGE Revert "Update camera2 API usage"
This temporarily reverts commit for unbundled branch 9c84812bba91831e1759c23e8c92082a8a5f44fd.
Change-Id: Ic4767cd27373c36dd77df4469f5006ced8746f9f
ndroid/camera/one/v2/ImageCaptureManager.java
ndroid/camera/one/v2/OneCameraImpl.java
ndroid/camera/one/v2/OneCameraManagerImpl.java
ndroid/camera/one/v2/OneCameraZslImpl.java
|
| 3c56192fac54644a301251aae8d1e33c8d60c3e5 |
06-Sep-2014 |
Spike Sprague <spikuru@google.com> |
wait for filmstrip bottom panel buttons to finish animating
to show clings
bug: 17321626
Change-Id: Ib810157a2821ed40b2d1e30bee80bf1cc243ee59
ndroid/camera/app/FilmstripBottomPanel.java
ndroid/camera/widget/Cling.java
ndroid/camera/widget/ExternalViewerButton.java
|
| d686e6d6fd331d617ff7ec8a09572797b1cc8081 |
06-Sep-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Implemented rotation of zsl images" into ub-camera-haleakala
|
| 0ad7ab0b0a0d17a96438a503d0c918979b5d6480 |
05-Sep-2014 |
Puneet Lall <puneetl@google.com> |
Implemented rotation of zsl images
Bug: 17370310
Change-Id: Ida437d817482d19224d7afd2f06b00960480bd1c
ndroid/camera/one/v2/ImageCaptureManager.java
ndroid/camera/one/v2/OneCameraZslImpl.java
ndroid/camera/util/JpegUtilNative.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
ndroid/camera/CameraActivity.java
|
| bbd6516a5aedf3173954ee0ece85a45ebb9d73aa |
06-Sep-2014 |
Puneet Lall <puneetl@google.com> |
Zsl, handle null CaptureResults, increase ring buffer size
Change-Id: I288b85eab04666718af61a07d0db8382ac4f72e2
ndroid/camera/one/v2/OneCameraZslImpl.java
|
| 1e9a294273b5d22e2fbf3bb52d805783cf700d0b |
05-Sep-2014 |
Eino-Ville Talvala <etalvala@google.com> |
am 82465c1c: Merge "Update camera2 API usage" into ub-camera-glacier
* commit '82465c1c603d3d76bf8c7487779766d5ea38a5cd':
Update camera2 API usage
|
| 82465c1c603d3d76bf8c7487779766d5ea38a5cd |
05-Sep-2014 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Update camera2 API usage" into ub-camera-glacier
|
| e75df71e5b38d314a958279e8fb110dc4fb792c1 |
05-Sep-2014 |
Alan Newberger <alann@google.com> |
am 29a009c9: Add additional lifecycle logging to Camera
* commit '29a009c974f153f72cd5e28851a8cb85a691e215':
Add additional lifecycle logging to Camera
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoModule.java
ndroid/camera/app/CameraController.java
|
| 9c84812bba91831e1759c23e8c92082a8a5f44fd |
05-Sep-2014 |
Eino-Ville Talvala <etalvala@google.com> |
Update camera2 API usage
Rename listeners to callbacks
Bug: 17389922
Change-Id: I33affcaeec331eca2d084ded4eb199f86fa58765
ndroid/camera/one/v2/ImageCaptureManager.java
ndroid/camera/one/v2/OneCameraImpl.java
ndroid/camera/one/v2/OneCameraManagerImpl.java
ndroid/camera/one/v2/OneCameraZslImpl.java
|
| df435d0e26b6fa5f0d8443b2d9098d61b54a9f00 |
05-Sep-2014 |
Sascha Haeberling <haeberling@google.com> |
am dc0369f3: Merge "Load Gcam OneCamera in CaptureModule when it\'s also doing normal shots." into ub-camera-glacier
* commit 'dc0369f37b07adb4355113540af3c1f7c82a404e':
Load Gcam OneCamera in CaptureModule when it's also doing normal shots.
|
| dc0369f37b07adb4355113540af3c1f7c82a404e |
05-Sep-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Load Gcam OneCamera in CaptureModule when it's also doing normal shots." into ub-camera-glacier
|
| 961805e8fafa3ef21d1984eeb1429b40df6ffcde |
04-Sep-2014 |
Sascha Haeberling <haeberling@google.com> |
Load Gcam OneCamera in CaptureModule when it's also doing normal shots.
Bug: 16654225
Change-Id: I939e4793125cc996e26bbd5a13579f2f4ebab663
ndroid/camera/CaptureModule.java
|
| 2615ec286fe2b14e0c5ab59b08aa8a570dca049f |
05-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am eacf9460: Merge "remove stray bool resource for determining if OS is L or not, moved to more universal ApiHelper for that." into ub-camera-glacier
* commit 'eacf94608e5358a028c64dd1523270e61093e8b2':
remove stray bool resource for determining if OS is L or not, moved to more universal ApiHelper for that.
|
| eacf94608e5358a028c64dd1523270e61093e8b2 |
04-Sep-2014 |
Spike Sprague <spikuru@google.com> |
Merge "remove stray bool resource for determining if OS is L or not, moved to more universal ApiHelper for that." into ub-camera-glacier
|
| 79150ed3f8963016e1dc4576e6acab507bef4228 |
04-Sep-2014 |
Spike Sprague <spikuru@google.com> |
remove stray bool resource for determining if OS is L or not,
moved to more universal ApiHelper for that.
this brings back the fade-in on shutter button touchDown.
bug: 17389859
Change-Id: I7c7d24db30bfbb149f84e6f5acf3e211c282c1ec
ndroid/camera/ui/BottomBar.java
|
| db943ef7dc6c6882a77dca49e1628f484ae591ad |
04-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am 17d9084e: Add short flash animation and shutter sound to ZSL camera.
* commit '17d9084e38e64f06a9d411d64fe3c2739d299cda':
Add short flash animation and shutter sound to ZSL camera.
|
| 17d9084e38e64f06a9d411d64fe3c2739d299cda |
29-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
Add short flash animation and shutter sound to ZSL camera.
Bug: 17217567
Change-Id: I9a75fdd15e03f47029ef4a631287899718794c5c
ndroid/camera/CameraActivity.java
ndroid/camera/CaptureModule.java
ndroid/camera/app/AppController.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/one/OneCamera.java
ndroid/camera/one/v2/ImageCaptureManager.java
ndroid/camera/one/v2/OneCameraImpl.java
ndroid/camera/one/v2/OneCameraZslImpl.java
ndroid/camera/ui/CaptureAnimationOverlay.java
|
| 0793b92914e7770a49fa7993f8b1e3e38b08eb5b |
04-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am ae6e94f5: Merge "Re-enable shutter-button when switching between front and back cameras." into ub-camera-glacier
* commit 'ae6e94f570a8436715384993f2e06b2193915b78':
Re-enable shutter-button when switching between front and back cameras.
|
| f1688031d0f1add1de7ea072aad1170261113aa8 |
04-Sep-2014 |
Alan Newberger <alann@google.com> |
am 2ef0f9dc: Fix unnecessary string cast
* commit '2ef0f9dc95527a354846940bae675741c464e6ae':
Fix unnecessary string cast
|
| ae6e94f570a8436715384993f2e06b2193915b78 |
04-Sep-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Re-enable shutter-button when switching between front and back cameras." into ub-camera-glacier
|
| 2ef0f9dc95527a354846940bae675741c464e6ae |
04-Sep-2014 |
Alan Newberger <alann@google.com> |
Fix unnecessary string cast
Code was taking a setting as a string, which when empty returns null,
then tried to parseInt it. Instead ask for an int, which will default
to zero, and things will work.
Bug: 16827108
Change-Id: I5bbed091ec29fc98257a5eb18948891c43caa29f
ndroid/camera/widget/IndicatorIconController.java
|
| 5c6a72e2d3a954221d00e297ac924d608d2d6b15 |
04-Sep-2014 |
Alan Newberger <alann@google.com> |
am 2b084ec5: Merge "Fixing settings upgrades" into ub-camera-glacier
* commit '2b084ec5c7c262003581be3584825300269adae2':
Fixing settings upgrades
|
| 2b084ec5c7c262003581be3584825300269adae2 |
04-Sep-2014 |
Alan Newberger <alann@google.com> |
Merge "Fixing settings upgrades" into ub-camera-glacier
|
| a830b1aefc9d5f29b512817ac96c68e38a38a13b |
03-Sep-2014 |
Alan Newberger <alann@google.com> |
Fixing settings upgrades
Did a full audit of upgrade scenarios and performed the following fixes.
* restored pre-existing location upgrade code that handled old upgrades.
preserves location choice from C straight to G.
* added string type format conversion for "old global" values that were
not implemented in the refactor : hdr, hdr+, grid buttons
* moved a "reset" that existed in upgraders that put the user in Camera
mode on upgrade. it should run for everglades upgraders along with size
changes.
Bug: 17317510
Change-Id: I87db511bfa89676525ee727620cb546c180a8ef6
ndroid/camera/settings/AppUpgrader.java
ndroid/camera/settings/SettingsManager.java
ndroid/camera/settings/SettingsUpgrader.java
|
| 91eb5f1e9578a91c996dd40ebd91f8988654ae00 |
04-Sep-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Force ZSL and CaptureModule to be enabled." into ub-camera-haleakala
|
| 142b5bf5e10db858c2d2e69fd93d6565ba51363b |
03-Sep-2014 |
Puneet Lall <puneetl@google.com> |
Re-enable shutter-button when switching between front and back cameras.
Bug: 16961251
Change-Id: Ie3075bf711ab44dfe5e6cdd6b3645dd6583708b5
ndroid/camera/one/v2/OneCameraZslImpl.java
ndroid/camera/util/ConjunctionListenerMux.java
|
| 447a570cca5f53ff243827cd2c60bdc58050b5fa |
03-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am 4d6d676c: Refactor default picture size selection in zsl cam.
* commit '4d6d676c368b70e8c0fcf462e51de1d59fe34028':
Refactor default picture size selection in zsl cam.
|
| 4d6d676c368b70e8c0fcf462e51de1d59fe34028 |
03-Sep-2014 |
Puneet Lall <puneetl@google.com> |
Refactor default picture size selection in zsl cam.
Bug: 17322843
Change-Id: Ib34584937db639f984689042bd8371443a33bb64
ndroid/camera/one/v2/OneCameraZslImpl.java
|
| 636e7e7a9d842a1871c3ee03b70c6fc1c0a873dc |
03-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am 686c7b55: Merge "[ZSL Cam] Use largest supported size if no picture size is already set." into ub-camera-glacier
* commit '686c7b55a6b0c9c7202383e0589b190e5439ce69':
[ZSL Cam] Use largest supported size if no picture size is already set.
|
| 686c7b55a6b0c9c7202383e0589b190e5439ce69 |
03-Sep-2014 |
Puneet Lall <puneetl@google.com> |
Merge "[ZSL Cam] Use largest supported size if no picture size is already set." into ub-camera-glacier
|
| 89b48fd082cdb2a8e75caa577cbe25a422ee85e0 |
03-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am 4d7f3be8: CaptureModule countdown timer fixes: ability to cancel, and remove premature SoundPlayer release.
* commit '4d7f3be87a92c7efac7cf92bbd4ce7dd61f46e0d':
CaptureModule countdown timer fixes: ability to cancel, and remove premature SoundPlayer release.
|
| 80f44448e13b5d6d33f4aad63448d7b39b6dda0f |
03-Sep-2014 |
Puneet Lall <puneetl@google.com> |
[ZSL Cam] Use largest supported size if no picture size is already set.
Fixes crash due to null size when zsl is started for the first time on a
fresh device.
Bug: 17322843
Change-Id: I31ef4202c13cee1270af59231f93842fa0e86009
ndroid/camera/one/v2/OneCameraZslImpl.java
|
| 4d7f3be87a92c7efac7cf92bbd4ce7dd61f46e0d |
03-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
CaptureModule countdown timer fixes: ability to cancel, and remove premature SoundPlayer release.
Bug: 17204673
Change-Id: I438c3d4e7a9aad3f8fc709d255a249399bb05b57
ndroid/camera/CaptureModule.java
|
| 716876f9b254cc020a75e6acec7333c015f90023 |
03-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am d568e524: Merge "Add countdown timer to CaptureModule." into ub-camera-glacier
* commit 'd568e524029dc538d774d3d7b45586639549c79a':
Add countdown timer to CaptureModule.
|
| d568e524029dc538d774d3d7b45586639549c79a |
03-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
Merge "Add countdown timer to CaptureModule." into ub-camera-glacier
|
| 15bc0dcc293720baa0424afa5a901475982465be |
03-Sep-2014 |
Puneet Lall <puneetl@google.com> |
Force ZSL and CaptureModule to be enabled.
Temporary setting for testing zsl.
Bug: 17322843
Change-Id: I71befcd30d5ff60a52e041dbbef95fec66691a14
ndroid/camera/debug/DebugPropertyHelper.java
|
| a31162ce3ab4f9c68e46658b16b2c49f4dc0d145 |
02-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
Add countdown timer to CaptureModule.
Bug: 16654225
Bug: 17204673
Change-Id: I914094b204743ddbe786ef1a7621564e864ed834
ndroid/camera/CaptureModule.java
ndroid/camera/CaptureModuleUI.java
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
|
| 3caff61220ea3f41671c783bdcf8ba893581e596 |
03-Sep-2014 |
Sascha Haeberling <haeberling@google.com> |
am 7718b87b: Merge "A few Size clean-ups to support live metering changes." into ub-camera-glacier
* commit '7718b87b566b20d11dfa2dd97f60018e601ad409':
A few Size clean-ups to support live metering changes.
|
| 7718b87b566b20d11dfa2dd97f60018e601ad409 |
03-Sep-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "A few Size clean-ups to support live metering changes." into ub-camera-glacier
|
| 7ba98601bc9903b15ec00b66d79b389375a429d4 |
03-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am b9f4b931: Merge "actionbar opactiy tweaks" into ub-camera-glacier
* commit 'b9f4b931949dbddeba61b0a6bfcc52d24e01c97c':
actionbar opactiy tweaks
|
| b9f4b931949dbddeba61b0a6bfcc52d24e01c97c |
03-Sep-2014 |
Spike Sprague <spikuru@google.com> |
Merge "actionbar opactiy tweaks" into ub-camera-glacier
|
| df6c9e2750206bd768e8abe7a508fa5677b53f26 |
29-Aug-2014 |
Spike Sprague <spikuru@google.com> |
actionbar opactiy tweaks
bug: 17319586
Change-Id: I2bfde2db9cff62b6ac8d8f416c1f8512c25bd900
ndroid/camera/CameraActivity.java
|
| 0b2e533440acf3a2e2d7cfc56c3305eb61ae645f |
03-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 9bfd6bdd: shutter button color fix (pre-L)
* commit '9bfd6bddaa09ccdadabf3b0e7e2b81bc1bcf175d':
shutter button color fix (pre-L)
|
| 9bfd6bddaa09ccdadabf3b0e7e2b81bc1bcf175d |
18-Aug-2014 |
Spike Sprague <spikuru@google.com> |
shutter button color fix (pre-L)
bug: 17011894
Change-Id: Ic7626f89c811c08f1d16bb5e42fa9169b1e65759
ndroid/camera/ui/BottomBar.java
|
| f2627903d11faf47c5052884bc2b23e27b8d5f94 |
02-Sep-2014 |
Sascha Haeberling <haeberling@google.com> |
A few Size clean-ups to support live metering changes.
Bug: 16948752
Change-Id: I262a6b3caa42ecd7a4da40d1eaca6a7eaa96be98
ndroid/camera/CaptureModuleUtil.java
ndroid/camera/util/CameraUtil.java
ndroid/camera/util/Size.java
|
| 64983a28aed593ac09015c6f17c497b3c7a2dac0 |
02-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am 5ca2e0b9: Merge "Remove android.hardware.camera2 import from Settings3A." into ub-camera-glacier
* commit '5ca2e0b94a3031ff2117c5e68f8198a2f174b8eb':
Remove android.hardware.camera2 import from Settings3A.
|
| 5ca2e0b94a3031ff2117c5e68f8198a2f174b8eb |
02-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
Merge "Remove android.hardware.camera2 import from Settings3A." into ub-camera-glacier
|
| 527706e2957fe26f301d991d86d4359ab433408d |
02-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
Remove android.hardware.camera2 import from Settings3A.
Bug: 17358060
Change-Id: I7e4442a4257acf9e4b58981be697949aba62a31f
ndroid/camera/one/Settings3A.java
ndroid/camera/one/v2/AutoFocusHelper.java
ndroid/camera/one/v2/OneCameraImpl.java
ndroid/camera/one/v2/OneCameraZslImpl.java
|
| 4177782099827421e4c6486748f29ebfa4805d73 |
02-Sep-2014 |
Senpo Hu <senpo@google.com> |
am 10fcde55: Merge "Starting share/edit/play activities in its own task." into ub-camera-glacier
* commit '10fcde551bddb786e4cae0da3ed81a687cf2d470':
Starting share/edit/play activities in its own task.
|
| 10fcde551bddb786e4cae0da3ed81a687cf2d470 |
02-Sep-2014 |
Senpo Hu <senpo@google.com> |
Merge "Starting share/edit/play activities in its own task." into ub-camera-glacier
|
| 9f2b20a389fa79f35e1e12878e3cbd8db3e1ff95 |
30-Aug-2014 |
Senpo Hu <senpo@google.com> |
Starting share/edit/play activities in its own task.
Bug: 17091348
Change-Id: Ib90173e164fab2a1aba753ab4d4f05d305d3d522
ndroid/camera/CameraActivity.java
ndroid/camera/VideoModule.java
ndroid/camera/util/CameraUtil.java
|
| 12ee27a1a2986c31c64c7afb5bde68eca1b3f8d9 |
30-Aug-2014 |
Alan Newberger <alann@google.com> |
am ef481910: Merge "Ensure ZoomView appears on top of other views in L" into ub-camera-glacier
* commit 'ef4819104fa5e69b7654afcf2f388760e7989b24':
Ensure ZoomView appears on top of other views in L
|
| ef4819104fa5e69b7654afcf2f388760e7989b24 |
30-Aug-2014 |
Alan Newberger <alann@google.com> |
Merge "Ensure ZoomView appears on top of other views in L" into ub-camera-glacier
|
| b9535998da7a02f22156b70615c3e211401d14b0 |
30-Aug-2014 |
Alan Newberger <alann@google.com> |
Ensure ZoomView appears on top of other views in L
Since our normal image view now has an elevation on L, just calling
bringChildToFront() is not enough, elevation supersedes z order.
So we also ensure the ZoomView is at max elevation when we bring it
to front.
Bug: 17331586
Change-Id: I34b06949d063daa08d964003b28a245eb6133f95
ndroid/camera/ui/ZoomView.java
ndroid/camera/widget/FilmstripView.java
|
| cd5fcb9bfee2cf5879135fcbae462bc4c6dfea0e |
30-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am b868274c: Simplify AF in CaptureModule and OneCameraImpl and share code in AutoFocusHelper.
* commit 'b868274c9dc8d9c772ec89fb5955215cc7911087':
Simplify AF in CaptureModule and OneCameraImpl and share code in AutoFocusHelper.
|
| b868274c9dc8d9c772ec89fb5955215cc7911087 |
28-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
Simplify AF in CaptureModule and OneCameraImpl and share code in AutoFocusHelper.
Bug: 17202848
Change-Id: I08e92c9701d5b92938612137c87ca37c4305411f
ndroid/camera/CaptureModule.java
ndroid/camera/CaptureModuleUI.java
ndroid/camera/FocusOverlayManager.java
ndroid/camera/debug/DebugPropertyHelper.java
ndroid/camera/one/OneCamera.java
ndroid/camera/one/Settings3A.java
ndroid/camera/one/v2/AutoFocusHelper.java
ndroid/camera/one/v2/OneCameraImpl.java
ndroid/camera/one/v2/OneCameraZslImpl.java
ndroid/camera/ui/FocusOverlay.java
|
| 7bc74efd65f9bd8a628dd300735b9a7c4c9e60ce |
29-Aug-2014 |
Puneet Lall <puneetl@google.com> |
am 68c25ac5: ZSL refactoring
* commit '68c25ac5373126670cb6c2324e40537bb47e72d9':
ZSL refactoring
|
| 68c25ac5373126670cb6c2324e40537bb47e72d9 |
29-Aug-2014 |
Puneet Lall <puneetl@google.com> |
ZSL refactoring
Bug: 16961251
Change-Id: I19642f5de088135db6650df98a62dd8dd462e0da
ndroid/camera/one/v2/OneCameraZslImpl.java
ndroid/camera/util/ConjunctionListenerMux.java
|
| 9cd04236ffdc2ef3d03f3bd6a8ac9adf636bbbe0 |
29-Aug-2014 |
Puneet Lall <puneetl@google.com> |
am d308d001: Add missing copyright header in Open Source code.
* commit 'd308d001e876b7036fba2727b18b6b9d652ecffb':
Add missing copyright header in Open Source code.
|
| e65cb334be7f8e4e90a401978879855e25f7d2ce |
29-Aug-2014 |
Puneet Lall <puneetl@google.com> |
am 82d70ea0: Merge "[ZSL Cam] Fixed shutter button, compress on threadpool." into ub-camera-glacier
* commit '82d70ea06c58df44cfefdc4e1a34644f8f817a23':
[ZSL Cam] Fixed shutter button, compress on threadpool.
|
| d7ccf67f9f349ce0d40e461713f13629ef2dcb92 |
29-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am b8c3e31c: Merge "fix for a regression introduced in ag/534531" into ub-camera-glacier
* commit 'b8c3e31c32601095488a09c457a5cb154599c6a7':
fix for a regression introduced in ag/534531
|
| d7fdc639b5ec8530fd7de58e66dcf059c24d1753 |
29-Aug-2014 |
Alan Newberger <alann@google.com> |
am 475a1935: Merge "Increasing JPEG compression quality for filmstrip" into ub-camera-glacier
* commit '475a1935894830d3006c29d1155b5d98b62cc006':
Increasing JPEG compression quality for filmstrip
|
| d308d001e876b7036fba2727b18b6b9d652ecffb |
29-Aug-2014 |
Puneet Lall <puneetl@google.com> |
Add missing copyright header in Open Source code.
Change-Id: I07703e0f55544204645396423ced09f957214d73
ndroid/camera/util/ConjunctionListenerMux.java
|
| 82d70ea06c58df44cfefdc4e1a34644f8f817a23 |
29-Aug-2014 |
Puneet Lall <puneetl@google.com> |
Merge "[ZSL Cam] Fixed shutter button, compress on threadpool." into ub-camera-glacier
|
| b8c3e31c32601095488a09c457a5cb154599c6a7 |
29-Aug-2014 |
Spike Sprague <spikuru@google.com> |
Merge "fix for a regression introduced in ag/534531" into ub-camera-glacier
|
| af984b23a3140a16e5b0433dbb9693a076cfcf04 |
29-Aug-2014 |
Spike Sprague <spikuru@google.com> |
fix for a regression introduced in ag/534531
that CL kept the swipe-away-from-filmstip
preview background from alpha-animating correctly.
this CL fixes that and provides an alternate solution
to bug 17301367
Change-Id: I04ba363a55dd9485d13e2d243fd1fb84df1d31e5
ndroid/camera/app/FilmstripBottomPanel.java
ndroid/camera/widget/FilmstripLayout.java
|
| 182ba6f13e9dab9a9c0341efe4c907ff7853352d |
29-Aug-2014 |
Puneet Lall <puneetl@google.com> |
[ZSL Cam] Fixed shutter button, compress on threadpool.
Change-Id: I4c2167163ee35ba841f459ae76779f44647bcb28
ndroid/camera/one/v2/ImageCaptureManager.java
ndroid/camera/one/v2/OneCameraZslImpl.java
ndroid/camera/util/ConjunctionListenerMux.java
|
| 475a1935894830d3006c29d1155b5d98b62cc006 |
29-Aug-2014 |
Alan Newberger <alann@google.com> |
Merge "Increasing JPEG compression quality for filmstrip" into ub-camera-glacier
|
| af79e4288559ddbee4ba6ed3cb3d1d9657fc23ea |
29-Aug-2014 |
Alan Newberger <alann@google.com> |
Increasing JPEG compression quality for filmstrip
This CL increases JPEG quality for generated cache images
in the filmstrip. This reduces overall artifacts for thumbnails.
Bug: 17320690
Change-Id: If2d0483502c0d8d18755b42dff5ffe9fd74e540f
ndroid/camera/data/LocalMediaData.java
|
| a7f9c7a40a45e661a26235c0a8ca6cc74c7a1b0a |
29-Aug-2014 |
Puneet Lall <puneetl@google.com> |
am 3724805a: Merge "Zsl flash, auto focus, and other minor fixes" into ub-camera-glacier
* commit '3724805a043ac149b7bc103bb94787133c7e06a5':
Zsl flash, auto focus, and other minor fixes
|
| 3724805a043ac149b7bc103bb94787133c7e06a5 |
29-Aug-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Zsl flash, auto focus, and other minor fixes" into ub-camera-glacier
|
| 580f451fc85cc752e71eb730006b90d09aaafb55 |
28-Aug-2014 |
Puneet Lall <puneetl@google.com> |
Zsl flash, auto focus, and other minor fixes
Bug: 17216526
Bug: 17221258
Change-Id: I5129c57674874d3a29789e0c9029eadeaa138788
ndroid/camera/CaptureModule.java
ndroid/camera/one/v2/ImageCaptureManager.java
ndroid/camera/one/v2/OneCameraZslImpl.java
|
| acf313fc2586c3ff7c19ba9cd8bb514ccb8873e1 |
28-Aug-2014 |
Alan Newberger <alann@google.com> |
am 965db3e8: Merge "Actually remove settings" into ub-camera-glacier
* commit '965db3e8ca1416e418990344486b1008d1ebc8dd':
Actually remove settings
|
| 965db3e8ca1416e418990344486b1008d1ebc8dd |
28-Aug-2014 |
Alan Newberger <alann@google.com> |
Merge "Actually remove settings" into ub-camera-glacier
|
| b0c36b235198d6d9a38bf13f39aa25359aac9b1a |
28-Aug-2014 |
Alan Newberger <alann@google.com> |
Actually remove settings
Correct settings removal, which wasn't occurring during upgrades. Will
followup with scrub of preference file references -- there are likely
additional reasons this wasn't causing more crashes, i.e. certain
settings not being ported over earlier versions.
Bug: 16879376
Change-Id: I720a3181958a4201508726d0f6e06803c456f737
ndroid/camera/settings/SettingsManager.java
ndroid/camera/settings/SettingsUpgrader.java
|
| 6366cd8f947154688e1814122e5d27fe34ed29aa |
28-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am 076efc03: Do not show AF UI prior to snapping a picture (for state STATE_FOCUSING_SNAP_ON_FINISH).
* commit '076efc0354552ee3b0845ae3b5988e755f92d5b0':
Do not show AF UI prior to snapping a picture (for state STATE_FOCUSING_SNAP_ON_FINISH).
|
| 076efc0354552ee3b0845ae3b5988e755f92d5b0 |
28-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
Do not show AF UI prior to snapping a picture (for state STATE_FOCUSING_SNAP_ON_FINISH).
Bug: 17312087
Change-Id: Ib706e35af5b1f49021efdd45b1e010e24dfbc333
ndroid/camera/FocusOverlayManager.java
|
| 09abe98d56a46d016903f0671e94ca6cc966ed54 |
28-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 2d4be257: Add simple sound player to be used in Camera implementations.
* commit '2d4be2576b265a4abfbabbda20862fcea19c1395':
Add simple sound player to be used in Camera implementations.
|
| 2d4be2576b265a4abfbabbda20862fcea19c1395 |
28-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Add simple sound player to be used in Camera implementations.
Bug: 17205355
Change-Id: I04c4bf1a692c7a4555eafea794737e41a8fc342c
ndroid/camera/CameraActivity.java
ndroid/camera/CaptureModule.java
ndroid/camera/SoundPlayer.java
ndroid/camera/app/AppController.java
ndroid/camera/one/OneCameraManager.java
ndroid/camera/one/v2/OneCameraManagerImpl.java
|
| 23a5ac091ad6754f4c4d091a359f1c8a3b4fc48b |
28-Aug-2014 |
Alan Newberger <alann@google.com> |
am 352de757: Merge "Remove FeedbackHelper" into ub-camera-glacier
* commit '352de757246fa28c6fdfa5d0d3e51659e23f8183':
Remove FeedbackHelper
|
| 233f8deeb002069adb9e4182335323141d920940 |
28-Aug-2014 |
Sam Hasinoff <hasinoff@google.com> |
am 4f0d6384: gcam: Restore naming of Gcam debug folders.
* commit '4f0d63848684cb7cbcde42b0bd714bb6d6f998f5':
gcam: Restore naming of Gcam debug folders.
|
| 352de757246fa28c6fdfa5d0d3e51659e23f8183 |
28-Aug-2014 |
Alan Newberger <alann@google.com> |
Merge "Remove FeedbackHelper" into ub-camera-glacier
|
| 4f0d63848684cb7cbcde42b0bd714bb6d6f998f5 |
27-Aug-2014 |
Sam Hasinoff <hasinoff@google.com> |
gcam: Restore naming of Gcam debug folders.
When Gcam debugging is on, write output to per-burst folders
named SSSS_YYYYMMDD_HHMMSS_XXX, where 'SSSS' is the last 4
digits of the device serial number and 'XXX' are the
milliseconds of the timestamp.
Bug: 17204023
Change-Id: Ie1d58dc3ecb5d9dc7389d24acc4937498f00dbc9
ndroid/camera/one/AbstractOneCamera.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
ndroid/camera/CameraActivity.java
|
| 83fff453d7b37f7eaa778e71dd7728c8f588587d |
28-Aug-2014 |
Puneet Lall <puneetl@google.com> |
am 2b3cf868: Merge "Add setprop to enable ZSL." into ub-camera-glacier
* commit '2b3cf8689d68444dcf8f56a85d8525533d9d96aa':
Add setprop to enable ZSL.
|
| 2b3cf8689d68444dcf8f56a85d8525533d9d96aa |
28-Aug-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Add setprop to enable ZSL." into ub-camera-glacier
|
| e4ebe00f16c1ab61c8aed3ed75283d34fce9186a |
27-Aug-2014 |
Puneet Lall <puneetl@google.com> |
Add setprop to enable ZSL.
Bug: 16961251
Change-Id: I997a47345f7c277abb43f2533fa5226e0c6a3e06
ndroid/camera/debug/DebugPropertyHelper.java
|
| 8daec257bfe3575d008189df0a945a1ba2238cfa |
27-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 969d606a: Merge "Make sure CaptureModule (and therefore Gcam) always resumes right." into ub-camera-glacier
* commit '969d606acb2b2f6e755f9164348712306dc7b557':
Make sure CaptureModule (and therefore Gcam) always resumes right.
|
| 969d606acb2b2f6e755f9164348712306dc7b557 |
27-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Make sure CaptureModule (and therefore Gcam) always resumes right." into ub-camera-glacier
|
| e9e8eedb57e9b2f96bbf92f040d7d398cbfe49d9 |
27-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 480e58b1: Merge "fix for a doublebounce of the filmstip button on filmstip swipe out" into ub-camera-glacier
* commit '480e58b1020f853f6c71d2c3469b342d27084752':
fix for a doublebounce of the filmstip button on filmstip swipe out
|
| 480e58b1020f853f6c71d2c3469b342d27084752 |
27-Aug-2014 |
Spike Sprague <spikuru@google.com> |
Merge "fix for a doublebounce of the filmstip button on filmstip swipe out" into ub-camera-glacier
|
| f60d1335550bc6d34267b5039ccb6e907df0dadd |
27-Aug-2014 |
Spike Sprague <spikuru@google.com> |
fix for a doublebounce of the filmstip button on filmstip swipe out
bug: 17301367
Change-Id: I305618ee5012de229c9cc1fd73f0b6506d701477
ndroid/camera/widget/FilmstripLayout.java
|
| 8ace9601bb23ff67b33b74e039fd70fbfde4e4cc |
27-Aug-2014 |
Puneet Lall <puneetl@google.com> |
am c5b75258: Merge "Initial ZSL implementation" into ub-camera-glacier
* commit 'c5b752589e2721c72f8b8f879838f94d816bf1f8':
Initial ZSL implementation
|
| c5b752589e2721c72f8b8f879838f94d816bf1f8 |
27-Aug-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Initial ZSL implementation" into ub-camera-glacier
|
| 307c334002d4972b4a4a1d2b1303c1bdf9ed4e2d |
27-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Make sure CaptureModule (and therefore Gcam) always resumes right.
Bug: 17258531
Change-Id: I8a72fcd8f34eb95676ca939c2aff87fcac105e75
ndroid/camera/CaptureModule.java
|
| 512001df0211fa8999593717a0f186457a5a9cef |
14-Aug-2014 |
Puneet Lall <puneetl@google.com> |
Initial ZSL implementation
Bug: 16961251
Change-Id: I03c7c1813f99d460495472addc7f733e1bfa6a97
ndroid/camera/one/v2/ImageCaptureManager.java
ndroid/camera/one/v2/OneCameraZslImpl.java
ndroid/camera/util/ConcurrentSharedRingBuffer.java
ndroid/camera/util/Task.java
|
| e3935d713db003eb1dbb9535b03565055954bdda |
27-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 95817308: Enable location and heading to be stored in picture EXIF.
* commit '95817308fddad554c73cbe4539cb868dd4722ff9':
Enable location and heading to be stored in picture EXIF.
|
| 95817308fddad554c73cbe4539cb868dd4722ff9 |
27-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Enable location and heading to be stored in picture EXIF.
Bug: 17202845
Change-Id: Ic789c9a2d6078b35a09308d1b631166529f3f1bd
ndroid/camera/CaptureModule.java
ndroid/camera/one/OneCamera.java
|
| 3e879ec00bb6ea6bf7158d51cc96bd11ef1062f8 |
27-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 779414e8: Show a message to indicate that Gcam is not yet ready for quality feedback on Shamu.
* commit '779414e8bfe23d66de310570ff2314654e45ec9f':
Show a message to indicate that Gcam is not yet ready for quality feedback on Shamu.
|
| 779414e8bfe23d66de310570ff2314654e45ec9f |
27-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Show a message to indicate that Gcam is not yet ready for quality feedback on Shamu.
Bug: 17204023
Change-Id: I03ac9df0e4df8f09f5a4527616add6fb12ff0fd8
ndroid/camera/CaptureModule.java
|
| 06ebb079393fab517589249c8de507e0629167a9 |
27-Aug-2014 |
Alan Newberger <alann@google.com> |
am 26b224dd: Protect video recording callback from activity/module pauses
* commit '26b224dd3b4391dbbb8ee6ed35c40c431bdbec85':
Protect video recording callback from activity/module pauses
|
| 4423de9a8b229facb723831b71ef78109033a476 |
27-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am d225ea60: Add volume key capture suppor to CaptureModule
* commit 'd225ea6074a58021013c8c063abb51eb80b1feb7':
Add volume key capture suppor to CaptureModule
|
| 6a0c4d59318f2ed997b0d8909977b02bb67f2608 |
27-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am 9d3ec039: Add timeout to touch to focus.
* commit '9d3ec0396b71d7b9068f83b2e820eee988df8215':
Add timeout to touch to focus.
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/VideoModule.java
|
| d225ea6074a58021013c8c063abb51eb80b1feb7 |
27-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Add volume key capture suppor to CaptureModule
Bug: 17289383
Change-Id: If548c4ebe5f702aca6fc9a983ac4775812ad551f
ndroid/camera/CaptureModule.java
|
| 9d3ec0396b71d7b9068f83b2e820eee988df8215 |
27-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
Add timeout to touch to focus.
Bug: 17289205
Change-Id: Ide39b4b9c86691de36149fdd15d1db41f9fed342
ndroid/camera/CaptureModule.java
|
| 24d11545f95712862abd75fbc71a72d8b50d160b |
27-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 597c4d10: Merge "more consistently apply filmstip hide animations" into ub-camera-glacier
* commit '597c4d10b9bf0174a81e617cb89bab1a196cbc3a':
more consistently apply filmstip hide animations
|
| 597c4d10b9bf0174a81e617cb89bab1a196cbc3a |
27-Aug-2014 |
Spike Sprague <spikuru@google.com> |
Merge "more consistently apply filmstip hide animations" into ub-camera-glacier
|
| b7d0a227fb0f842135dbc92a7e15c571f0e1a946 |
27-Aug-2014 |
Spike Sprague <spikuru@google.com> |
more consistently apply filmstip hide animations
bug: 17278732
bug: 17279637
Change-Id: I2346dcd77c0afd84eb1167ad5d5df3770551c14f
ndroid/camera/widget/FilmstripLayout.java
ndroid/camera/widget/FilmstripView.java
|
| 17ae13e4222092c64c693fe5ffebe26bb04bb22a |
27-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am bd9b80b2: Reset metering and focus areas when touch focus period ends.
* commit 'bd9b80b267195f78a8514847d0f02629e761a334':
Reset metering and focus areas when touch focus period ends.
|
| bd9b80b267195f78a8514847d0f02629e761a334 |
27-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
Reset metering and focus areas when touch focus period ends.
Bug: 17286539
Change-Id: I36e554cac3969d6d0422efd2cb169d7afb08911c
ndroid/camera/FocusOverlayManager.java
|
| f88adf07fd7e601e28519ac657499d8be251e46e |
27-Aug-2014 |
Alan Newberger <alann@google.com> |
am d4d1dbe0: Merge "Remove one shot callback workaround in VideoModule for L" into ub-camera-glacier
* commit 'd4d1dbe00b84285bd0d235d984b9d71ea63a9305':
Remove one shot callback workaround in VideoModule for L
|
| d4d1dbe00b84285bd0d235d984b9d71ea63a9305 |
27-Aug-2014 |
Alan Newberger <alann@google.com> |
Merge "Remove one shot callback workaround in VideoModule for L" into ub-camera-glacier
|
| 3cb3cb6bc2200d4f37b16cdf227e65e6e835afd8 |
27-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am 462d9c51: Merge "In 3A debug mode, show pass/fail for active scans and show exact AF, AE regions." into ub-camera-glacier
* commit '462d9c510bbd072c63fb5be1ec12df15b4775f5f':
In 3A debug mode, show pass/fail for active scans and show exact AF, AE regions.
|
| 462d9c510bbd072c63fb5be1ec12df15b4775f5f |
27-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
Merge "In 3A debug mode, show pass/fail for active scans and show exact AF, AE regions." into ub-camera-glacier
|
| e2f5fdda4b19da650a7616853990624969d0f384 |
26-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
In 3A debug mode, show pass/fail for active scans and show exact AF, AE regions.
Bug: 17028594
Change-Id: I9c85178926a68c5e3ce26d04107db65514d84169
ndroid/camera/FocusOverlayManager.java
ndroid/camera/ui/FaceView.java
ndroid/camera/ui/FocusOverlay.java
|
| 6311e8e29872086608aa1f77595a6117395e8624 |
26-Aug-2014 |
Ruben Brunk <rubenbrunk@google.com> |
am 92ed7b6c: Merge "photosphere: Fix TextureView transforms." into ub-camera-glacier
* commit '92ed7b6c6d8ca735c35f5bdc6de6d15f485e19bd':
photosphere: Fix TextureView transforms.
|
| 92ed7b6c6d8ca735c35f5bdc6de6d15f485e19bd |
26-Aug-2014 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "photosphere: Fix TextureView transforms." into ub-camera-glacier
|
| 7bae31a17a7913b58b96787185cd965baef97f76 |
26-Aug-2014 |
Ruben Brunk <rubenbrunk@google.com> |
photosphere: Fix TextureView transforms.
Bug: 17098224
- WAR to set the SurfaceTexture default buffer dimensions to
the TextureView's layout dimensions to avoid bad
scaling/translation in TextureView's HardwareLayer transform.
Change-Id: I9e7d6e6cb33d806470cb11f00d45b97218ee7c11
ndroid/camera/app/CameraAppUI.java
|
| fb172acde20561b03b2279673857b8bea71d81e7 |
21-Aug-2014 |
Alan Newberger <alann@google.com> |
Remove one shot callback workaround in VideoModule for L
Since there was a framework fix for the issue, we don't need
to do an extra preview callback when entering video if on L.
Bug: 16649297
Bug: 17241994
Change-Id: I67fc67ef34a661daea6991c3b895b1c1bf6b9b85
ndroid/camera/VideoModule.java
ndroid/camera/util/ApiHelper.java
|
| 2634d27cd8e29bc6c9da00b88d3206f4b417e367 |
26-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am afb4c581: Merge "Enable mode options when capture is done." into ub-camera-glacier
* commit 'afb4c581786bb539e8753488e29a3d13fa8b43fd':
Enable mode options when capture is done.
|
| afb4c581786bb539e8753488e29a3d13fa8b43fd |
26-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Enable mode options when capture is done." into ub-camera-glacier
|
| cceaf1d5c7f9c26a9b38367412af066cd19c7e33 |
26-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Enable mode options when capture is done.
Bug: 17260403
Change-Id: I9e5c6c8516d5cdbb3fd303715af2a109b171c5f7
ndroid/camera/CaptureModule.java
|
| cee5f85cc5f4b11e2d3dfdb5f3693ae420543f6f |
26-Aug-2014 |
Igor Murashkin <iam@google.com> |
am 666c80b0: Merge "util: Optimal preview size picks smaller-than-display size in case of tie" into ub-camera-glacier
* commit '666c80b054d61bd813f0eaaa527632093f80ff02':
util: Optimal preview size picks smaller-than-display size in case of tie
|
| 666c80b054d61bd813f0eaaa527632093f80ff02 |
26-Aug-2014 |
Igor Murashkin <iam@google.com> |
Merge "util: Optimal preview size picks smaller-than-display size in case of tie" into ub-camera-glacier
|
| a48238515bd3b18335674098ac48c3e8633f53dd |
26-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am c0fe0b69: Show animated AF ring UI when lens is moving in continuous autofocus.
* commit 'c0fe0b6915004303a550047e68a2124edae9fdb2':
Show animated AF ring UI when lens is moving in continuous autofocus.
|
| c0fe0b6915004303a550047e68a2124edae9fdb2 |
26-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
Show animated AF ring UI when lens is moving in continuous autofocus.
Bug: 17028594
Change-Id: I0bb7c7cb3f8264304d4375f9f2b73608c8bfc1e5
ndroid/camera/CaptureModuleUI.java
ndroid/camera/FocusOverlayManager.java
ndroid/camera/VideoModule.java
ndroid/camera/ui/FocusOverlay.java
|
| 7b6c337aa86e469ec344f9655d314ed60f34dac9 |
26-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am 4d04e99b: Merge "Enable Face rectangles for debugging." into ub-camera-glacier
* commit '4d04e99b46642381b1f80b2a324454ebe741c9f3':
Enable Face rectangles for debugging.
|
| 4d04e99b46642381b1f80b2a324454ebe741c9f3 |
26-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
Merge "Enable Face rectangles for debugging." into ub-camera-glacier
|
| 62b4c3c0da3abd397b3790820359927784c50bc2 |
26-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
Enable Face rectangles for debugging.
Bug: 17028594
Change-Id: I57521aed991f93da1f5abdace6a72be0f1057dbe
ndroid/camera/CaptureModule.java
ndroid/camera/PhotoUI.java
ndroid/camera/debug/DebugPropertyHelper.java
ndroid/camera/one/v2/OneCameraImpl.java
ndroid/camera/ui/FaceView.java
|
| 4c2d8069149b3ecc504f3973b2155ce08f813931 |
26-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 46b3c730: Merge "Fix crash on Shamu since it\'s no longer camera 2 FULL." into ub-camera-glacier
* commit '46b3c730aa059bf5103922ae0c36c13a12e98223':
Fix crash on Shamu since it's no longer camera 2 FULL.
|
| 46b3c730aa059bf5103922ae0c36c13a12e98223 |
26-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Fix crash on Shamu since it's no longer camera 2 FULL." into ub-camera-glacier
|
| 868fcdca9b616239b7ed1162c394dc11526735cf |
25-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Fix crash on Shamu since it's no longer camera 2 FULL.
Bug: 17258194
Shamu is no longer a FULL camera2 device. So we change our OneCamera API
to create a V2 manager for partial deviced as well (but exclude legacy).
Change-Id: Ic095a754494047bc18d6e5e729bd9dd8a915753c
ndroid/camera/one/OneCameraManager.java
|
| cf2a8186cb72ea3df6f784cfdf259db5f5e67eb6 |
25-Aug-2014 |
Igor Murashkin <iam@google.com> |
util: Optimal preview size picks smaller-than-display size in case of tie
This fixes the case when 1600x1200 was selected over 1280x960 on a
Nexus 5 (display size 1920x1080); both preview sizes were equally close,
but the larger one was arbitrarily winning out.
Bug: 17216523
Change-Id: I163c29d5f46ad1b8b44825424c5202eb87855048
ndroid/camera/util/CameraUtil.java
|
| 6c64b406d4ce9597eb6b0ce2d9357d189d0753af |
25-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 4cc78bb3: set actionbar background to complete transparent
* commit '4cc78bb37f57f1499fe3d2eaf27e2a3b3e2e19bf':
set actionbar background to complete transparent
|
| 4cc78bb37f57f1499fe3d2eaf27e2a3b3e2e19bf |
21-Aug-2014 |
Spike Sprague <spikuru@google.com> |
set actionbar background to complete transparent
bug: 17114270
Change-Id: I309c98ed1ddbc0c322129e185ca4cd2df1f73520
ndroid/camera/CameraActivity.java
|
| 9fc70c0dffa07335db1f5513814dfe53d0dd467c |
23-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 392f249b: Merge "Enable switching within CaptureModule to HDR+ and back." into ub-camera-glacier
* commit '392f249b8295509cf6c31984f2420b876ca5a7ac':
Enable switching within CaptureModule to HDR+ and back.
|
| 392f249b8295509cf6c31984f2420b876ca5a7ac |
23-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Enable switching within CaptureModule to HDR+ and back." into ub-camera-glacier
|
| 4c1bffecc94cedf56d188eca40bd65a854746413 |
21-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Enable switching within CaptureModule to HDR+ and back.
Bug: 16945820
Change-Id: If92371129c5bf2a78b7623d745a8b86d218d32e1
ndroid/camera/CameraActivity.java
ndroid/camera/CaptureModule.java
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
ndroid/camera/module/ModulesInfo.java
ndroid/camera/one/OneCameraManager.java
ndroid/camera/one/v1/OneCameraManagerImpl.java
ndroid/camera/one/v2/OneCameraManagerImpl.java
ndroid/camera/util/ApiHelper.java
|
| ad862d7bab6f0b9456e65984d009dab2a387f460 |
23-Aug-2014 |
Sol Boucher <solb@google.com> |
am 799acabb: Merge "Switch from stepwise index-based zoom to a ratio-based scale" into ub-camera-glacier
* commit '799acabb5105aa1095740771457ce037422e492e':
Switch from stepwise index-based zoom to a ratio-based scale
|
| 799acabb5105aa1095740771457ce037422e492e |
23-Aug-2014 |
Sol Boucher <solb@google.com> |
Merge "Switch from stepwise index-based zoom to a ratio-based scale" into ub-camera-glacier
|
| 2192fbaaf598d4440a8d537a70095ea56bc9a5eb |
20-Aug-2014 |
Sol Boucher <solb@google.com> |
Switch from stepwise index-based zoom to a ratio-based scale
This brings the app up to date with the removal of the deprecated zoom methods
in the portability layer's CameraSettings class.
Bug: 17016658
Change-Id: Icb9f773188f7481d9af991d71feaff86379f5525
ndroid/camera/CaptureModuleUI.java
ndroid/camera/PhotoController.java
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
ndroid/camera/VideoController.java
ndroid/camera/VideoModule.java
ndroid/camera/VideoUI.java
ndroid/camera/ui/PreviewOverlay.java
|
| d260f0081ac69dbdef2ad9f012a76357dd603af0 |
22-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 0dec43e3: filmstrip actionbar tweaks
* commit '0dec43e3d77fd1f40093f2f3430a6e86d8d5307b':
filmstrip actionbar tweaks
|
| 0dec43e3d77fd1f40093f2f3430a6e86d8d5307b |
20-Aug-2014 |
Spike Sprague <spikuru@google.com> |
filmstrip actionbar tweaks
bug: 17114274
Change-Id: I70e7b285d27f81c87442bcc9d28ae7391d028568
ndroid/camera/CameraActivity.java
|
| f10aa3a6734e85f7cfbf9551cb3733a8c5524b66 |
22-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am fe1af189: Merge "filmstrip actionbar tweaks" into ub-camera-glacier
* commit 'fe1af189505e39b2d86af5b9fcec12f1661d1509':
filmstrip actionbar tweaks
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/util/CameraUtil.java
ndroid/camera/util/IntentHelper.java
|
| b56e20016dc15150e04cebcbda622b940a618de3 |
22-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am f859793d: Merge "Pick the preview size based on the selected picture size." into ub-camera-glacier
* commit 'f859793dddc0176774eb5bac28910e9783484d97':
Pick the preview size based on the selected picture size.
|
| f859793dddc0176774eb5bac28910e9783484d97 |
22-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Pick the preview size based on the selected picture size." into ub-camera-glacier
|
| 9a77507d67addb96f47aa6b0b65e3a5912dbfce2 |
21-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am ba97d192: animate filmstrip bottom button bar in and out from the bottom of the screen
* commit 'ba97d192b63ea81edf2dd6ca5cfbf6646a1f25a2':
animate filmstrip bottom button bar in and out from the bottom of the screen
|
| cbe861edcd0d094ee79d3eeaac48bb928017b600 |
21-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Pick the preview size based on the selected picture size.
Bug: 16654225
Also make this a function of the Camera device, since othe camera might
have to override the picture size.
Change-Id: Ieb6d1ffac0c3d7893416f9eae3232afde6d27240
ndroid/camera/CaptureModule.java
ndroid/camera/one/OneCamera.java
ndroid/camera/one/v2/OneCameraImpl.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
ndroid/camera/CameraActivity.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/app/FilmstripBottomPanel.java
|
| 104fa69c20f389d83fad0306421d88a01be79952 |
21-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 0382139c: Merge "Enable progress reporting for modules like HDR+." into ub-camera-glacier
* commit '0382139c99988f0002afeafb4c35f3599b1fc02f':
Enable progress reporting for modules like HDR+.
|
| d19eb82ad7d02e2dbced21674d64b42e6ee02eed |
21-Aug-2014 |
Senpo Hu <senpo@google.com> |
am 5b88f9a7: Merge "Change Shamu\'s default video resolution setting." into ub-camera-glacier
* commit '5b88f9a77fc997b922f99f0f5ec956b9caee42f9':
Change Shamu's default video resolution setting.
|
| 0382139c99988f0002afeafb4c35f3599b1fc02f |
21-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Enable progress reporting for modules like HDR+." into ub-camera-glacier
|
| 4d601a6f546f72166bd89bba352e0c2370b0a8c2 |
21-Aug-2014 |
Sol Boucher <solb@google.com> |
am dab267ce: Merge "TextureViewHelper workaround for SurfaceTexture/CameraProxy race" into ub-camera-glacier
* commit 'dab267ce77074883e7a3dd83f45c7722c16786dc':
TextureViewHelper workaround for SurfaceTexture/CameraProxy race
|
| 90f158340db39bca9ee5da4cf1d246adbcb03453 |
21-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Enable progress reporting for modules like HDR+.
Bug: 16945820
Change-Id: If6aba8ff5d2b973f4ea8112110695a84f897d881
ndroid/camera/CaptureModule.java
ndroid/camera/one/OneCamera.java
ndroid/camera/one/OneCameraManager.java
ndroid/camera/one/v2/OneCameraManagerImpl.java
ndroid/camera/ui/ProgressRenderer.java
|
| 5b88f9a77fc997b922f99f0f5ec956b9caee42f9 |
21-Aug-2014 |
Senpo Hu <senpo@google.com> |
Merge "Change Shamu's default video resolution setting." into ub-camera-glacier
|
| 20571ffe611c58d6d77e8d029b455f18c10181d5 |
19-Aug-2014 |
Senpo Hu <senpo@google.com> |
Change Shamu's default video resolution setting.
Bug: 17060480
Change-Id: I5ce8d2d2960d21856c0f13e9599d80b0edc03ec9
ndroid/camera/VideoModule.java
ndroid/camera/settings/Keys.java
ndroid/camera/settings/SettingsManager.java
|
| 0b832c3f870d0df792c64eebe46b14ff082e60d4 |
20-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am 2440815c: Merge "Add zoom to CaptureModule and OneCamera." into ub-camera-glacier
* commit '2440815caec484357250ddf0442e7cde2f4241ca':
Add zoom to CaptureModule and OneCamera.
|
| c4ad932aa0616e9ddd4faa5cec2e10987bc29755 |
20-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am e7476817: Remove logspam
* commit 'e74768171ae2172f43ab69ce38ecad26fd6471e4':
Remove logspam
|
| e74768171ae2172f43ab69ce38ecad26fd6471e4 |
20-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Remove logspam
Bug: 17157295
Change-Id: I7b6b505a7d389b59ae440dde7b30da78aaefa0c0
ndroid/camera/data/CameraDataAdapter.java
|
| 2440815caec484357250ddf0442e7cde2f4241ca |
20-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
Merge "Add zoom to CaptureModule and OneCamera." into ub-camera-glacier
|
| 26b3334755ffccc039249005435d5cc598d0689e |
20-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
Add zoom to CaptureModule and OneCamera.
Change-Id: Ia679d79a42e20e9033409939d0ca137ffcfbc75a
ndroid/camera/CaptureModule.java
ndroid/camera/CaptureModuleUI.java
ndroid/camera/debug/DebugPropertyHelper.java
ndroid/camera/one/AbstractOneCamera.java
ndroid/camera/one/OneCamera.java
ndroid/camera/one/v2/AutoFocusHelper.java
ndroid/camera/one/v2/OneCameraImpl.java
|
| 9da2ad5e355ceef748d83ac98dbaf1ad1b9f968f |
20-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 6d7ed701: Merge "roduce debug output for android.util.Pair" into ub-camera-glacier
* commit '6d7ed7016f28c240ae4901d076fc7f9583785c76':
roduce debug output for android.util.Pair
|
| 6d7ed7016f28c240ae4901d076fc7f9583785c76 |
20-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "roduce debug output for android.util.Pair" into ub-camera-glacier
|
| 7114133e8689ebc364cd4a6af222c5438b07bd74 |
19-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
roduce debug output for android.util.Pair
Bug: 16945820
Change-Id: Ia19c6fbfcaf2b1497a76e05600afc5a5b7364e50
ndroid/camera/util/CaptureDataSerializer.java
|
| be53d810b2b02f066ca0ace89a2dc3d56feca339 |
19-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am 03e17a62: Start moving AF and 3A to separate class; improve logging.
* commit '03e17a62b43e58c8da5cd6ee23fd0809a82ee448':
Start moving AF and 3A to separate class; improve logging.
|
| 03e17a62b43e58c8da5cd6ee23fd0809a82ee448 |
19-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
Start moving AF and 3A to separate class; improve logging.
Change-Id: Ib73415ffd5569fab8c2c3bf5ac0f35616d3ee697
ndroid/camera/one/v2/AutoFocusHelper.java
ndroid/camera/one/v2/OneCameraImpl.java
|
| dab267ce77074883e7a3dd83f45c7722c16786dc |
21-Aug-2014 |
Sol Boucher <solb@google.com> |
Merge "TextureViewHelper workaround for SurfaceTexture/CameraProxy race" into ub-camera-glacier
|
| 395bc17b71d13d97b3fd9f258fcf4d5748e66e5e |
21-Aug-2014 |
Sol Boucher <solb@google.com> |
TextureViewHelper workaround for SurfaceTexture/CameraProxy race
CameraController#getCurrentCameraId() now returns the ID of the requested camera
device if called after #requestCamera() but before the camera device has
finished opening. Assuming the most recent request is for the desired API level
and device, this resolves an issue where no transformation matrix was applied on
returning from the settings activity.
Bug: 17140996
Change-Id: Ideaec0072acd8aab77b98b213f260907f84270de
ndroid/camera/app/CameraController.java
|
| 5eef91210b46e16fe71d72d49bb580ce7d335525 |
19-Aug-2014 |
Alan Newberger <alann@google.com> |
am 34264dab: Merge "Remove extra parent mode from array, and make PhotoModule scope string public" into ub-camera-glacier
* commit '34264dab0b30bfcc3af38c3211d5a9cf9f9932e6':
Remove extra parent mode from array, and make PhotoModule scope string public
|
| b04889b8d20d138f0e8b63c21eaa1f3faa0f67ac |
19-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 5f8927b9: Merge "tweak filmstrip show/hide background for Material Design" into ub-camera-glacier
* commit '5f8927b94ebed2a0710ed8c60acfbbe1d92bc437':
tweak filmstrip show/hide background for Material Design
|
| 5f8927b94ebed2a0710ed8c60acfbbe1d92bc437 |
19-Aug-2014 |
Spike Sprague <spikuru@google.com> |
Merge "tweak filmstrip show/hide background for Material Design" into ub-camera-glacier
|
| 3088f90d01e169c7b2ee626069a8714f695436f5 |
19-Aug-2014 |
Spike Sprague <spikuru@google.com> |
tweak filmstrip show/hide background for Material Design
bug: 17113925
Change-Id: I5d478e3e72346e4a333aa2399d339130c5ca4187
ndroid/camera/widget/FilmstripLayout.java
|
| a764124d1f239c23c687db52612cb7bbf64f77dd |
18-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 66d3d0d0: add functionality to enable/disable clicks on a MultiToggleImageButton without affecting its visual state.
* commit '66d3d0d0633324893b89e1ddec14a4710d8034c3':
add functionality to enable/disable clicks on a MultiToggleImageButton without affecting its visual state.
|
| 66d3d0d0633324893b89e1ddec14a4710d8034c3 |
18-Aug-2014 |
Spike Sprague <spikuru@google.com> |
add functionality to enable/disable clicks on a MultiToggleImageButton
without affecting its visual state.
bug: 17014507
Change-Id: I824e07d518cce9768cf48f4c50afe079ebff4121
ndroid/camera/ButtonManager.java
ndroid/camera/MultiToggleImageButton.java
ndroid/camera/PhotoModule.java
|
| d7c5f149afb234973fcfd362b641a74f7bf5da11 |
18-Aug-2014 |
Alan Newberger <alann@google.com> |
am 251402b0: Merge "Protect Camera2 functions from null CameraDeviceInfo" into ub-camera-glacier
* commit '251402b0765e6ca2093ed674fa15ca295896273f':
Protect Camera2 functions from null CameraDeviceInfo
|
| f551a8afe83e77961f3d6a59d0ab3281f6038564 |
16-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am a2dd9ea5: Fix orientation and move it to the util class so we can use it elsewhere.
* commit 'a2dd9ea5ba031128b9f0aa3852ff59991dd3008c':
Fix orientation and move it to the util class so we can use it elsewhere.
|
| 34264dab0b30bfcc3af38c3211d5a9cf9f9932e6 |
19-Aug-2014 |
Alan Newberger <alann@google.com> |
Merge "Remove extra parent mode from array, and make PhotoModule scope string public" into ub-camera-glacier
|
| 00a390e17672cc81bc15b8478f27019358e6d6a4 |
19-Aug-2014 |
Alan Newberger <alann@google.com> |
Remove extra parent mode from array, and make PhotoModule scope string public
When pruning modes, we neglected to remove one of the 'photo' parent modes.
This still worked because the last two entries were both 'photo'. Also,
making PhotoModule scope string public so it can be referred to by
other modules, to accomplish the same parent function as the array.
Bug: 17103121
Change-Id: I574e9a7c2db8bf2c86d810c930fbf510d5aa1a24
ndroid/camera/PhotoModule.java
|
| 251402b0765e6ca2093ed674fa15ca295896273f |
18-Aug-2014 |
Alan Newberger <alann@google.com> |
Merge "Protect Camera2 functions from null CameraDeviceInfo" into ub-camera-glacier
|
| a2dd9ea5ba031128b9f0aa3852ff59991dd3008c |
16-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Fix orientation and move it to the util class so we can use it elsewhere.
Bug: 16948752
Change-Id: Ic7bf2f01176d8f6f1e1a70940c35531e1a5a1cbc
ndroid/camera/one/v2/OneCameraImpl.java
ndroid/camera/util/CameraUtil.java
|
| 096e5b734a18dae5bdca5cc312ad61ce09568f3f |
16-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
DO NOT MERGE - Reverting accidentally merged 524943 into glacier.
We only want it in Haleakala, but it go into glacier through another CL.
Change-Id: Ie08ec3e0d1ad7637650c45bf1908a04267464935
ndroid/camera/app/CameraApp.java
|
| 2040b56b1e0a93b38a558fa56e4b49970bd4b248 |
16-Aug-2014 |
Alan Newberger <alann@google.com> |
Protect Camera2 functions from null CameraDeviceInfo
When the underlying camera fails, the camera1 agent
returns null for CameraDeviceInfo. Guard against this case
where it is used in app upgrading and settings.
Bug: 16982203
Change-Id: I7e4686e508993f0d0fc03eaa9e0b5dc312016eae
ndroid/camera/settings/AppUpgrader.java
ndroid/camera/settings/CameraSettingsActivity.java
|
| 8563d90f706ac7505014d59fda2bcef92c221c6e |
16-Aug-2014 |
Sol Boucher <solb@google.com> |
Merge "Move preview transform matrix code into portability library" into ub-camera-glacier
|
| 8c8fb114ad4e121c4c1f3d726632dffbb32bda13 |
12-Aug-2014 |
Sol Boucher <solb@google.com> |
Move preview transform matrix code into portability library
This allows it to be calculated differently depending on the backing camera API,
which means that camera2 preview streams can be (and are!) displayed upright.
Bug: 16875535
Change-Id: I58fa86098a8b8eddc8f864b93d1e92672c40a1de
ndroid/camera/TextureViewHelper.java
ndroid/camera/app/CameraAppUI.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
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoModule.java
ndroid/camera/app/CameraController.java
ndroid/camera/app/CameraProvider.java
ndroid/camera/settings/AppUpgrader.java
ndroid/camera/settings/CameraSettingsActivity.java
|
| a69d497fd44faab8afe65b748dfede715ea7239f |
15-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
Merge "Reset 3A regions during CONTINUOUS_PICTURE passive scanning per camera2 API." into ub-camera-glacier
|
| 34ac0609e30601fe2ce9b2338a173d7740ab3f82 |
15-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
Reset 3A regions during CONTINUOUS_PICTURE passive scanning per camera2 API.
Bug: 17028594
Change-Id: I8ce7dbd12f2b14a50068d8b034e7a80d8840f012
ndroid/camera/one/v2/OneCameraImpl.java
|
| fa7b92c1ee99bc6734c06bb50445cffae94e8197 |
15-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Add ability to add a ready-state changed listener to the camera." into ub-camera-glacier
|
| e3ad4352a23ddb21350d356e0947905d1e635911 |
15-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Add ability to add a ready-state changed listener to the camera.
Bug: 16945820
Bug: 16948752
This enables us to hook up memory intense cameras and make sure we don't
activate the shutter button if the camera is not ready.
Change-Id: I70a31c76e063d775c844404ee9e20e583fa233e3
ndroid/camera/CaptureModule.java
ndroid/camera/one/AbstractOneCamera.java
ndroid/camera/one/OneCamera.java
ndroid/camera/one/v2/OneCameraImpl.java
|
| 064f851a063c80be4e6cc3f1716ff19b605e4865 |
15-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
Hold touch to focus target in 3A UI debug mode.
Bug: 17028594
Change-Id: I6d60f2a891cc8ab33c2165438295950bf46095b3
ndroid/camera/CaptureModule.java
|
| 886bcc4694071c6bf797d18754021af21a237eb9 |
15-Aug-2014 |
Alan Newberger <alann@google.com> |
Move preference subscreens to new Activities from Dialogs
Dialogs are hard to override for action bar settings. The documented
way to do navigation up is to receive menu events. So we no longer
use Dialogs, instead here we set up intents back to the same Activity,
and add an extra system to designate which subscreen to load. This uses
activity stack to do subscreen navigation, and then all screens hit the
same menu handler in the Activity which properly receives up navigation
signals via 'home'. This is not awesome but a better hack than the
Dialog one which depends on Action Bar internals; this approach only
uses public APIs.
Bug: 15756177
Change-Id: Iae2bd254e9cd5dde1d32d0997e5610f359662467
ndroid/camera/settings/CameraSettingsActivity.java
|
| 011c5cde82df9fee23f21891ae1c3da63ebe27ae |
15-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
Merge "Consolidate properties for debugging." into ub-camera-glacier
|
| 99a37d89f92cb0ad60cd57169c4845560ad0ffac |
15-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
Consolidate properties for debugging.
Change-Id: I052492375bf176622b38382579b2189d22a05349
ndroid/camera/CaptureModule.java
ndroid/camera/debug/DebugPropertyHelper.java
ndroid/camera/module/ModulesInfo.java
ndroid/camera/one/v2/OneCameraImpl.java
|
| c8c6efa020f830b54df4f06eba883ae8386d96b4 |
15-Aug-2014 |
Alan Newberger <alann@google.com> |
Merge "Move preference subscreens to new Activities from Dialogs" into ub-camera-glacier
|
| 51163540604bcb1deabfde4d83c54a86114cefd0 |
15-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Move code from GoogleCamera that dumps capture request metadata.
Bug: 16945820
Change-Id: Iff3f05b65687073a7272ed31644f34dc6187de21
ndroid/camera/app/CameraApp.java
ndroid/camera/one/AbstractOneCamera.java
ndroid/camera/one/v2/OneCameraImpl.java
ndroid/camera/util/CaptureDataSerializer.java
|
| 39384da05ba9ced9086dba64932878ce447c6230 |
14-Aug-2014 |
Spike Sprague <spikuru@google.com> |
add a range check in MultiToggleImageButton's bitmap combine function.
bug: overrideImageIds
Change-Id: I6e6b60ff8bb269fb25f7b788009103d9b9d02f19
ndroid/camera/MultiToggleImageButton.java
|
| 7951206e0157586d3c5676987343dc3ca81fc40e |
14-Aug-2014 |
Alan Newberger <alann@google.com> |
Merge "Revert our layout from FULLSCREEN to LAYOUT_FULLSCREEN" into ub-camera-glacier
|
| 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
ndroid/camera/CameraActivity.java
|
| eb9443226ee117779e2396c2f7cee9789af80cf8 |
13-Aug-2014 |
Spike Sprague <spikuru@google.com> |
Merge "update mode switch transition anims" into ub-camera-glacier
|
| 62c367f2199d826646cd2c665ed358b339c4b313 |
13-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Fix potential multi-threading bug where size can change before deletion." into ub-camera-glacier
|
| 16029b4a9e0d16cb05ca2202c0b91fe04d412443 |
13-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Fix potential multi-threading bug where size can change before deletion.
Bug: 16949503
Change-Id: I9b087cc257edfb2fe5368abaa7a73f910a6db3df
ndroid/camera/data/CameraDataAdapter.java
ndroid/camera/data/LocalDataList.java
|
| 59c784bf588b9e0994e9769001f624200e9b1027 |
05-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
[OC] Gcam OneCamera implementation.
Bug: 16948752
Change-Id: I0160de117c4ff7024e0d546f594b5777847d1833
ndroid/camera/CaptureModule.java
ndroid/camera/app/CameraApp.java
ndroid/camera/one/OneCamera.java
ndroid/camera/one/OneCameraManager.java
ndroid/camera/one/v2/OneCameraManagerImpl.java
ndroid/camera/util/CameraUtil.java
|
| 111863182bcc4b99bdaa727304d5800fc91dfd51 |
08-Aug-2014 |
Senpo Hu <senpo@google.com> |
Enable 4K video for Shamu.
- Add a new resolution setting for back camera video: "UHD 4K"
Bug: 16206549
Change-Id: I0b72f8100bc26b556099ad08e093273ccda0f25d
ndroid/camera/VideoModule.java
ndroid/camera/settings/SettingsUtil.java
|
| bbcf8774821a0e09a4cf6ab2472f89c83981326b |
14-Aug-2014 |
Spike Sprague <spikuru@google.com> |
Merge "Update option icon transitions" into ub-camera-glacier
|
| 955ae1f8afc9c4fb0905e0baece959efac9326f6 |
14-Aug-2014 |
Spike Sprague <spikuru@google.com> |
another tweak of the mode switch expanding circle, no more pre-white circle expansion.
bug: 16129873
Change-Id: I1f55dbd40be1801bf7bbf1f3646a8deeec5c353f
ndroid/camera/ui/TouchCircleDrawable.java
|
| 18b22b5963e8871e539edf669d96862eec72bb5d |
09-Aug-2014 |
Spike Sprague <spikuru@google.com> |
Update option icon transitions
bug: 16458864
Change-Id: Idaf4b60d357fa08635b55c1356450d3a4b2b48c2
ndroid/camera/MultiToggleImageButton.java
ndroid/camera/widget/ModeOptions.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
ndroid/camera/CameraActivity.java
|
| 0496fcaa51f88f6c753975473b971941e4090cfa |
25-Jul-2014 |
Spike Sprague <spikuru@google.com> |
update mode switch transition anims
bug: 16129873
Change-Id: Ibcb2e31162dc353de250db2a7d24726b05768ab1
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/ModeIconView.java
ndroid/camera/ui/ModeListView.java
ndroid/camera/ui/ModeSelectorItem.java
ndroid/camera/ui/TouchCircleDrawable.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
ndroid/camera/CameraActivity.java
ndroid/camera/settings/AppUpgrader.java
ndroid/camera/settings/SettingsUpgrader.java
ndroid/camera/settings/Upgrade.java
ndroid/camera/settings/UpgradeAosp.java
|
| 967b782837a22974f565f5bbc71bef7bc05fc878 |
08-Aug-2014 |
Puneet Lall <puneetl@google.com> |
Implemented NDK libjpeg wrapper for YUV420 encoding.
Bug: 16676082
Change-Id: I588b8023b401d5e713762563c9265ec3d774a678
ndroid/camera/exif/ExifData.java
ndroid/camera/one/v2/OneCameraImpl.java
ndroid/camera/util/JpegUtilNative.java
|
| 30ffce08f511fbed4cf18daa743778b541583351 |
01-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
[OC] Add autofocus (tap-to-focus, UI and pre-shot focus) to OneCamera.
Change-Id: Ic88359ad27b8e9ee0e74c8d1bd6ecb71fe3c24f0
ndroid/camera/CaptureModule.java
ndroid/camera/CaptureModuleUI.java
ndroid/camera/one/OneCamera.java
ndroid/camera/one/v2/OneCameraImpl.java
|
| e9a226f6c9cf7e59a57bab7e99926647fd0fc23f |
08-Aug-2014 |
Alan Newberger <alann@google.com> |
Merge "Route zoom value through to zoomIndex in device API" into ub-camera-glacier
|
| 282655f4d66c24c5d2f4ea696f53a345e31926dd |
08-Aug-2014 |
Alan Newberger <alann@google.com> |
Route zoom value through to zoomIndex in device API
Current UI is wired to track zoom index, so pass that in rather
than the unfinished new zoom ratio API. This finishes the fix for
zoom in the app.
Extended TODO already there. App should continue to operate until
one big refactor moves it form working with zoom indices, to working
with zoom ratios, no breakage in between.
Bug: 16527845
Change-Id: I8d88c3d34ba9ad85b1a115cf1249548a16722a38
ndroid/camera/PhotoModule.java
|
| 7f112487e7c19983fe36164494486a0a289a4831 |
08-Aug-2014 |
Sol Boucher <solb@google.com> |
Merge "Move display orientation calculations out of app code" into ub-camera-glacier
|
| 0be64680fb9b5a982b1b92730236ebb85e76624a |
07-Aug-2014 |
Spike Sprague <spikuru@google.com> |
rollback of b/16632474 and ag/518674
Change-Id: I77af6135ff339240bd52881550a0f42ec996f9c4
ndroid/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
ndroid/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
ndroid/camera/CameraActivity.java
|
| 0024b57e54c674d86ff15011867a0f44029e0c48 |
06-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "[OC] Enable flash support." into ub-camera-glacier
|
| e3dfd5a433e39d76578b379fe1539864cf924cee |
06-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
[OC] Migrate away from android.util.Size sinc we cannot use it in K.
Bug: 16654225
Change-Id: I2c0ea6b387b8ad38d6e49c84dca8bf2bde34e249
ndroid/camera/CaptureModule.java
ndroid/camera/CaptureModuleUtil.java
ndroid/camera/one/OneCamera.java
ndroid/camera/one/OneCameraManager.java
ndroid/camera/one/v1/OneCameraManagerImpl.java
ndroid/camera/one/v2/OneCameraImpl.java
ndroid/camera/one/v2/OneCameraManagerImpl.java
ndroid/camera/settings/ResolutionUtil.java
ndroid/camera/settings/SettingsManager.java
ndroid/camera/util/Size.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
ndroid/camera/CameraActivity.java
ndroid/camera/CaptureModule.java
ndroid/camera/app/AppController.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/one/OneCamera.java
ndroid/camera/one/v2/OneCameraImpl.java
ndroid/camera/one/v2/OneCameraManagerImpl.java
|
| 822b8e291d7141932837b1f3a9bf9bb670da9b6e |
03-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "[OC] Introduce OneCameraCreator so we can dynamically create a different version." into ub-camera-glacier
|
| 2b99192dea8a56097e2b9da13c01e4bbea59967a |
03-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
[OC] Introduce OneCameraCreator so we can dynamically create a different version.
Bug: 16654225
Change-Id: Iaf7d738b4405fa2e58cc5fc8af99d5ff2718f5a9
ndroid/camera/one/v2/OneCameraManagerImpl.java
|
| ad87534c5a9e77e3d8fa09ed0b8692caf2a34937 |
03-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Prevent monkey crash when deleting without data" into ub-camera-glacier
|
| 517f32a7cb9b154ddde61d91f1f562d2f1889984 |
01-Aug-2014 |
Alan Newberger <alann@google.com> |
Restore grid initialization logic to fix grid display on startup
The large settings refactor in ag/484817 not only changed settings
calls in ButtonManager.initializeGridLinesButton, it altered the
order of calls to create the button callback and to set the button
state. The prior implementation and this CL creates the callback,
and then sets state so that the callback, which controls display,
runs upon initial state setup of the button. Otherwise the grid
is not shown correctly on module startup.
Bug: 16687954
Change-Id: I482906d2d54a8545066dded3209b55ae4ad48bdb
ndroid/camera/ButtonManager.java
|
| 57bcd92f39d85427102f30be2c749c4a7bd4be96 |
01-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
[OC] Refactoring the session API before intgrating GCam into OneCamera
Bug: 16654225
Change-Id: I3fe6f46847ed6424310a81722c93c63be8b807a3
ndroid/camera/CaptureModule.java
ndroid/camera/one/OneCamera.java
ndroid/camera/one/v2/OneCameraImpl.java
ndroid/camera/processing/ProcessingService.java
ndroid/camera/session/CaptureSession.java
ndroid/camera/session/CaptureSessionManager.java
ndroid/camera/session/CaptureSessionManagerImpl.java
ndroid/camera/ui/BottomBar.java
|
| 73ec9851f8e92968ac50193916526afd8f1343fc |
25-Jul-2014 |
Sol Boucher <solb@google.com> |
Move display orientation calculations out of app code
Because they're needed by every app, these are being relocated into the
portability layer. As such, the CameraUtil#getDisplayOrientation() and
CameraUtil#getJpegRotation() methods are being replaced by the API-agnostic
CameraDeviceInfo.Characteristics#getPreviewOrientation() and
CameraDeviceInfo.Characteristics#getJpegOrientation() calls, respectively.
Change-Id: I5048e6f1a5ff655e4ea260b109e7c104bbe790b0
ndroid/camera/CaptureModule.java
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.java
ndroid/camera/util/CameraUtil.java
|
| 9a9a1086c10ea39ae9a2a5bdeeb600c2d7f940b6 |
31-Jul-2014 |
Andy Huibers <andyhuibers@google.com> |
Improved logging of foreground source type.
Change-Id: I6fdd5a52ec136f76352e006a8e95e88aac0ac1af
ndroid/camera/CameraActivity.java
|
| 00d8bbc97d970db9604474210554caa18935c7eb |
31-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "[OC] Hook new Capture module up, behind a system property." into ub-camera-glacier
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/CaptureModule.java
ndroid/camera/CaptureModuleUI.java
ndroid/camera/app/AppController.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/settings/ResolutionUtil.java
|
| f8df06c4a7d77b61e0f64448d15c50a2a61e263f |
31-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
[OC] Hook new Capture module up, behind a system property.
Bug: 16654225
Change-Id: I6be44fefce66c09425a1bebc1942489f6af7636c
ndroid/camera/module/ModulesInfo.java
|
| 2fe3a3ee942690f3b88218fcd941d6c93039bf82 |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
Prevent monkey crash when deleting without data
Bug: 16536894
Change-Id: I960c0d8f61b2909c7020d3c259fbad8f8c33bc05
ndroid/camera/CameraActivity.java
|
| f5e51ec44934d6d687267d2aff6386f5b728dd9f |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
[OC] Camera2-based OneCamera implementation.
Bug: 16654225
Change-Id: Icc544eac762b5494e6bb6c9e768b810c44e11cd9
ndroid/camera/one/v2/OneCameraImpl.java
ndroid/camera/one/v2/OneCameraManagerImpl.java
|
| fafb8d03af87476aa2986edeb2f6906292df516f |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
Put conversion from string to size into SettingsManager.
This way we don't have to spread this logic throughout the codebase.
Change-Id: I2d534d0756a9030e6d67b479a67c86c1cf596589
ndroid/camera/settings/SettingsManager.java
|
| ee36c5f591ac181a10692b2ec2b96de5251c4abb |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
Minor clean-up around the code base.
Change-Id: I2ed422dd4e0383739ccfa85a2e1e0e49e093e51d
ndroid/camera/FocusOverlayManager.java
ndroid/camera/PhotoModule.java
ndroid/camera/TextureViewHelper.java
ndroid/camera/VideoModule.java
ndroid/camera/data/CameraDataAdapter.java
ndroid/camera/settings/SettingsUtil.java
|
| b0d171e892dffbc7ce0caf7415f96fa513c6f3fc |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
[OC] Adding the OneCamera manager API.
Bug: 16654225
Change-Id: I070f36a6e6c1e756223ff69b74c3171547090f97
ndroid/camera/one/OneCameraManager.java
ndroid/camera/one/v1/OneCameraManagerImpl.java
ndroid/camera/one/v2/OneCameraManagerImpl.java
|
| 8c34b30b2ae23ceb13f2912fe8b6f83c27940306 |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
[OC] Add common abstract OneCamera class.
Bug: 16654225
Change-Id: I31c0ab4d8f4aa91447d384444258616648633de4
ndroid/camera/one/AbstractOneCamera.java
ndroid/camera/one/OneCamera.java
|
| 00c122a56f76d8ba523c324638e5083f721da01a |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
[OC] Version 1 of the nterface for OneCamera.
Bug: 16654225
Change-Id: Id4a6755577e327849ce60db7c5f64d76fb0a55b2
ndroid/camera/one/OneCamera.java
|
| a5c41b83304218f05a6454bf40fc6d236c218338 |
29-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
[OC] Adds a class with common utility functions for capture modules.
Bug: 16654225
Change-Id: I7bc2eaaa928fd152d20777086abef984421cc320
ndroid/camera/CaptureModuleUtil.java
|
| ffa2ff02c19d3b3a22e7ea700587a1c95bbf08b7 |
25-Jul-2014 |
Spike Sprague <spikuru@google.com> |
added a mutate() call when loading LayerDrawables.
bug: 16566825
Change-Id: I71a3a9787b73957f9c34bf1ffa52df41c3a5f6e6
ndroid/camera/ui/BottomBar.java
|
| df5989b01e4075d666b7d9e59ac70876b64b8932 |
25-Jul-2014 |
Alan Newberger <alann@google.com> |
Merge "Ensure default focus mode is continuous-picture" into ub-camera-glacier
|
| ec4a3fc5e87bf545fb718189b37538f1f1da68df |
25-Jul-2014 |
Alan Newberger <alann@google.com> |
Ensure default focus mode is continuous-picture
The new Settings infrastructure created a bug where the default
focus mode was 'auto', it needs to be continuous-picture. Fixing
here. Also adding verbose logging to the focus manager, could be
helpful in the future.
Bug: 16536583
Change-Id: I80b5905524f7fdaf69097ff8d2780da9f4ee2428
ndroid/camera/FocusOverlayManager.java
|
| 141263e22b53dadde54afbf416dec76812746578 |
25-Jul-2014 |
Spike Sprague <spikuru@google.com> |
Merge "ripple drawable on shutter button" into ub-camera-glacier
|
| d9516f276cd45f87edc7eafe6aa476eeab7c29e7 |
19-Jul-2014 |
Spike Sprague <spikuru@google.com> |
ripple drawable on shutter button
bug: 16123188
Change-Id: I390279acb7a4599f1aeba71b415f1261b9a9b97b
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/AnimatedCircleDrawable.java
ndroid/camera/ui/BottomBar.java
|
| 7bc335f4c69b8630f1619b2235991173fd8540a5 |
23-Jul-2014 |
Alan Newberger <alann@google.com> |
Upgrade mode index settings after mode indices were cleaned
Because we removed a mode index from the camera_mode_* sequence in res/values/arrays.xml,
upgrades were found to crash when settings referred to the old, now nonexistent mode value.
This CL preserves the arrays cleanup and adds a settings upgrade to convert modes to the
new value. Tested and works properly with mode preservation.
Bug: 16467318
Change-Id: I1352a940285687af38290250d7a06b5b7c421338
ndroid/camera/settings/UpgradeAosp.java
ndroid/camera/util/CameraUtil.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
ndroid/camera/CameraActivity.java
|
| 919bea1a10464f23aeb090a254ff36169d012e9a |
21-Jul-2014 |
Spike Sprague <spikuru@google.com> |
filmstip quantumification
bug: 16456504
Change-Id: I7c4c309671ae08179f22c35ffa7f3f9f5b4ee7ce
ndroid/camera/data/LocalMediaData.java
ndroid/camera/widget/FilmstripLayout.java
|
| f15d63e82af0ecf141ae16cae11b1cffbb8a8ab8 |
21-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
Make sure to set an audio source using MediaRecorder.
Bug: 16454543
Change-Id: Ic3bfb14bd7d37e5feda43e50eafcf2e687dee0ce
ndroid/camera/VideoModule.java
|
| 170384322694cbcebc2dc3e889ad1a5fb4bf0f25 |
18-Jul-2014 |
Spike Sprague <spikuru@google.com> |
Merge "clean out timelapse stuff from codebase" into ub-camera-glacier
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/app/CameraApp.java
ndroid/camera/app/CameraServices.java
ndroid/camera/settings/ManagedSwitchPreference.java
ndroid/camera/settings/SettingsManager.java
ndroid/camera/widget/IndicatorIconController.java
|
| 71ae986c611c49674d53af48e56da629de0ace93 |
18-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
resolved conflicts for merge of dcea7639 to ub-camera-glacier
Change-Id: I151b172d3e415a529375351ba8c038308e593cd5
|
| d020fbf12aff20c0a4b5cd1df67da6c2054e7408 |
17-Jul-2014 |
Spike Sprague <spikuru@google.com> |
clean out timelapse stuff from codebase
Change-Id: Ibcf07302f3eea2800d1f36c918ffe1c3d93b8018
ndroid/camera/VideoModule.java
ndroid/camera/VideoUI.java
ndroid/camera/settings/Keys.java
|
| dcea7639255d5bc4b17a5976bb84de1f6dba0ed1 |
17-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
Speed up lockscreen start-up time.
Bug: 16375664
- Avoid unnecessary camera open/close loop (~350ms)
- Don't load sounds and do other init work when not needed.
Change-Id: I5d297913dcbd3100034c3915119cc3c818f330d3
ndroid/camera/PhotoModule.java
ndroid/camera/app/CameraController.java
|
| 7868361295f07205fb49d3d03e886f1c7d2eb08b |
16-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
Store temp session data in 'cache' directory, not data.
Bug: 16010129
Change-Id: I06ff67d2917580e1f44bdb6686a9371239bccfef
ndroid/camera/session/SessionStorageManagerImpl.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
ndroid/camera/CameraActivity.java
|
| a899a5a5052921b6e5f172b8ebe06d1e2f84c7f4 |
15-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am 3c6de14b: Work in #onPictureTaken will be on a forked, so no need to fork the call.
* commit '3c6de14b6e771b6eab84428d53543b066324b8f0':
Work in #onPictureTaken will be on a forked, so no need to fork the call.
|
| 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
ndroid/camera/CameraActivity.java
|
| 3c6de14b6e771b6eab84428d53543b066324b8f0 |
14-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
Work in #onPictureTaken will be on a forked, so no need to fork the call.
Bug: 16217551
Change-Id: Id9f6e129d402d5e58cf5f63380c5bf13ab996431
ndroid/camera/PhotoModule.java
|
| 49e49adde177d7009df9682ce56e8c74cb6ed240 |
11-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am c17a5664: Prevent a monkey-generated crash.
* commit 'c17a56643186dee671bf6e7dec54cd558a7ecb2f':
Prevent a monkey-generated crash.
|
| c17a56643186dee671bf6e7dec54cd558a7ecb2f |
10-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
Prevent a monkey-generated crash.
Bug: 16191092
Change-Id: Ic6488381ed6f80184401c925dd6891126736019f
ndroid/camera/widget/FilmstripView.java
|
| 3755aefaafc21860394b3101177d9f730706e846 |
10-Jul-2014 |
Sol Boucher <solb@google.com> |
Merge "Eliminate unnecessary context in FragmentActivity constructor" into ub-camera-glacier
|
| c230d391d55b5ba7a3356695cd6d653e2b8d6ffb |
10-Jul-2014 |
Sol Boucher <solb@google.com> |
Eliminate unnecessary context in FragmentActivity constructor
Use the one that was already being obtained from getApplicationContext() instead
Change-Id: I1e0a62449b3ac9d02404fa623c0c62063069aae2
ndroid/camera/settings/CameraSettingsActivity.java
|
| acfad92c88807c99cf5165b201f24b9d76a8cdf4 |
09-Jul-2014 |
Sam Judd <judds@google.com> |
Fix crash when dimensions are <= 0.
Change-Id: I78531a025cf209b59f768ab38ea96ce0fe44c401
ndroid/camera/data/LocalMediaData.java
|
| c8f408861d5703f74eb8f6d31961c0768953f966 |
09-Jul-2014 |
Sol Boucher <solb@google.com> |
Merge "Make app build against updated frameworks/ex portability library" into ub-camera-glacier
|
| e36bb1bc05a9bc3ca795a6fd918979a05b284aad |
09-Jul-2014 |
Sam Judd <judds@google.com> |
Merge commit 'acfad92c' into merge_crash_fix
Conflicts:
src/com/android/camera/data/LocalMediaData.java
Change-Id: I7000054e53f1258a3de2253a816b091689d62da5
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/debug/DebugCameraProxy.java
ndroid/camera/settings/CameraSettingsActivity.java
ndroid/camera/settings/UpgradeAosp.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
|
| d921ee087e7becd6c99db9f9ef971e9611198414 |
07-Jul-2014 |
Spike Sprague <spikuru@google.com> |
am 04ebcbba: make ProgressOverlay obey left and top of its bounding Rect
* commit '04ebcbbab90b1ccb263247c39b45ade232de7b0a':
make ProgressOverlay obey left and top of its bounding Rect
|
| 04ebcbbab90b1ccb263247c39b45ade232de7b0a |
07-Jul-2014 |
Spike Sprague <spikuru@google.com> |
make ProgressOverlay obey left and top of its bounding Rect
bug: 16061226
Change-Id: If2e3748963191963f6e9223699cb0144a9710d5d
ndroid/camera/ui/ProgressOverlay.java
|
| 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
|
| c78ffd7011c9841697a75bdc48c7011e806afaee |
07-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
resolved conflicts for merge of ff899495 to ub-camera-glacier
Change-Id: Iffdde32e6f2b70d6a2fc560c6347a159678a7c60
|
| 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.
|
| 1d1af90609b7a896f74dda83b7f22f91b50e70cf |
08-Jul-2014 |
Spike Sprague <spikuru@google.com> |
Merge "previous CL ag/496035 disabled shutter button clicks during shimmy, scaling back a11y disabling on shutter button" into ub-camera-fishlake
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/BottomBar.java
|
| ff8994953ada97684f7c894151754d8631b719fa |
07-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Fix regression: Update summary when quality settings change." into ub-camera-fishlake
|
| 5697927e1650ba368916000a67b8f59dadbc59aa |
07-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
Fix regression: Update summary when quality settings change.
Bug: 16062378
Change-Id: I8532ac5bcc73a36b9666903d985bf13424819a0f
ndroid/camera/settings/CameraSettingsActivity.java
|
| 950fb6b8e8e7663f09428f25f2f788a3a191baef |
07-Jul-2014 |
Sam Judd <judds@google.com> |
Merge "Ensure photosphere/pano thumbs are always shown." into ub-camera-fishlake
|
| 8aa154952b2d32776759a83dd61437313069e1c8 |
07-Jul-2014 |
Sam Judd <judds@google.com> |
Ensure photosphere/pano thumbs are always shown.
Bug: 16061224
Change-Id: I93f1dd8a094cd4f00d06c02c13f51ef8545aa26c
ndroid/camera/CameraActivity.java
ndroid/camera/Storage.java
ndroid/camera/data/LocalSessionData.java
|
| 6d427e305cdd6e8a539b7d30858609868598feab |
07-Jul-2014 |
Spike Sprague <spikuru@google.com> |
am 1e89c919: Merge "disable talkback a11y navigation on mode list during shimmy" into ub-camera-fishlake
* commit '1e89c9196d91175bcc3d878c95b230d93cd5280c':
disable talkback a11y navigation on mode list during shimmy
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/ui/BottomBar.java
ndroid/camera/ui/ModeListView.java
|
| 1e89c9196d91175bcc3d878c95b230d93cd5280c |
07-Jul-2014 |
Spike Sprague <spikuru@google.com> |
Merge "disable talkback a11y navigation on mode list during shimmy" into ub-camera-fishlake
|
| c064750b7a02c4e495a30d2ec8d25319a9e49e9c |
03-Jul-2014 |
Spike Sprague <spikuru@google.com> |
disable talkback a11y navigation on mode list during shimmy
bug: 16042079
Change-Id: Ied2c91326d924bbd032853c84bba19a6dc75c992
ndroid/camera/ui/ModeListView.java
|
| 5f828150c228d69fdeafb06609918073d5be47f5 |
02-Jul-2014 |
Spike Sprague <spikuru@google.com> |
am 02b9b9af: move intent review image view to proper spot in view hierachy
* commit '02b9b9af097ac7886ec1d23392cd87c9fbcb186f':
move intent review image view to proper spot in view hierachy
|
| 02b9b9af097ac7886ec1d23392cd87c9fbcb186f |
02-Jul-2014 |
Spike Sprague <spikuru@google.com> |
move intent review image view to proper spot in view hierachy
bug: 15729563
Change-Id: Id0952399cc0577f728665843826dcc6f12c4429a
ndroid/camera/PhotoUI.java
|
| 70310d793f9b2e80bd85698718818da7bf8b72e3 |
02-Jul-2014 |
Sascha Häberling <haeberling@google.com> |
am d2922674: Merge "Pass the real file length to MediaStore." into ub-camera-fishlake
* commit 'd2922674e622c924b288c42d8e468812ad548de2':
Pass the real file length to MediaStore.
|
| 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
ndroid/camera/CameraActivity.java
|
| d2922674e622c924b288c42d8e468812ad548de2 |
01-Jul-2014 |
Sascha Häberling <haeberling@google.com> |
Merge "Pass the real file length to MediaStore." into ub-camera-fishlake
|
| c66ab6c9dee4aa8ce8eb9c2f737eae07f881b6de |
27-Jun-2014 |
Angus Kong <shkong@google.com> |
Pass the real file length to MediaStore.
Bug:15115507
And also a little code clean/rearrangement.
Change-Id: I65ceec4c0489f965473c29cad684190f966b9218
ndroid/camera/MediaSaverImpl.java
ndroid/camera/Storage.java
|
| af374822959b95dd8ede91a03fa43b9bcf60cd83 |
01-Jul-2014 |
Doris Liu <tianliu@google.com> |
Merge "DO NOT MERGE Revert "Remove workaround for K-MR1 that registers redundant preview callbacks"" into ub-camera-fishlake
|
| 1b515da04984c90d4f43dbd921503c20ebda9201 |
01-Jul-2014 |
Doris Liu <tianliu@google.com> |
DO NOT MERGE Revert "Remove workaround for K-MR1 that registers redundant preview callbacks"
Since there is a small percentage of users still on K-MR1 as of June 30, we
will revert this CL for fishlake (only).
This reverts commit 2c8ac0ad7e1951d1c7314f4ac304dc7a920bd20d.
Bug: 15986316
Change-Id: I10283032e2873d07a51cfc697801b04977b3b18f
ndroid/camera/PhotoModule.java
ndroid/camera/util/ApiHelper.java
|
| 8d92caac9849e962de3c22b5e327ab4f8fb9b0bc |
01-Jul-2014 |
Spike Sprague <spikuru@google.com> |
am 9f3d01d9: volume button cancels ongoing countdown prevent volume button from doing anything during intent capture review
* commit '9f3d01d9c5d2200882de76e309db55d74d950110':
volume button cancels ongoing countdown prevent volume button from doing anything during intent capture review
|
| 9f3d01d9c5d2200882de76e309db55d74d950110 |
30-Jun-2014 |
Spike Sprague <spikuru@google.com> |
volume button cancels ongoing countdown
prevent volume button from doing anything during intent capture review
bug: 15141921
Change-Id: Icf974de09eb59e92bcce4a14aaa4775e21043c13
ndroid/camera/PhotoModule.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/BottomBar.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
ndroid/camera/CameraActivity.java
|
| 09e134056bf85ee87855a44bfc5d8e7b055fe2e9 |
28-Jun-2014 |
Andy Huibers <andyhuibers@google.com> |
Fix build.
Change-Id: I463f525e6097f8705257c5d18a88689216e40123
ndroid/camera/FocusOverlayManager.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
ndroid/camera/CameraActivity.java
ndroid/camera/settings/CameraSettingsActivity.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
ndroid/camera/CameraActivity.java
ndroid/camera/data/CameraDataAdapter.java
ndroid/camera/data/ImageModelLoader.java
ndroid/camera/data/LocalData.java
ndroid/camera/data/LocalMediaData.java
ndroid/camera/data/LocalSessionData.java
ndroid/camera/data/VideoModelLoader.java
|
| 4db887668a02bf3b66b8bc793bcda47c46d9948b |
27-Jun-2014 |
Sascha Haeberling <haeberling@google.com> |
resolved conflicts for merge of b0870db3 to ub-camera-glacier
Change-Id: If06d585dbbe2d47ea92679bf63428fc2c0bca923
|
| c8df26bf7eae262a13036fb63eb1a4926735cabf |
25-Jun-2014 |
Sascha Haeberling <haeberling@google.com> |
am 57d4f74f: Ensure focusAndCapture() is called on the main thread.
* commit '57d4f74f9c4a122d87748d1ace36b0ec9bbd54a5':
Ensure focusAndCapture() is called on the main thread.
|
| 57d4f74f9c4a122d87748d1ace36b0ec9bbd54a5 |
25-Jun-2014 |
Sascha Haeberling <haeberling@google.com> |
Ensure focusAndCapture() is called on the main thread.
Bug: 15863231
Change-Id: Ieeb6e61e5a8a1d49832ea8ded6de2575afb0bdad
ndroid/camera/PhotoModule.java
|
| b0870db3a70635da8994a7fac688060d73a1dd8f |
25-Jun-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Clean-Up formatting." into ub-camera-fishlake
|
| e3f9ce2932f65ad537c550d0ff1f0c5fa4856ee7 |
25-Jun-2014 |
Sascha Haeberling <haeberling@google.com> |
Clean-Up formatting.
Change-Id: I6278a2fe8e0bf8059021d5a247c0282c16cfd3c8
ndroid/camera/FocusOverlayManager.java
|
| b7c7d9a067cd52a27cfbaf0714a2074f972d836d |
19-Jun-2014 |
Andy Huibers <andyhuibers@google.com> |
Add metadata to capture and tap to focus events.
Bug: 15646701
Change-Id: Id290935839a81cfe86e9a503849207d828f33225
ndroid/camera/FocusOverlayManager.java
ndroid/camera/PhotoModule.java
ndroid/camera/ShutterButton.java
ndroid/camera/VideoModule.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/FocusOverlay.java
ndroid/camera/ui/TouchCoordinate.java
ndroid/camera/widget/ModeOptionsOverlay.java
|
| 3689d13faefecdaf96d3f880b9095edf443a3c07 |
24-Jun-2014 |
Sol Boucher <solb@google.com> |
Merge "Replace uses of CameraDevice#getCameraInfos() and CameraInfo" into ub-camera-glacier
|
| b6605381f4c2d5d086cdd04c8d3972f22e525be5 |
24-Jun-2014 |
Andy Huibers <andyhuibers@google.com> |
Fix merge conflict.
Change-Id: Ie3a66e4c362355d0dfff1597efcb9d69234266e6
ndroid/camera/FocusOverlayManager.java
|
| 4a0042759b9521bf36dc0d8576a628f4a29b2bb5 |
24-Jun-2014 |
Andy Huibers <andyhuibers@google.com> |
am b7c7d9a0: Add metadata to capture and tap to focus events.
* commit 'b7c7d9a067cd52a27cfbaf0714a2074f972d836d':
Add metadata to capture and tap to focus events.
|
| 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.
|
| 21a623616162d75978945766f2c2246655c1e4f4 |
24-Jun-2014 |
Erin Dahlgren <edahlgren@google.com> |
resolved conflicts for merge of e1547937 to ub-camera-glacier
Change-Id: I15a68218f95e0f9192d91628ad972a7815e4ec73
|
| e154793797851ebbfac13e209ae49696e9c43912 |
24-Jun-2014 |
Erin Dahlgren <edahlgren@google.com> |
Hard reset HDR off if HDR+ is supported.
HDR and HDR+ should not be activatable on the same phone.
Our app depends on this assumption, so in case the app is killed
in some way to prevents us from going to gms core to get the
right information about hdr/hdr+ support, force HDR off if HDR+
at any point is supported.
Bug: 15310749
Change-Id: I450671d1218679ac8d413a01c5857030ba6ea32a
ndroid/camera/PhotoModule.java
|
| 03fd3baf01447f30246b095f816ce337562d15f7 |
24-Jun-2014 |
Andy Huibers <andyhuibers@google.com> |
Merge "Add maximum zoom level and time to view events." into ub-camera-fishlake
|
| 43e1813a5d4a59ef107768eb523d76ae2781cb02 |
20-Jun-2014 |
Sol Boucher <solb@google.com> |
Replace uses of CameraDevice#getCameraInfos() and CameraInfo
This API 1--specific portability library method has been removed. All
non-debugging direct uses of the Camera.CameraInfo class are also addressed by
this commit.
Change-Id: I551bb1476a26f79c101892336d0bf99e4fa823cc
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.java
ndroid/camera/app/CameraController.java
ndroid/camera/app/CameraProvider.java
ndroid/camera/debug/DebugCameraProxy.java
ndroid/camera/settings/CameraSettingsActivity.java
ndroid/camera/settings/SettingsUtil.java
ndroid/camera/settings/UpgradeAosp.java
ndroid/camera/util/CameraUtil.java
|
| c8924b2ec3788ca6d0f0af5ca749e5fe7be125ce |
21-May-2014 |
Andy Huibers <andyhuibers@google.com> |
Add maximum zoom level and time to view events.
Bug: 15646701
Change-Id: I7c1de761fc10486b417a25ebc8469cebaf840a1c
ndroid/camera/CameraActivity.java
ndroid/camera/data/LocalSessionData.java
ndroid/camera/filmstrip/FilmstripController.java
ndroid/camera/widget/FilmstripLayout.java
ndroid/camera/widget/FilmstripView.java
|
| ecf1014c0349e42cb7689eb61fb33d91aa69590e |
21-Jun-2014 |
Sascha Häberling <haeberling@google.com> |
Merge "Revert "Memory window analysis in Camera2. Bug: 13280671"" into ub-camera-fishlake
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/app/MemoryManager.java
ndroid/camera/app/MemoryManagerImpl.java
ndroid/camera/app/MemoryQuery.java
|
| 5802ea97c0bab7cf17e3567ea31ec943e812b31d |
20-Jun-2014 |
Erin Dahlgren <edahlgren@google.com> |
Protect settings logging with a verbose flag
Change-Id: Icacc7c01971ed2077b9e5999e042a2b9ba031cfd
ndroid/camera/settings/SettingsManager.java
|
| 28973902b2fb8158ece59282218938ca3e060f6b |
20-Jun-2014 |
Erin Dahlgren <edahlgren@google.com> |
dump default and global shared preferences
Change-Id: Ia9f3780dc6a0725badb3214fc9388fab9007dbb5
ndroid/camera/settings/SettingsManager.java
|
| b4f3483bfb5c2edcaefd0b44e84bb080e46502c8 |
17-Apr-2014 |
Kevin Gabayan <gabayan@google.com> |
Memory window analysis in Camera2.
Bug: 13280671
Change-Id: I22249e6aeb76dca2fe79e49d3bd75c089fa7936f
ndroid/camera/CameraActivity.java
ndroid/camera/app/MemoryManager.java
ndroid/camera/app/MemoryManagerImpl.java
ndroid/camera/app/MemoryQuery.java
|
| 831347d9cb5c0e3f03db7aadfc89e91b231104e7 |
17-Jun-2014 |
Angus Kong <shkong@google.com> |
Migrate to use new CameraSettings.
Totally get rid of Camera.Parameters.
Change-Id: I147b88f77ecab52600088a10417c3eac3d7fd340
ndroid/camera/CameraActivity.java
ndroid/camera/CurrentModuleProvider.java
ndroid/camera/FocusOverlayManager.java
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.java
ndroid/camera/app/AppController.java
ndroid/camera/hardware/HardwareSpecImpl.java
ndroid/camera/settings/SettingsManager.java
ndroid/camera/settings/SettingsUtil.java
ndroid/camera/util/CameraUtil.java
|
| ca8d97fda9470f575de1f68ee90d6ab0047644e0 |
19-Jun-2014 |
Sascha Haeberling <haeberling@google.com> |
Fixing bad manual merge to fix build.
Change-Id: I0a96593e72240de5e1ffa562704b30932fddb4f3
ndroid/camera/PhotoModule.java
|
| 2b04dc42f691257742a7f73f4d9e803ea4a0d7ed |
19-Jun-2014 |
Kevin Gabayan <gabayan@google.com> |
Merge "Memory window analysis in Camera2. Bug: 13280671" into ub-camera-fishlake
|
| c0e03f7d0ace14431e2390d76c90080d4970cf69 |
19-Jun-2014 |
Sascha Haeberling <haeberling@google.com> |
resolved conflicts for merge of 1bf0889d to ub-camera-glacier
Change-Id: I5281f7c362165bc5a9d0790601fd8d1b29a71d4e
|
| 32048fec74f6b964c07aa71608e26a8eb1343fa6 |
19-Jun-2014 |
Angus Kong <shkong@google.com> |
Fix the build.
Change-Id: Id8acdcfa54721042e61e16a9c50381e61414f778
ndroid/camera/debug/DebugCameraProxy.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
ndroid/camera/ButtonManager.java
ndroid/camera/CameraActivity.java
ndroid/camera/FocusOverlayManager.java
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.java
ndroid/camera/app/AppController.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/app/CameraController.java
ndroid/camera/app/CameraProvider.java
ndroid/camera/app/ModuleManagerImpl.java
ndroid/camera/module/ModuleController.java
ndroid/camera/settings/CameraSettingsActivity.java
ndroid/camera/settings/DefaultsStore.java
ndroid/camera/settings/Keys.java
ndroid/camera/settings/SettingsCache.java
ndroid/camera/settings/SettingsManager.java
ndroid/camera/settings/SettingsUtil.java
ndroid/camera/settings/Upgrade.java
ndroid/camera/settings/UpgradeAosp.java
ndroid/camera/widget/IndicatorIconController.java
|
| 1bf0889d8a40ef9f1a56439563ae76688fd69716 |
18-Jun-2014 |
Sascha Haeberling <haeberling@google.com> |
Remote shutter should focus before taking a photo.
Bug: 13929364
Change-Id: Ib6fd83186100c67aef613f93bb8f9ea780da9ceb
ndroid/camera/PhotoModule.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
ndroid/camera/CameraActivity.java
ndroid/camera/CameraErrorCallback.java
ndroid/camera/CameraModule.java
ndroid/camera/CameraTestDevice.java
ndroid/camera/FocusOverlayManager.java
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
ndroid/camera/VideoModule.java
ndroid/camera/VideoUI.java
ndroid/camera/app/CameraController.java
ndroid/camera/app/CameraProvider.java
ndroid/camera/cameradevice/AndroidCameraCapabilities.java
ndroid/camera/cameradevice/AndroidCameraManagerImpl.java
ndroid/camera/cameradevice/AndroidCameraSettings.java
ndroid/camera/cameradevice/CameraActions.java
ndroid/camera/cameradevice/CameraCapabilities.java
ndroid/camera/cameradevice/CameraCapabilitiesFactory.java
ndroid/camera/cameradevice/CameraDeviceInfo.java
ndroid/camera/cameradevice/CameraManager.java
ndroid/camera/cameradevice/CameraManagerFactory.java
ndroid/camera/cameradevice/CameraSettings.java
ndroid/camera/cameradevice/CameraStateHolder.java
ndroid/camera/cameradevice/DispatchThread.java
ndroid/camera/cameradevice/HistoryHandler.java
ndroid/camera/cameradevice/Size.java
ndroid/camera/debug/DebugCameraProxy.java
ndroid/camera/hardware/HardwareSpecImpl.java
ndroid/camera/module/ModuleController.java
ndroid/camera/settings/CameraPictureSizesCacher.java
ndroid/camera/settings/CameraSettingsActivity.java
ndroid/camera/settings/ResolutionUtil.java
ndroid/camera/settings/SettingsManager.java
ndroid/camera/settings/SettingsUtil.java
ndroid/camera/util/CameraUtil.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
ndroid/camera/CameraActivity.java
ndroid/camera/FocusOverlayManager.java
ndroid/camera/PhotoModule.java
ndroid/camera/app/CameraApp.java
ndroid/camera/app/CameraServices.java
|
| d24c9b02d6e1a72af01e0acbd654fc199100a10a |
13-Jun-2014 |
Angus Kong <shkong@google.com> |
Don't pass empty list of areas.
Some devices won't work well if we pass in an empty list of focusing or metering
areas.
Change-Id: Iff6bfd37a7d551b12c43e88cf8d4934472837257
ndroid/camera/cameradevice/AndroidCameraManagerImpl.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
|
| 85b403a59418d198204ec50d0807c2fdd30247a7 |
13-Jun-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 51c55dac: Merge "GoogleHelp affordance in CameraSettingsActivity" into ub-camera-fishlake
* commit '51c55dac6950dca94a40b3fb685fb075ca47120e':
GoogleHelp affordance in CameraSettingsActivity
|
| 0f54163a7b0ee554e7083e0108153cbc6c9f32e5 |
13-Jun-2014 |
Doris Liu <tianliu@google.com> |
resolved conflicts for merge of 2c8ac0ad to ub-camera-glacier
Change-Id: If25e388378acefe505c6bd8fed530eacb0bef6eb
|
| 2c8ac0ad7e1951d1c7314f4ac304dc7a920bd20d |
13-Jun-2014 |
Doris Liu <tianliu@google.com> |
Remove workaround for K-MR1 that registers redundant preview callbacks
as MR2 has already started rollout, and is expected to finish before F release.
Change-Id: Ifa37a91f5270bb820d5bfb8db03bf21a71f225ff
ndroid/camera/PhotoModule.java
ndroid/camera/util/ApiHelper.java
|
| 811a814dc3a2221048c1b23206a9d0a4bf9b6901 |
13-Jun-2014 |
Kevin Gabayan <gabayan@google.com> |
Merge "Revert "MotionManager for motion-aware focus unlock in Camera2 Bug: 14222601"" into ub-camera-fishlake
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/FocusOverlayManager.java
ndroid/camera/PhotoModule.java
ndroid/camera/app/CameraApp.java
ndroid/camera/app/CameraServices.java
|
| ebba3288da5628c9ea7579b63139aa7b7312e137 |
02-Jun-2014 |
Kevin Gabayan <gabayan@google.com> |
MotionManager for motion-aware focus unlock in Camera2
Bug: 14222601
Change-Id: Id118e12c8f789c74c8fc2e32ec208ff943b97e49
ndroid/camera/CameraActivity.java
ndroid/camera/FocusOverlayManager.java
ndroid/camera/PhotoModule.java
ndroid/camera/app/CameraApp.java
ndroid/camera/app/CameraServices.java
|
| 51c55dac6950dca94a40b3fb685fb075ca47120e |
13-Jun-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "GoogleHelp affordance in CameraSettingsActivity" into ub-camera-fishlake
|
| c78accd603200e0e7e61056b259c2ac9758abf4b |
09-Jun-2014 |
Erin Dahlgren <edahlgren@google.com> |
GoogleHelp affordance in CameraSettingsActivity
Uses the first Account available to launch a GoogleHelp
Activity from the CameraSettingsActivity. We remove the
affordance if the phone has no registered Accounts.
Bug: 8426295
Change-Id: I02f8f0accd76c19d42cbbd68c4043c174f13d424
ndroid/camera/settings/CameraSettingsActivity.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
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
ndroid/camera/VideoModule.java
ndroid/camera/VideoUI.java
ndroid/camera/cameradevice/AndroidCameraCapabilities.java
ndroid/camera/cameradevice/AndroidCameraManagerImpl.java
ndroid/camera/cameradevice/AndroidCameraSettings.java
ndroid/camera/cameradevice/CameraActions.java
ndroid/camera/cameradevice/CameraCapabilities.java
ndroid/camera/cameradevice/CameraManager.java
ndroid/camera/cameradevice/CameraSettings.java
ndroid/camera/cameradevice/Size.java
ndroid/camera/debug/DebugCameraProxy.java
ndroid/camera/hardware/HardwareSpecImpl.java
ndroid/camera/settings/CameraPictureSizesCacher.java
ndroid/camera/settings/CameraSettingsActivity.java
ndroid/camera/settings/ResolutionUtil.java
ndroid/camera/settings/SettingsManager.java
ndroid/camera/settings/SettingsUtil.java
ndroid/camera/util/CameraUtil.java
ndroid/camera/util/Size.java
|
| ba0e617e663bd95f0440ae2eac27ea5f7b3dc662 |
11-Jun-2014 |
Spike Sprague <spikuru@google.com> |
Merge "disambiguate media types in capture/filmstrip a11y descriptions" into ub-camera-glacier
|
| aebd86d6c0a06bc142091f4aa830ce67d5e88fd5 |
11-Jun-2014 |
Spike Sprague <spikuru@google.com> |
am 40468e76: Merge "intent captrue review gets its own ImageView! instead of relying on a stopped preview TextureView" into ub-camera-fishlake
* commit '40468e76810596e1dd9ec6bfeb05d0ab7bf38b4e':
intent captrue review gets its own ImageView! instead of relying on a stopped preview TextureView
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/CameraModule.java
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/data/LocalMediaData.java
ndroid/camera/widget/PeekView.java
|
| bacc2584a7c03931643dd4c2d95d6c3f302e4a00 |
13-Jun-2014 |
Kevin Gabayan <gabayan@google.com> |
Merge "MotionManager for motion-aware focus unlock in Camera2 Bug: 14222601" into ub-camera-fishlake
|
| 514d6872acfcbf683f72bd9a4a67480b08e576c6 |
09-Jun-2014 |
Sol Boucher <solb@google.com> |
Refactor CameraManager hierarchy to support new implementations
This relocates several components of the implementation class
AndroidCameraManagerImpl to higher levels in the inheritence hierarchy, where
they can be reused by other implementations of the CameraManager interface:
- AndroidCameraManager.DispatchThread is moved into its own file
- The core (history-tracking) pieces of CameraManager.CameraHandler are moved
into their own HistoryHandler class, which the former is made to inherit
- The constants defined in AndroidCameraManagerImpl for use in its nested
CameraHandler class are moved into a separate class called CameraActions
- AndroidCameraManagerImpl.CameraStateHolder is moved into its own file
- Those CallbackForward classes that aren't tied to Android's Camera1 API are
moved directly into the CameraManager interface
Change-Id: I5f3e1eb72039a0018ce2277e3ec6289bfa4ccec3
ndroid/camera/cameradevice/AndroidCameraManagerImpl.java
ndroid/camera/cameradevice/CameraActions.java
ndroid/camera/cameradevice/CameraManager.java
ndroid/camera/cameradevice/CameraStateHolder.java
ndroid/camera/cameradevice/DispatchThread.java
ndroid/camera/cameradevice/HistoryHandler.java
|
| b4a2222950f627a39267636fba19649974cb8734 |
22-May-2014 |
Spike Sprague <spikuru@google.com> |
intent captrue review gets its own ImageView!
instead of relying on a stopped preview TextureView
bug: 13526027
Change-Id: I40d2a97d15ed5d27b0000fa0a6d96af03ad55cf9
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
ndroid/camera/TextureViewHelper.java
ndroid/camera/ui/BottomBar.java
|
| 84b40c7defd0a7a0028c39fcd78543ad68862fc0 |
02-Jun-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Timeout on wait lock and throw exception to prevent ANR." into ub-camera-fishlake
|
| d832f3173eab04a0c1838e0aefcd72ff5c45228b |
22-May-2014 |
Spike Sprague <spikuru@google.com> |
secure camera -> gallery launch hardcoded to
launch G+ photos
bug: 15141761
Change-Id: I5009d58917bbc1ea41b01d22b4c2e0f168f6b5cc
ndroid/camera/CameraActivity.java
ndroid/camera/util/IntentHelper.java
|
| 2321d7ade0013a877fa94ad23185419ebf29c98b |
27-May-2014 |
Seth Raphael <magicseth@google.com> |
am cbf2efe0: Merge "Fix NPE in CountdownSoundPlayer." into ub-camera-everglades
* commit 'cbf2efe047cc9db55076fca6e69116c32c72845a':
Fix NPE in CountdownSoundPlayer.
|
| cbf2efe047cc9db55076fca6e69116c32c72845a |
27-May-2014 |
Seth Raphael <magicseth@google.com> |
Merge "Fix NPE in CountdownSoundPlayer." into ub-camera-everglades
|
| 20e20c91089b37e0c6cec07899d6cbe4e6e8151c |
27-May-2014 |
Seth Raphael <magicseth@google.com> |
Fix NPE in CountdownSoundPlayer.
Bug: 15222673
Change-Id: I7068bbc8f4c063691647131160bf53fa4dd5f0f3
ndroid/camera/PhotoModule.java
|
| 2b64549838ad847101434e68c5cec0e3c40ea994 |
24-May-2014 |
Erin Dahlgren <edahlgren@google.com> |
Timeout on wait lock and throw exception to prevent ANR.
Change-Id: I5b0d2b8c0384d32ed0d870e5db6003991524fc38
ndroid/camera/cameradevice/AndroidCameraManagerImpl.java
|
| 3fcd36f648b4ec966cd64aad28ad5014a2d9b948 |
24-May-2014 |
Angus Kong <shkong@google.com> |
am 7dc0fade: Merge "Restore the flash setting after HDR is off." into ub-camera-everglades
* commit '7dc0fade17f0ee776997b7400870265a65d52dd4':
Restore the flash setting after HDR is off.
|
| 7dc0fade17f0ee776997b7400870265a65d52dd4 |
24-May-2014 |
Angus Kong <shkong@google.com> |
Merge "Restore the flash setting after HDR is off." into ub-camera-everglades
|
| 3699c41faa811a872f4dc1ab152d9a7ea89a0590 |
24-May-2014 |
Angus Kong <shkong@google.com> |
Restore the flash setting after HDR is off.
bug:15162517
Change-Id: I4b159b6f9067ddde975d3b7692b781a9b18c8eed
ndroid/camera/PhotoModule.java
|
| 2a6ef32408d199826c11cdc209db913c51ebd402 |
23-May-2014 |
Sam Judd <judds@google.com> |
am 8f93077d: Merge "Include signature in cache keys for Glide." into ub-camera-everglades
* commit '8f93077d99183cb0f4d1af365e696a251d89ec4d':
Include signature in cache keys for Glide.
|
| 837d8f2687cdf53e657c03c1d01b1c5df3902442 |
23-May-2014 |
Sam Judd <judds@google.com> |
Include signature in cache keys for Glide.
Bug: 14625920
Change-Id: Id010bae14ac163523215e3afad712a423aad5875
ndroid/camera/Storage.java
ndroid/camera/data/ImageModelLoader.java
ndroid/camera/data/VideoModelLoader.java
|
| 35a25188cbed3d0bebdb9294cc700ac2427c3511 |
23-May-2014 |
Doris Liu <tianliu@google.com> |
resolved conflicts for merge of 26aa92bf to ub-camera-fishlake
Change-Id: Ifa2422c520a78357b6e920b88ec5a744bb694a95
|
| 26aa92bf5942bfde16621c6833c14ba0e1ea8b5e |
23-May-2014 |
Doris Liu <tianliu@google.com> |
Add cling for settings button
Bug: 14683799
Change-Id: Id3785036f2b1642963dfa43f3272da314d952f2d
ndroid/camera/app/CameraAppUI.java
ndroid/camera/settings/SettingsCache.java
ndroid/camera/settings/SettingsManager.java
ndroid/camera/ui/ModeListView.java
ndroid/camera/widget/SettingsCling.java
|
| 9d1d4f46fe60ce4d3e6f61ce1c108e4ec1530d2e |
23-May-2014 |
Angus Kong <shkong@google.com> |
am 293b9628: Merge "Disable flash when HDR mode is on." into ub-camera-everglades
* commit '293b9628a54ee3871f448e6f66fdc00d82d4adf2':
Disable flash when HDR mode is on.
|
| 293b9628a54ee3871f448e6f66fdc00d82d4adf2 |
23-May-2014 |
Angus Kong <shkong@google.com> |
Merge "Disable flash when HDR mode is on." into ub-camera-everglades
|
| 566c1a949c34b532ff74ac4a9f5264fca73039bb |
23-May-2014 |
Seth Raphael <magicseth@google.com> |
am b0800488: Merge "Address some code style nits." into ub-camera-everglades
* commit 'b0800488c841a3bd5238e5f9015c941c2c4f8f8c':
Address some code style nits.
|
| 8ec64616380fca92a10a264b232f49af83bf539e |
23-May-2014 |
Seth Raphael <magicseth@google.com> |
am 75b16d7d: Merge "Convert camera size settings on upgrade" into ub-camera-everglades
* commit '75b16d7da5922cec46c1385bc3c175a09cbb1b08':
Convert camera size settings on upgrade
|
| 313a52110de0a0dabfdadc604637127700f28220 |
22-May-2014 |
Seth Raphael <magicseth@google.com> |
Address some code style nits.
Change-Id: I0672216f0d2ccbd7f708a974a573a46e732d4580
ndroid/camera/TextureViewHelper.java
|
| 5b577a679eb790c4c8ad410436cca0a8cad28f7d |
22-May-2014 |
Seth Raphael <magicseth@google.com> |
Convert camera size settings on upgrade
In older versions of the camera, the settings
wsere stored as “small”, “medium”, or “default”.
Now the app expects absolute resolutions to be
stored in the settings.
Bug: 14617489
Change-Id: I9d9373b6bc98c1c2ba25cb51de122673b3edef6a
ndroid/camera/settings/CameraSettingsActivity.java
ndroid/camera/settings/SettingsManager.java
ndroid/camera/settings/SettingsUtil.java
|
| 8c07fe97bc1b28e3c612ab9979e439cdeb8e59f2 |
22-May-2014 |
Angus Kong <shkong@google.com> |
Disable flash when HDR mode is on.
bug:15162517
Change-Id: Ia63b36e5c83e805080ed518a1d6a9bdf686b7d44
ndroid/camera/PhotoModule.java
|
| 164916d6c6caac9e87bf4422ad128f87af02c1b7 |
22-May-2014 |
Seth Raphael <magicseth@google.com> |
am 73b109e7: Merge "Fix jank when switching in and out of hdr+ Also, fix alignment of grid and progress indicator" into ub-camera-everglades
* commit '73b109e793fb8ca3c894eb3df5ee42e1f2a7e27f':
Fix jank when switching in and out of hdr+ Also, fix alignment of grid and progress indicator
|
| 274f6e962e9e7f94cfc4ceb9cad3fa8dc0a80abb |
22-May-2014 |
Seth Raphael <magicseth@google.com> |
Fix jank when switching in and out of hdr+
Also, fix alignment of grid and progress indicator
Bug: 15140487
Bug: 14470553
Change-Id: I09303f16b01a380e617343fa0f3cbe2c12fda147
ndroid/camera/PhotoModule.java
ndroid/camera/TextureViewHelper.java
ndroid/camera/app/CameraAppUI.java
|
| b8600b2b798f6b28e405380a17bd5f6fc23fcc82 |
22-May-2014 |
Andy Huibers <andyhuibers@google.com> |
Change naming to indicate that date taken is in milliseconds.
Change-Id: I5c78e897113c5b1405201b29b4f6f90850112ab6
ndroid/camera/data/LocalData.java
ndroid/camera/data/LocalMediaData.java
|
| 721c26135557442771a4b444178292d30eab8543 |
22-May-2014 |
Andy Huibers <andyhuibers@google.com> |
am 404126e3: Merge "Cache queries to Camera.Parameters.getSupportedPictureSizes() to speed up opening of Settings page." into ub-camera-everglades
* commit '404126e35045c82ca89a090407cd3ad4a8cf2c3b':
Cache queries to Camera.Parameters.getSupportedPictureSizes() to speed up opening of Settings page.
|
| 53b6bde32a3d77fcd583f398aacc42cbec3fc8c5 |
21-May-2014 |
Doris Liu <tianliu@google.com> |
am 6809eb84: Freeze the screen during camera switch to hide visual distraction
* commit '6809eb840f358430d3032c0532fb42d6dcfd06ef':
Freeze the screen during camera switch to hide visual distraction
|
| cb6f97e6ab9327c96e4970cbb0eaf10f088752b6 |
21-May-2014 |
Spike Sprague <spikuru@google.com> |
am 42c07cc1: Merge "added Filmstrip viewtype tags for session, secure album placeholder, and camera preview" into ub-camera-everglades
* commit '42c07cc1cca3460c67a4243747074c822e11025f':
added Filmstrip viewtype tags for session, secure album placeholder, and camera preview
|
| a47397fbc04c90de4b47f98040d558821b369a01 |
21-May-2014 |
Andy Huibers <andyhuibers@google.com> |
am 489293d4: Merge "Add timer duration to UsageStatistics." into ub-camera-everglades
* commit '489293d47c7c9f8e63b3462c87fe8e30ebe138e8':
Add timer duration to UsageStatistics.
|
| 92f48c51f3bb4bf66867f6c5a29df41d50ed91b5 |
21-May-2014 |
Angus Kong <shkong@google.com> |
am ff988f23: Merge "Reset the decoder in ZoomView when data updated." into ub-camera-everglades
* commit 'ff988f235df9d4d8c26a976be2c57ede41d7f7b6':
Reset the decoder in ZoomView when data updated.
|
| cc520451ef4fd0a4936d1ec4f54ed6b4fd2aeaf4 |
21-May-2014 |
Angus Kong <shkong@google.com> |
am cfe9acc2: Ignore metadata update callback after paused.
* commit 'cfe9acc23fcc5f2c00dde46e7e5c3c5192f5e9f0':
Ignore metadata update callback after paused.
|
| dc5243e6e9689c7ac4386862bb354e614d58f44f |
21-May-2014 |
Seth Raphael <magicseth@google.com> |
Merge commit '3cfd962f' into manualmerge
Conflicts:
src/com/android/camera/app/CameraAppUI.java
Change-Id: I662798190c39dc889291a6eb3add77244875467f
|
| 404126e35045c82ca89a090407cd3ad4a8cf2c3b |
21-May-2014 |
Andy Huibers <andyhuibers@google.com> |
Merge "Cache queries to Camera.Parameters.getSupportedPictureSizes() to speed up opening of Settings page." into ub-camera-everglades
|
| c0a85390c2045ae1a8a7c9686c24c5136509a620 |
21-May-2014 |
Sascha Haeberling <haeberling@google.com> |
am b514cdea: Merge "Show timer option in HDR+ mode and as disabled." into ub-camera-everglades
* commit 'b514cdeaffca52da323481293e3b9117de04d375':
Show timer option in HDR+ mode and as disabled.
|
| a1b1f0e7bacb9b01c1b6f2a824a230b0cf940c41 |
21-May-2014 |
Spike Sprague <spikuru@google.com> |
am 6522c97a: Merge "add null check to RadioOptions set selected option" into ub-camera-everglades
* commit '6522c97a8bbbc7834dfd9f10dba4ddef910334a7':
add null check to RadioOptions set selected option
|
| 6809eb840f358430d3032c0532fb42d6dcfd06ef |
21-May-2014 |
Doris Liu <tianliu@google.com> |
Freeze the screen during camera switch to hide visual distraction
Bug: 14818897
Change-Id: If6df2a6d0783e27807f01f8518244df33c24647f
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoModule.java
ndroid/camera/app/AppController.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/ModeTransitionView.java
|
| b4dd5659a53c625a611080db0d41f52f2b421354 |
21-May-2014 |
Sam Hasinoff <hasinoff@google.com> |
Rename HDR+ torch to flash
For consistency, and to better reflect the meaning of the
flash button in HDR+ mode, change the naming from 'torch'
to 'flash'.
Even though flash in HDR+ mode is implemented by turning
the flash on in torch mode for a burst of frames, HDR+ flash
is closer in meaning to a regular photographic flash than
a flashlight/torch.
Bug: 15133661
Change-Id: I3ac4bb3dac455be1341575966910c2a86e29644b
ndroid/camera/ButtonManager.java
ndroid/camera/app/CameraAppUI.java
|
| 90c7ad5159145227349b389074d2d9437a1243a4 |
21-May-2014 |
Andy Huibers <andyhuibers@google.com> |
Cache queries to Camera.Parameters.getSupportedPictureSizes() to speed up
opening of Settings page.
Bug: 15090067
Change-Id: I1eea24adbf55bf6a73b02b129b725415edca859c
ndroid/camera/PhotoModule.java
ndroid/camera/settings/CameraPictureSizesCacher.java
ndroid/camera/settings/CameraSettingsActivity.java
ndroid/camera/util/Size.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
ndroid/camera/CameraActivity.java
ndroid/camera/data/CameraPreviewData.java
ndroid/camera/data/LocalMediaData.java
ndroid/camera/data/LocalSessionData.java
|
| 489293d47c7c9f8e63b3462c87fe8e30ebe138e8 |
21-May-2014 |
Andy Huibers <andyhuibers@google.com> |
Merge "Add timer duration to UsageStatistics." into ub-camera-everglades
|
| ff988f235df9d4d8c26a976be2c57ede41d7f7b6 |
21-May-2014 |
Angus Kong <shkong@google.com> |
Merge "Reset the decoder in ZoomView when data updated." into ub-camera-everglades
|
| d1d28254c1413b4d7725df7d7b38e2a1f2f42e28 |
20-May-2014 |
Angus Kong <shkong@google.com> |
Reset the decoder in ZoomView when data updated.
The BitmapRegionDecoder has to be reset to load the new bitmap when the data is
updated. Also recycle() should be called when the decoder is not used anymore.
bug:14625920
Change-Id: Ib7284059320a71adb66204c4834e5b75802142fc
ndroid/camera/ui/ZoomView.java
ndroid/camera/widget/FilmstripView.java
|
| cfe9acc23fcc5f2c00dde46e7e5c3c5192f5e9f0 |
21-May-2014 |
Angus Kong <shkong@google.com> |
Ignore metadata update callback after paused.
bug:14814811
Change-Id: Iaa2185ce533b88b75ec13840b30a6df7c04b0ddb
ndroid/camera/CameraActivity.java
|
| 3cfd962fc550918a4003daabc90678a00766957d |
21-May-2014 |
Seth Raphael <magicseth@google.com> |
Merge "Add Letterboxing for HDR+" into ub-camera-everglades
|
| 6382c70a769b9ec94a3b0372ee27c0cd075e8be8 |
20-May-2014 |
Seth Raphael <magicseth@google.com> |
Add Letterboxing for HDR+
Bug: 14470553
Change-Id: I37d9270b5ad2917c8c19a8aa4abc04967f03621c
ndroid/camera/CameraActivity.java
ndroid/camera/TextureViewHelper.java
ndroid/camera/app/AppController.java
ndroid/camera/app/CameraAppUI.java
|
| 547d7c840265e645a41a9f58ad296e4fbdfcbaca |
21-May-2014 |
Andy Huibers <andyhuibers@google.com> |
Add timer duration to UsageStatistics.
Bug: 14364757
Change-Id: I74505834d4d7b94154722c63cf52110d410c955b
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.java
|
| b514cdeaffca52da323481293e3b9117de04d375 |
21-May-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Show timer option in HDR+ mode and as disabled." into ub-camera-everglades
|
| 4333fac867f6f6a11235b16d305dd197093b44d5 |
21-May-2014 |
Sascha Haeberling <haeberling@google.com> |
Show timer option in HDR+ mode and as disabled.
Bug: 15089347
Change-Id: I366cd0b553808d55136c141bc1efec6ada9ee9b0
ndroid/camera/PhotoModule.java
ndroid/camera/app/CameraAppUI.java
|
| 6522c97a8bbbc7834dfd9f10dba4ddef910334a7 |
21-May-2014 |
Spike Sprague <spikuru@google.com> |
Merge "add null check to RadioOptions set selected option" into ub-camera-everglades
|
| 5c3ef9c902ca797ab5d5688f7e712d0ec7f7b2fc |
21-May-2014 |
Seth Raphael <magicseth@google.com> |
am ffc06a4e: Merge "Preparatory commit for 16:9 hdr+" into ub-camera-everglades
* commit 'ffc06a4e9d20712c216b93878e16feaaa291bbf5':
Preparatory commit for 16:9 hdr+
|
| ffc06a4e9d20712c216b93878e16feaaa291bbf5 |
21-May-2014 |
Seth Raphael <magicseth@google.com> |
Merge "Preparatory commit for 16:9 hdr+" into ub-camera-everglades
|
| 774f110f1aab1c28ca039943f5c3093cc0b27d98 |
21-May-2014 |
Spike Sprague <spikuru@google.com> |
add null check to RadioOptions set selected option
bug: 15080601
Change-Id: Icbe0baedc0f629ec0946ea6f94862d29edbb4fce
ndroid/camera/ButtonManager.java
ndroid/camera/ui/RadioOptions.java
|
| 556a174d0f7cbd49cd8aaec6a5359440b42352c6 |
21-May-2014 |
Doris Liu <tianliu@google.com> |
am cf404d02: Merge "Fix mode list layout issue after initial aspect ratio selection" into ub-camera-everglades
* commit 'cf404d02a998629bda92a05dfb2bcb9c800e693a':
Fix mode list layout issue after initial aspect ratio selection
|
| cf404d02a998629bda92a05dfb2bcb9c800e693a |
21-May-2014 |
Doris Liu <tianliu@google.com> |
Merge "Fix mode list layout issue after initial aspect ratio selection" into ub-camera-everglades
|
| c50c15162fa8073720df885cf4d4ec2612c91c55 |
21-May-2014 |
Sascha Haeberling <haeberling@google.com> |
am d849d5f0: Merge "Update cling in filmstrip at the right times." into ub-camera-everglades
* commit 'd849d5f00977194276053396d8bceb438b0bbea6':
Update cling in filmstrip at the right times.
|
| d849d5f00977194276053396d8bceb438b0bbea6 |
21-May-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Update cling in filmstrip at the right times." into ub-camera-everglades
|
| b908d933736a4ec042aad065b7ebf2059bbcac97 |
21-May-2014 |
Doris Liu <tianliu@google.com> |
Fix mode list layout issue after initial aspect ratio selection
Bug: 15088302
Change-Id: I10e6dcc7ce026c3ebb3fa676ebf0b7d7e0eda732
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/ModeListView.java
|
| a9845c7cda0b2c820158b9b8017b8d10b54c2150 |
21-May-2014 |
Spike Sprague <spikuru@google.com> |
am 99ec3b37: Merge "make recycleView() look at the view type passed in (via a view tag) instead of relying on the data adapter" into ub-camera-everglades
* commit '99ec3b376058a7beef96490fda29cea987ee7b04':
make recycleView() look at the view type passed in (via a view tag) instead of relying on the data adapter
|
| 99ec3b376058a7beef96490fda29cea987ee7b04 |
21-May-2014 |
Spike Sprague <spikuru@google.com> |
Merge "make recycleView() look at the view type passed in (via a view tag) instead of relying on the data adapter" into ub-camera-everglades
|
| bb3b39b13a7097a55e585e8d6197057500847708 |
20-May-2014 |
Spike Sprague <spikuru@google.com> |
make recycleView() look at the view type passed in
(via a view tag) instead of relying on the data adapter
bug: 14599203
Change-Id: I5809aef03a0b6e29dd80512ee0593aac0001d0a5
ndroid/camera/data/LocalMediaData.java
ndroid/camera/widget/FilmstripView.java
|
| d8d674ab7267cc4b7184f853a73242b47a9e4abd |
20-May-2014 |
Alan Newberger <alann@google.com> |
am 36ea98a7: Merge "Port Glide loading to use Files rather than String URIs" into ub-camera-everglades
* commit '36ea98a790be5bd08817a8b194bd9be48b6be3de':
Port Glide loading to use Files rather than String URIs
|
| 36ea98a790be5bd08817a8b194bd9be48b6be3de |
20-May-2014 |
Alan Newberger <alann@google.com> |
Merge "Port Glide loading to use Files rather than String URIs" into ub-camera-everglades
|
| 3c33ca256349fabf9cea404291f60ae261860441 |
20-May-2014 |
Alan Newberger <alann@google.com> |
Port Glide loading to use Files rather than String URIs
We encountered a bug with colons in filenames. Current integration
passes file paths as basic URIs into Glide, which then gets
confuses detecting paths with colons as they parse into schemes.
This CL instead bakes the assumption that LocalMedia paths are
file paths, into the app level. Tested with all modes and
captures, formerly buggy filmstrip items now display.
Bug: 15025417
Change-Id: I91efa1e7b66d630e402b23a36b2a05c9783370a3
ndroid/camera/data/ImageModelLoader.java
ndroid/camera/data/VideoModelLoader.java
|
| 0fa27e89c7ad6128197fcfe6e6e916e538244ec0 |
20-May-2014 |
Sascha Haeberling <haeberling@google.com> |
Update cling in filmstrip at the right times.
Bug: 14885868
Change-Id: I5ffc6eb59c949cb6317923eba05cedb0f4065629
ndroid/camera/widget/ExternalViewerButton.java
|
| f4b7cf9f3dce05c1e093c577cfc0030d8fcb0161 |
20-May-2014 |
Doris Liu <tianliu@google.com> |
am c40bb33f: Merge "Fix squished preview after startup apsect ratio selection" into ub-camera-everglades
* commit 'c40bb33fef476f0edccc2234520eb48f49571118':
Fix squished preview after startup apsect ratio selection
|
| c40bb33fef476f0edccc2234520eb48f49571118 |
20-May-2014 |
Doris Liu <tianliu@google.com> |
Merge "Fix squished preview after startup apsect ratio selection" into ub-camera-everglades
|
| 6a8ae81aac9487e87d23a8afc65b2dc0c409c418 |
20-May-2014 |
Doris Liu <tianliu@google.com> |
Fix squished preview after startup apsect ratio selection
Bug: 15085976
Change-Id: I7f787799201caf13da42d4f7b56806a494ae7c80
ndroid/camera/PhotoModule.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
ndroid/camera/CameraActivity.java
ndroid/camera/CaptureLayoutHelper.java
ndroid/camera/TextureViewHelper.java
ndroid/camera/app/AppController.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/settings/SettingsUtil.java
|
| 15473d4b69f4ad619aa10430e4bc86ab4fa815d0 |
14-May-2014 |
Erin Dahlgren <edahlgren@google.com> |
Add new hdr plus flash setting.
This setting will be used by GcamModule to manage their
torch mode. It should be different from the Camera 1 api
flash mode setting, because they are semantically different.
GcamModule needs to set enableHdrPlusFlash in the BottomBarSpec
to enable this feature.
Also normalize names, HDRPLUS/hdrplus -> HDR_PLUS/hdr_plus,
for consistency, to reflect the clear majority usage.
Depends on:
* GcamModule ag/465936
Bug: 13076855
Change-Id: I6fe5ab8b1c7b9fa1acd1181445748c0257d21ea4
ndroid/camera/ButtonManager.java
ndroid/camera/PhotoModule.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/settings/SettingsCache.java
ndroid/camera/settings/SettingsManager.java
ndroid/camera/widget/IndicatorIconController.java
|
| 203abe5913394239a1e888d71d56597b68f84f62 |
19-May-2014 |
Andy Huibers <andyhuibers@google.com> |
Add grid lines and flash states to capture logging.
Bug: 14364757
Change-Id: Ibf40c041d508f4406ead273dfdcb1c051a6f83a2
ndroid/camera/MediaSaverImpl.java
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.java
ndroid/camera/app/MediaSaver.java
|
| 29a2914d2e943e1ccc5bd3d3721a100c98617267 |
20-May-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Only show accessibility buttons when spoken feedback is enabled." into ub-camera-everglades
|
| d4c3333c99ece20b3125e86e1e3f6105b2bc9bdd |
20-May-2014 |
Sascha Haeberling <haeberling@google.com> |
Only show accessibility buttons when spoken feedback is enabled.
Bug: 15082416
Change-Id: I9d953781fd9107dd81058afab183e044a784fba9
ndroid/camera/app/CameraAppUI.java
|
| 4245502e9bba736e425c190894cfc928ae0b5e48 |
20-May-2014 |
Doris Liu <tianliu@google.com> |
Merge "Add back countdown timer" into ub-camera-everglades
|
| 6c75164c89f3bbd4f894b9c49a7914a24268a999 |
06-May-2014 |
Doris Liu <tianliu@google.com> |
Add back countdown timer
Bug: 14222651
Change-Id: I482ec942dd9d79c4ea0432140a96ba2fc5b29c57
ndroid/camera/ButtonManager.java
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/settings/SettingsCache.java
ndroid/camera/settings/SettingsManager.java
ndroid/camera/ui/BottomBar.java
ndroid/camera/ui/CountDownView.java
ndroid/camera/widget/IndicatorIconController.java
|
| e811b29f6707a6ea8f066e6f5b9cb0fc99d2dcd6 |
19-May-2014 |
Sascha Haeberling <haeberling@google.com> |
Change the texts in the aspect ratio selector screen.
Bug: 15024081
As per request from Jake, we don't show the megapixel count anymore but
instead show whether the result is cropped or full sensor. As we limit
this screen to N4 and N5, the texts can be static to cropped 16:9 and
full-sensor 4:3.
Change-Id: I309d52c050ddbce5fe3c85db417adf79129cd141
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
ndroid/camera/widget/AspectRatioDialogLayout.java
ndroid/camera/widget/AspectRatioSelector.java
|
| 1d943647c5b632588c4858ded04770e846341f1b |
19-May-2014 |
Sascha Haeberling <haeberling@google.com> |
Limit start-up screen to N4 + N5
Bug: 15024081
Change-Id: I1333a753bc3741d176765ab026cacc1358ab2fca
ndroid/camera/PhotoUI.java
|
| 05927e466d0288a0ea971ac543f5039246875f3b |
19-May-2014 |
Doris Liu <tianliu@google.com> |
Merge "Set a preview callback with a buffer size to force update preview callback stream" into ub-camera-everglades
|
| cb8215ef6efaf379adf0e0c45c655ac3ec9a5638 |
19-May-2014 |
Doris Liu <tianliu@google.com> |
Set a preview callback with a buffer size to force update preview callback stream
This is the workaround for the same issue that causes b/12210027. It was fixed
in KitKat MR2, so we are applying the workaround on KitKat and MR1.
Bug: 14954941
Change-Id: Ifba3f9d47769884e81a41277f858e5c7aef41803
ndroid/camera/PhotoModule.java
ndroid/camera/util/ApiHelper.java
|
| a7919c720c49d7aa9a033366a92f8b1828619a0f |
16-May-2014 |
Erin Dahlgren <edahlgren@google.com> |
Add hooks for disabling/enable the mode options toggle between captures.
Bug: 13982230
Change-Id: Ib2582420c2f7fd0038555aed0b23bfa8f151721b
ndroid/camera/app/CameraAppUI.java
ndroid/camera/widget/ModeOptionsOverlay.java
|
| 96867dc15d3a7582d94450adfdd6e33bbcb4c507 |
16-May-2014 |
Angus Kong <shkong@google.com> |
Merge "Update session data properly." into ub-camera-everglades
|
| f27f634824dcbd483a724ee05fb5d5f2bb7df01e |
16-May-2014 |
Alan Newberger <alann@google.com> |
Merge "Avoid creating dialog on an activity that is finishing" into ub-camera-everglades
|
| b19aba9c16bc68da92fae302c69c0200af0d6d13 |
16-May-2014 |
Alan Newberger <alann@google.com> |
Avoid creating dialog on an activity that is finishing
We have some stack traces in the wild indicating we are trying to
create a dialog on the CameraActivity while it is not in a valid
state to attach views. Adding an isFinishing check, see more info
in the following issue:
Bug: 13967353
Change-Id: Ic3c45fa362408f2641527497b15f67686d3aed79
ndroid/camera/util/CameraUtil.java
|
| d19b9b512d0dccd7faa3b7b8206b5d9117175107 |
16-May-2014 |
Angus Kong <shkong@google.com> |
Update session data properly.
bug:14969759
Change-Id: I39ba063e23482a03cf108931b6c686755dbec91e
ndroid/camera/data/LocalSessionData.java
|
| b32af4faa94a06aaefdd0e49392c9da0ec10bfb8 |
16-May-2014 |
Sascha Haeberling <haeberling@google.com> |
Format the megapixel value on the start screen same as settings.
Bug: 14955075
Change-Id: I1a57a0f9c884ce62cae97c77323c19c390fe2ee7
ndroid/camera/PhotoModule.java
|
| 20cc3ad8d462ab36c055dfeb12f6e5257df61db5 |
16-May-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Make new start-up screen accessible." into ub-camera-everglades
|
| 0d4f2b8fe779e66d1b8f0201fd0b92e5ea8e900b |
16-May-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Close mode options and mode list when needed." into ub-camera-everglades
|
| 256427babcb93dd3cdb11b6e23c47ecf82e5af19 |
15-May-2014 |
Sascha Haeberling <haeberling@google.com> |
Close mode options and mode list when needed.
Bug: 14834384
Bug: 14834783
Change-Id: Id96859d57a84c66489a0e764ba2950cc47f7c886
ndroid/camera/CameraActivity.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/widget/ModeOptionsOverlay.java
|
| aea8fc9fd14cb8be4f9e492fd3f95286f090c42c |
16-May-2014 |
Spike Sprague <spikuru@google.com> |
Merge "fix some lingering exposure comp value calculation errors hide exposure comp button if not supported in hardware" into ub-camera-everglades
|
| 156f3e5b41cd2049230b1423c455763d31738693 |
16-May-2014 |
Spike Sprague <spikuru@google.com> |
fix some lingering exposure comp value calculation errors
hide exposure comp button if not supported in hardware
bug: 13967706
Change-Id: I6aa6963929c00ed06122fa2e2dfd778844bcc280
ndroid/camera/ButtonManager.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/widget/IndicatorIconController.java
|
| 5fad0cadb4268c15ae765a538c5b287d8a3c1a5b |
15-May-2014 |
Sascha Haeberling <haeberling@google.com> |
Make new start-up screen accessible.
Bug: 14994854
- Make the text on locaiton dialog a label of checkbox
- Add content description to aspect ratio image buttons
Change-Id: Idbb633205eec35be2ec891e7c8ea079475c5ea3d
ndroid/camera/widget/AspectRatioSelector.java
ndroid/camera/widget/LocationDialogLayout.java
|
| 1cced0e893b6a2f37d447a049c1c3c08affd2d41 |
15-May-2014 |
Seth Raphael <magicseth@google.com> |
Use approximate descriptions of aspect ratios.
165:98 should be considered close enough and
described as 16:9
Bug: 14970245
Change-Id: I75ca9507e453d057c6db3e4fd99cebb0ee01d4f7
ndroid/camera/settings/CameraSettingsActivity.java
ndroid/camera/settings/ResolutionUtil.java
|
| 86ea01ab99c34b2391b90bc0526ede283377f73c |
15-May-2014 |
Spike Sprague <spikuru@google.com> |
Merge "pass FilmstripView accessibilty focus events to children" into ub-camera-everglades
|
| ae5fa1499ab1d6d1d421228859d13ac45ad1d437 |
13-May-2014 |
Spike Sprague <spikuru@google.com> |
pass FilmstripView accessibilty focus events to children
bug: 14815653
Change-Id: I48c381f87600f2eb11ce29942cdbc7e5f2dae446
ndroid/camera/data/LocalMediaData.java
ndroid/camera/widget/FilmstripView.java
|
| 8670da6b3631e82d864e55d36a1ccaf9b2c7a8ce |
15-May-2014 |
Sascha Haeberling <haeberling@google.com> |
Always reset position and visibility of newly added views.
Bug: 14887734
Bug: 14832742
Change-Id: I9d41a9e89f9c008aad819b52c4d9f0e0d3f54a19
ndroid/camera/widget/FilmstripView.java
|
| 5c92c9ec5e21a57646d6eca4360c0f6bb141a237 |
14-May-2014 |
Spike Sprague <spikuru@google.com> |
talkbacK: SCROLL_BACKWARD on first filmstrip item takes you back to cam preview
bug: 14837911
Change-Id: If96a32fbb74da769483f10666e84f89ba14c1735
ndroid/camera/widget/FilmstripView.java
|
| f75c1fdfe3a6b5d63c31ed50c5fea6a6ff9f046f |
14-May-2014 |
Spike Sprague <spikuru@google.com> |
Merge "fixed a list range check" into ub-camera-everglades
|
| 40caf2569cf1d27fd4a4aa9e3cf41f44a9a24075 |
14-May-2014 |
Doris Liu <tianliu@google.com> |
Merge "Reduce jank after aspect ratio change." into ub-camera-everglades
|
| 08b0cddea8e7390bd21053d3049ea165c759d4db |
14-May-2014 |
Doris Liu <tianliu@google.com> |
Reduce jank after aspect ratio change.
Also addressed the comment for persisting size in ag/464575
Change-Id: Ief38bf53fdb12016fb6106d712b93dc4aaf048ee
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
|
| ed78e45823ca82fea2c0e755c63558a31e97096c |
14-May-2014 |
Spike Sprague <spikuru@google.com> |
fixed a list range check
bug: 14929888
Change-Id: I1d494cd13d754bbe3c8a4a15b98dbae0be941dc1
ndroid/camera/data/CameraDataAdapter.java
|
| 9d2c5f91da124ad118ce6fef2baaa5832e4e4655 |
14-May-2014 |
Spike Sprague <spikuru@google.com> |
Merge "added null check to PhotoModule bottom bar spec for exposure comp params" into ub-camera-everglades
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
ndroid/camera/settings/SettingsCache.java
ndroid/camera/settings/SettingsManager.java
ndroid/camera/widget/AspectRatioDialogLayout.java
ndroid/camera/widget/AspectRatioSelector.java
ndroid/camera/widget/LocationDialogLayout.java
|
| e10f6cff785050b251cfbd851160a89b68d6b781 |
13-May-2014 |
Andy Huibers <andyhuibers@google.com> |
Merge "Logging for Everglades release." into ub-camera-everglades
|
| cc3b010bafb3a2aa027ef27bd8d53a8398e132df |
13-May-2014 |
Angus Kong <shkong@google.com> |
Merge "Handle error getting camera info." into ub-camera-everglades
|
| 8f7425cad99f6be58b76be9d8acc1f456ad0e868 |
12-May-2014 |
Spike Sprague <spikuru@google.com> |
added null check to PhotoModule bottom bar spec
for exposure comp params
bug: 14624240
Change-Id: Iafbf97d1a024583b81497e7c0ffe4c1848c184df
ndroid/camera/PhotoModule.java
|
| c44c5d93a681d98719dfffdf7223c694e1cab715 |
13-May-2014 |
Angus Kong <shkong@google.com> |
Handle error getting camera info.
bug:13877028
Change-Id: Iff0353738de3290244092076b2f955f0d7d57408
ndroid/camera/app/CameraController.java
ndroid/camera/cameradevice/AndroidCameraManagerImpl.java
ndroid/camera/cameradevice/CameraDeviceInfo.java
ndroid/camera/cameradevice/CameraManager.java
|
| 910c1a94340163181a35bb60cd347ffbed0fbbf1 |
13-May-2014 |
Sascha Haeberling <haeberling@google.com> |
Add custom share and edit intent chooser titles.
Bug: 14834379
Change-Id: I4534a8129ebc540c86d022d758aabfa0c8fbf23a
ndroid/camera/CameraActivity.java
|
| 08f6a7f5c693c3e3de02a8285efd5b7af323b574 |
13-May-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Fix wrongly placed null check to prevent app crashes." into ub-camera-everglades
|
| e541dc2d520aae8d45f3c605c3d732e33dd3b616 |
13-May-2014 |
Spike Sprague <spikuru@google.com> |
fix pano buttons order in landscape orientation
bug: 14886267
Change-Id: I111f24cb1f4f8a07bb96de8c36edeebeba80526a
ndroid/camera/ButtonManager.java
|
| ebd95379407dc99471d8091c7f23189ac0997d82 |
12-May-2014 |
Andy Huibers <andyhuibers@google.com> |
Logging for Everglades release.
Bug: 14364757
Change-Id: Ic29b41e7385378e022e388a02af7e4842e7ab9b5
ndroid/camera/CameraActivity.java
ndroid/camera/app/CameraApp.java
|
| 3f192ccf03d0d25521b96304c4464b4bad28150a |
13-May-2014 |
Sascha Haeberling <haeberling@google.com> |
Fix wrongly placed null check to prevent app crashes.
Bug: 13923937
Change-Id: I2a144ba5d7057acb6f49d624695293fd39ed366a
ndroid/camera/widget/FilmstripView.java
|
| 9f9cc190b39d142b731be6c5bd55818d51fbb7d0 |
13-May-2014 |
Scott Ettinger <settinger@google.com> |
Add wide angle and fish eye capture modes.
bug: 14883143
Change-Id: I57d1257652b3d6d9a2d7a05abea7a45337ec6a03
ndroid/camera/ButtonManager.java
|
| 0b7f494a6fb9bc861bdad529bf07618e63093fa9 |
13-May-2014 |
Seth Raphael <magicseth@google.com> |
Merge "Localize aspect ratios in settings summaries" into ub-camera-everglades
|
| 5fc3c7a0f577419bbf0ef32dc43f6cf9c13d2999 |
12-May-2014 |
Seth Raphael <magicseth@google.com> |
Merge "Do not mutate the List of Sizes passed to helpers" into ub-camera-everglades
|
| d074fffd7c85df39893125f29fb3d487864feaf1 |
12-May-2014 |
Seth Raphael <magicseth@google.com> |
Localize aspect ratios in settings summaries
Bug: 14496248
Change-Id: I392dc627d09a09980d450ad1dfc93d0e4e5a237c
ndroid/camera/settings/CameraSettingsActivity.java
ndroid/camera/settings/ResolutionUtil.java
|
| 92c4a17d580fdbebac0c07d90ec52d6024de86ae |
12-May-2014 |
Spike Sprague <spikuru@google.com> |
Merge "new pano icons preliminary support for wide-angle and fisheye pano modes" into ub-camera-everglades
|
| e06ad2887d24171f30951e4236a7e848ca913607 |
08-May-2014 |
Spike Sprague <spikuru@google.com> |
new pano icons
preliminary support for wide-angle and fisheye pano modes
Change-Id: I6cb6c62f7f1f1f3a9943501e2de0ba9d718540dd
ndroid/camera/ButtonManager.java
|
| 59c85801c6fa9f6a083ad0fe1976284a2d5bf610 |
12-May-2014 |
Seth Raphael <magicseth@google.com> |
Do not mutate the List of Sizes passed to helpers
This was causing a bug by removing resolutions
from a list that was being reused other places.
Bug: 14826712
Change-Id: Iaab3bd279b7c517f2a51e582bc4047ef97192122
ndroid/camera/settings/SettingsUtil.java
|
| 80670484772338535c41346a405fb49989095692 |
12-May-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Don't use stale parameters for capabilities." into ub-camera-everglades
|
| 080bf50e9da85808b4142f497373e7d30eb07db7 |
12-May-2014 |
Sascha Haeberling <haeberling@google.com> |
Don't use stale parameters for capabilities.
Bug: 14823111
Change-Id: I524de9a6dd774c3aa8b6c47092657d66447565bc
ndroid/camera/cameradevice/AndroidCameraManagerImpl.java
|
| a4b0118d15d4a3c6b77827feb63c3809c61c0fcf |
12-May-2014 |
Seth Raphael <magicseth@google.com> |
Do not display large 16x9 option on N5 front cam
It was erroneously added to the list of supported
resolutions for the Nexus 5 front facing camera
Bug: 14819623
Change-Id: I4481c68a473cb790fa67a9648e80302f19bf3065
ndroid/camera/settings/CameraSettingsActivity.java
ndroid/camera/settings/ResolutionUtil.java
|
| 71fa0ba6a52abd71bd8c56526cbd3f9a07cf3537 |
10-May-2014 |
Spike Sprague <spikuru@google.com> |
Merge "filmstrip accessibility" into ub-camera-everglades
|
| 893ca79bdea899fe3f3ed700c22235cc5b460527 |
06-May-2014 |
Spike Sprague <spikuru@google.com> |
filmstrip accessibility
add support for ACTION_SCROLL_BACKWARD/FORWARD events
note: to test this do this
1) turn on talkback
2) launch camera, get into filmstrip
3a) trigger FORWARD event with a left->right->left swipe
3b) trigger BACKWARD event with a right->left->right swipe
bug: 14108635
Change-Id: Iabe2d13c6ed96163a5b9139b6674b3457dd1abc1
ndroid/camera/widget/FilmstripView.java
|
| 6b8d928e3b52c319a7b321638edb72cd58d31ff9 |
08-May-2014 |
Doris Liu <tianliu@google.com> |
am 1b0fb15d: Do not scale down preview when preview asp is close to screen asp.
* commit '1b0fb15dcb5388ec07a382536d188461bc2d74da':
Do not scale down preview when preview asp is close to screen asp.
|
| 1b0fb15dcb5388ec07a382536d188461bc2d74da |
08-May-2014 |
Doris Liu <tianliu@google.com> |
Do not scale down preview when preview asp is close to screen asp.
The logic for transforming preview when preview aspect ratio
is greater than 14/9 is brought back to achieve the same behavior
for preview positioning as we did in Denali release.
Bug: 14626812
Change-Id: Ife38efc342cd218aca7d9473ede4db92daebcf54
ndroid/camera/CaptureLayoutHelper.java
|
| 1dad685ad3a16136b0b2108e566535c460f2a965 |
07-May-2014 |
Angus Kong <shkong@google.com> |
Merge "First Step: CameraCapabilities intead of Parameter" into ub-camera-everglades
|
| f8fc8d7451b54790740b63c759a869dd8fd22c0c |
07-May-2014 |
Angus Kong <shkong@google.com> |
Merge "Add cropping for nexus 5 to support 16:9 sizes." into ub-camera-everglades
|
| 88289047ba6928e317d17f2e1d4b013693545c67 |
23-Apr-2014 |
Angus Kong <shkong@google.com> |
First Step: CameraCapabilities intead of Parameter
To get rid of Camera.Parameters, we need to provide our own interfaces.
Camera.Parameters actually consists of 2 parts: capabilities and settings. We'll
provide two interfaces and will just use Camera.Parameters inside of
CameraManager implementations.
Change-Id: I53922b6d740835412d74365374a6a0382129564e
ndroid/camera/FocusOverlayManager.java
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.java
ndroid/camera/cameradevice/AndroidCameraCapabilities.java
ndroid/camera/cameradevice/AndroidCameraManagerImpl.java
ndroid/camera/cameradevice/CameraCapabilities.java
ndroid/camera/cameradevice/CameraCapabilitiesFactory.java
ndroid/camera/cameradevice/CameraManager.java
ndroid/camera/debug/DebugCameraProxy.java
ndroid/camera/settings/SettingsUtil.java
ndroid/camera/util/CameraUtil.java
|
| 454d63f617489281971fb151abfe14730209c047 |
06-May-2014 |
Angus Kong <shkong@google.com> |
Add cropping for nexus 5 to support 16:9 sizes.
Based on Seth's proposal of faking a new resolution setting.
Improvements made:
1. Move the cropping to a background thread.
2. Refactored to start the preview early to avoid jankness from waiting for the
cropping.
3. Fix the wrong width and hight in EXIF. The original logic is to use width and
height from the camera parameters. Now this is not true anymore.
4. Add check for Nexus 5 for the support to take effect.
Change-Id: I37515fc394b31539644a33b6d32840baf205e15c
ndroid/camera/PhotoModule.java
ndroid/camera/settings/ResolutionUtil.java
ndroid/camera/settings/SettingsUtil.java
ndroid/camera/util/ApiHelper.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
|
| 08d63f0f77aa9b70fa5ba39da2e776fe091dc0bf |
07-May-2014 |
Alan Newberger <alann@google.com> |
Merge "Move share evaluation into ReleaseDialogHelper" 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
ndroid/camera/CameraActivity.java
|
| 46acdc5401956ee4951d25d047ae892b78c13d86 |
06-May-2014 |
Spike Sprague <spikuru@google.com> |
moved set exposure limits code into an enabled check
bug: 14462164
Change-Id: Ia75449e92ffb46c8f19326828c81c40c053e7ad0
ndroid/camera/app/CameraAppUI.java
ndroid/camera/settings/SettingsManager.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
ndroid/camera/CameraActivity.java
|
| 0c8b9b92d6dc075430199b00e8c8b15b7232deca |
06-May-2014 |
Spike Sprague <spikuru@google.com> |
Merge "change exposure comp and pano orientation to use the new RadioOptions" into ub-camera-everglades
|
| 59345144c4bde59b81bb19c95cdd977c1d1a9cd4 |
23-Apr-2014 |
Spike Sprague <spikuru@google.com> |
change exposure comp and pano orientation to
use the new RadioOptions
bug: 13780101
Change-Id: Ie7b12199a96272827cc381560a5b801f87a5b81a
ndroid/camera/ButtonManager.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/RadioOptions.java
ndroid/camera/widget/IndicatorIconController.java
ndroid/camera/widget/ModeOptions.java
|
| 8888e16a42e0b5a260917e0bb77ba69b9eb81a72 |
06-May-2014 |
Angus Kong <shkong@google.com> |
Merge "Cancel onResumeTask when the app is paused." into ub-camera-everglades
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoModule.java
ndroid/camera/app/CameraController.java
ndroid/camera/cameradevice/AndroidCameraManagerImpl.java
ndroid/camera/cameradevice/CameraManager.java
ndroid/camera/debug/DebugCameraProxy.java
|
| eec46c2ab3536159d9446b5731a26eb47155e3c7 |
06-May-2014 |
Doris Liu <tianliu@google.com> |
Merge "Support for rotation lock in video recording hints" into ub-camera-everglades
|
| 8dc878f5537fbd27dbf82bc322aced410e5148f4 |
05-May-2014 |
Doris Liu <tianliu@google.com> |
Support for rotation lock in video recording hints
Bug: 13545160
Change-Id: I73c20e5a6701cc9b89ce6871b6541320fe7317e1
ndroid/camera/VideoModule.java
ndroid/camera/VideoUI.java
ndroid/camera/ui/CameraControls.java
ndroid/camera/ui/RotatableLayout.java
ndroid/camera/util/CameraUtil.java
ndroid/camera/widget/VideoRecordingHints.java
|
| d634bf630b64a938d785366fd6af26136ab04ae7 |
05-May-2014 |
Spike Sprague <spikuru@google.com> |
Make ModeOptionsOverlay sizing a little more robust
bug: 13352479
bug: 14414850
Change-Id: I27c6515d79db8df630f5a5ddfac6345005926931
ndroid/camera/widget/ModeOptionsOverlay.java
|
| b19eaa0bb37a1252015eafd3e965a011e6e98727 |
02-May-2014 |
Seth Raphael <magicseth@google.com> |
Allow multiple aspect ratios to be set for the
resolution setting.
Bug: 13328191
Change-Id: Ie067d18b70bc1ae84dc284f881b7f6030f6a6622
ndroid/camera/settings/CameraSettingsActivity.java
ndroid/camera/settings/ResolutionUtil.java
ndroid/camera/settings/SettingsManager.java
ndroid/camera/settings/SettingsUtil.java
|
| 74d4ecffbb932dbdfb54f1cb521108ee51ef28a0 |
02-May-2014 |
Doris Liu <tianliu@google.com> |
am d80cd803: Merge "Fix rounding error" into gb-ub-photos-denali
* commit 'd80cd80371540af0bc44245bdee330a8f32647f3':
Fix rounding error
|
| d80cd80371540af0bc44245bdee330a8f32647f3 |
02-May-2014 |
Doris Liu <tianliu@google.com> |
Merge "Fix rounding error" into gb-ub-photos-denali
|
| a558a24553ca5e36ff6230bcdbae474f6b9b1ee3 |
02-May-2014 |
Doris Liu <tianliu@google.com> |
Fix rounding error
Bug: 14446168
Change-Id: Ic3fc882eab96f4d6e94fdb25928c362e5b33153f
ndroid/camera/CaptureLayoutHelper.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
|
| 39f1c22bbe02a5d8edaa1e0ba60e49ed27215e4b |
01-May-2014 |
Alan Newberger <alann@google.com> |
Merge "Fix storage warning hint crash" into gb-ub-photos-denali
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/OnScreenHint.java
|
| 8dfa3c7d5d676590e4f4f200805fe711b88fef8c |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
am efcc8f0c: Merge "Log warning when video snapshot is requested on devices not supporting it" into gb-ub-photos-denali
* commit 'efcc8f0c67340ce2ad7d1477cbb7d33e6b7ea73f':
Log warning when video snapshot is requested on devices not supporting it
|
| efcc8f0c67340ce2ad7d1477cbb7d33e6b7ea73f |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
Merge "Log warning when video snapshot is requested on devices not supporting it" into gb-ub-photos-denali
|
| 810b0b6c5e1539ddd94c3a268b3f03301c35998b |
30-Apr-2014 |
Angus Kong <shkong@google.com> |
Preload metadata for new videos.
bug:14279339
Change-Id: I4733199fecc45b24abc41a241fdb5af3421f5652
ndroid/camera/CameraActivity.java
ndroid/camera/data/MetadataLoader.java
|
| 46836730f2f4f872c90a108a0dac3c12dfaa663b |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
Log warning when video snapshot is requested on devices not supporting it
Bug: 14413599
Change-Id: I483c3a02f39ca84f4d4a6d36f832e47276d70a38
ndroid/camera/VideoModule.java
|
| 48a380627793dfc11070505d5493bd8eb948969e |
30-Apr-2014 |
Spike Sprague <spikuru@google.com> |
build broke, here's a fix
Change-Id: Ifc2399e9c971aa9eb278b0b0b5c2cf4aac82509e
ndroid/camera/VideoModule.java
|
| 6db1236ecd6b33b4fd1042570cc0d725634a5276 |
30-Apr-2014 |
Spike Sprague <spikuru@google.com> |
resolved conflicts for merge of e903ae3f to ub-camera-everglades
Change-Id: Ic0ea3fdfd5bad7ea3a576c3bc1ab7fddd7b557bc
|
| e903ae3fc0fc7a98bfc21129ac7ca8ee7ce98fec |
30-Apr-2014 |
Spike Sprague <spikuru@google.com> |
Merge "fix free space calculation / querying timing problem" into gb-ub-photos-denali
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.java
|
| 85cb6f2cbf4d3506a3cf423941f0e25f41f0b280 |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 7f714038: Merge "Fix abrupt opacity change in mode switcher when a mode is selected" into gb-ub-photos-denali
* commit '7f7140385c9a3811328fea3ca1c915809132fe6f':
Fix abrupt opacity change in mode switcher when a mode is selected
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/ModeListView.java
|
| bee2022d8dcde61d2b0c6cf9b709d8e34cdcb739 |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
Fix abrupt opacity change in mode switcher when a mode is selected
Bug: 14408761
Change-Id: Icb526fd30fe764322f0fd6158b4d47eb0540bb30
ndroid/camera/ui/ModeListView.java
ndroid/camera/widget/AnimationEffects.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
ndroid/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
ndroid/camera/CameraActivity.java
ndroid/camera/app/AndroidCameraManagerImpl.java
ndroid/camera/app/CameraController.java
ndroid/camera/app/CameraManager.java
|
| dafb921412409c6884e8f9d44cba3da214489ce7 |
28-Apr-2014 |
Angus Kong <shkong@google.com> |
am 51a09680: Notify DataAdapter.Listener the changes of data.
* commit '51a09680b57aca64db91aaea11c11ca4b86a296b':
Notify DataAdapter.Listener the changes of data.
|
| 51a09680b57aca64db91aaea11c11ca4b86a296b |
28-Apr-2014 |
Angus Kong <shkong@google.com> |
Notify DataAdapter.Listener the changes of data.
The DataAdapter.Listener should be notified the changes of data due to the
metadata change.
bug:14279339
Change-Id: Ia6b7302a6967c10a53557d6953fa7888955e13a0
ndroid/camera/data/CameraDataAdapter.java
|
| 1fb5e00f051462ebe81b3e9c923608cbb553246e |
28-Apr-2014 |
Doris Liu <tianliu@google.com> |
am e5ba601d: Merge "Bring back video snapshot" into gb-ub-photos-denali
* commit 'e5ba601d4e3aa9419886e2ea4b3b2e5ba3d3e2e7':
Bring back video snapshot
|
| 677a5b9bc43ed30cc7b4df9db7848deb6b45e93b |
28-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am df8a3327: Avoid duplicate entries in the resolutions list.
* commit 'df8a332710bbb1f2beee90b2b91f706c49ef5701':
Avoid duplicate entries in the resolutions list.
|
| 4f1f5ecea11a8f06d213ea0aa963903882c4d727 |
28-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 837d8524: Properly remove the settings for an unavailable camera.
* commit '837d8524a35731ce01e2a69fde846edc21b94071':
Properly remove the settings for an unavailable camera.
|
| a8e77ab86849156ea91758d1c1128f57ac5b7d21 |
26-Apr-2014 |
Doris Liu <tianliu@google.com> |
Merge "DO NOT MERGE - Shutter button left handed support" into gb-ub-photos-denali
|
| e5ba601d4e3aa9419886e2ea4b3b2e5ba3d3e2e7 |
26-Apr-2014 |
Doris Liu <tianliu@google.com> |
Merge "Bring back video snapshot" into gb-ub-photos-denali
|
| 057b21a03d71e92a7bf5d086059011d1976c4631 |
26-Apr-2014 |
Doris Liu <tianliu@google.com> |
Bring back video snapshot
Bug: 14220490
Change-Id: Ibf20d169aae9de4eb9c1e2151d9c7335bcf7b3a3
ndroid/camera/VideoModule.java
ndroid/camera/app/AndroidCameraManagerImpl.java
|
| 4931664284b9473b705b2e278d5bf5d939d7887c |
22-Apr-2014 |
Doris Liu <tianliu@google.com> |
DO NOT MERGE - Shutter button left handed support
Bug: 12823819
Change-Id: I77bdbf17557bdd9f545b98bab58acce68d01b51d
(cherry picked from commit 344320c90639f823451ddac42e8f39b74727787c)
ndroid/camera/CaptureLayoutHelper.java
ndroid/camera/TextureViewHelper.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/MainActivityLayout.java
ndroid/camera/widget/ModeOptionsOverlay.java
|
| df8a332710bbb1f2beee90b2b91f706c49ef5701 |
25-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Avoid duplicate entries in the resolutions list.
Bug: 14277230
Dup entries indicate that a camera doesn't support at least three entries.
Change-Id: Id3c18664637ba9cf80edada924695737863cf3a7
ndroid/camera/settings/CameraSettingsActivity.java
ndroid/camera/settings/SettingsUtil.java
|
| 344320c90639f823451ddac42e8f39b74727787c |
22-Apr-2014 |
Doris Liu <tianliu@google.com> |
Shutter button left handed support
Bug: 12823819
Change-Id: I77bdbf17557bdd9f545b98bab58acce68d01b51d
ndroid/camera/CaptureLayoutHelper.java
ndroid/camera/TextureViewHelper.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/MainActivityLayout.java
ndroid/camera/widget/ModeOptionsOverlay.java
|
| 00b7b10987b38c362cc88600aad58890d531bf35 |
25-Apr-2014 |
Angus Kong <shkong@google.com> |
Use Point to back up util.Size.
Change-Id: I125d290ee94c9acadf77c50c6c9c0b9b24df4a88
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.java
ndroid/camera/settings/CameraSettingsActivity.java
ndroid/camera/settings/SettingsUtil.java
ndroid/camera/util/CameraUtil.java
ndroid/camera/util/Size.java
|
| 837d8524a35731ce01e2a69fde846edc21b94071 |
24-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Properly remove the settings for an unavailable camera.
Bug: 14108948
Change-Id: I34222ab976a481e8e28ed0bbc8b773dd3d49e8bb
ndroid/camera/settings/CameraSettingsActivity.java
|
| 2c6eabec7edbfa159e207449d575fa7bb64a9470 |
24-Apr-2014 |
Angus Kong <shkong@google.com> |
Merge "Use util.Size to replace Camera.Size." into ub-camera-everglades
|
| 634246650a5ae72bb80ab4fe4be5da1afa23b684 |
23-Apr-2014 |
Angus Kong <shkong@google.com> |
Use util.Size to replace Camera.Size.
Change-Id: I77784d339a09f24afbf96dc5ef4ce2ac2702b356
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.java
ndroid/camera/settings/CameraSettingsActivity.java
ndroid/camera/settings/SettingsUtil.java
ndroid/camera/util/CameraUtil.java
ndroid/camera/util/Size.java
|
| 8afc8e2eaaa4fdeef3cf9060cc69613d37804f56 |
11-Apr-2014 |
Doris Liu <tianliu@google.com> |
DO NOT MERGE - Refactor preview position logic
Centralize the logic of laying out bottom bar and transforming
preview TextureView based on the total space to lay them out
and preview aspect ratio. The layout is updated when either condition
above has changed. Then the rect of the bottom bar and preview
rect can be queried anywhere. This way, bottom bar, mode options
layout, and any view that relies on the preview rect and bottom bar
rect can be laid out without extra layout passes.
Bug: 13795952
Change-Id: I13c38b566b5b5d8f37ec94f325554c089a86ca8e
(cherry picked from commit 28a2950939614a0c1c83787960ce1a218fb69a5e)
ndroid/camera/CaptureLayoutHelper.java
ndroid/camera/TextureViewHelper.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/BottomBar.java
ndroid/camera/ui/BottomBarModeOptionsWrapper.java
ndroid/camera/ui/MainActivityLayout.java
ndroid/camera/ui/ModeListView.java
ndroid/camera/ui/PreviewStatusListener.java
ndroid/camera/widget/ModeOptionsOverlay.java
ndroid/camera/widget/SettingsButton.java
|
| 28a2950939614a0c1c83787960ce1a218fb69a5e |
11-Apr-2014 |
Doris Liu <tianliu@google.com> |
Refactor preview position logic
Centralize the logic of laying out bottom bar and transforming
preview TextureView based on the total space to lay them out
and preview aspect ratio. The layout is updated when either condition
above has changed. Then the rect of the bottom bar and preview
rect can be queried anywhere. This way, bottom bar, mode options
layout, and any view that relies on the preview rect and bottom bar
rect can be laid out without extra layout passes.
Bug: 13795952
Change-Id: I13c38b566b5b5d8f37ec94f325554c089a86ca8e
ndroid/camera/CaptureLayoutHelper.java
ndroid/camera/TextureViewHelper.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/BottomBar.java
ndroid/camera/ui/BottomBarModeOptionsWrapper.java
ndroid/camera/ui/MainActivityLayout.java
ndroid/camera/ui/ModeListView.java
ndroid/camera/ui/PreviewStatusListener.java
ndroid/camera/widget/ModeOptionsOverlay.java
ndroid/camera/widget/SettingsButton.java
|
| 420595e86147a691b9d06baf2e36a533b7e7c7fa |
22-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "DO NOT MERGE - Remove SmartCamera (Part 1/2)" into ub-camera-everglades
|
| f9cba4ed77bcac695c3b0a6bc7d20dc9dd07db02 |
22-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
DO NOT MERGE - Remove SmartCamera (Part 1/2)
Bug: 14254411
Change-Id: I09488e8c39fce104a92659a989a275a5f72821bb
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.java
|
| 7539e49296b993be37709f45385a6286618d464d |
22-Apr-2014 |
Angus Kong <shkong@google.com> |
The coordinatations should be relative.
The coordinations we got in onLayout() is relative to its parent. FilmstripView
doesn't not consider this and the layout can be wrong when it's not fullscreen.
Change-Id: Icc3d40a9cb3c805f8b3a8a4652edbfd873296fa8
ndroid/camera/widget/FilmstripView.java
|
| 1045fefdf22bd58fa911b100e7db5750f7efa3e6 |
21-Apr-2014 |
Angus Kong <shkong@google.com> |
Create cameradevice package for camera management.
Change-Id: I73c69a70736b0b0eb0ef069a7876cf75fee91262
ndroid/camera/CameraActivity.java
ndroid/camera/CameraErrorCallback.java
ndroid/camera/CameraModule.java
ndroid/camera/CameraTestDevice.java
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
ndroid/camera/VideoModule.java
ndroid/camera/app/AndroidCameraManagerImpl.java
ndroid/camera/app/CameraController.java
ndroid/camera/app/CameraManager.java
ndroid/camera/app/CameraManagerFactory.java
ndroid/camera/app/CameraProvider.java
ndroid/camera/cameradevice/AndroidCameraManagerImpl.java
ndroid/camera/cameradevice/CameraManager.java
ndroid/camera/cameradevice/CameraManagerFactory.java
ndroid/camera/debug/DebugCameraProxy.java
ndroid/camera/module/ModuleController.java
ndroid/camera/settings/SettingsUtil.java
|
| 53efdde1b01b4a98eba5c5dd1ba52985baba3b9a |
19-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Catch potential RTE from Camera." into ub-camera-everglades
|
| 3fff70c316ff1f3d6ec1cd93e1f34769ebc4f781 |
18-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Catch potential RTE from Camera.
I got this one on a Nexus S running CM. So maybe not a real problem in
the wild. But given the amount of errors we see in the wild about camera
not connection, we should revisit and see if any of these errors are
catchable, like this one.
Change-Id: I02421bb6a1b5256bf23c2b5fe81f11a78d02cd57
ndroid/camera/app/AndroidCameraManagerImpl.java
|
| 264062c014713c05dfb5b122558654b0c994b7fb |
19-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am e8766be4: Don\'t crash when less than two cameras are present.
* commit 'e8766be48ed4c0bd17d68a45152a34fa2c860b94':
Don't crash when less than two cameras are present.
|
| e8766be48ed4c0bd17d68a45152a34fa2c860b94 |
18-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Don't crash when less than two cameras are present.
Bug: 14108948
Change-Id: Ib288f9fd2bd86f870df22c1fde03184f00cea219
ndroid/camera/settings/CameraSettingsActivity.java
|
| 1762ef6398b2150657aa040d61ab1cd93faaf4bf |
17-Apr-2014 |
Spike Sprague <spikuru@google.com> |
Merge "trigger remaining storage calculation during init move ic_video_disabled.png icons to res_p" into ub-camera-everglades
|
| 30f339e53b305de5d95c727f14414419f828527b |
17-Apr-2014 |
Spike Sprague <spikuru@google.com> |
Merge "make manual exposure compensation settings work acrss different devices bug: 13967706" into ub-camera-everglades
|
| a479fcaad5b83c8fbb881f491d93145531b25cba |
12-Apr-2014 |
Spike Sprague <spikuru@google.com> |
make manual exposure compensation settings work acrss different devices
bug: 13967706
Change-Id: I2ebe579c8b7df1218546dd888b5bbfb5486e9e55
ndroid/camera/ButtonManager.java
ndroid/camera/PhotoModule.java
ndroid/camera/app/CameraAppUI.java
|
| bca64bf23a875c5ebb2e342834550e98a30cd39f |
17-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Don't block the main thread on remote shutter code
Bug: 14135621
The current RemoreShutterBridge is doing a bunch of heavy listing,
so it shouldn't happen on the main thread.
Change-Id: Ic1a81e7dfd0a2fd5a7424058a6a27c712ed3ca51
ndroid/camera/PhotoModule.java
|
| 3f67379b38ebd1ff4c460c097b2ed1cca50f74c6 |
15-Apr-2014 |
Spike Sprague <spikuru@google.com> |
trigger remaining storage calculation during init
move ic_video_disabled.png icons to res_p
bug: 14062023
Change-Id: I93b506ce2c9f669067dc94259e63f44bc9378fea
ndroid/camera/VideoModule.java
|
| bc34225d59a7d33fd0c1e0247af84ae11e4ee640 |
16-Apr-2014 |
Sascha Häberling <haeberling@google.com> |
am ace5f7f8: Merge "Fix edge case in supported video quality selection." into gb-ub-photos-denali
* commit 'ace5f7f81899341d16bfea70c9bd4ec4b6ca2e56':
Fix edge case in supported video quality selection.
|
| ace5f7f81899341d16bfea70c9bd4ec4b6ca2e56 |
16-Apr-2014 |
Sascha Häberling <haeberling@google.com> |
Merge "Fix edge case in supported video quality selection." into gb-ub-photos-denali
|
| 7d3c2dba1afc28d823ef2305109a3f1be24542b3 |
16-Apr-2014 |
Seth Raphael <magicseth@google.com> |
am 1d891fe5: Do not crash when attempting to refocus a deleted image.
* commit '1d891fe52f83d7be1d3a7f0b06b6fed327815c0a':
Do not crash when attempting to refocus a deleted image.
|
| 8d85af5f43bf31f4988c616a7e93a09277b20bb4 |
24-Mar-2014 |
Paul Chang <paulchang@google.com> |
Fix edge case in supported video quality selection.
Bug: 14108743
If less than three distinct video quality levels are supported, it's possible
for getNextSupportedVideoQualityIndex() to return an out-of-range array index.
Instead, just return the previous supported video quality -- this appears to
be the intended behavior.
Change-Id: I089571edf6ff748ce4914f188b4ef844ecb638c2
ndroid/camera/settings/SettingsUtil.java
|
| 1d891fe52f83d7be1d3a7f0b06b6fed327815c0a |
16-Apr-2014 |
Seth Raphael <magicseth@google.com> |
Do not crash when attempting to refocus a deleted
image.
Bug: 13546660
Change-Id: Ic260811ad2f45a44577609af0dc69a5c55c7fcfd
ndroid/camera/session/PlaceholderManager.java
|
| 604eb9e594f6486fa7c3333222bcbc612f137498 |
16-Apr-2014 |
Seth Raphael <magicseth@google.com> |
am 92f19760: Don\'t update metadata on local data insert.
* commit '92f197607eb6303e11f88dc65e7e23614e384615':
Don't update metadata on local data insert.
|
| 92f197607eb6303e11f88dc65e7e23614e384615 |
08-Apr-2014 |
Seth Raphael <magicseth@google.com> |
Don't update metadata on local data insert.
It is possible for insert data to be called in
a loop with many items, and this will cause un-
needed lookups of meta data.
The metadata lookup is already handled but the
filmstrip lazily, so it is not necessary here.
Bug: 13875458
Change-Id: I476eb1d44fa3d089f47b8b16f9be6d3255b4759e
ndroid/camera/data/CameraDataAdapter.java
|
| fe073c6e57a5511a4c40e787eedb9eb55c729e94 |
15-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 5dd85a13: Avoid using stale parameters to get focus mode in video
* commit '5dd85a1399f795284c7f0e632d102b61bb82887a':
Avoid using stale parameters to get focus mode in video
|
| 5dd85a1399f795284c7f0e632d102b61bb82887a |
15-Apr-2014 |
Doris Liu <tianliu@google.com> |
Avoid using stale parameters to get focus mode in video
Bug: 13990664
Change-Id: If6a5b1cc9ce7d1ac67f0558a61036f228601b92b
ndroid/camera/VideoModule.java
|
| 6f174227f1459a6e71f80e2953acc0162f29f82b |
15-Apr-2014 |
Andy Huibers <andyhuibers@google.com> |
am 2d6a8abe: Merge "Set video-size key for Samsung Brand devices." into gb-ub-photos-denali
* commit '2d6a8abe5dd22492dc098a63a33d7d9ea5888999':
Set video-size key for Samsung Brand devices.
|
| 2d6a8abe5dd22492dc098a63a33d7d9ea5888999 |
15-Apr-2014 |
Andy Huibers <andyhuibers@google.com> |
Merge "Set video-size key for Samsung Brand devices." into gb-ub-photos-denali
|
| 34d73dd0a7335527d2294bb15bda35908c2a05e0 |
15-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 0fed7e62: Safeguard callback receiver to prevent crashes.
* commit '0fed7e62bfa0d8351b91d3531228a113637963a3':
Safeguard callback receiver to prevent crashes.
|
| 6dcf90c01f7f0e2fddd2d67c39158d15ba53c0a6 |
14-Apr-2014 |
Andy Huibers <andyhuibers@google.com> |
Set video-size key for Samsung Brand devices.
Bug: 14060121
Change-Id: I5b8e5b0259a4105b8839112b13e58f2222848c7e
ndroid/camera/VideoModule.java
|
| 0fed7e62bfa0d8351b91d3531228a113637963a3 |
14-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Safeguard callback receiver to prevent crashes.
Bug: 13765929
It is safe to add these checks here. The receiver is only set in
the constructor, and it's only created in one place, which is
onCreate. And the parameter is the Activity itself, so it can
never be null.
This means the NPE can only happen if onCameraOpened is called after
removeCallbackReceiver is called, which is in onDestroy of the activity.
In this case it's safe to exit.
Change-Id: Ibffd6d54679b564a11b3e83319896241f2e306ad
ndroid/camera/app/CameraController.java
|
| f92d00ba6f0cdeefbcbf711e9043d53bf136026c |
12-Apr-2014 |
Andy Huibers <andyhuibers@google.com> |
am e08bc042: Check zoom enabled check and null check on zoom ratio list.
* commit 'e08bc0428d3d5695d029f0b412d98db6ff8ac956':
Check zoom enabled check and null check on zoom ratio list.
|
| e08bc0428d3d5695d029f0b412d98db6ff8ac956 |
12-Apr-2014 |
Andy Huibers <andyhuibers@google.com> |
Check zoom enabled check and null check on zoom ratio list.
Bug: 13987837
Change-Id: I45d3edc42a240c866f151c5e23431cd50eec7bc6
ndroid/camera/PhotoModule.java
|
| 49edf5203a792e5bab355f21eb0548f1baf7a46f |
12-Apr-2014 |
Sascha Häberling <haeberling@google.com> |
am c6ef756c: Merge "Revert "ZoomRatios might not exist, not crash for logging."" into gb-ub-photos-denali
* commit 'c6ef756c0eb736c3e43cff13d593f5ad71d2cb7b':
Revert "ZoomRatios might not exist, not crash for logging."
|
| c6ef756c0eb736c3e43cff13d593f5ad71d2cb7b |
12-Apr-2014 |
Sascha Häberling <haeberling@google.com> |
Merge "Revert "ZoomRatios might not exist, not crash for logging."" into gb-ub-photos-denali
|
| c35768c2ba6769fa8cd22ad88f69729ae216fb3d |
12-Apr-2014 |
Sascha Häberling <haeberling@google.com> |
Revert "ZoomRatios might not exist, not crash for logging."
This reverts commit de26138f7821e33cac293e9c78c23b5c4612dcd2.
Change-Id: Ia788ef858cf2bc8891a5bbbf1a538b49d583247d
ndroid/camera/PhotoModule.java
|
| b44cc385e699d0cda1457dd2b9a1548248e9845a |
12-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Remove an ICS workaround calling stopPreview.
Bug: 13966525
Change-Id: I3592906a6220b6af228fa42ef77e5b0d6e19e7b8
ndroid/camera/PhotoModule.java
|
| 08acce5b16beef4be30c5d0567d3452aa7e99c26 |
12-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "DO NOT MERGE Don't call stopPreview after taking a picture on the m8" into gb-ub-photos-denali
|
| c089fdce065ef216738dd2854345cc5c02a23b9f |
12-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
DO NOT MERGE Don't call stopPreview after taking a picture on the m8
Bug: 13966525
The proper solution is to remove the stopPreview call completely,
but as we have only limited time for testing left, let's be
careful and target specific devices only.
Change-Id: I5aa90b7c72068bae5352a8396e39a2c82ac137b9
ndroid/camera/PhotoModule.java
|
| dcb6f94d095b2e15a8c924d986a3d850b7b13b83 |
12-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 9ac314fb: Merge "ZoomRatios might not exist, not crash for logging." into gb-ub-photos-denali
* commit '9ac314fb42435a090f33e9db051ab0f203484722':
ZoomRatios might not exist, not crash for logging.
|
| 9ac314fb42435a090f33e9db051ab0f203484722 |
12-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "ZoomRatios might not exist, not crash for logging." into gb-ub-photos-denali
|
| de26138f7821e33cac293e9c78c23b5c4612dcd2 |
12-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
ZoomRatios might not exist, not crash for logging.
Bug: 13987837
Change-Id: I77b8863b60cf5311ffd326015e612dfaeb45daa2
ndroid/camera/PhotoModule.java
|
| 692166545bce2c83fb1053b0312b80e4acf2c7bf |
12-Apr-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 3c62221a: Update mode options with hardware spec whenever hdr setting changes.
* commit '3c62221afd869828ba867fce15755a582f2c2334':
Update mode options with hardware spec whenever hdr setting changes.
|
| 3c62221afd869828ba867fce15755a582f2c2334 |
11-Apr-2014 |
Erin Dahlgren <edahlgren@google.com> |
Update mode options with hardware spec whenever hdr setting changes.
Bug: 13965048
Change-Id: I7e718bb56cb5dc92c7583bef780d442c04644a56
ndroid/camera/ButtonManager.java
ndroid/camera/app/CameraAppUI.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
|
| 63da42d610376d2fc02c0ac453d5df3a1e885504 |
10-Apr-2014 |
Alan Newberger <alann@google.com> |
Merge "Tweak log levels for photo, video" into gb-ub-photos-denali
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.java
|
| e0e6d34a040fc14ef25000ad5b3d48427c8cdfb0 |
10-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am f66eb70a: Don\'t crash when listener registration gets out of sync
* commit 'f66eb70a66bb194f4bef54fe74a04d6c9a3515de':
Don't crash when listener registration gets out of sync
|
| f66eb70a66bb194f4bef54fe74a04d6c9a3515de |
10-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Don't crash when listener registration gets out of sync
Bug: 13914960
In some cases it can happen that resume/pause sequences happen on
two CameraActivities at the same time, especially when switching
from lock-screen to non-lockscreen activities.
Change-Id: Ic0826fc4a1d601b0ba0e6ac9cef84c022d958ad4
ndroid/camera/app/MemoryManagerImpl.java
|
| 7981b91c47e098381750d25fe68835ff027fe6e1 |
10-Apr-2014 |
Doris Liu <tianliu@google.com> |
am f79de8d6: Merge "Fix the layout error in preview" into gb-ub-photos-denali
* commit 'f79de8d69c2305660e287ec872fe500b34739e44':
Fix the layout error in preview
|
| f79de8d69c2305660e287ec872fe500b34739e44 |
10-Apr-2014 |
Doris Liu <tianliu@google.com> |
Merge "Fix the layout error in preview" into gb-ub-photos-denali
|
| 240b072f9a9cb2f0b4b08ca5b8a682d78c25ce9c |
10-Apr-2014 |
Doris Liu <tianliu@google.com> |
Fix the layout error in preview
This bug is caused by view configuration and layout rect occasionally
out of sync and bottom bar's incapability of correcting itself. To
be specific, configuration can be out of sync with layout rect (i.e.
configuration.orientation is landscape but onLayout() passes in portrait
coordinates), but when that happens, configuration will soon correct
itself through onConfigurationChanged(), then another layout pass will
happen to make sure everything is laid out correctly. In this case,
when configuration and layout coordinates are inconsistent, bottom bar
lays out itself using the wrong alignment, and then changed the preview
rect accordingly. When another layout pass happens to correct this
inconsistency, bottom bar then lays out itself based on the correct
alignment and a wrong preview rect previously adjusted, rendering
correct alignment but wrong size.
Bug: 13911202
Change-Id: I7cf6dbea582ce3888df11039de8f94687fe75784
ndroid/camera/ui/BottomBar.java
ndroid/camera/ui/BottomBarModeOptionsWrapper.java
|
| 5f3f0ea7c9a0267a2b1a1817cb5bc56e35f99e36 |
09-Apr-2014 |
Alan Newberger <alann@google.com> |
am 2d0fdb5e: Merge "Add logging override helper" into gb-ub-photos-denali
* commit '2d0fdb5e6582126bd554030c7432745ae589f515':
Add logging override helper
|
| 2d0fdb5e6582126bd554030c7432745ae589f515 |
09-Apr-2014 |
Alan Newberger <alann@google.com> |
Merge "Add logging override helper" into gb-ub-photos-denali
|
| 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
|
| c00f209e861dba093eb3c267ddc5078b23928d05 |
09-Apr-2014 |
Alan Newberger <alann@google.com> |
Add logging override helper
This CL removes compile-time log suppression with a runtim override.
With a runtime override we can custom configure logging with a single
level, not quite as flexible as a boolean per level but should suit
our needs. Compile-time log pruning could be done with proguard if
desired.
Bug: 13737123
Change-Id: I8bdcaca44b4dc5c7eab8ef2f74e5181bcacd2727
ndroid/camera/app/CameraApp.java
ndroid/camera/debug/Config.java
ndroid/camera/debug/Configurations.java
ndroid/camera/debug/CurrentConfig.java
ndroid/camera/debug/Log.java
|
| 05ee74dcf3b1c8e65229f43441d282fcf89744a6 |
09-Apr-2014 |
Kevin Gabayan <gabayan@google.com> |
Log memory consumption at end of onCreate (Camera2).
Bug: 13280671
Change-Id: Ifdeadff2c89a08757cc2f3792ba61a2b54d19ae0
ndroid/camera/CameraActivity.java
ndroid/camera/app/MemoryQuery.java
|
| 0aeb0c82704401a050ad3b892ed1c9efa457013d |
08-Apr-2014 |
Kevin Gabayan <gabayan@google.com> |
Query memory consumption at end of onCreate.
Bug: 13280671
Change-Id: Iedc4c8907a6e726a1835494bd6fad93e6ee8a666
ndroid/camera/CameraActivity.java
ndroid/camera/app/MemoryManager.java
ndroid/camera/app/MemoryManagerImpl.java
ndroid/camera/app/MemoryQuery.java
|
| 1f8951e9fa956e1d1e9283141a11b8b1c2f1f9dd |
08-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 39262608: Merge "Cancel touch event forwarding when transitioning from shimmy to scroll state" into gb-ub-photos-denali
* commit '3926260864a25a7db00e5a7d629b363cc833ffb3':
Cancel touch event forwarding when transitioning from shimmy to scroll state
|
| 3926260864a25a7db00e5a7d629b363cc833ffb3 |
08-Apr-2014 |
Doris Liu <tianliu@google.com> |
Merge "Cancel touch event forwarding when transitioning from shimmy to scroll state" into gb-ub-photos-denali
|
| 1c5a87b4301c4211d3e3b85be5c863c50d4eab7b |
08-Apr-2014 |
Doris Liu <tianliu@google.com> |
Cancel touch event forwarding when transitioning from shimmy to scroll state
Bug: 13903149
Change-Id: I70badb1fdc959b3ce0a9d3385e664938ab7918a9
ndroid/camera/ui/ModeListView.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.
|
| f773a11d50fc48f3831f259075a0e64460f9baaa |
08-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Keep lights out even if the system changes it." into gb-ub-photos-denali
|
| 099b49b8e9fce2b1e1e5c2f6f8756527852329b4 |
08-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Keep lights out even if the system changes it.
Bug: 13894148
Change-Id: Ie6d5b8fc1d3601082942a5c0843b447cb4805ceb
ndroid/camera/CameraActivity.java
|
| 300e332a777c77761d20825ee0bb699f9b4b598d |
08-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 298d4548: Merge "Switch visibility on AbstractTutorialOverlay removeOverlay." into gb-ub-photos-denali
* commit '298d45483448de4493abadca286bba4eccab44ae':
Switch visibility on AbstractTutorialOverlay removeOverlay.
|
| 298d45483448de4493abadca286bba4eccab44ae |
08-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Switch visibility on AbstractTutorialOverlay removeOverlay." into gb-ub-photos-denali
|
| 8ec052bad062927e767e24010db22aa55fdfb5ff |
08-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Switch visibility on AbstractTutorialOverlay removeOverlay.
Bug: 13337436
Bug: 12440059
Change-Id: I34dd96df02cedf33be72ae5563bbad3d4b307a12
ndroid/camera/ui/AbstractTutorialOverlay.java
|
| 74a266639e4713d96102033b2420dc499befb0b0 |
08-Apr-2014 |
Alan Newberger <alann@google.com> |
am 0d4570a2: Merge "Replace isDebugging compiletime logging override with runtime property" into gb-ub-photos-denali
* commit '0d4570a241f3e2505fa66fb81b4c297a3c1d4d09':
Replace isDebugging compiletime logging override with runtime property
|
| 349fc845670a1ee51939d89c08c6ff817790dc5c |
08-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 829c8e92: Merge "Don\'t show the tutorial wrapper all the time." into gb-ub-photos-denali
* commit '829c8e929949e1951b1562ef97cf447b02dcef45':
Don't show the tutorial wrapper all the time.
|
| 0d4570a241f3e2505fa66fb81b4c297a3c1d4d09 |
08-Apr-2014 |
Alan Newberger <alann@google.com> |
Merge "Replace isDebugging compiletime logging override with runtime property" into gb-ub-photos-denali
|
| 829c8e929949e1951b1562ef97cf447b02dcef45 |
08-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Don't show the tutorial wrapper all the time." into gb-ub-photos-denali
|
| de7633bbcfb08865175126713d97132086bff340 |
08-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Don't show the tutorial wrapper all the time.
Bug: 13337436
Bug: 12440059
Change-Id: I10a969a4c550b6ebbc101f7cdce8ef12c3029137
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/AbstractTutorialOverlay.java
|
| af4bcb92d710f2cb74ddc0559397c49b55beb115 |
08-Apr-2014 |
Alan Newberger <alann@google.com> |
Replace isDebugging compiletime logging override with runtime property
This CL accomplishes the same goal as the compile-time isDebuggable,
with a runtime property check. This is useful so that we opt in to
logging everything at a given level with one setprop line.
Note that either with this new runtime property or with isDebuggable,
the Log proxy wouldn't log if a particular Configuration value is false,
since that level is instead routed to SILENT_LOGGER.
Bug: 13737123
Change-Id: I78ce629620f420a08a2cc013865847674941fb9b
ndroid/camera/debug/Config.java
ndroid/camera/debug/Configurations.java
ndroid/camera/debug/Log.java
|
| 8387e379315e4352359935abe561eeaf20cd4404 |
08-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 13cdf16b: Merge "Make tutorials render in smaller layout on tablets." into gb-ub-photos-denali
* commit '13cdf16bee5a46d20266a60230239a49cd0f22ac':
Make tutorials render in smaller layout on tablets.
|
| 13cdf16bee5a46d20266a60230239a49cd0f22ac |
08-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Make tutorials render in smaller layout on tablets." into gb-ub-photos-denali
|
| 1e0810c88e791d0f658eb5a6f95d771ee03a7631 |
08-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Make tutorials render in smaller layout on tablets.
Bug: 13337436
Bug: 12440059
Change-Id: I7886a86189a94483775a5535c69e22090cec1530
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/AbstractTutorialOverlay.java
|
| 02bb5070ef1779d795f6e3064cf8975b48bebfa9 |
08-Apr-2014 |
Alan Newberger <alann@google.com> |
am 81e56a9f: Shorten ExternalViewerButton log
* commit '81e56a9f6de8935a1200aafaaa6858662559517f':
Shorten ExternalViewerButton log
|
| 81e56a9f6de8935a1200aafaaa6858662559517f |
08-Apr-2014 |
Alan Newberger <alann@google.com> |
Shorten ExternalViewerButton log
While examining logs, noticed our Log proxy rejected this log line
as too long.
Bug: 13737123
Change-Id: I8ca2cf6be79539db0fd262ffd13a317f6fe20dcb
ndroid/camera/widget/ExternalViewerButton.java
|
| bc862b509f14a0127eb5a13473e0773628950747 |
08-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 77da836f: Merge "Hide mode switcher in selected state when window is no longer visible" into gb-ub-photos-denali
* commit '77da836f524dbbf7fe92ff1ca6147595a540246f':
Hide mode switcher in selected state when window is no longer visible
|
| 77da836f524dbbf7fe92ff1ca6147595a540246f |
08-Apr-2014 |
Doris Liu <tianliu@google.com> |
Merge "Hide mode switcher in selected state when window is no longer visible" into gb-ub-photos-denali
|
| fa50f7d71a77dc730746c33fd17a570d42453759 |
08-Apr-2014 |
Doris Liu <tianliu@google.com> |
Hide mode switcher in selected state when window is no longer visible
Bug: 13751149
Change-Id: Id479eeed06ec8965df2836c4825de6212c7efa7a
ndroid/camera/ui/ModeListView.java
|
| 5633ecee6b8fa3cd4e7cd251194848c6374055fc |
07-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 71c43b6f: Merge "Make removeOverlay publicly available." into gb-ub-photos-denali
* commit '71c43b6f062ced7cf239dc506718cf0825665b67':
Make removeOverlay publicly available.
|
| 71c43b6f062ced7cf239dc506718cf0825665b67 |
07-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Make removeOverlay publicly available." into gb-ub-photos-denali
|
| 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
ndroid/camera/CameraActivity.java
|
| c938d7b424466ff899dd52864ad1b58ac0c0c68e |
07-Apr-2014 |
Doris Liu <tianliu@google.com> |
am f4d5afbc: Merge "Workaround for black sqaure issue caused by incorrectly recreated HW layer" into gb-ub-photos-denali
* commit 'f4d5afbcdc31165caef741aa7c06371b01c91b45':
Workaround for black sqaure issue caused by incorrectly recreated HW layer
|
| f4d5afbcdc31165caef741aa7c06371b01c91b45 |
07-Apr-2014 |
Doris Liu <tianliu@google.com> |
Merge "Workaround for black sqaure issue caused by incorrectly recreated HW layer" into gb-ub-photos-denali
|
| f4985d0f5183259c7b17ff61017a623828e8348f |
07-Apr-2014 |
Spike Sprague <spikuru@google.com> |
am abf54e29: exposure compensation control is back
* commit 'abf54e2994961395a0feb0b08353e62718443f23':
exposure compensation control is back
|
| e4e51076aeeb7dbbdde509a4621379359f6cf273 |
07-Apr-2014 |
Seth Raphael <magicseth@google.com> |
am 3cd228a2: Merge "Fix Settings Activity" into gb-ub-photos-denali
* commit '3cd228a2cce5ec89ddedd52d88fa5488e0e47bd9':
Fix Settings Activity
|
| 51f409e3770eef615a4fa5314073ba132994cd82 |
07-Apr-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 00b04884: Merge "Make the camera id setting have static possible values." into gb-ub-photos-denali
* commit '00b04884a4f857ad5d34247c0ad1bed1cb4a164c':
Make the camera id setting have static possible values.
|
| 342e68d3f3f38e333e3e05d2effedc3afc5e4e55 |
07-Apr-2014 |
Seth Raphael <magicseth@google.com> |
am 224b97cb: Merge "Add context to parameters passed to ExtraSettings" into gb-ub-photos-denali
* commit '224b97cbde1ca050e8e74d34ba7c2f8046142fd4':
Add context to parameters passed to ExtraSettings
|
| c5f382f9c5921feec7ba4756ced8331474d976d0 |
07-Apr-2014 |
Andy Huibers <andyhuibers@google.com> |
am b5b2e4a7: Merge "Fix hdr check." into gb-ub-photos-denali
* commit 'b5b2e4a762db8a8608df0508312d5329ddd243f9':
Fix hdr check.
|
| ab5f455956b79badf05f4b79e1b0c49cccc66b13 |
07-Apr-2014 |
Andy Huibers <andyhuibers@google.com> |
am 68e10629: Merge "Use only filename from path as reference." into gb-ub-photos-denali
* commit '68e106296a350b8f0f0c8d6efde1545dca59b623':
Use only filename from path as reference.
|
| f3e528c6928655b171ddca4d05d0d99e862bbf4f |
07-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
resolved conflicts for merge of 0bfc7619 to ub-camera-everglades
Change-Id: Id95979da7701d52f1c25ddba710686465a8ba60d
|
| eddb0743f60d0544be896043187a1981e78acf3b |
07-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 76aaa187: Fix layout error during mode switch
* commit '76aaa1870d77856c975283392d3a0fea3e1fb7ba':
Fix layout error during mode switch
|
| 107172f82e8c9b7cbfab09f54f97af40b9dfabde |
07-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
resolved conflicts for merge of 79dd6876 to ub-camera-everglades
Change-Id: Icba83583ffb5b6210ec084ca7e3193bedebe7da1
|
| 2aeeb7ac635ad5b490e7128884aa89efde862c67 |
07-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 7933feb7: Fix for visibilty of cling out of sync with the external viewer button
* commit '7933feb7d1bbb0342061584f623bb239266f5d91':
Fix for visibilty of cling out of sync with the external viewer button
|
| 137e4810b02f2361d45260100d3b9b62dba2975e |
07-Apr-2014 |
Angus Kong <shkong@google.com> |
am c9638388: Merge "Add API to query the current auto-rotation setting" into gb-ub-photos-denali
* commit 'c9638388b28c9eca448bb4279c0f2f519c6d342e':
Add API to query the current auto-rotation setting
|
| 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.
|
| e503446399a5a4073489490912ed6d6297b5222b |
07-Apr-2014 |
Seth Raphael <magicseth@google.com> |
am d3d78999: Avoid a race condition causing dup\'d images.
* commit 'd3d789992f96e4598521a27f085d185044ec7cee':
Avoid a race condition causing dup'd images.
|
| da80fa8b7d3272a29201fb3357d862616507a461 |
07-Apr-2014 |
Seth Raphael <magicseth@google.com> |
am 59efb9af: When we reset app ui, re-enable shutter button.
* commit '59efb9af8340a5e3500037b23fb3ac16011a1c7e':
When we reset app ui, re-enable shutter button.
|
| 3f0286598e0bb0cf3924763ec0accae8d5b82027 |
07-Apr-2014 |
Seth Raphael <magicseth@google.com> |
am 55d5b4a6: Merge "Fix crash related to deleted items being processed" into gb-ub-photos-denali
* commit '55d5b4a6a892b9c6265b2b6e43102396a6123493':
Fix crash related to deleted items being processed
|
| 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.
|
| ceff11e73430af86fdf0b0819cd36a9f5dc7173f |
05-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Make removeOverlay publicly available.
Bug: 13337436
Change-Id: I222f3353230ad734db304f2068f853bdf8ef9de3
ndroid/camera/ui/AbstractTutorialOverlay.java
|
| abf54e2994961395a0feb0b08353e62718443f23 |
27-Mar-2014 |
Spike Sprague <spikuru@google.com> |
exposure compensation control is back
bug: 13607051
Change-Id: Ib4920ba3f8f3a548651a2d07613ccfdc28ca1d6e
ndroid/camera/ButtonManager.java
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoModule.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/settings/CameraSettingsActivity.java
ndroid/camera/settings/SettingsCache.java
ndroid/camera/settings/SettingsManager.java
ndroid/camera/widget/IndicatorIconController.java
ndroid/camera/widget/ModeOptions.java
|
| 759122e8b3071b79fa2a388f00403af4e21be68c |
05-Apr-2014 |
Doris Liu <tianliu@google.com> |
Workaround for black sqaure issue caused by incorrectly recreated HW layer
Bug: 12594617
Change-Id: I9209d4bc0d6ebd045b957b3c79eabdca0a4f7cc4
ndroid/camera/ui/ModeListView.java
ndroid/camera/ui/ModeTransitionView.java
|
| 3cd228a2cce5ec89ddedd52d88fa5488e0e47bd9 |
05-Apr-2014 |
Seth Raphael <magicseth@google.com> |
Merge "Fix Settings Activity" into gb-ub-photos-denali
|
| d054061c389cc09e96362266cfb166749c72c54f |
05-Apr-2014 |
Seth Raphael <magicseth@google.com> |
Fix Settings Activity
Bug: 13817516
Change-Id: Idb8b95c3501b52519ae97b6d603ee59e8cc50ce4
ndroid/camera/settings/CameraSettingsActivity.java
|
| 00b04884a4f857ad5d34247c0ad1bed1cb4a164c |
04-Apr-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Make the camera id setting have static possible values." into gb-ub-photos-denali
|
| 224b97cbde1ca050e8e74d34ba7c2f8046142fd4 |
04-Apr-2014 |
Seth Raphael <magicseth@google.com> |
Merge "Add context to parameters passed to ExtraSettings" into gb-ub-photos-denali
|
| 4b531ae5ac0f18b1625b62884780f113667b2404 |
04-Apr-2014 |
Seth Raphael <magicseth@google.com> |
Add context to parameters passed to ExtraSettings
Bug: 13791528
Change-Id: Ibcc4db1ab07b274f18f1ab369747d759180f155b
ndroid/camera/settings/CameraSettingsActivity.java
|
| b5b2e4a762db8a8608df0508312d5329ddd243f9 |
04-Apr-2014 |
Andy Huibers <andyhuibers@google.com> |
Merge "Fix hdr check." into gb-ub-photos-denali
|
| 6b9743a03f4674974a8675c12f67149e2d7e017d |
04-Apr-2014 |
Andy Huibers <andyhuibers@google.com> |
Fix hdr check.
Change-Id: I7ebd06a985fbc0661d71b189fe1fdbf620f1c341
ndroid/camera/PhotoModule.java
|
| 261e07eaf18cfff3c2ace3b6b9d2df28b5020291 |
04-Apr-2014 |
Erin Dahlgren <edahlgren@google.com> |
Make the camera id setting have static possible values.
This is important because the dynamic hook for querying the
supported number of cameras is currently only based on the camera 1 api.
We want to make sure we can set the enabled/disabled state of back
and front facing camera in the mode options, so it's necessasry to
always have both possible values.
Bug: 13769609
Change-Id: I9d526315dbe15e008542832f9b2c4c9d23d34021
ndroid/camera/settings/SettingsManager.java
|
| 6388e638d36082138f58ad2c7ab8d7645f315ea1 |
04-Apr-2014 |
Andy Huibers <andyhuibers@google.com> |
Use only filename from path as reference.
Change-Id: Ifa3dd1a8c89cab5b135953eebca70f4ed53c1102
ndroid/camera/MediaSaverImpl.java
|
| 0bfc76192fcd7060089a01be7dc022916308b03c |
04-Apr-2014 |
Andy Huibers <andyhuibers@google.com> |
Merge "Logging revisions." into gb-ub-photos-denali
|
| 10c5816e1ff3d30e4c4996643ba05d63d522b81a |
29-Mar-2014 |
Andy Huibers <andyhuibers@google.com> |
Logging revisions.
Bug: 13747555
Change-Id: Ic5f735de89f9a69d981cdeab209b3966532697c7
ndroid/camera/CameraActivity.java
ndroid/camera/FocusOverlayManager.java
ndroid/camera/MediaSaverImpl.java
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.java
ndroid/camera/app/CameraApp.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/app/MediaSaver.java
ndroid/camera/ui/FocusOverlay.java
ndroid/camera/ui/MainActivityLayout.java
ndroid/camera/ui/ModeListView.java
|
| 76aaa1870d77856c975283392d3a0fea3e1fb7ba |
04-Apr-2014 |
Doris Liu <tianliu@google.com> |
Fix layout error during mode switch
Cause for the incorrect layout: the two modes have a preview
of the same aspect ratio, and therefore bottom bar did not need to re-layout
after the mode switch and it incidentally skipped adjusting preview position.
Bug: 13210080
Change-Id: Iad722abd682885633885ff0e8d9fba4efb4e5e6a
ndroid/camera/ui/BottomBar.java
|
| 79dd6876e5f5cb9d2a9d3d0597389811cc73c31f |
03-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Move SettingsManager back into Activity." into gb-ub-photos-denali
|
| 7933feb7d1bbb0342061584f623bb239266f5d91 |
03-Apr-2014 |
Doris Liu <tianliu@google.com> |
Fix for visibilty of cling out of sync with the external viewer button
Due to no visiblity changed listener provided from Framework, a subclass
of the image button was created to track the visiblity change of itself
and more importantly its ancesters. This way cling is gauranteed to be
in sync with the visility of the button.
Also fixed preference type of showing refocus viewer cling.
Bug: 13754204
Bug: 13752484
Change-Id: Iaf38c076d5b1e251f3d5d4b4ccba1bd8447999aa
ndroid/camera/app/FilmstripBottomPanel.java
ndroid/camera/settings/SettingsManager.java
ndroid/camera/widget/ExternalViewerButton.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
ndroid/camera/CameraActivity.java
ndroid/camera/app/CameraApp.java
ndroid/camera/app/CameraServices.java
ndroid/camera/settings/SettingsManager.java
|
| c9638388b28c9eca448bb4279c0f2f519c6d342e |
03-Apr-2014 |
Angus Kong <shkong@google.com> |
Merge "Add API to query the current auto-rotation setting" into gb-ub-photos-denali
|
| 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
ndroid/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
ndroid/camera/CameraActivity.java
ndroid/camera/CameraPreference.java
ndroid/camera/CameraSettings.java
ndroid/camera/ComboPreferences.java
ndroid/camera/CountDownTimerPreference.java
ndroid/camera/IconListPreference.java
ndroid/camera/ListPreference.java
ndroid/camera/PreferenceGroup.java
ndroid/camera/VideoModule.java
ndroid/camera/settings/SettingsManager.java
|
| d3d789992f96e4598521a27f085d185044ec7cee |
02-Apr-2014 |
Seth Raphael <magicseth@google.com> |
Avoid a race condition causing dup'd images.
When a session is finished, it is written to the
media store.
We now have a listener looking for new images in
the media store. If that happens to fire before
the session manager has updated the filmstrip,
the photo ends up being added twice.
Now, the listener checks to see if it is a photo
already being handled by a session
Bug: 13644124
Change-Id: I8a3c4a161ad0c326d9295f6714f6c6cbbcc6764e
ndroid/camera/Storage.java
ndroid/camera/data/CameraDataAdapter.java
|
| 59efb9af8340a5e3500037b23fb3ac16011a1c7e |
02-Apr-2014 |
Seth Raphael <magicseth@google.com> |
When we reset app ui, re-enable shutter button.
This allows all modules to have a known state on
resume.
Change-Id: I8efab600b7c6df611e522bb20c8a164006a27a9d
ndroid/camera/app/CameraAppUI.java
|
| 55d5b4a6a892b9c6265b2b6e43102396a6123493 |
02-Apr-2014 |
Seth Raphael <magicseth@google.com> |
Merge "Fix crash related to deleted items being processed" into gb-ub-photos-denali
|
| 7acc5d51f0df785c8c314e3f17a311af49164aec |
02-Apr-2014 |
Seth Raphael <magicseth@google.com> |
Fix crash related to deleted items being processed
If an item from the media store was being edited
there is a race condition where the item may be
deleted from the media store before it is finished
The resulting update to the media store cannot
find the original item, and therefore results in
0 rows being updated, which is what is desired,
as the item was deleted by the user.
Bug: 11598186
Change-Id: I1b2945f638676ccd63ab70ba201d2488df920eb3
ndroid/camera/Storage.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
|
| ad4cc5f6ccd7e40ca4ccc000b3ff3041e281577e |
02-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 86f71de1: Merge "Fix capture button layout for RTL" into gb-ub-photos-denali
* commit '86f71de115a1a7771d5505e10bce0262bc7093ba':
Fix capture button layout for RTL
|
| 745a0fd223a979bfd5e61be96f74de228c8a701a |
02-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 14320b47: Merge "Temp swipe interception to support swipe from capture button" into gb-ub-photos-denali
* commit '14320b47a88a818b6cc341f4a15c294e28ef1dfe':
Temp swipe interception to support swipe from capture button
|
| ee2868d1a2f8f840bd36846f9a3d5b7ec8ed26c2 |
02-Apr-2014 |
Spike Sprague <spikuru@google.com> |
am 6446567c: Merge "properly resize capture flash anim overlay" into gb-ub-photos-denali
* commit '6446567c51f99c500d4fff16052586495605a33d':
properly resize capture flash anim overlay
|
| 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
|
| 9dc4262cea73123b2a73cc0b0f762bb9ce2d5622 |
02-Apr-2014 |
Angus Kong <shkong@google.com> |
Add API to query the current auto-rotation setting
bug:13527779
Change-Id: I1ebcab1108bb03a997508033befeec26fb9a6b7e
ndroid/camera/app/OrientationManager.java
ndroid/camera/app/OrientationManagerImpl.java
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/CurrentModuleProvider.java
ndroid/camera/app/AppController.java
ndroid/camera/app/CameraApp.java
ndroid/camera/app/CameraServices.java
ndroid/camera/settings/SettingsManager.java
|
| 94dea6e4d1744aeaa5001a5023fb0a7ecb124128 |
02-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Refactor UsageStatistic so it can be disabled more easily." into gb-ub-photos-denali
|
| 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
ndroid/camera/ButtonManager.java
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
ndroid/camera/VideoModule.java
ndroid/camera/VideoUI.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/BottomBar.java
|
| 86f71de115a1a7771d5505e10bce0262bc7093ba |
02-Apr-2014 |
Doris Liu <tianliu@google.com> |
Merge "Fix capture button layout for RTL" into gb-ub-photos-denali
|
| a83ec8a3acb174e2688f0d31f2094e1aa72a06ee |
31-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Refactor UsageStatistic so it can be disabled more easily.
Change-Id: I2ca6e7d5642b1400d4b13f2c45cb48793b2fc178
ndroid/camera/CameraActivity.java
ndroid/camera/FocusOverlayManager.java
ndroid/camera/ListPreference.java
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.java
ndroid/camera/app/CameraApp.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/MainActivityLayout.java
|
| 14320b47a88a818b6cc341f4a15c294e28ef1dfe |
02-Apr-2014 |
Doris Liu <tianliu@google.com> |
Merge "Temp swipe interception to support swipe from capture button" into gb-ub-photos-denali
|
| 9eb517f4c4bcf00fbe435a56f89d3abcaaa4d881 |
02-Apr-2014 |
Doris Liu <tianliu@google.com> |
Temp swipe interception to support swipe from capture button
Bug: 13535296
Change-Id: I911336ce407abbfe51759bb38ffff9a534a49de6
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/MainActivityLayout.java
ndroid/camera/ui/ModeListView.java
|
| 6446567c51f99c500d4fff16052586495605a33d |
02-Apr-2014 |
Spike Sprague <spikuru@google.com> |
Merge "properly resize capture flash anim overlay" into gb-ub-photos-denali
|
| 88ea520053c1911e013ba675136be7dfa28c6c3b |
01-Apr-2014 |
Doris Liu <tianliu@google.com> |
Fix capture button layout for RTL
Created a class to handle the custom layout of mode options
and bottom bar, simplied the dependency between the two in
terms of positioning.
Also did some restructuring in layout resources for better readability
Bug: 13734579
Change-Id: I7088057e0c84f02f3cc6d598935d64b68dbc9526
ndroid/camera/ui/BottomBar.java
ndroid/camera/ui/BottomBarModeOptionsWrapper.java
ndroid/camera/ui/RotatableLinearLayout.java
|
| c4fbb3d83031686b0bbe5612fa58db90d1d1c9dc |
02-Apr-2014 |
Erin Dahlgren <edahlgren@google.com> |
Move disk IO from first time use background task.
Bug: 13251352
Change-Id: Ib6b0dbebb00f3210a649bb4d2782d65faaceb41c
ndroid/camera/CameraActivity.java
|
| cd79ac8f3c6ca7faf2a6b8eef2fb8f3b8b7fccc5 |
01-Apr-2014 |
Spike Sprague <spikuru@google.com> |
properly resize capture flash anim overlay
bug: 13651263
Change-Id: Icc9b23613185a0a5be606ec06c3e3ad4255be5c0
ndroid/camera/ui/CaptureAnimationOverlay.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
ndroid/camera/CameraActivity.java
|
| 74d0037d0743b2c119ac4ab346529b7c88909948 |
01-Apr-2014 |
Angus Kong <shkong@google.com> |
am d210c295: Merge "Change flash animation duration and maximum alpha." into gb-ub-photos-denali
* commit 'd210c2958806c8e63d8caa152e27799e278becde':
Change flash animation duration and maximum alpha.
|
| d210c2958806c8e63d8caa152e27799e278becde |
01-Apr-2014 |
Angus Kong <shkong@google.com> |
Merge "Change flash animation duration and maximum alpha." into gb-ub-photos-denali
|
| 95cc6c80438f9045b024fb50c54f07c0521fea8e |
01-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 265454d7: Enable all logging for dogfooding.
* commit '265454d7861b3ec54656032de3d346b1711ab4c9':
Enable all logging for dogfooding.
|
| 265454d7861b3ec54656032de3d346b1711ab4c9 |
01-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Enable all logging for dogfooding.
I will file a big to determine what logging level is right for launching.
For now let's enable all logs again we had it before, otherwise we might
miss some important logs.
Change-Id: I2abc7ca47c92987d594002bf09c82a69a6d6b056
ndroid/camera/debug/CurrentConfig.java
|
| aa90b599d6ef411c116edb1bb3ec9da6af6bedbc |
01-Apr-2014 |
Angus Kong <shkong@google.com> |
Change flash animation duration and maximum alpha.
bug:13340312
Change-Id: Ic239e345dfe2d8dd501565f2ea4614d0505ac478
ndroid/camera/ui/CaptureAnimationOverlay.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
|
| 84312832d7dbae89df75046ce91bf3d675b4b928 |
01-Apr-2014 |
Doris Liu <tianliu@google.com> |
Merge "New generic cling widget, add cling for refocus editor button" 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
ndroid/camera/CameraActivity.java
ndroid/camera/data/AbstractLocalDataAdapterWrapper.java
ndroid/camera/data/CameraDataAdapter.java
ndroid/camera/data/LocalDataAdapter.java
ndroid/camera/session/CaptureSessionManager.java
ndroid/camera/session/CaptureSessionManagerImpl.java
|
| 281b7ec77677feadb9b1813b8edf819a7eea0fa0 |
01-Apr-2014 |
Spike Sprague <spikuru@google.com> |
am 7c696626: Merge "keep three dots option toggle on the screen" into gb-ub-photos-denali
* commit '7c696626e213f010ab3027165b7c70bc2345fe01':
keep three dots option toggle on the screen
|
| 7c696626e213f010ab3027165b7c70bc2345fe01 |
01-Apr-2014 |
Spike Sprague <spikuru@google.com> |
Merge "keep three dots option toggle on the screen" into gb-ub-photos-denali
|
| b36c6b7a5262e2d80b4c6e3e17cc3cb79b6a522a |
31-Mar-2014 |
Spike Sprague <spikuru@google.com> |
keep three dots option toggle on the screen
bug: 13716654
Change-Id: I142d2ce8c026ad4f4fded15475e4d2a42e10f859
ndroid/camera/app/CameraAppUI.java
ndroid/camera/widget/IndicatorIconController.java
ndroid/camera/widget/ModeOptionsOverlay.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
ndroid/camera/CameraActivity.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/app/FilmstripBottomPanel.java
ndroid/camera/settings/SettingsCache.java
ndroid/camera/settings/SettingsManager.java
ndroid/camera/widget/Cling.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
ndroid/camera/CameraActivity.java
|
| 9858871ebed68889ce108588491055a40874a156 |
31-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
am 33e3133b: Merge "Enable a memory override through Gservices." into gb-ub-photos-denali
* commit '33e3133bb7161fad5f97880facdf8bea97d930d0':
Enable a memory override through Gservices.
|
| 33e3133bb7161fad5f97880facdf8bea97d930d0 |
31-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Enable a memory override through Gservices." into gb-ub-photos-denali
|
| 0b1acadf43507288d516618577c66e5e214fd6c3 |
31-Mar-2014 |
Angus Kong <shkong@google.com> |
am a5d07059: Add log for unfinished synchronous job.
* commit 'a5d07059d1f9d61d918a0b33e781efd764032eba':
Add log for unfinished synchronous job.
|
| a5d07059d1f9d61d918a0b33e781efd764032eba |
31-Mar-2014 |
Angus Kong <shkong@google.com> |
Add log for unfinished synchronous job.
bug:13566485
Change-Id: Ic3920bcc5c2c8ffdfd7f55f6e688ddfea44cad93
ndroid/camera/app/AndroidCameraManagerImpl.java
|
| fe14c6811cfe88ff8cbfa28153ce4379b22cf838 |
31-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
am d1bb8e08: If debug is on, log everything.
* commit 'd1bb8e084f4ef1dc0b6836d8de07454a80de3ac9':
If debug is on, log everything.
|
| 23262280ef73104d909d23d0fa811c217a349497 |
29-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Enable a memory override through Gservices.
Bug: 13591498
Change-Id: I8515c57c2349279fb74071854b85021716895fa6
ndroid/camera/app/MemoryManagerImpl.java
|
| d1bb8e084f4ef1dc0b6836d8de07454a80de3ac9 |
29-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
If debug is on, log everything.
Change-Id: I706874c9ea1b03c2fd9f987cda9581f72883c914
ndroid/camera/debug/Log.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.
|
| 60f4d74c66e47439c6213b331d73c8a50a284363 |
28-Mar-2014 |
Doris Liu <tianliu@google.com> |
am c51b5d24: Merge "Remove white balance and non-HDR scene mode settings" into gb-ub-photos-denali
* commit 'c51b5d242f95442f75cd46e84bf91087c18f65be':
Remove white balance and non-HDR scene mode settings
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.java
ndroid/camera/module/ModuleController.java
|
| ed2097d63d327eeb6f0d0399da604e78dc1d1d9d |
28-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
resolved conflicts for merge of 366c13ba to ub-camera-everglades
Change-Id: I6654367c0a761382c26c3bd09039fe8fc0f52f78
|
| c51b5d242f95442f75cd46e84bf91087c18f65be |
28-Mar-2014 |
Doris Liu <tianliu@google.com> |
Merge "Remove white balance and non-HDR scene mode settings" into gb-ub-photos-denali
|
| 8ad8ad4841f65ee89e3c5e79f57d95cf8e4438b4 |
27-Mar-2014 |
Doris Liu <tianliu@google.com> |
Remove white balance and non-HDR scene mode settings
Also hook up HDR setting with scene mode to ensure it functions correctly
Bug: 13546569
Bug: 13546102
Change-Id: I71ef1841fc2bcb22f6ca0e286c31806ea049c79e
ndroid/camera/ButtonManager.java
ndroid/camera/OnScreenIndicators.java
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/settings/SettingsCache.java
ndroid/camera/settings/SettingsManager.java
ndroid/camera/widget/IndicatorIconController.java
|
| 366c13baa640bc597cac360c5a1ffad5a3618b11 |
28-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Change processing logic so that it can be suspended
Bug: 13591498
Change-Id: Ib6e86bd6da197415676a80b212ea910ad0215f5d
ndroid/camera/app/MemoryManagerImpl.java
ndroid/camera/data/LocalMediaData.java
ndroid/camera/processing/ProcessingService.java
ndroid/camera/processing/ProcessingServiceManager.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
|
| a293597032795e3f245e9f0d5b20701375904e04 |
27-Mar-2014 |
Alan Newberger <alann@google.com> |
resolved conflicts for merge of 1cfa3dd7 to ub-camera-everglades
Change-Id: I82bd27a28ad5df4dda149e97bddc317ffe6914d0
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/app/CameraAppUI.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
|
| fa74d8bab8b01a28e956b646eed784f349bc662f |
26-Mar-2014 |
Alan Newberger <alann@google.com> |
am f2711925: Fix video recording announcements
* commit 'f2711925113d405f83734ac81e3de36132e783ce':
Fix video recording announcements
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/CameraErrorCallback.java
ndroid/camera/CameraSettings.java
ndroid/camera/DisableCameraReceiver.java
ndroid/camera/Exif.java
ndroid/camera/FocusOverlayManager.java
ndroid/camera/ListPreference.java
ndroid/camera/MediaSaverImpl.java
ndroid/camera/OnScreenHint.java
ndroid/camera/OnScreenIndicators.java
ndroid/camera/PanoProgressBar.java
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
ndroid/camera/PreviewGestures.java
ndroid/camera/SoundClips.java
ndroid/camera/Storage.java
ndroid/camera/SurfaceTextureRenderer.java
ndroid/camera/TextureViewHelper.java
ndroid/camera/VideoModule.java
ndroid/camera/VideoUI.java
ndroid/camera/app/AndroidCameraManagerImpl.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/app/CameraController.java
ndroid/camera/app/CameraManager.java
ndroid/camera/app/LegacyLocationProvider.java
ndroid/camera/app/MemoryManagerImpl.java
ndroid/camera/app/ModuleManagerImpl.java
ndroid/camera/app/OrientationManagerImpl.java
ndroid/camera/data/CameraDataAdapter.java
ndroid/camera/data/FixedFirstDataAdapter.java
ndroid/camera/data/LocalData.java
ndroid/camera/data/LocalDataUtil.java
ndroid/camera/data/LocalMediaData.java
ndroid/camera/data/MediaDetails.java
ndroid/camera/data/RotationTask.java
ndroid/camera/data/SimpleViewData.java
ndroid/camera/data/VideoRotationMetadataLoader.java
ndroid/camera/debug/Config.java
ndroid/camera/debug/Configurations.java
ndroid/camera/debug/CurrentConfig.java
ndroid/camera/debug/DebugCameraProxy.java
ndroid/camera/debug/Log.java
ndroid/camera/exif/ExifData.java
ndroid/camera/exif/ExifModifier.java
ndroid/camera/exif/ExifOutputStream.java
ndroid/camera/exif/ExifParser.java
ndroid/camera/exif/ExifReader.java
ndroid/camera/module/ModulesInfo.java
ndroid/camera/processing/ProcessingService.java
ndroid/camera/processing/ProcessingServiceManager.java
ndroid/camera/session/CaptureSessionManagerImpl.java
ndroid/camera/session/PlaceholderManager.java
ndroid/camera/session/SessionStorageManagerImpl.java
ndroid/camera/settings/SettingsManager.java
ndroid/camera/settings/SettingsUtil.java
ndroid/camera/tinyplanet/TinyPlanetFragment.java
ndroid/camera/ui/BottomBar.java
ndroid/camera/ui/CaptureAnimationOverlay.java
ndroid/camera/ui/FaceView.java
ndroid/camera/ui/FilmstripGestureRecognizer.java
ndroid/camera/ui/MainActivityLayout.java
ndroid/camera/ui/ModeListView.java
ndroid/camera/ui/ModeTransitionView.java
ndroid/camera/ui/OverlayRenderer.java
ndroid/camera/ui/PieRenderer.java
ndroid/camera/ui/PreviewOverlay.java
ndroid/camera/ui/RenderOverlay.java
ndroid/camera/ui/RotatableLayout.java
ndroid/camera/ui/RotateImageView.java
ndroid/camera/ui/RotateLayout.java
ndroid/camera/ui/ZoomRenderer.java
ndroid/camera/ui/ZoomView.java
ndroid/camera/util/CameraUtil.java
ndroid/camera/util/ImageLoader.java
ndroid/camera/util/IntentHelper.java
ndroid/camera/util/XmpUtil.java
ndroid/camera/widget/FilmstripView.java
ndroid/camera/widget/IndicatorIconController.java
ndroid/camera/widget/ModeOptionsOverlay.java
ndroid/camera/widget/Preloader.java
|
| 1cfa3dd77d3828985d37beffbfad9388af054757 |
26-Mar-2014 |
Alan Newberger <alann@google.com> |
Add content description for filmstrip images, video button
This CL corrects a missing content description for video icon in
filmstrip. It also adds content description for images so that when
a user in TalkBack highlights an image, it describes its timestamp.
Bug: 13644357
Bug: 13589550
Change-Id: I029b141cee4ddc325a5e5569ef10de600734b0f4
ndroid/camera/data/LocalMediaData.java
ndroid/camera/data/LocalSessionData.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
ndroid/camera/CameraActivity.java
|
| f2711925113d405f83734ac81e3de36132e783ce |
26-Mar-2014 |
Alan Newberger <alann@google.com> |
Fix video recording announcements
Video recording announcements were implemented in the past, but broken
due to null shutter button View during attempt. I pushed the announcements
into the VideoUI where IMO it belongs, and it encapsulates the implementation
detail that I use the timer View (which works fine).
Bug: 13644953
Bug: 13589550
Change-Id: I0d5135e5d23d9c4df594307d0beb5d5be934e409
ndroid/camera/VideoModule.java
ndroid/camera/VideoUI.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
ndroid/camera/CameraActivity.java
ndroid/camera/CameraErrorCallback.java
ndroid/camera/CameraSettings.java
ndroid/camera/DisableCameraReceiver.java
ndroid/camera/Exif.java
ndroid/camera/FocusOverlayManager.java
ndroid/camera/ListPreference.java
ndroid/camera/MediaSaverImpl.java
ndroid/camera/OnScreenHint.java
ndroid/camera/OnScreenIndicators.java
ndroid/camera/PanoProgressBar.java
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
ndroid/camera/PreviewGestures.java
ndroid/camera/SoundClips.java
ndroid/camera/Storage.java
ndroid/camera/SurfaceTextureRenderer.java
ndroid/camera/TextureViewHelper.java
ndroid/camera/VideoModule.java
ndroid/camera/VideoUI.java
ndroid/camera/app/AndroidCameraManagerImpl.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/app/CameraController.java
ndroid/camera/app/CameraManager.java
ndroid/camera/app/LegacyLocationProvider.java
ndroid/camera/app/MemoryManagerImpl.java
ndroid/camera/app/ModuleManagerImpl.java
ndroid/camera/app/OrientationManagerImpl.java
ndroid/camera/data/CameraDataAdapter.java
ndroid/camera/data/FixedFirstDataAdapter.java
ndroid/camera/data/LocalData.java
ndroid/camera/data/LocalDataUtil.java
ndroid/camera/data/LocalMediaData.java
ndroid/camera/data/MediaDetails.java
ndroid/camera/data/RotationTask.java
ndroid/camera/data/SimpleViewData.java
ndroid/camera/data/VideoRotationMetadataLoader.java
ndroid/camera/debug/Config.java
ndroid/camera/debug/Configurations.java
ndroid/camera/debug/CurrentConfig.java
ndroid/camera/debug/DebugCameraProxy.java
ndroid/camera/debug/Log.java
ndroid/camera/exif/ExifData.java
ndroid/camera/exif/ExifModifier.java
ndroid/camera/exif/ExifOutputStream.java
ndroid/camera/exif/ExifParser.java
ndroid/camera/exif/ExifReader.java
ndroid/camera/module/ModulesInfo.java
ndroid/camera/processing/ProcessingService.java
ndroid/camera/processing/ProcessingServiceManager.java
ndroid/camera/session/CaptureSessionManagerImpl.java
ndroid/camera/session/PlaceholderManager.java
ndroid/camera/session/SessionStorageManagerImpl.java
ndroid/camera/settings/SettingsManager.java
ndroid/camera/settings/SettingsUtil.java
ndroid/camera/tinyplanet/TinyPlanetFragment.java
ndroid/camera/ui/BottomBar.java
ndroid/camera/ui/CaptureAnimationOverlay.java
ndroid/camera/ui/FaceView.java
ndroid/camera/ui/FilmstripGestureRecognizer.java
ndroid/camera/ui/MainActivityLayout.java
ndroid/camera/ui/ModeListView.java
ndroid/camera/ui/ModeTransitionView.java
ndroid/camera/ui/OverlayRenderer.java
ndroid/camera/ui/PieRenderer.java
ndroid/camera/ui/PreviewOverlay.java
ndroid/camera/ui/RenderOverlay.java
ndroid/camera/ui/RotatableLayout.java
ndroid/camera/ui/RotateImageView.java
ndroid/camera/ui/RotateLayout.java
ndroid/camera/ui/ZoomRenderer.java
ndroid/camera/ui/ZoomView.java
ndroid/camera/util/CameraUtil.java
ndroid/camera/util/ImageLoader.java
ndroid/camera/util/IntentHelper.java
ndroid/camera/util/XmpUtil.java
ndroid/camera/widget/FilmstripView.java
ndroid/camera/widget/IndicatorIconController.java
ndroid/camera/widget/ModeOptionsOverlay.java
ndroid/camera/widget/Preloader.java
|
| ddbec4d1c3a0e2a796de65c226d5d2621a4d0d21 |
26-Mar-2014 |
Andy Huibers <andyhuibers@google.com> |
am 2fc87a73: Merge "Clean up stats stubs." into gb-ub-photos-denali
* commit '2fc87a7338d34d8d7383eeea3a367893961a6ac5':
Clean up stats stubs.
|
| 2fc87a7338d34d8d7383eeea3a367893961a6ac5 |
26-Mar-2014 |
Andy Huibers <andyhuibers@google.com> |
Merge "Clean up stats stubs." into gb-ub-photos-denali
|
| f7d4ebac5b4a8093b37d35fd0d650380dae8c8e4 |
26-Mar-2014 |
Andy Huibers <andyhuibers@google.com> |
Clean up stats stubs.
Change-Id: I3e2aefc2a1e4c5086af43fea18cc39963cfd0c82
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.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()
|
| 744eee4a13bb33449dba51e371a62257d6e7ef56 |
26-Mar-2014 |
Doris Liu <tianliu@google.com> |
Merge "Disconnect visibility change listener in onDestroy()" into gb-ub-photos-denali
|
| 3cea8cc394ec2468de7b4ba1b5a68717b22f7c8a |
26-Mar-2014 |
Doris Liu <tianliu@google.com> |
Disconnect visibility change listener in onDestroy()
Bug: 13642099
Change-Id: If31304db8eb7152aea4365e6c112e3254fd8820b
ndroid/camera/CameraActivity.java
|
| cbd058a6e3cd7a9b254c51e3db4d4aef2d31579f |
25-Mar-2014 |
Carlos Hernandez <chernand@google.com> |
Implement callbacks for setProgressMessage
Change-Id: Id958d39c91ba3371d6b52b8f6005cc533ca38b45
ndroid/camera/CameraActivity.java
ndroid/camera/session/CaptureSessionManager.java
ndroid/camera/session/CaptureSessionManagerImpl.java
|
| 71bd7248ab31bc9bb280dd56ef6be5c8fa749ba4 |
25-Mar-2014 |
Alan Newberger <alann@google.com> |
am 75fc98f2: provide announcements for peeks states
* commit '75fc98f248f4383e3dc10048bfdf0292fd8dd970':
provide announcements for peeks states
|
| 75fc98f248f4383e3dc10048bfdf0292fd8dd970 |
25-Mar-2014 |
Alan Newberger <alann@google.com> |
provide announcements for peeks states
The peek is a visual element that with this CL, has an
a11y accompaniment.
Bug: 13589550
Change-Id: I92be51f64d43e1f3c1cdb90ac135986455bd2177
ndroid/camera/widget/PeekView.java
|
| 85ba9ecf5951b3f1afbec996c08580496ac4d741 |
25-Mar-2014 |
Alan Newberger <alann@google.com> |
am 26e901ed: Add a11y announcements for Mode List
* commit '26e901ed46054fb6cc2cb4c09bef3a779a1cbf78':
Add a11y announcements for Mode List
|
| 26e901ed46054fb6cc2cb4c09bef3a779a1cbf78 |
25-Mar-2014 |
Alan Newberger <alann@google.com> |
Add a11y announcements for Mode List
This CL adds mode list announcements when shown, hidden, and for shimmy.
Adds a Manager to guard access to current state, which calls an event on the
state onCurrentState, in which announcements and other processing can be done.
Bug: 13589550
Change-Id: Ib0f3b555978438426d158c33d3d97f72f3e83130
ndroid/camera/ui/ModeListView.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
ndroid/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
ndroid/camera/CameraActivity.java
ndroid/camera/app/CameraAppUI.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
ndroid/camera/CameraActivity.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/filmstrip/FilmstripController.java
ndroid/camera/widget/FilmstripView.java
|
| 92acdb86dcbce90c904e1682c49617614ab3dddc |
25-Mar-2014 |
Angus Kong <shkong@google.com> |
am 218ebb8f: Merge "Disable camera switch after it\'s pressed." into gb-ub-photos-denali
* commit '218ebb8f396aa83de198f313f577d9710059bc8f':
Disable camera switch after it's pressed.
|
| 2ed67843b7eb5cb67eaec51561770262f5fd36c7 |
25-Mar-2014 |
Angus Kong <shkong@google.com> |
Show hint animations forever.
bug:13544174
Change-Id: I7d679c8e13b41a5d8266c2c2768e914ef3d5ea1b
ndroid/camera/CameraActivity.java
ndroid/camera/app/AppController.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/settings/SettingsCache.java
ndroid/camera/settings/SettingsManager.java
|
| 218ebb8f396aa83de198f313f577d9710059bc8f |
25-Mar-2014 |
Angus Kong <shkong@google.com> |
Merge "Disable camera switch after it's pressed." into gb-ub-photos-denali
|
| 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
|
| c8d9ad868e515ccebe1b6f52cb5fae1e6d13cbab |
25-Mar-2014 |
Angus Kong <shkong@google.com> |
Disable camera switch after it's pressed.
bug:13477604
Change-Id: I478715b345ce39d6bff65c9eda3a5604fb9d7edb
ndroid/camera/ButtonManager.java
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/widget/FilmstripLayout.java
|
| b3596fc4e44db6696a73f76fd2492acec9fb67ab |
24-Mar-2014 |
Kevin Gabayan <gabayan@google.com> |
am 8bfef0d5: Merge "Focus reset delay changed from 3 to 4 seconds. Bug: 12826152" into gb-ub-photos-denali
* commit '8bfef0d567232aec9711790f66187588c67ae82a':
Focus reset delay changed from 3 to 4 seconds. Bug: 12826152
|
| 8bfef0d567232aec9711790f66187588c67ae82a |
24-Mar-2014 |
Kevin Gabayan <gabayan@google.com> |
Merge "Focus reset delay changed from 3 to 4 seconds. Bug: 12826152" into gb-ub-photos-denali
|
| d829d95be0bc45b6a8aa7973c7d739299fcda07e |
24-Mar-2014 |
Doris Liu <tianliu@google.com> |
am f6504fce: Merge "More efficient drawing during animation" into gb-ub-photos-denali
* commit 'f6504fceb9a37b543368be6e5d943b1981434b31':
More efficient drawing during animation
|
| f6504fceb9a37b543368be6e5d943b1981434b31 |
24-Mar-2014 |
Doris Liu <tianliu@google.com> |
Merge "More efficient drawing during animation" into gb-ub-photos-denali
|
| d4a68ca4e34ad256cd4cd2f7b1faae234d240dfa |
24-Mar-2014 |
Kevin Gabayan <gabayan@google.com> |
Focus reset delay changed from 3 to 4 seconds.
Bug: 12826152
Change-Id: I91a0dce343035b8d39de092a7f4bb1af26a44c55
ndroid/camera/FocusOverlayManager.java
|
| 9a617ec88bd3ebf7ce72428b4b4f10615f43d92b |
24-Mar-2014 |
Carlos Hernandez <chernand@google.com> |
am dc1afd4b: Merge "let ProcessingServiceManager report if the service is running" into gb-ub-photos-denali
* commit 'dc1afd4bebd4ab220b1aca14295038ad790d5f6b':
let ProcessingServiceManager report if the service is running
|
| dc1afd4bebd4ab220b1aca14295038ad790d5f6b |
24-Mar-2014 |
Carlos Hernandez <chernand@google.com> |
Merge "let ProcessingServiceManager report if the service is running" into gb-ub-photos-denali
|
| 9f834952cbef4d8c2dbf67be77157192f7a70d90 |
24-Mar-2014 |
Carlos Hernandez <chernand@google.com> |
let ProcessingServiceManager report if the service is running
Change-Id: Ib706f2446baa12d2b70ff5c5b3d5637214006340
ndroid/camera/processing/ProcessingService.java
ndroid/camera/processing/ProcessingServiceManager.java
|
| 4fffd39dc7cec711f236fa98c480657e2e5ebc16 |
24-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
am c34c7700: Merge "Add more logging to the processing service." into gb-ub-photos-denali
* commit 'c34c77005b15289c8198172c9ea9b7cbbb09d2ea':
Add more logging to the processing service.
|
| c34c77005b15289c8198172c9ea9b7cbbb09d2ea |
24-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Add more logging to the processing service." into gb-ub-photos-denali
|
| d5f38f505d5a5445288677f839cf4d8b9222a6c8 |
24-Mar-2014 |
Sameer Padala <sxp@google.com> |
Merge "Enable SmartCamera in video mode" into ub-camera-everglades
|
| b4dc6350a10464cbd73495425032ecb854f11c0b |
24-Mar-2014 |
Spike Sprague <spikuru@google.com> |
am 197e238d: Merge "moving m*Animator.end() out of onConfigurationChanged" into gb-ub-photos-denali
* commit '197e238d3ccd2c758238f1bce27687644c4d0521':
moving m*Animator.end() out of onConfigurationChanged
|
| 4df915872c25fe61640a94c7a2c5f27eee1a1048 |
22-Mar-2014 |
Doris Liu <tianliu@google.com> |
More efficient drawing during animation
- Improved mode options animation and video capture animation
- Changed the drawPath() calls to drawCircle() as drawing oval is
generally optimized and therefore more efficient. The efficiency
gained depends on the hardware/software specific implementation,
depending on where it's rendered. But drawCircle() should always
no more costly than drawPath().
- Move the video capture button animation to after MediaRecorder
initialization/release to avoid animation being blocked by time
consuming operations.
Bug: 13589320
Change-Id: I9c01374e46d439e33a066cfba07d95749a3caebf
ndroid/camera/VideoModule.java
ndroid/camera/ui/BottomBar.java
ndroid/camera/widget/ModeOptions.java
|
| 085fc9ffa97b85b36a7368a2880e222efa0f9165 |
24-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
resolved conflicts for merge of e1cc77ad to ub-camera-everglades
Change-Id: I5814d65c2dc5ae5f669881c2cf676277d1512684
|
| 197e238d3ccd2c758238f1bce27687644c4d0521 |
24-Mar-2014 |
Spike Sprague <spikuru@google.com> |
Merge "moving m*Animator.end() out of onConfigurationChanged" into gb-ub-photos-denali
|
| d88c0011ab16c2a27962249a9896835f85576794 |
24-Mar-2014 |
Sam Judd <judds@google.com> |
resolved conflicts for merge of 2666dc8a to ub-camera-everglades
Change-Id: I9e3733dc447ae6613c73c1a94e7cc3c5e400b1da
|
| e1cc77ad1ce8a7d4fc1447792da4667b5f2b2073 |
24-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Clean up notifications again after the removal of the notifications manager." into gb-ub-photos-denali
|
| 2f845b851439b3500727742278876ae017a8f4c5 |
24-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Clean up notifications again after the removal of the notifications manager.
Bug: 12972656
Change-Id: I3b16689ae22bbebd61143f84b55657759da2fad5
ndroid/camera/app/CameraApp.java
|
| 4a5b9e0b9f4eab654f30588941749a25aeba97fe |
24-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Add more logging to the processing service.
Bug: 13567165
Change-Id: I759ba750e3c911454bad86c4397d02e22837322c
ndroid/camera/processing/ProcessingService.java
|
| 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.
|
| 2666dc8a1c23b7c2b7c80d7c09104f113fb7dbb2 |
22-Mar-2014 |
Sam Judd <judds@google.com> |
Decode fullsize bitmap dimensions on a background thread.
Bug: 13587605
Change-Id: Ia40e0799947abae3089e66dfcea339a68ee0d8e4
ndroid/camera/data/LocalDataUtil.java
ndroid/camera/data/LocalMediaData.java
ndroid/camera/ui/ZoomView.java
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/app/CameraAppUI.java
|
| 2d697d09777cb9d662dcd7c414f8f228b8912526 |
22-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
am 0bb2a760: Merge "Processing service needs to start in foreground." into gb-ub-photos-denali
* commit '0bb2a76095707d4ae4b147133bc1b0d65541c2cd':
Processing service needs to start in foreground.
|
| 0bb2a76095707d4ae4b147133bc1b0d65541c2cd |
22-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Processing service needs to start in foreground." into gb-ub-photos-denali
|
| 4a400d7f09ea0655d4730e904892e3a9d96993eb |
21-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Processing service needs to start in foreground.
Bug: 13575616
This moves the notification logic into the processing service as we
anyway only have one notification.
Change-Id: I267966a0e34028cb72be373031562e9e9bc89bbb
ndroid/camera/app/CameraApp.java
ndroid/camera/processing/ProcessingService.java
ndroid/camera/session/CaptureSession.java
ndroid/camera/session/CaptureSessionManagerImpl.java
ndroid/camera/session/ProcessingNotificationManager.java
|
| fd29a841a046c6a02306adc9e4df1a5eeb466f39 |
21-Mar-2014 |
Spike Sprague <spikuru@google.com> |
moving m*Animator.end() out of onConfigurationChanged
bug: 13436761
Change-Id: Ife53c47d6076a9804dbbe87e4e2ab6344bac22ff
ndroid/camera/widget/ModeOptions.java
|
| db81ce638be2782ba3313e721fcd4e062c0935fe |
21-Mar-2014 |
Sameer Padala <sxp@google.com> |
Enable SmartCamera in video mode
Change-Id: Ic10715c961990aacba1c20f9678358856ed4081c
ndroid/camera/CameraActivity.java
ndroid/camera/CameraModule.java
ndroid/camera/VideoModule.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
ndroid/camera/CameraActivity.java
ndroid/camera/data/CameraDataAdapter.java
ndroid/camera/data/FixedFirstDataAdapter.java
ndroid/camera/data/FixedLastDataAdapter.java
ndroid/camera/data/ImageModelLoader.java
ndroid/camera/data/LocalData.java
ndroid/camera/data/LocalMediaData.java
ndroid/camera/data/LocalSessionData.java
ndroid/camera/data/RotationTask.java
ndroid/camera/data/SimpleViewData.java
ndroid/camera/data/VideoModelLoader.java
ndroid/camera/filmstrip/ImageData.java
ndroid/camera/widget/FilmstripView.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
ndroid/camera/CameraActivity.java
ndroid/camera/VideoModule.java
ndroid/camera/data/AbstractLocalDataAdapterWrapper.java
ndroid/camera/data/CameraDataAdapter.java
ndroid/camera/data/FixedFirstDataAdapter.java
ndroid/camera/data/FixedLastDataAdapter.java
ndroid/camera/data/LocalDataAdapter.java
ndroid/camera/data/LocalDataUtil.java
ndroid/camera/data/LocalMediaData.java
ndroid/camera/data/MetadataLoader.java
ndroid/camera/data/VideoRotationMetadataLoader.java
ndroid/camera/filmstrip/FilmstripController.java
ndroid/camera/widget/FilmstripView.java
ndroid/camera/widget/Preloader.java
|
| 82411163a2467b2bc3dd42da183f98638365ad8a |
21-Mar-2014 |
Seth Raphael <magicseth@google.com> |
am 282dc2c3: Merge "Fix lookup type" into gb-ub-photos-denali
* commit '282dc2c37ad1fa27dd5e28ff148f9432f6077078':
Fix lookup type
|
| 282dc2c37ad1fa27dd5e28ff148f9432f6077078 |
21-Mar-2014 |
Seth Raphael <magicseth@google.com> |
Merge "Fix lookup type" into gb-ub-photos-denali
|
| 0708bb4cc97afb9ffb17dc2148c97ab95368767b |
21-Mar-2014 |
Seth Raphael <magicseth@google.com> |
Fix lookup type
Bug: 13582743
Change-Id: I16ddf8fbedc1461c05aeadfad27930862aebc4ff
ndroid/camera/session/CaptureSessionManagerImpl.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
ndroid/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
ndroid/camera/CameraActivity.java
ndroid/camera/session/CaptureSessionManager.java
ndroid/camera/session/CaptureSessionManagerImpl.java
|
| 6e014d74d8a93fe23cc7025891fc53a4b569b074 |
21-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
am de5cb2a3: Merge "Update processing API to support pause/resume." into gb-ub-photos-denali
* commit 'de5cb2a3ac53eea54eae01268e98610aa5acdaba':
Update processing API to support pause/resume.
|
| de5cb2a3ac53eea54eae01268e98610aa5acdaba |
21-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Update processing API to support pause/resume." into gb-ub-photos-denali
|
| 58acf0df808ea67e8ad9ab6ffccff4548566580a |
20-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Update processing API to support pause/resume.
Bug: 12080035
BUg: 12211113
This has been ported over from the LightCycle service. We make use of
this to pause processing while new memory-intense captures are going on.
Change-Id: I9c7d8eb4199d290a2f35becce2541661636a26d4
ndroid/camera/processing/ProcessingService.java
ndroid/camera/processing/ProcessingTask.java
|
| 87ae86d3eb92cec95929dd2cabf521feb4ced37b |
20-Mar-2014 |
Spike Sprague <spikuru@google.com> |
am 5cc5f61e: Merge "video bottom bar stop button tweaking" into gb-ub-photos-denali
* commit '5cc5f61e96ebc6bd0af2613b14d68c2cafd7ab78':
video bottom bar stop button tweaking
|
| 5cc5f61e96ebc6bd0af2613b14d68c2cafd7ab78 |
20-Mar-2014 |
Spike Sprague <spikuru@google.com> |
Merge "video bottom bar stop button tweaking" into gb-ub-photos-denali
|
| 0f2af74e7e6861402a766301d7f9114f453b0aa1 |
20-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
am 4ef32fda: Merge "Add ability to add extra settings." into gb-ub-photos-denali
* commit '4ef32fda7c6b084b9799e53e3071a1ce5e5b6ac3':
Add ability to add extra settings.
|
| ed107412eee6bdb7f24c09c41559b04fa80747f3 |
20-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Add ability to add extra settings.
Bug: 13077452
Change-Id: Id1159405d8cbbe3b84b94899b9f6352e64e428fa
ndroid/camera/settings/CameraSettingsActivity.java
ndroid/camera/settings/SettingsCache.java
ndroid/camera/settings/SettingsManager.java
|
| d26f305dd9eb20d23e808ed8a2f1f37de0d9261e |
20-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 7a4364b0: Merge "Prevent rapid HDR+ switching from causing illegal state." into gb-ub-photos-denali
* commit '7a4364b0ef54fe4b02a108b0181d10d3f7feda96':
Prevent rapid HDR+ switching from causing illegal state.
|
| 7a4364b0ef54fe4b02a108b0181d10d3f7feda96 |
19-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Prevent rapid HDR+ switching from causing illegal state." into gb-ub-photos-denali
|
| 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
ndroid/camera/CameraActivity.java
|
| 4cdaf5178704224673d0e7ba948830d1cabd8fa0 |
19-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
Prevent rapid HDR+ switching from causing illegal state.
Bug: 13524559
Change-Id: Id8b2ebbfcdbf5e9b32a0f580adb6fe4754143396
ndroid/camera/PhotoModule.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
ndroid/camera/CameraActivity.java
|
| 43bf03f6e7f9a71b7553e7282b5799798997caf7 |
17-Mar-2014 |
Sam Judd <judds@google.com> |
Allow views to be reused in filmstrip.
Change-Id: Ic2b8bbc251c9b19e658412ac3885a0cb83680809
ndroid/camera/CameraActivity.java
ndroid/camera/data/CameraDataAdapter.java
ndroid/camera/data/CameraPreviewData.java
ndroid/camera/data/FixedFirstDataAdapter.java
ndroid/camera/data/FixedLastDataAdapter.java
ndroid/camera/data/LocalData.java
ndroid/camera/data/LocalDataViewType.java
ndroid/camera/data/LocalMediaData.java
ndroid/camera/data/LocalSessionData.java
ndroid/camera/data/SimpleViewData.java
ndroid/camera/filmstrip/DataAdapter.java
ndroid/camera/widget/FilmstripView.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
ndroid/camera/CameraActivity.java
ndroid/camera/settings/SettingsManager.java
|
| 6c59b629511240fd9a12bc2b1de6d11525f2a88a |
18-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
am 454a33f1: Merge "Put resolution settings in a sub-screen." into gb-ub-photos-denali
* commit '454a33f1ceacdd4d5ce97e97c031385de208eace':
Put resolution settings in a sub-screen.
|
| 454a33f1ceacdd4d5ce97e97c031385de208eace |
18-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Put resolution settings in a sub-screen." into gb-ub-photos-denali
|
| 04ca24b495c4b410dc8b6127b3af0ac29df74eb8 |
18-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Put resolution settings in a sub-screen.
Bug: 13512118
Also fixes a crash when going into settings.
Change-Id: I354749e2e4180e46d888b82e2c4d479cc7c06aca
ndroid/camera/settings/CameraSettingsActivity.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
ndroid/camera/CameraActivity.java
ndroid/camera/data/AbstractLocalDataAdapterWrapper.java
ndroid/camera/data/CameraDataAdapter.java
ndroid/camera/data/LocalDataAdapter.java
ndroid/camera/data/LocalDataList.java
ndroid/camera/data/LocalMediaData.java
ndroid/camera/data/LocalSessionData.java
ndroid/camera/data/MetadataLoader.java
ndroid/camera/data/RotationTask.java
ndroid/camera/data/SimpleViewData.java
ndroid/camera/filmstrip/ImageData.java
ndroid/camera/session/CaptureSession.java
ndroid/camera/session/CaptureSessionManager.java
ndroid/camera/session/CaptureSessionManagerImpl.java
ndroid/camera/widget/FilmstripView.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
|
| 459c12ebaf5dbf71d2c775c4f3fbf5fd8d6a97c7 |
17-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
am 57a16b12: Merge "New resolution settings. Two for each camera." into gb-ub-photos-denali
* commit '57a16b1204081250a7d510d30c47fdd5c2108fa5':
New resolution settings. Two for each camera.
|
| 57a16b1204081250a7d510d30c47fdd5c2108fa5 |
17-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "New resolution settings. Two for each camera." into gb-ub-photos-denali
|
| e2c646d1cd75ff0bd9654431f5419e9ccb612c5d |
17-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
am a57d3747: Merge "Disable time-lapse as Denali doesn\'t contain this feature." into gb-ub-photos-denali
* commit 'a57d374727dc122ab16cffc73fa3950e3b3d0b96':
Disable time-lapse as Denali doesn't contain this feature.
|
| a57d374727dc122ab16cffc73fa3950e3b3d0b96 |
17-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Disable time-lapse as Denali doesn't contain this feature." into gb-ub-photos-denali
|
| 8c000c204fe676a3e791f65831f6e62f7fc46448 |
17-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Disable time-lapse as Denali doesn't contain this feature.
Bug: 13509556
Change-Id: Iad4b5f821c571627570b0bb85bafb7b5d832c0f4
ndroid/camera/VideoModule.java
|
| 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
ndroid/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
ndroid/camera/CameraActivity.java
ndroid/camera/settings/SettingsManager.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
|
| 6ccec205c8d43757bcefd0202eb0cde0df020574 |
11-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
New resolution settings. Two for each camera.
Bug: 13025151
Bug: 13349351
Also fixes the issue of summaries not showing up before
changing a resolution setting.
Change-Id: I63482a79e742c0403ebf556148f7a12d4e6c8b0e
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.java
ndroid/camera/settings/CameraSettingsActivity.java
ndroid/camera/settings/SettingsCache.java
ndroid/camera/settings/SettingsManager.java
ndroid/camera/settings/SettingsUtil.java
|
| 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.
|
| b8d4e380828a49ba2bb119ac2c676904ae0f15e8 |
14-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Respond to menu button key events based on current view." into gb-ub-photos-denali
|
| 5e255bfd80a12dbe4d0a02a80f89238a5e7a1345 |
14-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
Support HDR+ secure camera is user prefers.
Bug: 13475212
Change-Id: I2a061256ddc689cd6fdc6a0e9bd22c4f57aca9bb
ndroid/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
ndroid/camera/CameraActivity.java
ndroid/camera/VideoModule.java
ndroid/camera/ui/ModeListView.java
|
| 45a821d43ae8d7287b649f670a66ab3d99eeccaf |
14-Mar-2014 |
Spike Sprague <spikuru@google.com> |
video bottom bar stop button tweaking
bug: 13367909
Change-Id: I670350f77a1e86500a0d66f3a3fc5d7e772d0c93
ndroid/camera/VideoModule.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/BottomBar.java
|
| 8db29371b01cf7c0b481826107b120f14235768e |
14-Mar-2014 |
Spike Sprague <spikuru@google.com> |
am 9e74a09f: Merge "mode options buttons animation tweaks" into gb-ub-photos-denali
* commit '9e74a09fe2bf6d3fb988904dea9273ff6a2ffcbd':
mode options buttons animation tweaks
|
| 9e74a09fe2bf6d3fb988904dea9273ff6a2ffcbd |
14-Mar-2014 |
Spike Sprague <spikuru@google.com> |
Merge "mode options buttons animation tweaks" into gb-ub-photos-denali
|
| 56d43cf80d40379d57ac1db697bc014d5c321b91 |
12-Mar-2014 |
Spike Sprague <spikuru@google.com> |
mode options buttons animation tweaks
bug: 13327124
Change-Id: Iddf824d0ee9807f179501b8e391540f0e798f920
ndroid/camera/widget/ModeOptions.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.
|
| 3cf55144483327b2b82af73b1a40335dba749f41 |
14-Mar-2014 |
Sam Judd <judds@google.com> |
Merge "Show photos added to camera folder externally in filmstrip promptly." into gb-ub-photos-denali
|
| aeed91f3777d08a4160d68ddfc2626808a08b92d |
13-Mar-2014 |
Sam Judd <judds@google.com> |
Show photos added to camera folder externally in filmstrip promptly.
Bug: 13320658
Change-Id: I2f605674fdd23e31bc7567b28ba098fff59802c0
ndroid/camera/CameraActivity.java
ndroid/camera/data/AbstractLocalDataAdapterWrapper.java
ndroid/camera/data/CameraDataAdapter.java
ndroid/camera/data/LocalDataAdapter.java
ndroid/camera/data/LocalDataList.java
ndroid/camera/data/LocalMediaData.java
ndroid/camera/data/LocalMediaObserver.java
ndroid/camera/data/LocalSessionData.java
|
| bbf1b9e776d5a0316cd236013f167cf15b1b5585 |
14-Mar-2014 |
Doris Liu <tianliu@google.com> |
am 87ea428f: Merge "Mode switcher refactor for better state management" into gb-ub-photos-denali
* commit '87ea428ffe1b52f4859aaa1b1c993a0bdf939f5e':
Mode switcher refactor for better state management
|
| 87ea428ffe1b52f4859aaa1b1c993a0bdf939f5e |
14-Mar-2014 |
Doris Liu <tianliu@google.com> |
Merge "Mode switcher refactor for better state management" into gb-ub-photos-denali
|
| a8a24e0241ad3a3d3c8d8b77ac5cbd7138736bd5 |
12-Mar-2014 |
Doris Liu <tianliu@google.com> |
Mode switcher refactor for better state management
Also added support for mode selection during shimmy.
Bug: 13441279
Bug: 13403920
Change-Id: If7093e833b83f093b779df1d497e20ea3054c0c1
ndroid/camera/ui/ModeListView.java
ndroid/camera/widget/AnimationEffects.java
|
| a104f96ce2051d50a732e2860bcf5f1d38fbb5d6 |
13-Mar-2014 |
Seth Raphael <magicseth@google.com> |
am 93c6b617: Allow a session to know its content uri
* commit '93c6b617868b73b73199cf93216fec7002290f55':
Allow a session to know its content uri
|
| 93c6b617868b73b73199cf93216fec7002290f55 |
13-Mar-2014 |
Seth Raphael <magicseth@google.com> |
Allow a session to know its content uri
Bug: 13442744
Change-Id: I8ec870ae81cf70dbdf6cab9295a4556cf9f66179
ndroid/camera/session/CaptureSession.java
ndroid/camera/session/CaptureSessionManagerImpl.java
ndroid/camera/session/PlaceholderManager.java
|
| b3aaa8c08a1094ac1a80bf9c4d57a9405c8ccfc8 |
13-Mar-2014 |
Seth Raphael <magicseth@google.com> |
am deda5239: Don\'t crash if a placeholder session is not found
* commit 'deda5239be336cd306a5750bdf3033099b0c767d':
Don't crash if a placeholder session is not found
|
| deda5239be336cd306a5750bdf3033099b0c767d |
13-Mar-2014 |
Seth Raphael <magicseth@google.com> |
Don't crash if a placeholder session is not found
When the activity crashes, sessions may still be
in progress in the service. On relaunch of the
activity the service may complete process, and
attempt to update an unknown session (as they
are currently stored in the activity).
Bug: 13421356
Change-Id: I87b1585bff1c46621aed1af18dae105f04e41268
ndroid/camera/data/CameraDataAdapter.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
ndroid/camera/CameraActivity.java
|
| 0bbaa0f5e9973afd9bd01b815e40ea99558f968c |
13-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 6dbd5ae9: Merge "Prevent VideoModule from freezing forever without triggering ANR." into gb-ub-photos-denali
* commit '6dbd5ae96714d3460bf31c4c41a29a7522a7d386':
Prevent VideoModule from freezing forever without triggering ANR.
|
| 6dbd5ae96714d3460bf31c4c41a29a7522a7d386 |
13-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Prevent VideoModule from freezing forever without triggering ANR." into gb-ub-photos-denali
|
| 11213160bd8810a2874c47ed888b8c63cd200800 |
13-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
Prevent VideoModule from freezing forever without triggering ANR.
Bug: 13330215
Change-Id: I76a2c758c2e16454feebfed8b20fa0c967eda2cf
ndroid/camera/VideoModule.java
|
| 6edc4d51015688108439082207ff54a5e522bf05 |
13-Mar-2014 |
Sam Judd <judds@google.com> |
am cb4fbd73: Merge "Use velocity to allow easier filmstrip delete gestures." into gb-ub-photos-denali
* commit 'cb4fbd73d5e46987035a84366c402dcebafdbbed':
Use velocity to allow easier filmstrip delete gestures.
|
| cb4fbd73d5e46987035a84366c402dcebafdbbed |
13-Mar-2014 |
Sam Judd <judds@google.com> |
Merge "Use velocity to allow easier filmstrip delete gestures." into gb-ub-photos-denali
|
| bcd1152e8214b1fb4a17963ffe8c292681c81688 |
12-Mar-2014 |
Sam Judd <judds@google.com> |
Use velocity to allow easier filmstrip delete gestures.
Bug: 12889007
Change-Id: I049119117a0d84e40dfa402af8cbf6313fc4d1de
ndroid/camera/widget/FilmstripView.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
|
| ca93cb14e4f318698248ea28978ac2e9197102d3 |
13-Mar-2014 |
Seth Raphael <magicseth@google.com> |
Merge changes Ie0d123f0,I97c1f825 into gb-ub-photos-denali
* changes:
Avoid showing old preview frames on restart.
Support cancel layout for long captures
|
| 568a292e8a87ace79c5574a5b41a21639cc9f883 |
12-Mar-2014 |
Sam Judd <judds@google.com> |
am 29d9b3cd: Ensure the first filmstrip view appears instantly when swiping the filmstrip in.
* commit '29d9b3cd08a7b31b8ccecf4792d5ae981faa205c':
Ensure the first filmstrip view appears instantly when swiping the filmstrip in.
|
| 29d9b3cd08a7b31b8ccecf4792d5ae981faa205c |
12-Mar-2014 |
Sam Judd <judds@google.com> |
Ensure the first filmstrip view appears instantly when swiping the filmstrip in.
Bug: 13329039
Change-Id: I97ae14f5a76e261ccef51f673c147297b49bc779
ndroid/camera/widget/FilmstripLayout.java
ndroid/camera/widget/FilmstripView.java
|
| 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
ndroid/camera/CameraActivity.java
|
| 2db51d761f8fb070f660b90913e131ab361cbbad |
11-Mar-2014 |
Seth Raphael <magicseth@google.com> |
Support cancel layout for long captures
Bug: 12468010
Change-Id: I97c1f8254287b8a3648d21a9dbc54b5b5bc2424a
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/BottomBar.java
|
| b2abac9580c998931f8c9b52e14d335ac965a1aa |
12-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
am d05374f1: Implement preview started callbacks.
* commit 'd05374f1cb447615760665ec03fa3d6e2db55d21':
Implement preview started callbacks.
|
| d05374f1cb447615760665ec03fa3d6e2db55d21 |
12-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
Implement preview started callbacks.
This is used by RefocusModule to avoid blocking the main
thread after startPreview.
Bug: 13240688
Change-Id: Id9f719f51bb08493d6c736d90372e4dac6de1cac
ndroid/camera/app/AndroidCameraManagerImpl.java
ndroid/camera/app/CameraManager.java
|
| 6cf405e775e27b4f5ce00346adf3654ab6398fa1 |
12-Mar-2014 |
Seth Raphael <magicseth@google.com> |
am c45a75bc: Merge "Clear all notifications on relaunch" into gb-ub-photos-denali
* commit 'c45a75bcc406e619bb0bad58a6752d47b27b3a83':
Clear all notifications on relaunch
|
| 15219548ccf1c6360ea06b8a561959e1c95ae187 |
12-Mar-2014 |
Spike Sprague <spikuru@google.com> |
am 883ff162: Merge "capture button disabled states support" into gb-ub-photos-denali
* commit '883ff162b22fc651f6c6429dc6da3537c0fcead4':
capture button disabled states support
|
| 3c097d115cf3e6ce2cb25939582be2990c9f89fc |
12-Mar-2014 |
Seth Raphael <magicseth@google.com> |
am 4938c242: Only show one notification at a time Bug: 12211117
* commit '4938c2425cea1eed385eb0f8a2f69bf742bc1889':
Only show one notification at a time Bug: 12211117
|
| c45a75bcc406e619bb0bad58a6752d47b27b3a83 |
11-Mar-2014 |
Seth Raphael <magicseth@google.com> |
Merge "Clear all notifications on relaunch" into gb-ub-photos-denali
|
| 883ff162b22fc651f6c6429dc6da3537c0fcead4 |
11-Mar-2014 |
Spike Sprague <spikuru@google.com> |
Merge "capture button disabled states support" into gb-ub-photos-denali
|
| 4938c2425cea1eed385eb0f8a2f69bf742bc1889 |
11-Mar-2014 |
Seth Raphael <magicseth@google.com> |
Only show one notification at a time
Bug: 12211117
Change-Id: I32fc474f4c85ce22106383d9a3ad854c02c8653a
ndroid/camera/session/ProcessingNotificationManager.java
|
| 411127a6b77db44b26c62a0a880cb3ad670eded5 |
11-Mar-2014 |
Seth Raphael <magicseth@google.com> |
Clear all notifications on relaunch
Bug: 12972656
Change-Id: Id7d02685e975f12ad92e776168ea2c6728b5dab5
ndroid/camera/session/ProcessingNotificationManager.java
|
| a93909ffe93c9f5e27e493f32a78aab6fbf3e06e |
08-Mar-2014 |
Spike Sprague <spikuru@google.com> |
capture button disabled states support
bug: 13244592
Change-Id: I58b1b3dada9be60ec28be0e0bab81c9dc000511b
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/BottomBar.java
|
| bd0164520726d75fbab38b6a01b2942d35549c33 |
11-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Fix build. Got broken with last manual merge.
Change-Id: I69131a478a26a15057acd1af7a96ab81149eb111
ndroid/camera/PhotoModule.java
|
| de51c81f9870abf1e20868bbf00c20ecb6b2fb9e |
11-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
resolved conflicts for merge of 7cb8c791 to ub-camera-everglades
Change-Id: Iad7e7f78ae8e48456493451a62b154fa0e6c8cb3
|
| 7cb8c791df0bcb48b2c3f2f34d7c7538c619b592 |
11-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Spring cleaning. Throwing out old cruft.
Change-Id: I99952405a0036c4a518b31e543a72a84dbe07995
ndroid/camera/PhotoModule.java
ndroid/camera/Storage.java
ndroid/camera/crop/BoundedRect.java
ndroid/camera/crop/CropActivity.java
ndroid/camera/crop/CropDrawingUtils.java
ndroid/camera/crop/CropExtras.java
ndroid/camera/crop/CropMath.java
ndroid/camera/crop/CropObject.java
ndroid/camera/crop/CropView.java
ndroid/camera/crop/GeometryMathUtils.java
ndroid/camera/crop/ImageLoader.java
ndroid/camera/crop/SaveImage.java
ndroid/camera/crop/Utils.java
ndroid/camera/ui/AbstractSettingPopup.java
ndroid/camera/ui/CountDownView.java
ndroid/camera/ui/CountdownTimerPopup.java
ndroid/camera/ui/InLineSettingCheckBox.java
ndroid/camera/ui/InLineSettingItem.java
ndroid/camera/ui/InLineSettingMenu.java
ndroid/camera/ui/RotateTextToast.java
ndroid/camera/util/ImageLoader.java
|
| bbd121bda44794bcb9e11f394af803594c1a05ff |
11-Mar-2014 |
Doris Liu <tianliu@google.com> |
am cc855959: Merge "Fix mode drawer not properly hide itself" into gb-ub-photos-denali
* commit 'cc855959c9a643a08bb10a41253720c04580dfe5':
Fix mode drawer not properly hide itself
|
| cc855959c9a643a08bb10a41253720c04580dfe5 |
11-Mar-2014 |
Doris Liu <tianliu@google.com> |
Merge "Fix mode drawer not properly hide itself" into gb-ub-photos-denali
|
| 5e5734b558013e23f21902ad96d0dc2949610b90 |
11-Mar-2014 |
Doris Liu <tianliu@google.com> |
Fix mode drawer not properly hide itself
Bug: 13402877
Change-Id: I5c9777ea91fc9101a4d42f0bbf84f40c8e5fd15c
ndroid/camera/ui/ModeListView.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
ndroid/camera/CameraActivity.java
ndroid/camera/CameraModule.java
ndroid/camera/PhotoModule.java
ndroid/camera/module/ModuleController.java
|
| 4979cd199da63d8d4215aec7fc904a83cff8b2c7 |
11-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 3413517f: Merge "Handle uncaught runtime exceptions from the framework." into gb-ub-photos-denali
* commit '3413517f52239cebe3261cfce32b00899f8bd1e5':
Handle uncaught runtime exceptions from the framework.
|
| 3413517f52239cebe3261cfce32b00899f8bd1e5 |
11-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Handle uncaught runtime exceptions from the framework." into gb-ub-photos-denali
|
| 426ad0580b485d5b79fd00b4458d1b8e4bf6cbc4 |
11-Mar-2014 |
Seth Raphael <magicseth@google.com> |
am 5ac2bfbb: bring comment up to date
* commit '5ac2bfbb23f6277947f284531237ea85c81a06e4':
bring comment up to date
|
| 1398a1d6eab5aef198cce8cfd82f810572178a41 |
11-Mar-2014 |
Seth Raphael <magicseth@google.com> |
am 3020ba5d: Increase opacity of mode switcher
* commit '3020ba5dc23723bab7503324d82dd5ae3830008c':
Increase opacity of mode switcher
|
| 630d55ba8111357730119899565026be503264c0 |
10-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
Handle uncaught runtime exceptions from the framework.
Bug: 12529676
Change-Id: I0319b1fa7367076f33853200b8b09a6abe7b0bdf
ndroid/camera/CameraActivity.java
ndroid/camera/app/AndroidCameraManagerImpl.java
ndroid/camera/app/CameraController.java
ndroid/camera/app/CameraManager.java
ndroid/camera/app/CameraProvider.java
|
| 5ac2bfbb23f6277947f284531237ea85c81a06e4 |
11-Mar-2014 |
Seth Raphael <magicseth@google.com> |
bring comment up to date
Change-Id: If9f7d43e2680ac6210cefac30be953fb4f7a8bfb
ndroid/camera/ui/ModeListView.java
|
| 3020ba5dc23723bab7503324d82dd5ae3830008c |
11-Mar-2014 |
Seth Raphael <magicseth@google.com> |
Increase opacity of mode switcher
Bug: 13213552
Change-Id: I4b9e710d20804aef68e58d571b4d7d7aab9e8397
ndroid/camera/ui/ModeListView.java
|
| a2a2b9b2e5fefa8e4ff0e84c23bccf6c29351fcd |
11-Mar-2014 |
Seth Raphael <magicseth@google.com> |
am 3e848a84: Merge changes I5d7821f8,If58fa121 into gb-ub-photos-denali
* commit '3e848a842800c0db7565acf78d5d90d0eb5280d5':
Remove unused variables
Allow processing tasks to supply their own sessions.
|
| 6face7add8c5827048dc72fecaadf99951297cca |
11-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
am 88d5e6df: Merge "Support an abstract API for tutorials." into gb-ub-photos-denali
* commit '88d5e6df0f7dab24c6b5e74504ffece1f4d9f4bb':
Support an abstract API for tutorials.
|
| 3e848a842800c0db7565acf78d5d90d0eb5280d5 |
11-Mar-2014 |
Seth Raphael <magicseth@google.com> |
Merge changes I5d7821f8,If58fa121 into gb-ub-photos-denali
* changes:
Remove unused variables
Allow processing tasks to supply their own sessions.
|
| 88d5e6df0f7dab24c6b5e74504ffece1f4d9f4bb |
11-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Support an abstract API for tutorials." into gb-ub-photos-denali
|
| d84c2f914c64138fcdaeadf48da89b9610a44a57 |
11-Mar-2014 |
Seth Raphael <magicseth@google.com> |
am 955b3580: Merge "Hold in-progress sessions in mem, not media store" into gb-ub-photos-denali
* commit '955b3580a53dd3b032f95b161b2c79d807281308':
Hold in-progress sessions in mem, not media store
|
| f08f3acd270e93e534f71ee0c9170f73e26179f0 |
11-Mar-2014 |
Seth Raphael <magicseth@google.com> |
Remove unused variables
Change-Id: I5d7821f8158438000b813bbba840c3d6fd51ab3a
ndroid/camera/session/CaptureSessionManagerImpl.java
|
| 955b3580a53dd3b032f95b161b2c79d807281308 |
11-Mar-2014 |
Seth Raphael <magicseth@google.com> |
Merge "Hold in-progress sessions in mem, not media store" into gb-ub-photos-denali
|
| 2a978f2b7b07ce4e5f6163910912e79fed38aff8 |
11-Mar-2014 |
Seth Raphael <magicseth@google.com> |
Allow processing tasks to supply their own
sessions.
This is part of a fix for
Bug: 13100494
Change-Id: If58fa1212bf666be3f974c35c6be6ef964415405
ndroid/camera/processing/ProcessingService.java
ndroid/camera/processing/ProcessingTask.java
|
| 81418339a88afc66b53f371e0626165a9bf1abe0 |
11-Mar-2014 |
Angus Kong <shkong@google.com> |
am 6b95ed2f: Merge "Checks the on view size for video preview size." into gb-ub-photos-denali
* commit '6b95ed2f82ba49a2fd7fe0ab8774161434af95b4':
Checks the on view size for video preview size.
|
| 6b95ed2f82ba49a2fd7fe0ab8774161434af95b4 |
11-Mar-2014 |
Angus Kong <shkong@google.com> |
Merge "Checks the on view size for video preview size." 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
ndroid/camera/CameraActivity.java
ndroid/camera/app/AppController.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/AbstractTutorialOverlay.java
|
| e94a343de763fa7e0b5a6319d895a8af8033c938 |
10-Mar-2014 |
Doris Liu <tianliu@google.com> |
am 64c04fcb: Merge "Fix shimmy cold start jank" into gb-ub-photos-denali
* commit '64c04fcbf8e5680b835283a3094e68410082e560':
Fix shimmy cold start jank
|
| 64c04fcbf8e5680b835283a3094e68410082e560 |
10-Mar-2014 |
Doris Liu <tianliu@google.com> |
Merge "Fix shimmy cold start jank" into gb-ub-photos-denali
|
| 8676e7802fb40f64a3b465c9b5e1a0a1ada9f699 |
10-Mar-2014 |
Doris Liu <tianliu@google.com> |
Fix shimmy cold start jank
Bug: 13392593
Change-Id: I08a45bad9fc93a284a9966fa8aa8c6e13e674ae5
ndroid/camera/ui/ModeListView.java
ndroid/camera/ui/ModeSelectorItem.java
|
| 2264367a58d9d771995befc84a6bdbe35acabf72 |
10-Mar-2014 |
Spike Sprague <spikuru@google.com> |
am 8e75f99a: Merge "enable grid lines for video module" into gb-ub-photos-denali
* commit '8e75f99af7873fe3d5f7dfe6e232e0690a490c75':
enable grid lines for video module
|
| 8e75f99af7873fe3d5f7dfe6e232e0690a490c75 |
10-Mar-2014 |
Spike Sprague <spikuru@google.com> |
Merge "enable grid lines for video module" into gb-ub-photos-denali
|
| 5f8c30e3f6c921befc00bf1e0e6d93e181335e78 |
07-Mar-2014 |
Angus Kong <shkong@google.com> |
Checks the on view size for video preview size.
bug:12016054
Change-Id: I602a814ba4616d842117242240447096da6530d4
ndroid/camera/VideoModule.java
ndroid/camera/VideoUI.java
ndroid/camera/util/CameraUtil.java
|
| 016c55c8a3e056aa35536113a8a1dd65e9cc2944 |
10-Mar-2014 |
Angus Kong <shkong@google.com> |
am 9d5f94b5: Merge "Respect the module configuration of preview." into gb-ub-photos-denali
* commit '9d5f94b562228bf0053f902d1183b9f44eebd4b0':
Respect the module configuration of preview.
|
| 9d5f94b562228bf0053f902d1183b9f44eebd4b0 |
10-Mar-2014 |
Angus Kong <shkong@google.com> |
Merge "Respect the module configuration of preview." into gb-ub-photos-denali
|
| b259701e4f421b10404425d2a827cbe9d2571585 |
10-Mar-2014 |
Angus Kong <shkong@google.com> |
Respect the module configuration of preview.
bug:13393521
Change-Id: I46e3df4948980eceb66f4109b52a59f93296cfc6
ndroid/camera/app/CameraAppUI.java
|
| 455ba5a146484d2af4a4fb44eb50ad294834dfa0 |
14-Feb-2014 |
Seth Raphael <magicseth@google.com> |
Hold in-progress sessions in mem, not media store
Bug: 12457236
Change-Id: I88f7c3a822010744881b8be966adbcf2774a8115
ndroid/camera/CameraActivity.java
ndroid/camera/Storage.java
ndroid/camera/data/AbstractLocalDataAdapterWrapper.java
ndroid/camera/data/CameraDataAdapter.java
ndroid/camera/data/InProgressDataWrapper.java
ndroid/camera/data/LocalDataAdapter.java
ndroid/camera/data/LocalDataUtil.java
ndroid/camera/data/LocalMediaData.java
ndroid/camera/data/LocalSessionData.java
ndroid/camera/session/CaptureSessionManagerImpl.java
ndroid/camera/session/PlaceholderManager.java
ndroid/camera/util/FileUtil.java
ndroid/camera/widget/FilmstripView.java
|
| ab3adde8ca8e8e2461972c6fb946d5719673d339 |
10-Mar-2014 |
Spike Sprague <spikuru@google.com> |
enable grid lines for video module
bug: 13000320
Change-Id: If0b7947d38aa91578913ffc6e67b840bf3016190
ndroid/camera/VideoModule.java
|
| 9a37466bd24e17de8ec3b203b2bb1bf8e664bd50 |
10-Mar-2014 |
Doris Liu <tianliu@google.com> |
am 557c77fe: Fix HDR+ landscape transform
* commit '557c77fe3340780da3b016b09e691dc18eb71bb4':
Fix HDR+ landscape transform
|
| 557c77fe3340780da3b016b09e691dc18eb71bb4 |
08-Mar-2014 |
Doris Liu <tianliu@google.com> |
Fix HDR+ landscape transform
Some logic in resetting translation overlooked the fact that HDR+ has
rotation baked in the transform matrix because camera2 api requires
that surface texture gets rotated by app for device rotation. As a
result, simply setting the translation to 0 for transform matrix when
there is rotation set on the matrix as well offsets the preview off
the screen.
Bug: 13367662
Change-Id: I0529fe4913b55aebc058c93a901b6689da1208ba
ndroid/camera/TextureViewHelper.java
|
| 615f60f464c03591cda998799a84ab41cd542cbe |
08-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
am 597c1a09: Support for capture session errors.
* commit '597c1a093f840af3c42e00af05da01ef124dc846':
Support for capture session errors.
|
| 5798bcda75b1de93e6aabb9f81291f3b841b524b |
08-Mar-2014 |
Doris Liu <tianliu@google.com> |
am 69cb8407: New shimmy
* commit '69cb84076c2f290ee2cd782ab668a661c9d5386e':
New shimmy
|
| 3215592f607797d008402faea475d2280d9a0458 |
08-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
am 5775660a: Merge "Change session API to support location inside a task." into gb-ub-photos-denali
* commit '5775660acd2a744ab92355d1366bfbc4e7b7ba4d':
Change session API to support location inside a task.
|
| 597c1a093f840af3c42e00af05da01ef124dc846 |
06-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Support for capture session errors.
Bug: 13026663
Change-Id: I3713440483aa4732f94aff9eaff2fc34a04c0427
ndroid/camera/CameraActivity.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/app/FilmstripBottomPanel.java
ndroid/camera/session/CaptureSession.java
ndroid/camera/session/CaptureSessionManager.java
ndroid/camera/session/CaptureSessionManagerImpl.java
ndroid/camera/ui/BottomBar.java
|
| 69cb84076c2f290ee2cd782ab668a661c9d5386e |
02-Mar-2014 |
Doris Liu <tianliu@google.com> |
New shimmy
Add soft landing for quick swipe-to-open.
Bug: 13183433
Change-Id: Ib51b3e401108c292f27ddb963d34cdbafa37f9ae
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/MainActivityLayout.java
ndroid/camera/ui/ModeListView.java
ndroid/camera/ui/ModeSelectorItem.java
ndroid/camera/widget/AnimationEffects.java
|
| 5775660acd2a744ab92355d1366bfbc4e7b7ba4d |
08-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Change session API to support location inside a task." into gb-ub-photos-denali
|
| b396a5c1d3cbda0e4b8c65d01310b3b629053434 |
08-Mar-2014 |
Spike Sprague <spikuru@google.com> |
am 4f8d5923: Merge "proper preview letterboxing for not-so-tall apsect ratios" into gb-ub-photos-denali
* commit '4f8d5923212b4ac08226be5e86583d17e47a3848':
proper preview letterboxing for not-so-tall apsect ratios
|
| 4f8d5923212b4ac08226be5e86583d17e47a3848 |
08-Mar-2014 |
Spike Sprague <spikuru@google.com> |
Merge "proper preview letterboxing for not-so-tall apsect ratios" into gb-ub-photos-denali
|
| 90599aa03447f9a836157d429c7a14e74d5b14aa |
07-Mar-2014 |
Spike Sprague <spikuru@google.com> |
proper preview letterboxing for not-so-tall apsect ratios
bug: 13085409
Change-Id: If574ff5fe290f4b5eb5e2fdb75e9592e5018dce4
ndroid/camera/TextureViewHelper.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/BottomBar.java
|
| 401d6fe906e6a3d67d3c6d2b37b7f3d169963db2 |
07-Mar-2014 |
Spike Sprague <spikuru@google.com> |
am f4d378c5: Merge "fix touch to focus in option bar area" into gb-ub-photos-denali
* commit 'f4d378c58b0d33af652366e04a2a8b95bd2a0f9a':
fix touch to focus in option bar area
|
| 2a58938576e6d4220c02cf0b9a8226a1d3bcf176 |
07-Mar-2014 |
Spike Sprague <spikuru@google.com> |
fix touch to focus in option bar area
bug: 13348926
Change-Id: Ibbf0f45f50d072e5251d49b9999642efc96b84bd
ndroid/camera/widget/ModeOptions.java
|
| dc5a16739fc125fe1195aabb51745b53522e596d |
07-Mar-2014 |
Kevin Gabayan <gabayan@google.com> |
am 261307a0: Merge "Manage location recording state only in CameraActivity. Bug: 13230126" into gb-ub-photos-denali
* commit '261307a033cb3a5c2196ab4cdb3069d319dd64ae':
Manage location recording state only in CameraActivity. Bug: 13230126
|
| 261307a033cb3a5c2196ab4cdb3069d319dd64ae |
07-Mar-2014 |
Kevin Gabayan <gabayan@google.com> |
Merge "Manage location recording state only in CameraActivity. Bug: 13230126" into gb-ub-photos-denali
|
| 477902cbd92148f66c5f89d5cdfde54e4a1d0ef9 |
07-Mar-2014 |
Andy Huibers <andyhuibers@google.com> |
am 94f46ee4: Merge "Remove video-size parameter setting causing 720p video issues on Palman." into gb-ub-photos-denali
* commit '94f46ee421468cefbc6e914eba48a40bea7f50e2':
Remove video-size parameter setting causing 720p video issues on Palman.
|
| 94f46ee421468cefbc6e914eba48a40bea7f50e2 |
07-Mar-2014 |
Andy Huibers <andyhuibers@google.com> |
Merge "Remove video-size parameter setting causing 720p video issues on Palman." into gb-ub-photos-denali
|
| acad83540bd77c2c64e69fdbacd356985734fd87 |
07-Mar-2014 |
Kevin Gabayan <gabayan@google.com> |
Manage location recording state only in CameraActivity.
Bug: 13230126
Change-Id: Ia36b55e6678d1caa2ab5ba553f991e26664ea9ba
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.java
|
| 66045bd2ab2aa2898436ead371f7a63f341eeba4 |
07-Mar-2014 |
Doris Liu <tianliu@google.com> |
am 630e500b: Merge "Hide video recording hint if starting in landscape" into gb-ub-photos-denali
* commit '630e500b8c8763d160484a30693abaaa123c9cfe':
Hide video recording hint if starting in landscape
|
| 630e500b8c8763d160484a30693abaaa123c9cfe |
07-Mar-2014 |
Doris Liu <tianliu@google.com> |
Merge "Hide video recording hint if starting in landscape" into gb-ub-photos-denali
|
| 7939e157d96471ecca47ee9b6f144cf348b06f04 |
07-Mar-2014 |
Doris Liu <tianliu@google.com> |
Hide video recording hint if starting in landscape
Change-Id: I591dacf9aa2646dd465273580a21890c6abb072b
ndroid/camera/widget/VideoRecordingHints.java
|
| 8adfafed25ecf9ff22cdd6e815474dccb78c7a84 |
07-Mar-2014 |
Angus Kong <shkong@google.com> |
am 027ad26e: Merge "Allow touch event goes down to view in filmstrip" into gb-ub-photos-denali
* commit '027ad26e2cc768a124653983643d01b897f139fe':
Allow touch event goes down to view in filmstrip
|
| 89489880d0f0d3a6ede7a689ffb39c185f3897d7 |
07-Mar-2014 |
Andy Huibers <andyhuibers@google.com> |
Remove video-size parameter setting causing 720p video issues on Palman.
Bug: 13304124
Change-Id: I3e449afe446941a5286f36fe739311a1bb9ab135
ndroid/camera/VideoModule.java
ndroid/camera/settings/SettingsUtil.java
|
| 027ad26e2cc768a124653983643d01b897f139fe |
07-Mar-2014 |
Angus Kong <shkong@google.com> |
Merge "Allow touch event goes down to view in filmstrip" into gb-ub-photos-denali
|
| 7e9e4b7bdf371afd37f43a331cef1672fac1a230 |
07-Mar-2014 |
Angus Kong <shkong@google.com> |
Allow touch event goes down to view in filmstrip
bug:13027352
Change-Id: Iee5783a3698bea2fc5cd695d3b671c0206d2fbf2
ndroid/camera/widget/FilmstripView.java
|
| 8dbb33766ce284b0c82680078c6ccf325618bd63 |
07-Mar-2014 |
Angus Kong <shkong@google.com> |
am 26d32221: Merge "Align the peek to capture button in landscape" into gb-ub-photos-denali
* commit '26d32221d8f2f70b0532a7bc459b24c61d490d6b':
Align the peek to capture button in landscape
|
| 26d32221d8f2f70b0532a7bc459b24c61d490d6b |
07-Mar-2014 |
Angus Kong <shkong@google.com> |
Merge "Align the peek to capture button in landscape" into gb-ub-photos-denali
|
| e67f38e158a7b9f0d74bb5a8dc829d34faca1b6b |
07-Mar-2014 |
Spike Sprague <spikuru@google.com> |
am ba3f02b0: Merge "options bar ui fixes" into gb-ub-photos-denali
* commit 'ba3f02b0e9284e0127d730041ba1d4ac36411619':
options bar ui fixes
|
| 5f2c54d0619a8b871bb30e1fd7ac9e720e900e3b |
07-Mar-2014 |
Spike Sprague <spikuru@google.com> |
am b88ed2c7: Merge "video intent ui" into gb-ub-photos-denali
* commit 'b88ed2c7bb4c6ad28b163645b1d7f70b02423395':
video intent ui
|
| e43ca3a01337b062801f99993339d238c195435f |
07-Mar-2014 |
Angus Kong <shkong@google.com> |
Align the peek to capture button in landscape
bug:13165526
Change-Id: Ib8bb3a1bfc6edd209061cff71567b66f0fe6525c
ndroid/camera/app/CameraAppUI.java
|
| ba3f02b0e9284e0127d730041ba1d4ac36411619 |
07-Mar-2014 |
Spike Sprague <spikuru@google.com> |
Merge "options bar ui fixes" into gb-ub-photos-denali
|
| b88ed2c7bb4c6ad28b163645b1d7f70b02423395 |
07-Mar-2014 |
Spike Sprague <spikuru@google.com> |
Merge "video intent ui" into gb-ub-photos-denali
|
| 591eec6465d29bbc053e164071c4c3a7c260a1d3 |
06-Mar-2014 |
Spike Sprague <spikuru@google.com> |
options bar ui fixes
bug: 13331173
bug: 13330727
Change-Id: I270fd04feeb8f6a4db6fae21184fad150be5fcbe
ndroid/camera/widget/ModeOptions.java
ndroid/camera/widget/ModeOptionsOverlay.java
|
| e170bb61df145495dc36c15043471c7e64dc862a |
06-Mar-2014 |
Angus Kong <shkong@google.com> |
am 8a86a838: Add null check for listeners in BottomBar.
* commit '8a86a8384010aeaa252c21607d8dd2d2afee7bca':
Add null check for listeners in BottomBar.
|
| 8a86a8384010aeaa252c21607d8dd2d2afee7bca |
06-Mar-2014 |
Angus Kong <shkong@google.com> |
Add null check for listeners in BottomBar.
bug:13210080
Change-Id: Idd94318cbaed0bbb386ffc14fbdd58bf25adefc3
ndroid/camera/ui/BottomBar.java
|
| b8a85766e235590cef30a058c733c5afe1153634 |
06-Mar-2014 |
Angus Kong <shkong@google.com> |
am 2bacca79: Align the gridlines with the preview area.
* commit '2bacca795a1b0adb0daf515c43c48234b44bbba5':
Align the gridlines with the preview area.
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/FocusOverlayManager.java
ndroid/camera/PhotoUI.java
ndroid/camera/TextureViewHelper.java
ndroid/camera/app/AppController.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/BottomBar.java
ndroid/camera/ui/CaptureAnimationOverlay.java
ndroid/camera/ui/FaceView.java
ndroid/camera/ui/GridLines.java
ndroid/camera/ui/ModeListView.java
ndroid/camera/ui/PreviewOverlay.java
ndroid/camera/ui/PreviewStatusListener.java
ndroid/camera/widget/ModeOptionsOverlay.java
|
| 51c877c56e204ac29a4db72d46168afac3feb239 |
18-Feb-2014 |
Spike Sprague <spikuru@google.com> |
video intent ui
bug: 13194672
Change-Id: I55ca912a4de78e75f4f6e23cf448beab4430a606
ndroid/camera/VideoModule.java
ndroid/camera/app/CameraAppUI.java
|
| 3869d657670d305928ca678f14abbbe211274d63 |
06-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
am 7865bb08: Merge "Add build version to settings and add settings headers." into gb-ub-photos-denali
* commit '7865bb08e2989964dcbf9684090fb6c2b6e993df':
Add build version to settings and add settings headers.
|
| 7ff26f939222fd86509fa1354ab17f0d4b3d8382 |
06-Mar-2014 |
Angus Kong <shkong@google.com> |
am 31162a64: Merge "Align preview to bottom bar." into gb-ub-photos-denali
* commit '31162a6448fd4deaf702a3e0c67827a4a3426862':
Align preview to bottom bar.
|
| 93be42a997b008fbd098ce8ad8e8bf1eb775b3f6 |
06-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Change session API to support location inside a task.
Bug: 13325568
Change-Id: I72f69803ab304d198e8c74c194a36bd0820ac187
ndroid/camera/Storage.java
ndroid/camera/processing/ProcessingService.java
ndroid/camera/processing/ProcessingTask.java
ndroid/camera/session/CaptureSession.java
ndroid/camera/session/CaptureSessionManager.java
ndroid/camera/session/CaptureSessionManagerImpl.java
ndroid/camera/session/PlaceholderManager.java
|
| 7865bb08e2989964dcbf9684090fb6c2b6e993df |
06-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Add build version to settings and add settings headers." into gb-ub-photos-denali
|
| 31162a6448fd4deaf702a3e0c67827a4a3426862 |
06-Mar-2014 |
Angus Kong <shkong@google.com> |
Merge "Align preview to bottom bar." into gb-ub-photos-denali
|
| 58b9b03f2bedc522bde5b4199121ea2e559c79a9 |
06-Mar-2014 |
Angus Kong <shkong@google.com> |
Align preview to bottom bar.
bug:13210080
Change-Id: I6ec4071e2f21ef351b2b16a53662c2a3c1b29721
ndroid/camera/TextureViewHelper.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/BottomBar.java
|
| e659f9775478d51094ccb6bf277cf4f33ba8bc85 |
06-Mar-2014 |
Doris Liu <tianliu@google.com> |
am 68f235b8: Merge "Add video recording hint to discourage vertical videos" into gb-ub-photos-denali
* commit '68f235b8685fa9deaa55847ba972f28c2e558621':
Add video recording hint to discourage vertical videos
|
| 68f235b8685fa9deaa55847ba972f28c2e558621 |
06-Mar-2014 |
Doris Liu <tianliu@google.com> |
Merge "Add video recording hint to discourage vertical videos" into gb-ub-photos-denali
|
| 82248d7d1209436bd01d3a8a1ff8b447f08f1d16 |
06-Mar-2014 |
Andy Huibers <andyhuibers@google.com> |
am 81187939: Avoid 720P video recording on Palman.
* commit '81187939d5390e7fe1c0121e4bf902a6a20a1764':
Avoid 720P video recording on Palman.
|
| 81187939d5390e7fe1c0121e4bf902a6a20a1764 |
06-Mar-2014 |
Andy Huibers <andyhuibers@google.com> |
Avoid 720P video recording on Palman.
Bug: 13304124
Change-Id: I107a8669308f857df5970628872e702b142b14d0
ndroid/camera/settings/SettingsUtil.java
|
| d6487c911dd1f5095723db2a1e9aaa609ebc5ee1 |
28-Feb-2014 |
Doris Liu <tianliu@google.com> |
Add video recording hint to discourage vertical videos
Bug: 8654023
Change-Id: I336f9e6af2393985e223a44a8e877e2878add76d
ndroid/camera/VideoModule.java
ndroid/camera/VideoUI.java
ndroid/camera/widget/VideoRecordingHints.java
|
| f42bfdc9ecd4149c982833abc9993612fb4ab152 |
06-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Add build version to settings and add settings headers.
Bug: 13329975
Bug: 13025151
Change-Id: I0259ec91da68efe1eed07b396f42fc69631413fd
ndroid/camera/settings/CameraSettingsActivity.java
|
| 79f764921dad482812b1980891d5b34d33cf59e6 |
06-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
am 1b98b97f: Merge "Tell the module it\'s visible when we start dragging out the filmstrip." into gb-ub-photos-denali
* commit '1b98b97f458e4a2146384b840987e15a7d0dd4e5':
Tell the module it's visible when we start dragging out the filmstrip.
|
| 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
ndroid/camera/CameraActivity.java
|
| 3180a8a124a195844aa5bdd0e2ef2d41c308af3c |
05-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
am b4a579aa: Merge "Add placeholder to use for tutorial screens across modules." into gb-ub-photos-denali
* commit 'b4a579aa0772a3e6140868a7e4ba03e0040f8353':
Add placeholder to use for tutorial screens across modules.
|
| b4a579aa0772a3e6140868a7e4ba03e0040f8353 |
05-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Add placeholder to use for tutorial screens across modules." into gb-ub-photos-denali
|
| 02f1f90809f5fee616dd64c7c5b60dc28510b9bb |
05-Mar-2014 |
Angus Kong <shkong@google.com> |
am 7d1d6057: Merge "No switch camera when switching camera" into gb-ub-photos-denali
* commit '7d1d6057817ff5b47129a07ce355afb74cdab88b':
No switch camera when switching camera
|
| 7d1d6057817ff5b47129a07ce355afb74cdab88b |
05-Mar-2014 |
Angus Kong <shkong@google.com> |
Merge "No switch camera when switching camera" into gb-ub-photos-denali
|
| 4baa6c53b04c0fa9951d0dff19ac97d910a9b6ae |
05-Mar-2014 |
Andy Huibers <andyhuibers@google.com> |
am a9a83bc9: Merge "Add details open event to logs." into gb-ub-photos-denali
* commit 'a9a83bc93f386f5799f6f89936edcd138e5d22dc':
Add details open event to logs.
|
| a9a83bc93f386f5799f6f89936edcd138e5d22dc |
05-Mar-2014 |
Andy Huibers <andyhuibers@google.com> |
Merge "Add details open event to logs." into gb-ub-photos-denali
|
| e340bd9dc8130a513aec237f38a59435f88f7265 |
05-Mar-2014 |
Spike Sprague <spikuru@google.com> |
am bf42b205: Merge "implement capture options animation" into gb-ub-photos-denali
* commit 'bf42b2058ebb0298967a85ab750ad3ec18c24892':
implement capture options animation
|
| bf42b2058ebb0298967a85ab750ad3ec18c24892 |
05-Mar-2014 |
Spike Sprague <spikuru@google.com> |
Merge "implement capture options animation" into gb-ub-photos-denali
|
| 17f6a0672d764712beed3c50118ac037fb26c32c |
05-Mar-2014 |
Angus Kong <shkong@google.com> |
am 57fb2851: Merge "Flatten the parameter in calling thread." into gb-ub-photos-denali
* commit '57fb2851530a0da741616ba75b5dc472c3cc7087':
Flatten the parameter in calling thread.
|
| 57fb2851530a0da741616ba75b5dc472c3cc7087 |
05-Mar-2014 |
Angus Kong <shkong@google.com> |
Merge "Flatten the parameter in calling thread." into gb-ub-photos-denali
|
| f0a683470f46fcf0b74960b378002852a86e6b9c |
05-Mar-2014 |
Andy Huibers <andyhuibers@google.com> |
Add details open event to logs.
Change-Id: I6a468bcbb5dde0fb5703c629d0b305c0bc32f6cb
ndroid/camera/CameraActivity.java
|
| d494b9afc833b966863df04d5560e73fc7e0125d |
05-Mar-2014 |
Alan Newberger <alann@google.com> |
am acb0802c: Remove onPreviewReadyToStart from PhotoModule
* commit 'acb0802ccfa23723686a154806c6ba2d6cba453f':
Remove onPreviewReadyToStart from PhotoModule
|
| acb0802ccfa23723686a154806c6ba2d6cba453f |
05-Mar-2014 |
Alan Newberger <alann@google.com> |
Remove onPreviewReadyToStart from PhotoModule
Removing this call results in no jank or loss of function on tested
devices, and resolves an issue on certain devices where starting the
callback prior to the preview results in a permanent mode cover. This
issue was not observed in any other mode, i.e. video is working on
warm start for all tested devices before and after this change.
Bug: 13078926
Change-Id: I7a63011dd96d40466d6bc3bb7f6867552a2b0dc8
ndroid/camera/PhotoModule.java
|
| a9a9d1558b87507905559918df5a144688269f5b |
05-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Add placeholder to use for tutorial screens across modules.
Bug: 13076376
Change-Id: Ia157040b460a296a61ce1c84e637c36f24072a15
ndroid/camera/app/CameraAppUI.java
|
| 97e282a3764215ac193726e0d259e55bf94369fe |
05-Mar-2014 |
Angus Kong <shkong@google.com> |
No switch camera when switching camera
bug:13234553
Change-Id: I1f26c2c69e5a0aee0ea1962a9cb2837bde94e02e
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.java
ndroid/camera/app/CameraController.java
ndroid/camera/app/CameraProvider.java
|
| 9d8fa68c734cc5671d71bc22e4f8b8d750bf2176 |
05-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 8c1f9701: Only allow simple capture for image intents.
* commit '8c1f97010898020ef7776a91aa1e437ce621fedb':
Only allow simple capture for image intents.
|
| 8c1f97010898020ef7776a91aa1e437ce621fedb |
05-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
Only allow simple capture for image intents.
Bug: 13289606
Change-Id: Id753def11f6499940a284b6bc3d33f5e45363183
ndroid/camera/CameraActivity.java
ndroid/camera/app/CameraAppUI.java
|
| 1da313cd8c2a1089ea6ddbc5a9e162600e0555dd |
05-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 1ba90e3e: Implement return to hdr plus after switch to front facing camera.
* commit '1ba90e3ea4b8280c28cf6d87e5b4cc6b3b5f1645':
Implement return to hdr plus after switch to front facing camera.
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoModule.java
ndroid/camera/app/AppController.java
ndroid/camera/settings/SettingsCache.java
ndroid/camera/settings/SettingsManager.java
|
| 2a73f3646311204858deb27031be8fcadb2431e3 |
04-Mar-2014 |
Angus Kong <shkong@google.com> |
am d02de780: Reduce the amount of peek animation.
* commit 'd02de7808c906f89c1d331feebcefba6696d8668':
Reduce the amount of peek animation.
|
| d02de7808c906f89c1d331feebcefba6696d8668 |
04-Mar-2014 |
Angus Kong <shkong@google.com> |
Reduce the amount of peek animation.
bug:13165526
Change-Id: I3a338c0a770be2d53b8caa5f287d06e64f4549ef
ndroid/camera/widget/PeekView.java
|
| 723cfb9743edb21e39a4a127d6c026ac39beb5e8 |
04-Mar-2014 |
Angus Kong <shkong@google.com> |
Flatten the parameter in calling thread.
bug:13246321
Change-Id: Id88714b7c8d9ff00c4ab85781f44d1e5ec5a0bae
ndroid/camera/app/AndroidCameraManagerImpl.java
|
| 82fa6ae85f7c07fef480eb1cd0cf7f578b150676 |
27-Feb-2014 |
Spike Sprague <spikuru@google.com> |
implement capture options animation
bug: 13100962
Change-Id: I1baf64693d0e01e99bfa19d0bd8699fd33d5812a
ndroid/camera/widget/ModeOptions.java
ndroid/camera/widget/ModeOptionsOverlay.java
|
| 23590418495a5334d22d43eaaf86ba076e388cad |
04-Mar-2014 |
Angus Kong <shkong@google.com> |
am 4d1e5f75: Merge "Don\'t show peek anim after 20 swipes to filmstrip." into gb-ub-photos-denali
* commit '4d1e5f7569e1728d9be2102f97c02a1213c3b940':
Don't show peek anim after 20 swipes to filmstrip.
|
| 4d1e5f7569e1728d9be2102f97c02a1213c3b940 |
04-Mar-2014 |
Angus Kong <shkong@google.com> |
Merge "Don't show peek anim after 20 swipes to filmstrip." into gb-ub-photos-denali
|
| dd58acfde980bace1229b89a9c85d5a337a08d9a |
04-Mar-2014 |
Angus Kong <shkong@google.com> |
am 19259ea4: Merge "Keep an reference count for CameraManager." into gb-ub-photos-denali
* commit '19259ea42f1ff0537847c9b5b3c01b4d0433a7d4':
Keep an reference count for CameraManager.
|
| 44442f6f673a37e5d0fa9c7676f5147fffd97218 |
04-Mar-2014 |
Angus Kong <shkong@google.com> |
Don't show peek anim after 20 swipes to filmstrip.
bug:13165526
Change-Id: I7e74ba9a92bb0e145ffda753c8a3475f1ea04417
ndroid/camera/CameraActivity.java
ndroid/camera/settings/SettingsCache.java
ndroid/camera/settings/SettingsManager.java
|
| f5a78334a317f999e1bc88b726b8537474a1cd38 |
04-Mar-2014 |
Angus Kong <shkong@google.com> |
Keep an reference count for CameraManager.
bug:13286589
Change-Id: Id4b44041044cb7439a4826c78b07411e68e2801e
ndroid/camera/app/CameraManagerFactory.java
|
| bd2b91f5202f9e5da20aba536086325a2c608825 |
01-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
am 7e016126: Merge "Add \'Details\' menu item in filmstrip" into gb-ub-photos-denali
* commit '7e016126879908ec9b1edfa7b1dd91cf592556f1':
Add 'Details' menu item in filmstrip
|
| 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
ndroid/camera/CameraActivity.java
|
| ada870871a8e9cd00bd9cdf69349572167ddefd4 |
01-Mar-2014 |
Doris Liu <tianliu@google.com> |
am 0c0ff04e: Merge "New Shimmy" into gb-ub-photos-denali
* commit '0c0ff04ed41aede510fe018633c7c4e1a05aec80':
New Shimmy
|
| 0c0ff04ed41aede510fe018633c7c4e1a05aec80 |
01-Mar-2014 |
Doris Liu <tianliu@google.com> |
Merge "New Shimmy" into gb-ub-photos-denali
|
| 6308ac096ad755888e30363bf0ec3b2b6bd3d795 |
01-Mar-2014 |
Alan Newberger <alann@google.com> |
am 32f8842e: Merge "Force chooser for sharing actions" into gb-ub-photos-denali
* commit '32f8842ecd394dae58304f16e5bce050b9ae249f':
Force chooser for sharing actions
|
| 32f8842ecd394dae58304f16e5bce050b9ae249f |
01-Mar-2014 |
Alan Newberger <alann@google.com> |
Merge "Force chooser for sharing actions" into gb-ub-photos-denali
|
| 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
ndroid/camera/CameraActivity.java
|
| b00d64307ae77541f8576593a29214d649fb94e9 |
26-Feb-2014 |
Doris Liu <tianliu@google.com> |
New Shimmy
- Two step shimmy: first show the mode switcher, then hide it
with a shimmy animation.
- Hiding will not start until after all the popups are dismissed
TODO:
- When mode switcher is shown for shimmy, text should be hidden (
this involves cooridnating the timing to show text with user
interaction)
- Need to have a graceful transition if user grabs the list on its
way out
Bug: 13183433
Change-Id: Idda5520c3c3663864be0f478787ef603fdb0f6da
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/ModeListView.java
ndroid/camera/ui/ModeTransitionView.java
|
| 320245280b0340907d08fabe861069242837d2a6 |
28-Feb-2014 |
Angus Kong <shkong@google.com> |
am 0c76cbcb: Merge "Refine the logic in CameraController." into gb-ub-photos-denali
* commit '0c76cbcb7e6406303f9e88d49034a73e58e1b426':
Refine the logic in CameraController.
|
| 432c964bb528a28600f19e18e81ff2b6407bb22d |
28-Feb-2014 |
Angus Kong <shkong@google.com> |
Refine the logic in CameraController.
Define a constant for empty request and also add some documentation.
bug:13234553
Change-Id: Ib491dc94304451a215dd09995233edf340f57d2b
ndroid/camera/app/CameraController.java
|
| 13771e5989c4771150626512d21673c5f7d1cf1a |
28-Feb-2014 |
Angus Kong <shkong@google.com> |
am d119afcb: Merge "Prevent crash during rapid switching camera" into gb-ub-photos-denali
* commit 'd119afcb87f6ffc4dabf52e9fa57ddede9a5c933':
Prevent crash during rapid switching camera
|
| d119afcb87f6ffc4dabf52e9fa57ddede9a5c933 |
28-Feb-2014 |
Angus Kong <shkong@google.com> |
Merge "Prevent crash during rapid switching camera" into gb-ub-photos-denali
|
| fcfa8a5ae0b61f3c150e1b7b15c77feaa5661256 |
28-Feb-2014 |
Doris Liu <tianliu@google.com> |
am 9fb887cb: Remove animation when going from pressed to selected state
* commit '9fb887cb6cb1941726e7c0820d491eba950c64a0':
Remove animation when going from pressed to selected state
|
| 9fb887cb6cb1941726e7c0820d491eba950c64a0 |
28-Feb-2014 |
Doris Liu <tianliu@google.com> |
Remove animation when going from pressed to selected state
Bug: 13097259
Change-Id: I2098366fe68d11c68d8fb958680dcc33da7b4391
ndroid/camera/ui/ModeIconView.java
ndroid/camera/ui/ModeListView.java
|
| e6a62c4cbe63a3b6b8cf6b710d21e1ee4856ceab |
28-Feb-2014 |
Angus Kong <shkong@google.com> |
Prevent crash during rapid switching camera
1. Don't request new camera when the previous request is not fulfilled yet.
2. Send camera open message through dispatch thread also.
bug:13234553
Change-Id: I9962cf084bc7f39bcbf05946800fc28a39d204c7
ndroid/camera/app/AndroidCameraManagerImpl.java
ndroid/camera/app/CameraController.java
|
| 86d99e1a3aa6d96b3396a7e84fdf8caa61730104 |
28-Feb-2014 |
Carlos Hernandez <chernand@google.com> |
am 83eeb95f: Merge "Add IsRGBZ to RefocusHelper" into gb-ub-photos-denali
* commit '83eeb95f610da6e01e97112a5979827de1376581':
Add IsRGBZ to RefocusHelper
|
| 83eeb95f610da6e01e97112a5979827de1376581 |
28-Feb-2014 |
Carlos Hernandez <chernand@google.com> |
Merge "Add IsRGBZ to RefocusHelper" into gb-ub-photos-denali
|
| ce6c00db0de3ac0370a65c308ec4c3d183be0a20 |
28-Feb-2014 |
Angus Kong <shkong@google.com> |
am df17a5dd: Remove spinner for in-progress data.
* commit 'df17a5dd7e2834d09e1d56e4487ffddf78cb99d9':
Remove spinner for in-progress data.
|
| df17a5dd7e2834d09e1d56e4487ffddf78cb99d9 |
28-Feb-2014 |
Angus Kong <shkong@google.com> |
Remove spinner for in-progress data.
bug:13195977
Change-Id: I5083c191583945192e2417ad208d1bfaf2f19be1
ndroid/camera/data/CameraDataAdapter.java
ndroid/camera/data/InProgressDataWrapper.java
|
| 20cc222a968adaec43c71a0ad045d6005de6356a |
28-Feb-2014 |
Angus Kong <shkong@google.com> |
am 589649e7: Merge "Show progress UI in secure camera." into gb-ub-photos-denali
* commit '589649e705abca400cfbf88d44139192a767e07d':
Show progress UI in secure camera.
|
| 589649e705abca400cfbf88d44139192a767e07d |
28-Feb-2014 |
Angus Kong <shkong@google.com> |
Merge "Show progress UI in secure camera." into gb-ub-photos-denali
|
| 001dc31f0b6e78b70db83c6d9b8cc7872e540965 |
28-Feb-2014 |
Angus Kong <shkong@google.com> |
Show progress UI in secure camera.
bug:13226795
Change-Id: I9de44b1c802094b88797ab90ceb022a42b3589f9
ndroid/camera/CameraActivity.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/app/FilmstripBottomPanel.java
|
| e8ce0ac3d520a8d48ade9c7faf2c15dcb52d4dec |
28-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
am 45382e86: Merge "Add exif util file." into gb-ub-photos-denali
* commit '45382e86f640ef098f613c9208a64d14ef50c9f9':
Add exif util file.
|
| 45382e86f640ef098f613c9208a64d14ef50c9f9 |
28-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Add exif util file." into gb-ub-photos-denali
|
| 6218e503a5d4f2fa566855022d14f5f96ca38120 |
28-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
Add exif util file.
Bug: 12067030
Change-Id: If5898b44335c004e3e750598f55a98516065a0ae
ndroid/camera/util/ExifUtil.java
|
| 77377ad618ccedeeecdff880f73780605d7c0d9e |
28-Feb-2014 |
Carlos Hernandez <chernand@google.com> |
Add IsRGBZ to RefocusHelper
Bug: 12210770
Change-Id: I4d030318f44b906a2f0e0d3f7c7d7387634098be
ndroid/camera/data/RgbzMetadataLoader.java
|
| c2a6f9996934dee97fbd86295482039e93787b26 |
28-Feb-2014 |
Doris Liu <tianliu@google.com> |
am b98b375d: Merge "30% transparent fill pressed state" into gb-ub-photos-denali
* commit 'b98b375d2651d1a621022081563b6325b88bbda6':
30% transparent fill pressed state
|
| b98b375d2651d1a621022081563b6325b88bbda6 |
28-Feb-2014 |
Doris Liu <tianliu@google.com> |
Merge "30% transparent fill pressed state" into gb-ub-photos-denali
|
| 26740cc00ba3184997c35991542acd2c1188bb39 |
27-Feb-2014 |
Angus Kong <shkong@google.com> |
am 945acc87: Merge "Check whether the camera is opened when releasing" into gb-ub-photos-denali
* commit '945acc87892de6a7c0059af31aa6466b1cc31951':
Check whether the camera is opened when releasing
|
| 945acc87892de6a7c0059af31aa6466b1cc31951 |
27-Feb-2014 |
Angus Kong <shkong@google.com> |
Merge "Check whether the camera is opened when releasing" into gb-ub-photos-denali
|
| 658b7ccb52092077b5f732747a5d5d93e6beef88 |
27-Feb-2014 |
Seth Raphael <magicseth@google.com> |
am 98378965: Merge "Only use a media retriever when necessary." into gb-ub-photos-denali
* commit '98378965b483df98fb1caaf63a14625df1c322e9':
Only use a media retriever when necessary.
|
| 98378965b483df98fb1caaf63a14625df1c322e9 |
27-Feb-2014 |
Seth Raphael <magicseth@google.com> |
Merge "Only use a media retriever when necessary." into gb-ub-photos-denali
|
| b21870f870e00d8dfa639a79c53a2c748092964f |
27-Feb-2014 |
Seth Raphael <magicseth@google.com> |
Only use a media retriever when necessary.
Previously we created a media retriever to query
the width and height of every video when making
the filmstrip data model.
This is extremely slow. Now we query the content
resolver first, and only create a media retriever
if it seems that the content resolver has poor
values.
Bug: 13225572
Change-Id: Ic366adbc8f82036ddd727fafe04077ccdee37c80
ndroid/camera/data/LocalMediaData.java
|
| f578829a0f9a298fd5e4fdd9081b768f25811599 |
27-Feb-2014 |
Angus Kong <shkong@google.com> |
Check whether the camera is opened when releasing
bug:13213439
Change-Id: I7360aca7de7533c920c1a1f5c7293a99a571a247
ndroid/camera/app/CameraController.java
|
| 06e0826c3ae8579bd301040607701e0065aa6848 |
26-Feb-2014 |
Doris Liu <tianliu@google.com> |
30% transparent fill pressed state
Bug: 13097259
Change-Id: I2d22e78fd80b3069df74df1bee53ec6276aedc73
ndroid/camera/ui/ModeIconView.java
ndroid/camera/ui/ModeListView.java
ndroid/camera/ui/ModeSelectorItem.java
|
| 597d0daef984f896d34dd0cfc64a7e73978644bb |
27-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
am 8f4dba0d: Merge "Fix potential crash by moving OrientationManager init." into gb-ub-photos-denali
* commit '8f4dba0d4e69cbd045a379f58e23cec7148894a7':
Fix potential crash by moving OrientationManager init.
|
| 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
ndroid/camera/CameraActivity.java
|
| 0f1cd9fe6ea3a575fb25aa0dd1b78622d40595a3 |
27-Feb-2014 |
Angus Kong <shkong@google.com> |
am fc1c289d: Merge "Add camera state in CameraManager implementation" into gb-ub-photos-denali
* commit 'fc1c289dff5b91cb9470009eb973325a38f91f4e':
Add camera state in CameraManager implementation
|
| fc1c289dff5b91cb9470009eb973325a38f91f4e |
27-Feb-2014 |
Angus Kong <shkong@google.com> |
Merge "Add camera state in CameraManager implementation" into gb-ub-photos-denali
|
| 5bea57cc0b47b81d11e903a4485f42eca039665f |
26-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
am 91c25e3d: First sweep to clean up unused preference code.
* commit '91c25e3d33120d5466c42f17276565f99df79c56':
First sweep to clean up unused preference code.
|
| 91c25e3d33120d5466c42f17276565f99df79c56 |
26-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
First sweep to clean up unused preference code.
Change-Id: I7caa89c8b5cb70824821d7fba5d05fbaadc39a2f
ndroid/camera/CameraActivity.java
ndroid/camera/CameraSettings.java
ndroid/camera/PieController.java
ndroid/camera/PreferenceInflater.java
ndroid/camera/RecordLocationPreference.java
ndroid/camera/VideoModule.java
ndroid/camera/ui/ListPrefSettingPopup.java
ndroid/camera/ui/MoreSettingPopup.java
ndroid/camera/ui/TimeIntervalPopup.java
|
| b82dade76dd940764bfd043a7f7cf19e161c6b7d |
26-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 5d18769f: Generalize shutter button listeners and add one for mode options.
* commit '5d18769f53db81d401488811250570290a73626b':
Generalize shutter button listeners and add one for mode options.
|
| 5d18769f53db81d401488811250570290a73626b |
26-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Generalize shutter button listeners and add one for mode options.
Bug: 13099000
Change-Id: Ib0726c70a9e4aa06197550f29360bacb2dda4783
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoModule.java
ndroid/camera/ShutterButton.java
ndroid/camera/VideoModule.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/module/ModuleController.java
ndroid/camera/widget/ModeOptionsOverlay.java
|
| ec32d995d690c072561e4bfc68195bda214d805e |
26-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 09a34b12: Merge "Pass Activity to GServices to launch panorama viewer." into gb-ub-photos-denali
* commit '09a34b12c8049a6a0f4d09635af6742e3a40e70e':
Pass Activity to GServices to launch panorama viewer.
|
| 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
ndroid/camera/CameraActivity.java
|
| d99ff2c7076b28e0beea762b5ed9d14d1da7a53e |
26-Feb-2014 |
Angus Kong <shkong@google.com> |
am 73e09f39: Hide action bar upon filmstrip is off position.
* commit '73e09f39f7d4075f3c95d20bb229f354211d05c0':
Hide action bar upon filmstrip is off position.
|
| 73e09f39f7d4075f3c95d20bb229f354211d05c0 |
26-Feb-2014 |
Angus Kong <shkong@google.com> |
Hide action bar upon filmstrip is off position.
bug:13184003
Change-Id: I6ad2bf2c4d0da45764907d819a5d4651a9887209
ndroid/camera/CameraActivity.java
ndroid/camera/filmstrip/FilmstripContentPanel.java
ndroid/camera/widget/FilmstripLayout.java
|
| a6e04167baa1e1c7ded376949e9b330d4b03828d |
26-Feb-2014 |
Angus Kong <shkong@google.com> |
am 7ae25c21: Align progress bar with filmstrip bottom controls.
* commit '7ae25c21fefd8b7fd4c4e1c207631f751167cb0a':
Align progress bar with filmstrip bottom controls.
|
| 7ae25c21fefd8b7fd4c4e1c207631f751167cb0a |
25-Feb-2014 |
Angus Kong <shkong@google.com> |
Align progress bar with filmstrip bottom controls.
bug:13026663
Change-Id: Ic751bf26475fd27237690678715e399f0d987e82
ndroid/camera/CameraActivity.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/app/FilmstripBottomControls.java
ndroid/camera/app/FilmstripBottomPanel.java
|
| a690296438e7b103b4e4b5f50098838a0414c406 |
26-Feb-2014 |
Teresa Ko <teresako@google.com> |
Merge "Revert "Add opt-in setting to everglades."" into ub-camera-everglades
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.java
ndroid/camera/app/AndroidCameraManagerImpl.java
ndroid/camera/app/CameraController.java
ndroid/camera/app/CameraManager.java
ndroid/camera/app/CameraManagerFactory.java
|
| 84aa1f86dc22714970862818817165a71495f47c |
26-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 37452547: Don\'t pass touch events from the mode options to the preview.
* commit '374525475747ffe1c102d7b3c3fda989393fa44b':
Don't pass touch events from the mode options to the preview.
|
| 374525475747ffe1c102d7b3c3fda989393fa44b |
26-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Don't pass touch events from the mode options to the preview.
Bug: 13099000
Change-Id: I01bbfb335d893848b084542301d50919152fabe5
ndroid/camera/widget/ModeOptionsOverlay.java
|
| 0807b7eda871d2c5832e7650de6835ea5792b4e5 |
26-Feb-2014 |
Teresa Ko <teresako@google.com> |
Revert "Add opt-in setting to everglades."
This reverts commit 72e51dbcb943d0de053e60978e6eb3d6c951d635.
Change-Id: I595397f4d528e62c69021eaf25f60ebf288b5ab8
ndroid/camera/settings/CameraSettingsActivity.java
ndroid/camera/settings/SettingsCache.java
ndroid/camera/settings/SettingsManager.java
|
| 72e51dbcb943d0de053e60978e6eb3d6c951d635 |
25-Feb-2014 |
Teresa Ko <teresako@google.com> |
Add opt-in setting to everglades.
Change-Id: I0af5b7faffa29ca9194fe2764024335ff08bb131
ndroid/camera/settings/CameraSettingsActivity.java
ndroid/camera/settings/SettingsCache.java
ndroid/camera/settings/SettingsManager.java
|
| 7317559db2798eaf3d1328a0d636a687d16c70c6 |
25-Feb-2014 |
Doris Liu <tianliu@google.com> |
am 9d52fc9e: Disable quick switch
* commit '9d52fc9e1a529012de83d1fea415c2fb4cba836c':
Disable quick switch
|
| 9d52fc9e1a529012de83d1fea415c2fb4cba836c |
25-Feb-2014 |
Doris Liu <tianliu@google.com> |
Disable quick switch
Bug: 13098335
Change-Id: Ic0e019d0b58234975e2bbd0238d0cb7618afb0e5
ndroid/camera/app/CameraAppUI.java
|
| 0211a39266f3fc03c776f559affa7e4b0f128c2c |
25-Feb-2014 |
Doris Liu <tianliu@google.com> |
am d6cf8e35: Merge "Remove face view from photo module view hierarchy" into gb-ub-photos-denali
* commit 'd6cf8e35b2d8d7d3f0721f8c6e2b6581829c452c':
Remove face view from photo module view hierarchy
|
| d6cf8e35b2d8d7d3f0721f8c6e2b6581829c452c |
25-Feb-2014 |
Doris Liu <tianliu@google.com> |
Merge "Remove face view from photo module view hierarchy" into gb-ub-photos-denali
|
| b41d527fe31372a3e11cd6247cd13133de3fdeaf |
25-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 87069e89: Merge "Support setting the bounds on a ProgressOverlay." into gb-ub-photos-denali
* commit '87069e8903495e0272e2ff772884b3bd187c7fff':
Support setting the bounds on a ProgressOverlay.
|
| 87069e8903495e0272e2ff772884b3bd187c7fff |
25-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Support setting the bounds on a ProgressOverlay." into gb-ub-photos-denali
|
| 90286f00664262de977ca1e9291abc1b4868ecda |
25-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Support setting the bounds on a ProgressOverlay.
Bug: 12650252
Change-Id: Ic91a4716c3dafa9ca5133c3f0eff1a56424d2faa
ndroid/camera/ui/ProgressOverlay.java
|
| 5390ca143fc3c4cc467f37fb2e7537447f00598d |
25-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
am 94716816: Merge "Use the mode list parent visibility." into gb-ub-photos-denali
* commit '947168164ea24087e29630a4c6888a650ed35c59':
Use the mode list parent visibility.
|
| 947168164ea24087e29630a4c6888a650ed35c59 |
25-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Use the mode list parent visibility." into gb-ub-photos-denali
|
| d27ea7be496ae823fa88b98760c1a9d9ce0d554d |
25-Feb-2014 |
Doris Liu <tianliu@google.com> |
Remove face view from photo module view hierarchy
TODO: Remove face detection logic if UX does not bring
this feature back within 2 months.
Bug: 12837314
Change-Id: I9fe7d2d525c2607848f53d9287116cfeca0bd8c4
ndroid/camera/PhotoUI.java
|
| b49ab283fe6fce242901a1a09fc2b148b27fe123 |
25-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
Use the mode list parent visibility.
Change-Id: I4a6ba89fc9027d526c60cfaef98b70c6faf0a2c1
ndroid/camera/ui/ModeListView.java
|
| 80642a556dc7a9c389a7534beb5df0c9650a45b9 |
25-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
am a71aa2a1: Merge "Make visibility support three states." into gb-ub-photos-denali
* commit 'a71aa2a1b895b305a6eab7f334a92d8bb0b107f0':
Make visibility support three states.
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/CameraModule.java
ndroid/camera/VideoModule.java
ndroid/camera/module/ModuleController.java
ndroid/camera/ui/ModeListView.java
|
| 87cfe4df5e2bdd8186d40af42f2f008ae1d1fb2f |
25-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 74913b43: Merge "Implement general upgrade recovery strategies and strict versioning." into gb-ub-photos-denali
* commit '74913b43e731dda86745548fd2070788df2a9b58':
Implement general upgrade recovery strategies and strict versioning.
|
| 74913b43e731dda86745548fd2070788df2a9b58 |
25-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Implement general upgrade recovery strategies and strict versioning." into gb-ub-photos-denali
|
| 4569b7089b4bc7ea6949505b7dd3637778011d7c |
24-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Implement general upgrade recovery strategies and strict versioning.
Bug: 11984903
Bug: 13165733
Change-Id: I2e7f39778fb185c3276ec35f3cc7afc9bfa5a747
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoModule.java
ndroid/camera/settings/SettingsCache.java
ndroid/camera/settings/SettingsManager.java
|
| a62a974adc9830190031d324b8fbb45898b4e3c9 |
24-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Remove SmartCam from Denali. DO NOT MERGE" into gb-ub-photos-denali
|
| 1ce0345123e91068e17cb3c9ff120bf34dbd3148 |
22-Feb-2014 |
Doris Liu <tianliu@google.com> |
am 6ababe93: Add a pressed state on mode drawer items
* commit '6ababe9379ecee4056a415085e28e7eb5e1249bf':
Add a pressed state on mode drawer items
|
| 6ababe9379ecee4056a415085e28e7eb5e1249bf |
21-Feb-2014 |
Doris Liu <tianliu@google.com> |
Add a pressed state on mode drawer items
Bug: 13097259
Change-Id: I63ba6a8200d69b451081b3ece8e8b71123b58a6e
ndroid/camera/ui/ModeListView.java
ndroid/camera/ui/ModeSelectorItem.java
|
| 5cb575db0bfab1686af0c379280e3f317f82bbcf |
22-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
Remove SmartCam from Denali. DO NOT MERGE
Change-Id: I94813a13301eb3bcd89eeb96a757763b3e7b34ff
ndroid/camera/PhotoModule.java
|
| d9f48fc84115606794de149689680ee912a34fce |
21-Feb-2014 |
Angus Kong <shkong@google.com> |
am 8dc0c487: Merge "Remove support for press and hold to focus." into gb-ub-photos-denali
* commit '8dc0c487576d03c5cae3d0e4e609bd9262e2e5a1':
Remove support for press and hold to focus.
|
| 8dc0c487576d03c5cae3d0e4e609bd9262e2e5a1 |
21-Feb-2014 |
Angus Kong <shkong@google.com> |
Merge "Remove support for press and hold to focus." into gb-ub-photos-denali
|
| ec4a91ac3a1de45ae93c1683cd53a506bba6ed6f |
21-Feb-2014 |
Angus Kong <shkong@google.com> |
am 8a61374e: Merge "Avoid making wrong filmstrip layout callbacks." into gb-ub-photos-denali
* commit '8a61374e37c99bdc6ef6b34b50405b454bc7cb85':
Avoid making wrong filmstrip layout callbacks.
|
| eaaf56d5ad909bf8d3eb23a2454983e7731e7644 |
20-Feb-2014 |
Angus Kong <shkong@google.com> |
Remove support for press and hold to focus.
bug:11985910
Change-Id: Ibf37468236f1483fe622ffa6adfbde71ec21673a
ndroid/camera/FocusOverlayManager.java
ndroid/camera/PhotoModule.java
|
| 8a61374e37c99bdc6ef6b34b50405b454bc7cb85 |
21-Feb-2014 |
Angus Kong <shkong@google.com> |
Merge "Avoid making wrong filmstrip layout callbacks." into gb-ub-photos-denali
|
| 255c27360fd6802e458a0f5963943f9ccb8bfd56 |
21-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
am 96fe3f0b: Merge "Maybe show release information before sharing certain data types." into gb-ub-photos-denali
* commit '96fe3f0b5cddbb13d452933d48f5408f7bb11b48':
Maybe show release information before sharing certain data types.
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/data/PanoramaMetadataLoader.java
|
| 6ae724120504967b1e37f7ae045134444013f00e |
21-Feb-2014 |
Angus Kong <shkong@google.com> |
Avoid making wrong filmstrip layout callbacks.
bug:12589076
Change-Id: I755fee94261f983a3172dcef18c93cb01f47dcc0
ndroid/camera/widget/FilmstripLayout.java
|
| 5e7becf4433f8b21b24ec980fbf414c740f635b3 |
21-Feb-2014 |
Angus Kong <shkong@google.com> |
am 43fd6d1e: Merge "Make up-affordance behavior consistent." into gb-ub-photos-denali
* commit '43fd6d1e00a1290ec60a54d7b562594bdcc64676':
Make up-affordance behavior consistent.
|
| 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
ndroid/camera/CameraActivity.java
|
| 6dad5340b6b71682d5648f8c548fe04db839c57f |
21-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
am 267571a0: Merge "To support Refocus orientation refactoring." into gb-ub-photos-denali
* commit '267571a094c55f4d7ebf87180d72e1d5e88b7c31':
To support Refocus orientation refactoring.
|
| 267571a094c55f4d7ebf87180d72e1d5e88b7c31 |
21-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "To support Refocus orientation refactoring." into gb-ub-photos-denali
|
| 3938d0a7f7af03399394d12d36875b89def4da2c |
21-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 0d2ba038: Merge "Show zoom ui on two finger preview touch." into gb-ub-photos-denali
* commit '0d2ba0388fc214cc962c8bca7c7c8824bcbf4738':
Show zoom ui on two finger preview touch.
|
| 0d2ba0388fc214cc962c8bca7c7c8824bcbf4738 |
21-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Show zoom ui on two finger preview touch." into gb-ub-photos-denali
|
| a7cbfc04d888624858271facdbf68797c54df8b6 |
14-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
To support Refocus orientation refactoring.
Bug: 13007150
Bug: 12996493
Change-Id: I360d0d0fcf8090d96277cd708bd8d0eb4e188b00
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.java
ndroid/camera/app/AppController.java
ndroid/camera/util/CameraUtil.java
|
| 950e8c4b4bc4ee630e8befd1e50508bc6a32ca75 |
21-Feb-2014 |
Angus Kong <shkong@google.com> |
am eb3f62f2: Merge "Tweak the peek animation image size." into gb-ub-photos-denali
* commit 'eb3f62f20df0a97d25d2390904631caf32a12d54':
Tweak the peek animation image size.
|
| eb3f62f20df0a97d25d2390904631caf32a12d54 |
21-Feb-2014 |
Angus Kong <shkong@google.com> |
Merge "Tweak the peek animation image size." into gb-ub-photos-denali
|
| c195e7a9208c90d7a55e184d4b2b9c747e9c90f1 |
21-Feb-2014 |
Angus Kong <shkong@google.com> |
Tweak the peek animation image size.
bug:12451161
Change-Id: Ie5a8a2911ed4b5ce831331ca7e7600d6d13659b7
ndroid/camera/CameraActivity.java
ndroid/camera/data/InProgressDataWrapper.java
ndroid/camera/data/LocalDataUtil.java
ndroid/camera/data/LocalMediaData.java
ndroid/camera/data/RotationTask.java
ndroid/camera/data/SimpleViewData.java
ndroid/camera/filmstrip/ImageData.java
ndroid/camera/util/CameraUtil.java
ndroid/camera/widget/FilmstripView.java
ndroid/camera/widget/PeekView.java
|
| 721e562bed02b463ae005d0ba7bbab05ce5c579b |
20-Feb-2014 |
Doris Liu <tianliu@google.com> |
am 948de99e: Dismiss mode drawer when tapped outside
* commit '948de99e58b72e815224d4e12761863dfceffae0':
Dismiss mode drawer when tapped outside
|
| 948de99e58b72e815224d4e12761863dfceffae0 |
20-Feb-2014 |
Doris Liu <tianliu@google.com> |
Dismiss mode drawer when tapped outside
Change shutter button alpha to disabled alpha when mode
drawer is open
Bug: 13084332
Bug: 13084982
Change-Id: Ic6f8c0b910e653045b3f8c1c6f22dca3420f6802
ndroid/camera/ShutterButton.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/ModeListView.java
|
| b9ae797a8f7c95b74605a7d0f5a5990eec9b16d4 |
20-Feb-2014 |
Angus Kong <shkong@google.com> |
am a303a71f: Merge "A test for media details." into gb-ub-photos-denali
* commit 'a303a71ff636535e59bd356bda40e9a324699357':
A test for media details.
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/data/LocalData.java
ndroid/camera/filmstrip/FilmstripController.java
ndroid/camera/ui/FilmstripGestureRecognizer.java
ndroid/camera/widget/FilmstripLayout.java
ndroid/camera/widget/FilmstripView.java
|
| b386d8344cde01019f114f474d4e19b70c7de86f |
20-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 791f211c: Merge "Don\'t show flash mode option if it\'s never supported." into gb-ub-photos-denali
* commit '791f211c87d0e15e3264086a5ea75ff9066aa177':
Don't show flash mode option if it's never supported.
|
| 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
|
| 14e7e5f62e738efbb70d4858b237f7dbc2cf8fa9 |
20-Feb-2014 |
Doris Liu <tianliu@google.com> |
am 0868a09e: Merge "Hide focus overlay when exiting a mode" into gb-ub-photos-denali
* commit '0868a09ecd0fb17e63efae3b8b3b694bda32ca20':
Hide focus overlay when exiting a mode
|
| 0868a09ecd0fb17e63efae3b8b3b694bda32ca20 |
20-Feb-2014 |
Doris Liu <tianliu@google.com> |
Merge "Hide focus overlay when exiting a mode" into gb-ub-photos-denali
|
| c738070feb05f04884300202749978e4463d7e16 |
20-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Show zoom ui on two finger preview touch.
Bug: 12114285
Change-Id: I9ab2db57c94eb5070f1c513062c69f3cb118a85f
ndroid/camera/ui/PreviewOverlay.java
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/settings/SettingsCache.java
ndroid/camera/settings/SettingsManager.java
|
| 0f501026a5a18e81fd10ffe0972561cc26883c26 |
20-Feb-2014 |
Angus Kong <shkong@google.com> |
am b86a02cd: Merge "Filmstrip peek animation." into gb-ub-photos-denali
* commit 'b86a02cddc807ac2f7524b786ff3c589cc340353':
Filmstrip peek animation.
|
| b86a02cddc807ac2f7524b786ff3c589cc340353 |
20-Feb-2014 |
Angus Kong <shkong@google.com> |
Merge "Filmstrip peek animation." into gb-ub-photos-denali
|
| af65683681dbbb98063363ee776f5d357a7b5de5 |
19-Feb-2014 |
Doris Liu <tianliu@google.com> |
Hide focus overlay when exiting a mode
Bug: 13005220
Change-Id: I48bc32b9137a850aefef43af44537b2c892a74a2
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/FocusOverlay.java
|
| 0a47eb038a4e59c6d78ff36af6c3e6568746283a |
19-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 71a74296: Bring back panorama indicator support.
* commit '71a742968e6b9efe2f570e2876f67330bfddf8c1':
Bring back panorama indicator support.
|
| 71a742968e6b9efe2f570e2876f67330bfddf8c1 |
19-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Bring back panorama indicator support.
Bug: 13023569
Bug: 12977732
Change-Id: I188a2f1aa7fa70cd0c7a803707c74a9b23f7203b
ndroid/camera/widget/IndicatorIconController.java
|
| ae4a15617b55d5822c362620b626e38c729ec860 |
19-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
am be08ab09: Merge "Install a release dialog at start-up if necessary." into gb-ub-photos-denali
* commit 'be08ab09c3f2228e07cace087d200169bbd3958e':
Install a release dialog at start-up if necessary.
|
| be08ab09c3f2228e07cace087d200169bbd3958e |
19-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Install a release dialog at start-up if necessary." into gb-ub-photos-denali
|
| e6e019fcb02edbe4a99bb7a4d3d19ecc5ab8179f |
19-Feb-2014 |
Doris Liu <tianliu@google.com> |
am 6514fd91: Merge "Update mode cover icon assets and size" into gb-ub-photos-denali
* commit '6514fd911e70b6ee679563ce25300876a719c67a':
Update mode cover icon assets and size
|
| 6514fd911e70b6ee679563ce25300876a719c67a |
19-Feb-2014 |
Doris Liu <tianliu@google.com> |
Merge "Update mode cover icon assets and size" 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
ndroid/camera/CameraActivity.java
ndroid/camera/settings/SettingsCache.java
ndroid/camera/settings/SettingsManager.java
|
| b520b97b89b0cf0389ea00d7e080971628cf6290 |
14-Feb-2014 |
Doris Liu <tianliu@google.com> |
Update mode cover icon assets and size
Also increase the fade out duration.
Bug: 12967901
Change-Id: I9573b234ad0c9123f5edc6cd40c115897ba14177
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/ModeTransitionView.java
ndroid/camera/util/CameraUtil.java
|
| 4a0a4c59a5f2f521c017fc17a12263cf2fcb4850 |
19-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 7785b26b: Merge "Support panorama orientation toggle in mode options." into gb-ub-photos-denali
* commit '7785b26b493b315da0a31c4a0a334d1d891ea9f4':
Support panorama orientation toggle in mode options.
|
| 7785b26b493b315da0a31c4a0a334d1d891ea9f4 |
19-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Support panorama orientation toggle in mode options." into gb-ub-photos-denali
|
| a6fb9d2c1bc0a8bda37327b24414b09bf7656a28 |
18-Feb-2014 |
Doris Liu <tianliu@google.com> |
am 5842607d: Change gear icon background and implement pressed state
* commit '5842607d1b9ec2b5e751a8aaf43ff97cc3f85d22':
Change gear icon background and implement pressed state
|
| 5842607d1b9ec2b5e751a8aaf43ff97cc3f85d22 |
15-Feb-2014 |
Doris Liu <tianliu@google.com> |
Change gear icon background and implement pressed state
Bug: 13004843
Bug: 13005562
Change-Id: I18b44283bb337ca0bb3eb4aae923398a8ac4bfbb
ndroid/camera/ui/ModeListView.java
|
| f80ac9ee5c66671c3a77ac6628fefc86cd39d57e |
18-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Support panorama orientation toggle in mode options.
Bug: 12977732
Change-Id: I945d53e1f0a6e3ff4e831c9907936f4d4456def6
ndroid/camera/ButtonManager.java
ndroid/camera/MultiToggleImageButton.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/settings/SettingsManager.java
|
| 5052117cc429d85cf446421ca74859f4365747d3 |
18-Jan-2014 |
Angus Kong <shkong@google.com> |
Filmstrip peek animation.
First version.
bug:12451161
Change-Id: Ie49314569bf607efd9220977ad5ffb1ca26d161c
ndroid/camera/CameraActivity.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/data/CameraDataAdapter.java
ndroid/camera/data/LocalDataAdapter.java
ndroid/camera/data/LocalDataUtil.java
ndroid/camera/data/LocalMediaData.java
ndroid/camera/widget/FilmstripLayout.java
ndroid/camera/widget/PeekView.java
|
| de68364bf8e003886eae0a92a15914aa7390b681 |
14-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 9ec6c49e: Rotate three dots in landscape to make position sticky.
* commit '9ec6c49e78715c63d9df71fa184761e47639e929':
Rotate three dots in landscape to make position sticky.
|
| 9ec6c49e78715c63d9df71fa184761e47639e929 |
14-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Rotate three dots in landscape to make position sticky.
Bug: 12369666
Change-Id: Iae8181c6656efce9de6701a4faf254be8d9396f7
ndroid/camera/widget/ModeOptionsOverlay.java
|
| 8c5208b4e2219ed5408b140ba824f154eecf8bae |
14-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
am f5f1a1b6: Merge "Add Licenses Activity support." into gb-ub-photos-denali
* commit 'f5f1a1b63630e9512801412ef32a6cda7b227a42':
Add Licenses Activity support.
|
| f5f1a1b63630e9512801412ef32a6cda7b227a42 |
14-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Add Licenses Activity support." into gb-ub-photos-denali
|
| 2553b7a74ca3cee7e55d8c29cc623522739074fb |
14-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
am cb87251c: Merge "Remove grid lines indicator." into gb-ub-photos-denali
* commit 'cb87251c72cf90bea9e05bcecb91fbcb743d250b':
Remove grid lines indicator.
|
| ced186e128dfd38f94ac414930ce38f1c6c4ecfc |
14-Feb-2014 |
Doris Liu <tianliu@google.com> |
am 537c8a92: Do not hide mode drawer when settings button is clicked
* commit '537c8a92385476aac360e41ad0306001ad73974c':
Do not hide mode drawer when settings button is clicked
|
| cb87251c72cf90bea9e05bcecb91fbcb743d250b |
14-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Remove grid lines indicator." into gb-ub-photos-denali
|
| a2d797bfe915ce414e4e90a2346aa44d4286e3f0 |
14-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Remove grid lines indicator.
Bug: 12990795
Change-Id: Ibc25050523a0ea61cb6ec000d5dae02755a31016
ndroid/camera/widget/IndicatorIconController.java
|
| 537c8a92385476aac360e41ad0306001ad73974c |
14-Feb-2014 |
Doris Liu <tianliu@google.com> |
Do not hide mode drawer when settings button is clicked
Change-Id: I4eefdbca124ee3656913877302cf32d32a6e9ec1
ndroid/camera/ui/ModeListView.java
|
| cccd5023409b7d5185c26696e34ddf57226d5c17 |
14-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
Add Licenses Activity support.
Bug: 13018845
Change-Id: I195d19da5430aa1c9ced068931be69d48d95efc0
ndroid/camera/settings/CameraSettingsActivity.java
|
| 5d9f17010cd3486da21e71735cd0f875c16ebb3b |
14-Feb-2014 |
Doris Liu <tianliu@google.com> |
am d849d2ba: Merge "Hide focus ring when auto focusing in camera and video" into gb-ub-photos-denali
* commit 'd849d2ba5f3d4ec6773d87dd16a89833a86a7856':
Hide focus ring when auto focusing in camera and video
|
| 7bbb5af5a1e2c9c4885775184e748dc7e303cea6 |
14-Feb-2014 |
Spike Sprague <spikuru@google.com> |
am a84a728d: doubling padding on intent capture review cancel and retake buttons
* commit 'a84a728d17c439d83a6ebd78e3e54b8480804600':
doubling padding on intent capture review cancel and retake buttons
|
| d849d2ba5f3d4ec6773d87dd16a89833a86a7856 |
14-Feb-2014 |
Doris Liu <tianliu@google.com> |
Merge "Hide focus ring when auto focusing in camera and video" into gb-ub-photos-denali
|
| a84a728d17c439d83a6ebd78e3e54b8480804600 |
13-Feb-2014 |
Spike Sprague <spikuru@google.com> |
doubling padding on intent capture review cancel and retake buttons
bug: 13006473
Change-Id: I881cc714c6a0fe9b1e4eebca123b0873f47a837f
ndroid/camera/ui/TopRightWeightedLayout.java
|
| 10a035c93e2cb3ed65f59258fa4d0aca89555bcd |
13-Feb-2014 |
Doris Liu <tianliu@google.com> |
Hide focus ring when auto focusing in camera and video
Bug: 12467152
Change-Id: If3c44f6b424d9796a937387d48e3dfd0dd161182
ndroid/camera/FocusOverlayManager.java
ndroid/camera/ui/FocusOverlay.java
|
| 90d9f618072b2e2da93d8d08326d4558059ef25b |
13-Feb-2014 |
Doris Liu <tianliu@google.com> |
am 8b6c3e04: Merge "Center mode drawer in uncovered preview" into gb-ub-photos-denali
* commit '8b6c3e04857a209e5a2e55ef837f34d9e8abc111':
Center mode drawer in uncovered preview
|
| 8b6c3e04857a209e5a2e55ef837f34d9e8abc111 |
13-Feb-2014 |
Doris Liu <tianliu@google.com> |
Merge "Center mode drawer in uncovered preview" into gb-ub-photos-denali
|
| e7e0c028d568c1a4c3e88ed75411b8b41c5aec69 |
12-Feb-2014 |
Doris Liu <tianliu@google.com> |
Center mode drawer in uncovered preview
Also align the mode drawer to the left edge of the preview
Bug: 12974095
Bug: 12971043
Change-Id: Ic7b9cb95352cba52d3ccf6c09667476f2ea04d69
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/ModeListView.java
|
| a456f23cdc7afeb8a8876495bb4450c414a91cbf |
12-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
am c919ef37: Merge "Separate button references now that options are centered." into gb-ub-photos-denali
* commit 'c919ef37fd3b8c17ebbcfc2107da0a7cb52a0878':
Separate button references now that options are centered.
|
| c919ef37fd3b8c17ebbcfc2107da0a7cb52a0878 |
12-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Separate button references now that options are centered." into gb-ub-photos-denali
|
| ce020e6f5174986d149ae16edea2fccf8778174a |
12-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 26b02441: Hide mode options overlay during video capture.
* commit '26b024414efe17ca1afd9a2acfb77847d6c301df':
Hide mode options overlay during video capture.
|
| 26b024414efe17ca1afd9a2acfb77847d6c301df |
12-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Hide mode options overlay during video capture.
Bug: 12976883
Change-Id: Ie832ebfaab74c80d1af45a7ca0ae853ebf179048
ndroid/camera/VideoModule.java
|
| e22f526a64b242c1617c8f6f5d2b9abd5ab63940 |
12-Feb-2014 |
Seth Raphael <magicseth@google.com> |
am c893312b: Merge "Give Smart Camera a signal to start" into gb-ub-photos-denali
* commit 'c893312b7639d1e9c9c73e29bbb4470e8b8147e3':
Give Smart Camera a signal to start
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/CameraModule.java
ndroid/camera/PhotoModule.java
ndroid/camera/module/ModuleController.java
|
| a9ceaf76b72cb4b499d3d9d90f979bae93bd593d |
12-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Separate button references now that options are centered.
Bug: 12976464
Change-Id: I8f492f4a6f243cb986cd1fee7b0f284c3020e8d4
ndroid/camera/ButtonManager.java
ndroid/camera/app/CameraAppUI.java
|
| 79c56d93266459310a3f3e3b26ee96b90f2ae35c |
12-Feb-2014 |
Spike Sprague <spikuru@google.com> |
am c4284574: Merge "new intent bottom bar ux" into gb-ub-photos-denali
* commit 'c428457470c382ec8ccb1a2a41421e814a129431':
new intent bottom bar ux
|
| c428457470c382ec8ccb1a2a41421e814a129431 |
12-Feb-2014 |
Spike Sprague <spikuru@google.com> |
Merge "new intent bottom bar ux" into gb-ub-photos-denali
|
| 4a1219127cd2cf57da06afcd26bf692b622c13e0 |
12-Feb-2014 |
Angus Kong <shkong@google.com> |
am ac53715b: Invalidate background drawable of filmstrip layout
* commit 'ac53715b1ca6704eff7e1142d2d3896cc91b8424':
Invalidate background drawable of filmstrip layout
|
| ac53715b1ca6704eff7e1142d2d3896cc91b8424 |
12-Feb-2014 |
Angus Kong <shkong@google.com> |
Invalidate background drawable of filmstrip layout
bug:12974357
Change-Id: I4e0aaf470268e92274ee48d3045128876181577f
ndroid/camera/widget/FilmstripLayout.java
|
| 1d346bc4df3d0258ee9db30c7232440ed38ee70c |
12-Feb-2014 |
Spike Sprague <spikuru@google.com> |
new intent bottom bar ux
bug: 12969738
Change-Id: I938a7266a71ed6a6eb4cf3e8a0153d938df11e1f
ndroid/camera/ui/TopRightWeightedLayout.java
|
| 089123bc4a1fd11fe3dd54593aefc34fed50483e |
12-Feb-2014 |
Doris Liu <tianliu@google.com> |
am a45d9f7f: Merge "Add settings entry point into mode switcher" into gb-ub-photos-denali
* commit 'a45d9f7f11e1e6917af811faf4c51008cf1969c1':
Add settings entry point into mode switcher
|
| a45d9f7f11e1e6917af811faf4c51008cf1969c1 |
12-Feb-2014 |
Doris Liu <tianliu@google.com> |
Merge "Add settings entry point into mode switcher" into gb-ub-photos-denali
|
| 9d264309a341c52601bdccdeff6647e0ce58c31f |
11-Feb-2014 |
Doris Liu <tianliu@google.com> |
Add settings entry point into mode switcher
Bug: 12963148
Bug: 12964884
Change-Id: I11b45037abe1716d89fe723170284c61fbb33a87
ndroid/camera/CameraActivity.java
ndroid/camera/app/AppController.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/ModeListView.java
ndroid/camera/widget/SettingsButton.java
|
| cca4bba995de3a0b3293e5963104bb5209950f0c |
12-Feb-2014 |
Angus Kong <shkong@google.com> |
am 3cd3d046: Merge "Use ImageView as background for filmstrip layout." into gb-ub-photos-denali
* commit '3cd3d0460c87754c1f76da396cde609bcae27ee9':
Use ImageView as background for filmstrip layout.
|
| 3cd3d0460c87754c1f76da396cde609bcae27ee9 |
12-Feb-2014 |
Angus Kong <shkong@google.com> |
Merge "Use ImageView as background for filmstrip layout." into gb-ub-photos-denali
|
| 2e090667b643a03c45033231399ec70d36b5b2e8 |
12-Feb-2014 |
Angus Kong <shkong@google.com> |
Use ImageView as background for filmstrip layout.
This is a workaround.
bug:12974357
Change-Id: I7e3601acddb623499776d689575bafb8f8a181d6
ndroid/camera/widget/FilmstripLayout.java
|
| ab064bef1cc71f5a4d711c475b4256fbc7e07798 |
12-Feb-2014 |
Doris Liu <tianliu@google.com> |
am 99d4ff96: Merge "Update focus ring indicator with new assets." into gb-ub-photos-denali
* commit '99d4ff969ff015b22a2ec19b02b14694f7049198':
Update focus ring indicator with new assets.
|
| 99d4ff969ff015b22a2ec19b02b14694f7049198 |
12-Feb-2014 |
Doris Liu <tianliu@google.com> |
Merge "Update focus ring indicator with new assets." into gb-ub-photos-denali
|
| c5d230b407a4e8cbc029f1eaeb5f759f8ae2d0a9 |
12-Feb-2014 |
Doris Liu <tianliu@google.com> |
Update focus ring indicator with new assets.
Bug: 12963258
Change-Id: I8f399aec05c2064b0b6dac0fc2e6fc31b68ca3ad
ndroid/camera/ui/FocusOverlay.java
|
| 9812206a5212b786ca1595c26adbddb2feabeee8 |
11-Feb-2014 |
Spike Sprague <spikuru@google.com> |
am 713c3cad: Merge "fixing video mode stop button (too big? not anymore)" into gb-ub-photos-denali
* commit '713c3cad6358aa9bc961cded929fa2b20f682bc0':
fixing video mode stop button (too big? not anymore)
|
| 53cdde39df5009bfa16b9c3104fcf9e05d6cdf0c |
11-Feb-2014 |
Spike Sprague <spikuru@google.com> |
fixing video mode stop button (too big? not anymore)
bug: 12970650
Change-Id: Idf22205919b295c0ca51beed93a187da11a327ed
ndroid/camera/VideoModule.java
|
| 63d87797929cf4c1fb4824f32f5b491c27e6d37c |
11-Feb-2014 |
Spike Sprague <spikuru@google.com> |
am 372c609a: Merge "min / max bottom bar height logic" into gb-ub-photos-denali
* commit '372c609a2cd0c5aa2e42bcc68df3440d70daa114':
min / max bottom bar height logic
|
| 372c609a2cd0c5aa2e42bcc68df3440d70daa114 |
11-Feb-2014 |
Spike Sprague <spikuru@google.com> |
Merge "min / max bottom bar height logic" into gb-ub-photos-denali
|
| 94c9b43061bee072a2322a2001d27e51dae023db |
06-Jan-2014 |
Spike Sprague <spikuru@google.com> |
min / max bottom bar height logic
bug: 12668831
Change-Id: Iadccd4c150a37955b0c612539edb6b747f87acbb
ndroid/camera/TextureViewHelper.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/BottomBar.java
|
| f8d1e50ddcaa3c6835f89fd91d721b0aa7fbeaa7 |
11-Feb-2014 |
Doris Liu <tianliu@google.com> |
am dfe96eac: New focus indicator for touch to focus
* commit 'dfe96eac810876659f831d2c9054f33b698916e7':
New focus indicator for touch to focus
|
| dfe96eac810876659f831d2c9054f33b698916e7 |
11-Feb-2014 |
Doris Liu <tianliu@google.com> |
New focus indicator for touch to focus
Bug: 12954917
Change-Id: I103c1071c81c48bbbd3a90cce2e2a39df4bd633e
ndroid/camera/ui/FocusOverlay.java
|
| 3ab5a4ac9bf568934dcfb625e86cc85c36d6e619 |
11-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
am 1b1583ee: Merge "New Settings UI and video quality selection logic." into gb-ub-photos-denali
* commit '1b1583ee73c46ecdce8d8d432c39f8f7697ac4f1':
New Settings UI and video quality selection logic.
|
| 1b1583ee73c46ecdce8d8d432c39f8f7697ac4f1 |
11-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "New Settings UI and video quality selection logic." into gb-ub-photos-denali
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoModule.java
ndroid/camera/SettingsController.java
ndroid/camera/VideoModule.java
ndroid/camera/app/AppController.java
ndroid/camera/settings/CameraSettingsActivity.java
ndroid/camera/settings/SettingsCache.java
ndroid/camera/settings/SettingsManager.java
ndroid/camera/settings/SettingsUtil.java
ndroid/camera/ui/SettingsView.java
ndroid/camera/util/Callback.java
|
| 7bf8932c8e741b3542061b0e79ee7f3298b91493 |
11-Feb-2014 |
Doris Liu <tianliu@google.com> |
am 9395bade: Merge "Mode switcher refinements." into gb-ub-photos-denali
* commit '9395bade85aab015f4d2914d6b27b8b6c625ba63':
Mode switcher refinements.
|
| 9395bade85aab015f4d2914d6b27b8b6c625ba63 |
11-Feb-2014 |
Doris Liu <tianliu@google.com> |
Merge "Mode switcher refinements." into gb-ub-photos-denali
|
| 9391f5a1eaf4e119ccb9f281789ba6c21cfffae6 |
11-Feb-2014 |
Angus Kong <shkong@google.com> |
am 7fc3f71e: Merge "Change capture animation to simple flash" into gb-ub-photos-denali
* commit '7fc3f71edde748f869ea40aa60932102553abf80':
Change capture animation to simple flash
|
| 7fc3f71edde748f869ea40aa60932102553abf80 |
11-Feb-2014 |
Angus Kong <shkong@google.com> |
Merge "Change capture animation to simple flash" into gb-ub-photos-denali
|
| 9824f85fab222653f15455d625a585ad2d913b5f |
10-Feb-2014 |
Angus Kong <shkong@google.com> |
Change capture animation to simple flash
bug:12959370
Change-Id: I7ea7c9da2642a348d1cb6b802fe64048720ebee8
ndroid/camera/ui/CaptureAnimationOverlay.java
|
| 040e3c053cc0d2097332de24cf5328a26a8e7332 |
10-Feb-2014 |
Doris Liu <tianliu@google.com> |
Mode switcher refinements.
- Increase the mode switch icon size.
- Change mode cover color to 0x191919
- Change the font of mode text to roboto medium
- Change the highlight state of mode icon to fill
Bug: 12954273
Bug: 12954790
Bug: 12954370
Bug: 12953261
Change-Id: I23ef62ae4ce5589da20c7ee6bf805e5af70b62f2
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/ModeIconView.java
ndroid/camera/ui/ModeListView.java
ndroid/camera/ui/ModeSelectorItem.java
ndroid/camera/util/ApiHelper.java
|
| 2d3478635fa18f8d579c43f2b151faa520eb5577 |
10-Feb-2014 |
Spike Sprague <spikuru@google.com> |
am 4108d9ac: Merge "fixing intent ui controls visibility" into gb-ub-photos-denali
* commit '4108d9ace2a0f40ad28f8d6530a174f1a0cffe95':
fixing intent ui controls visibility
|
| 4108d9ace2a0f40ad28f8d6530a174f1a0cffe95 |
10-Feb-2014 |
Spike Sprague <spikuru@google.com> |
Merge "fixing intent ui controls visibility" into gb-ub-photos-denali
|
| 15690d02da08bda74ed63f260b70076801bf91bf |
10-Feb-2014 |
Spike Sprague <spikuru@google.com> |
fixing intent ui controls visibility
bug: 12668877
Change-Id: Ibffc0682fb37f88998d2afddcf52bcd6ef86192f
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/BottomBar.java
|
| d3799683ad6f240b7409c912800227ba99238fcf |
08-Feb-2014 |
Doris Liu <tianliu@google.com> |
am 213a4a08: New mode drawer.
* commit '213a4a086b54904cee543adf60b16fc1a61efe38':
New mode drawer.
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/TextureViewHelper.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/ModeIconView.java
ndroid/camera/ui/ModeListView.java
ndroid/camera/ui/ModeSelectorItem.java
ndroid/camera/ui/ModeTransitionView.java
ndroid/camera/util/CameraUtil.java
|
| 936d3983d7544da87935653f186d9d5132d51e91 |
08-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 62a78dec: Merge "Add grid lines option and indicator." into gb-ub-photos-denali
* commit '62a78decdecd84b516854f2ccbf629d76cdf09eb':
Add grid lines option and indicator.
|
| 62a78decdecd84b516854f2ccbf629d76cdf09eb |
08-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Add grid lines option and indicator." into gb-ub-photos-denali
|
| 7721dba3992fa44fc373cc4bd13cbe9b866464b8 |
08-Feb-2014 |
Spike Sprague <spikuru@google.com> |
am 5ea38e3e: Merge "size bottom bar width to match preview area" into gb-ub-photos-denali
* commit '5ea38e3e1d1983a5734b8b84c5eff705e47ce821':
size bottom bar width to match preview area
|
| 5ea38e3e1d1983a5734b8b84c5eff705e47ce821 |
08-Feb-2014 |
Spike Sprague <spikuru@google.com> |
Merge "size bottom bar width to match preview area" into gb-ub-photos-denali
|
| d5e51466a2848f1c937656c8f8185290034c2429 |
07-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Add grid lines option and indicator.
Bug: 12454164
Change-Id: Iae088cee0cc67041bb304f276a5ffe84a813df5e
ndroid/camera/ButtonManager.java
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/settings/SettingsCache.java
ndroid/camera/settings/SettingsManager.java
ndroid/camera/ui/GridLines.java
ndroid/camera/widget/IndicatorIconController.java
|
| 83f14669bff9ebcdaae22e4d522ef325a461924f |
08-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
am d8de077f: Shared texture view in photosphere.
* commit 'd8de077f72b04cee1bdf26e5ca1678ac5297bd71':
Shared texture view in photosphere.
|
| d8de077f72b04cee1bdf26e5ca1678ac5297bd71 |
03-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Shared texture view in photosphere.
Change-Id: I8dd4898e3800b02fa7f0488104dcfa4600b3845f
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
ndroid/camera/TextureViewHelper.java
ndroid/camera/VideoModule.java
ndroid/camera/VideoUI.java
ndroid/camera/app/AndroidCameraManagerImpl.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/app/CameraManager.java
ndroid/camera/ui/BottomBar.java
ndroid/camera/ui/PreviewOverlay.java
ndroid/camera/ui/PreviewStatusListener.java
|
| 418b596da9f8e7a7a3ac027cb0d0897c9c03bd69 |
08-Feb-2014 |
Spike Sprague <spikuru@google.com> |
size bottom bar width to match preview area
bug: 12563756
Change-Id: If6d26aa050ab130a177a6c2c21e38ee11cb985b5
ndroid/camera/ui/BottomBar.java
|
| 0dd739eecaf86a3d78ea278210ad6a1bcd93adac |
07-Feb-2014 |
Angus Kong <shkong@google.com> |
am fe60979d: Move onPreviewAreaSizeChanged() out of layout pass
* commit 'fe60979d7d7ce78de503404da8e91e118242071a':
Move onPreviewAreaSizeChanged() out of layout pass
|
| fe60979d7d7ce78de503404da8e91e118242071a |
07-Feb-2014 |
Angus Kong <shkong@google.com> |
Move onPreviewAreaSizeChanged() out of layout pass
Change-Id: I4eb6f6ffda1438fca7575328ce09945d40549d51
ndroid/camera/PhotoModule.java
ndroid/camera/TextureViewHelper.java
ndroid/camera/VideoModule.java
ndroid/camera/module/ModuleController.java
ndroid/camera/ui/GridLines.java
ndroid/camera/widget/ModeOptionsOverlay.java
|
| b5afc76cc854fa3597fe14e91aaeffed50b0c63c |
07-Feb-2014 |
Andy Huibers <andyhuibers@google.com> |
am 771040cd: Scale high aspect ratio Bitmaps to use full texture size.
* commit '771040cd327bdf819af789321207a72a359a3a37':
Scale high aspect ratio Bitmaps to use full texture size.
|
| 771040cd327bdf819af789321207a72a359a3a37 |
07-Feb-2014 |
Andy Huibers <andyhuibers@google.com> |
Scale high aspect ratio Bitmaps to use full texture size.
Bug:11137777
Change-Id: I1a7ae213d3cdc199d381b89b610c5a195e30fbe9
ndroid/camera/data/LocalMediaData.java
|
| 82cecc9c74cbb7c2d316939ca799f85a29b78a2a |
06-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 66f41b34: Fix an IllegalStateException introduced by ag/413832.
* commit '66f41b3440ed95fdb079dab7993f839fcbb3641b':
Fix an IllegalStateException introduced by ag/413832.
|
| 66f41b3440ed95fdb079dab7993f839fcbb3641b |
05-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Fix an IllegalStateException introduced by ag/413832.
Change-Id: Ib160c313af4e60215a9a91b93a2ec2506a06c5d2
ndroid/camera/app/CameraAppUI.java
|
| 689d491b5edea4a8df8bad1636a96795f59933d8 |
05-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
am d1df1984: Merge "Treat mode toggle as indicators or default toggle view." into gb-ub-photos-denali
* commit 'd1df1984b7742a9f555d366e3acb87c3a43af5b4':
Treat mode toggle as indicators or default toggle view.
|
| 6e07fe22cf84e9eea02d368bf64ab68d92401f20 |
04-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Treat mode toggle as indicators or default toggle view.
Change-Id: I25a97cea27893ab76a8930c99de8e65eb2904b36
ndroid/camera/app/CameraAppUI.java
ndroid/camera/widget/IndicatorIconController.java
ndroid/camera/widget/IndicatorOverlay.java
ndroid/camera/widget/ModeOptionsOverlay.java
|
| 16fab2256235eec7fd6a8f685dc849a678412bf4 |
05-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
am fbf3a90e: Merge "Prevent crash if first-time location dialog." into gb-ub-photos-denali
* commit 'fbf3a90e72eb954ce90cd32fdbae2353411933a6':
Prevent crash if first-time location dialog.
|
| 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
ndroid/camera/CameraActivity.java
|
| dd5f9aab968dd904fe7b99cdb419b160f746fff3 |
05-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
am 1fc5502e: Merge "Properly guard the weak reference." into gb-ub-photos-denali
* commit '1fc5502ed041e3c781225ed5ba8ee0928e9ea632':
Properly guard the weak reference.
|
| 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
ndroid/camera/CameraActivity.java
|
| 97cb4883316feea9a3a8843f4033f4dd51a5343c |
05-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
am a6587a1a: Elevate refocus to its own mode, merge craft and camera.
* commit 'a6587a1a1e3672013da6a454c0e478846eced15d':
Elevate refocus to its own mode, merge craft and camera.
|
| a6587a1a1e3672013da6a454c0e478846eced15d |
03-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Elevate refocus to its own mode, merge craft and camera.
Change-Id: I9686db26993319fdaf09f09c0610bb65e00a0e05
ndroid/camera/ButtonManager.java
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/app/ModuleManagerImpl.java
ndroid/camera/module/ModulesInfo.java
ndroid/camera/widget/IndicatorIconController.java
|
| 25b3580491486028aac1fc983ada7d1032d80d85 |
05-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
am 846d3abf: Avoid activity leaks.
* commit '846d3abfe3da2fa2a5593c7d40a196005408bed1':
Avoid activity leaks.
|
| 846d3abfe3da2fa2a5593c7d40a196005408bed1 |
04-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
Avoid activity leaks.
Bug: 12805279
Change-Id: Ib91ff2d286f6a0e0d67dad673e7af24600e15759
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/app/CameraController.java
ndroid/camera/app/OrientationManagerImpl.java
ndroid/camera/module/ModuleController.java
ndroid/camera/util/CameraUtil.java
|
| 1533cf79bc03fd4d47f3497de4a57e63ff0554e7 |
05-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 93157d47: Merge "Add support for grid lines overlay." into gb-ub-photos-denali
* commit '93157d47817a833e88d2edbd5e727973cc6ea51a':
Add support for grid lines overlay.
|
| b3f59a874f675ceb7542298760a3c813c5e0d9ac |
05-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Add support for grid lines overlay.
Bug: 12454164
Change-Id: Iecf175e6dd41d8c2ce42c177f5bc91ec997c420b
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/GridLines.java
|
| a77d375355f08e9a13c7a35ad12b49cf12874ffa |
04-Feb-2014 |
Andy Huibers <andyhuibers@google.com> |
am 7ecf3a13: Merge "Make sure video quality requested is valid." into gb-ub-photos-denali
* commit '7ecf3a1334be4852d01574f60766c2b8da965d12':
Make sure video quality requested is valid.
|
| 7ecf3a1334be4852d01574f60766c2b8da965d12 |
04-Feb-2014 |
Andy Huibers <andyhuibers@google.com> |
Merge "Make sure video quality requested is valid." into gb-ub-photos-denali
|
| ca7b94f70435334806ac6fcf31de6aad7bfb8992 |
04-Feb-2014 |
Alan Newberger <alann@google.com> |
am a12b337e: Merge "add a11y announcement when multi toggle button changes" into gb-ub-photos-denali
* commit 'a12b337e63e7cbcb56e4d49da3d9c52f16f24ad1':
add a11y announcement when multi toggle button changes
|
| a12b337e63e7cbcb56e4d49da3d9c52f16f24ad1 |
04-Feb-2014 |
Alan Newberger <alann@google.com> |
Merge "add a11y announcement when multi toggle button changes" into gb-ub-photos-denali
|
| 5c62dc726ef2818283e767cde292148c263bcbf8 |
04-Feb-2014 |
Alan Newberger <alann@google.com> |
add a11y announcement when multi toggle button changes
addressing TODO with a manual announcement whenever the content
description of a button changes. Does checking of existing content
description to reduce chattiness when options are set by the system
e.g. on a resolution or orientation change. Still a bit of chattiness
on startup if the app is setting a button to a nonstandard value, but
I think its acceptable, it's giving user useful information about
nonstandard options on startup.
Bug: 10745077
Change-Id: I81089b2f4f7f14b90c4436199895a0f67075c3d3
ndroid/camera/MultiToggleImageButton.java
|
| 4743c1dc9667f5f14b579fe4a82ab17fb328d09c |
04-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
am e6dba2a1: Merge "Set bottom bar to a consistent color across app." into gb-ub-photos-denali
* commit 'e6dba2a113bdab462f849e2be3f7f36299f6aa7a':
Set bottom bar to a consistent color across app.
|
| 706b233b7de1b84b005adb07b7005ecc56f52a8b |
04-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 675e92c8: Merge "Center mode options according to spec." into gb-ub-photos-denali
* commit '675e92c856f9889d034c0cc05904cc6bd87f717f':
Center mode options according to spec.
|
| e6dba2a113bdab462f849e2be3f7f36299f6aa7a |
04-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Set bottom bar to a consistent color across app." into gb-ub-photos-denali
|
| 675e92c856f9889d034c0cc05904cc6bd87f717f |
04-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Center mode options according to spec." into gb-ub-photos-denali
|
| 329e101670311ba5d2b2506580cf4303d8885e4b |
04-Feb-2014 |
Andy Huibers <andyhuibers@google.com> |
Make sure video quality requested is valid.
Bug: 12824921
Change-Id: I653ad18359417844846b792d8ffa3b697e03f07e
ndroid/camera/VideoModule.java
|
| de05e8d5cb41ede6c9095659fc375f3a991d9806 |
04-Feb-2014 |
Alan Newberger <alann@google.com> |
am 80461c2d: Add content URI for current filmstrip item to Gallery intent
* commit '80461c2de3ee7f12e17e9951567a843c500b8fe1':
Add content URI for current filmstrip item to Gallery intent
|
| 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
ndroid/camera/CameraActivity.java
|
| 7ca4f457f789a19a811e44380387f2f552c41571 |
04-Feb-2014 |
Will Haldean Brown <haldean@google.com> |
Merge "Add hook in CameraApp to register a RemoteShutterListener." into ub-camera-everglades
|
| c0ad2fbb43002cf013989489dc0321f459baf84c |
03-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Center mode options according to spec.
* spec: https://drive.google.com/a/google.com/#folders/0B0GnUi_SFKJtdHp4YnBnLTZxcjQ
* for modes like video with less than the total possible
mode options, center the options.
Change-Id: I79dce62ced916d2ed20d04e805abe2bfdd60c779
ndroid/camera/ButtonManager.java
|
| 83e07f8c9a24b8373fcb57a5c53cdceefad54fc6 |
03-Feb-2014 |
Will Haldean Brown <haldean@google.com> |
Add hook in CameraApp to register a RemoteShutterListener.
Builds can provide an implementation of RemoteShutterBridge whose
create method returns a more interesting implementation of a
RemoteShutterListener. This also removes the need for the NOOP
RemoteShutterListener constant; instead, the default implementation of
RemoteShutterBridge returns the NOOP listener.
Change-Id: I5ec381abbb3fa5e38249f8a77edc765083bf32aa
ndroid/camera/app/CameraApp.java
ndroid/camera/remote/RemoteShutterListener.java
|
| 14466ba8f9ee23c003067f2c7b5569a6417cc60a |
03-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Set bottom bar to a consistent color across app.
Change-Id: Ieda492a9dbc122a828d8b5d8df831fbe99e6295f
ndroid/camera/CameraActivity.java
ndroid/camera/util/CameraUtil.java
|
| e7aff8c58fd36210539debc539165e6d7e9e664a |
03-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
am f6edd536: Correctly log the source of a foreground event.
* commit 'f6edd53668afe094c8dc09ac35d294d049f6cec1':
Correctly log the source of a foreground event.
|
| f6edd53668afe094c8dc09ac35d294d049f6cec1 |
31-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Correctly log the source of a foreground event.
Bug: 12589465
Change-Id: Ib26d44e1a8fdc4e03561c6a00886682881106ec2
ndroid/camera/CameraActivity.java
|
| b5d4786bfb11687012a8e2bcbfcb467cd1fa6863 |
03-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 165bb8d8: Move mode options to transparent overlay.
* commit '165bb8d85e6eab4e261c6b21a754ee227f732795':
Move mode options to transparent overlay.
|
| 165bb8d85e6eab4e261c6b21a754ee227f732795 |
30-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Move mode options to transparent overlay.
Change-Id: Iec0423668c58a5b849841afc45def923210df6fd
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/BottomBar.java
ndroid/camera/ui/TopRightMostOverlay.java
ndroid/camera/ui/TopRightWeightedLayout.java
ndroid/camera/widget/ModeOptionsOverlay.java
|
| 6948ff8fc0946eeec29e9be6ff2abce8d1f2abed |
31-Jan-2014 |
Spike Sprague <spikuru@google.com> |
am 30099ea6: Merge "adding accessibilty strings to ui items" into gb-ub-photos-denali
* commit '30099ea6efee35f4665d500143d5a3e5a2a4d3b5':
adding accessibilty strings to ui items
|
| 30099ea6efee35f4665d500143d5a3e5a2a4d3b5 |
31-Jan-2014 |
Spike Sprague <spikuru@google.com> |
Merge "adding accessibilty strings to ui items" into gb-ub-photos-denali
|
| 123e1a026a267f4296558cbb303790ee116e22c9 |
31-Jan-2014 |
Doris Liu <tianliu@google.com> |
am 4ba3c72b: Merge "First pass on tracking camera performance" into gb-ub-photos-denali
* commit '4ba3c72b6cf7b17345a8ffe643a3e21df460893d':
First pass on tracking camera performance
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/app/CameraAppUI.java
|
| d9453cca683243d08ca314a88ebf4f323b9caf1f |
31-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 9fdeb77f: Merge "Log swipes out of filmstrip." into gb-ub-photos-denali
* commit '9fdeb77f5d3f9e25ce18f18be64f726305aedcc6':
Log swipes out of filmstrip.
|
| 9fdeb77f5d3f9e25ce18f18be64f726305aedcc6 |
31-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Log swipes out of filmstrip." into gb-ub-photos-denali
|
| b85ab30d88af269cec63ff466b4cc1f2be6a31b7 |
31-Jan-2014 |
Sascha Haeberling <haeberling@google.com> |
am 048cd76a: Merge "Move tiny planet editor into the edit action." into gb-ub-photos-denali
* commit '048cd76ab602974b95d7ba9b21c0e8d10ccbbfcf':
Move tiny planet editor into the edit action.
|
| 048cd76ab602974b95d7ba9b21c0e8d10ccbbfcf |
31-Jan-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Move tiny planet editor into the edit action." into gb-ub-photos-denali
|
| fa1f4e436d1fee85007ec0c7f1365e9728c000ca |
31-Jan-2014 |
Sascha Haeberling <haeberling@google.com> |
am 0c8a1a4e: Prevent Tiny Planet from crashing often.
* commit '0c8a1a4e65e758beb4f5d48b5110aada49667738':
Prevent Tiny Planet from crashing often.
|
| 0c8a1a4e65e758beb4f5d48b5110aada49667738 |
31-Jan-2014 |
Sascha Haeberling <haeberling@google.com> |
Prevent Tiny Planet from crashing often.
Bug: 11050122
Make sure the preview rendering is always happening on the
handler thread.
Change-Id: Id5a2e5d939fa6bd3520dc8bfa5bb1803ef6fb1c5
ndroid/camera/tinyplanet/TinyPlanetFragment.java
|
| e8959e7a72cd6f057ac4cd8bd47075272700e62e |
31-Jan-2014 |
Sascha Haeberling <haeberling@google.com> |
Move tiny planet editor into the edit action.
Bug: 12553864
Change-Id: I3431565928bef637c11246fc6e711ef3d1f925ce
ndroid/camera/CameraActivity.java
ndroid/camera/app/AppController.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/app/FilmstripBottomControls.java
|
| 3488188fa8dff9a90021446e6ed4f9c321c4d4db |
30-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Log swipes out of filmstrip.
Bug: 12589465
Change-Id: I13b20b3e56b1ae4285ecc00ca4c2fb5a42fa75ed
ndroid/camera/CameraActivity.java
ndroid/camera/filmstrip/FilmstripContentPanel.java
ndroid/camera/widget/FilmstripLayout.java
|
| db8e52dfe4aadbc30fb3a42abb27246a0491efec |
31-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 426901fb: Merge "Add logging for swipe to filmstrip from camera." into gb-ub-photos-denali
* commit '426901fb6adf728742ad2841ac595bc1414f3568':
Add logging for swipe to filmstrip from camera.
|
| 426901fb6adf728742ad2841ac595bc1414f3568 |
31-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Add logging for swipe to filmstrip from camera." into gb-ub-photos-denali
|
| c99846976802c6c2c010c3785bdf57bfb24555b1 |
30-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 1841b11d: Don\'t add duplicate identical OnSettingChangedListeners.
* commit '1841b11d64fe17193331d3d091cff4a74a789548':
Don't add duplicate identical OnSettingChangedListeners.
|
| 772951602f9cfccd097283e3b78d188838c82138 |
30-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Add logging for swipe to filmstrip from camera.
Bug: 12589465
Change-Id: Ia57c1f341d7c9262b96823121e046fe4c4378b5c
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/MainActivityLayout.java
ndroid/camera/widget/FilmstripView.java
|
| 1841b11d64fe17193331d3d091cff4a74a789548 |
30-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Don't add duplicate identical OnSettingChangedListeners.
Bug: 12802314
Change-Id: I8baa668205633a9f5c9da259f0fa28dbca951a77
ndroid/camera/settings/SettingsManager.java
|
| 6a3874c4220211798ebb1786c72f30b9b1a84b28 |
30-Jan-2014 |
Doris Liu <tianliu@google.com> |
am b93451d7: Merge "Fix NPE" into gb-ub-photos-denali
* commit 'b93451d7f8b665aa393ad4c38a78f7a6f160c6ff':
Fix NPE
|
| 8d800d0d9e23121388d5994bd149826436a66803 |
30-Jan-2014 |
Sascha Haeberling <haeberling@google.com> |
resolved conflicts for merge of 914a6dba to ub-camera-everglades
Change-Id: I1e5700e8d34e19a09c8098ccf0cdfc64bfd4dbf8
|
| b93451d7f8b665aa393ad4c38a78f7a6f160c6ff |
30-Jan-2014 |
Doris Liu <tianliu@google.com> |
Merge "Fix NPE" into gb-ub-photos-denali
|
| 914a6dbafa14065404cf8f72f9bc84877963be10 |
30-Jan-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Changes the picture size settings to L,M,S from concrete resolutions." into gb-ub-photos-denali
|
| 6365bad43ff3e3e93d4e8c7e6dc22cbc96eb1aaf |
30-Jan-2014 |
Doris Liu <tianliu@google.com> |
Fix NPE
This NPE is caused by not having a PreviewStatusListener in
photosphere module. Hooking up PreviewStatusListener in
photosphere requires a refactor which is non-trivial amount
of work.
So for now, a null check is added here to prevent NPE
and the logic of detecting and handling device flip will be
added into photosphere to properly handle device flp.
Part II at ag/412607
Bug: 12679997
Change-Id: I5392674e387800e6a2a3114ec3f834b439aed31e
ndroid/camera/app/CameraAppUI.java
|
| 3b0ab89e3fefd25ae87687420df9315ec860d346 |
29-Jan-2014 |
Sascha Haeberling <haeberling@google.com> |
Changes the picture size settings to L,M,S from concrete resolutions.
Bug: 12575084
Bug: 12717251
The strategy in detail:
- Sort all available sizes
- For 'large', select the resolution with the most pixels.
- Use the 'large' resolution aspect ratio as the target AR.
- Create a list of resolutions with AR close to 'large'.
- If only two more are available, use them for medium and small.
- If less are available, boarden the search in complete list.
- Again, if only two more are available, use them for medium and small.
- Otherwise find medium resolution with total pixels closest to 50% of 'large' and ...
small as 25% of 'large' pixels.
- If they both come out the same, select either one small for 'small' or one larger
for 'medium'.
Change-Id: Ib94fdf0ce987968bccd85abbf5be7bdaa914325f
ndroid/camera/CameraSettings.java
ndroid/camera/PhotoModule.java
ndroid/camera/SettingsController.java
ndroid/camera/settings/SettingsManager.java
ndroid/camera/settings/SettingsUtil.java
ndroid/camera/ui/SettingsView.java
|
| 9411a4ba0500263be4b4c85a5a0bc4f755eb9025 |
30-Jan-2014 |
Alan Newberger <alann@google.com> |
am 2ecb9dda: Merge "add additional lifecycle states to PanoramaViewHelper" into gb-ub-photos-denali
* commit '2ecb9dda1b10ce12386819402845d3a8407a8e4e':
add additional lifecycle states to PanoramaViewHelper
|
| 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
ndroid/camera/CameraActivity.java
|
| 79718f6c6fb60aedd09edeedb2c16d1e2f9fe02d |
29-Jan-2014 |
Spike Sprague <spikuru@google.com> |
adding accessibilty strings to ui items
Change-Id: I3f2356c765bd2799dfa1009ff6707fc3af87383e
ndroid/camera/ButtonManager.java
ndroid/camera/MultiToggleImageButton.java
ndroid/camera/ui/ModeListView.java
ndroid/camera/util/CameraUtil.java
|
| f211ae37ec80c603feff214c1cf8ec5de8d2a09b |
29-Jan-2014 |
Doris Liu <tianliu@google.com> |
am bd5341b0: Merge "Use mutable drawable to avoid sharing drawable states" into gb-ub-photos-denali
* commit 'bd5341b04a2982885d079b5f6a87a91e84603efd':
Use mutable drawable to avoid sharing drawable states
|
| bd5341b04a2982885d079b5f6a87a91e84603efd |
29-Jan-2014 |
Doris Liu <tianliu@google.com> |
Merge "Use mutable drawable to avoid sharing drawable states" into gb-ub-photos-denali
|
| 58ac7e042e0718e860f9aea6dca3697e1c3d9bb8 |
29-Jan-2014 |
Doris Liu <tianliu@google.com> |
Use mutable drawable to avoid sharing drawable states
Bug: 12594617
Change-Id: I798b67ed42a5593c346643d42ebf1143d54551e6
ndroid/camera/ui/BottomBar.java
ndroid/camera/ui/ModeSelectorItem.java
|
| c630181f9921c8355c41ca3acea7009c57101fcc |
29-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 8389ebe6: Merge "Fix secure camera launch crash." into gb-ub-photos-denali
* commit '8389ebe65ca6f3640b90e24f35339b5f233dee83':
Fix secure camera launch crash.
|
| 8389ebe65ca6f3640b90e24f35339b5f233dee83 |
29-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Fix secure camera launch crash." into gb-ub-photos-denali
|
| 49ab922e8e1e7535286392fc667312ec419403fd |
29-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Fix secure camera launch crash.
Bug: 12783858
Change-Id: Iff5cfecff986966f63b40d2db4bc1d31037f12d4
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.java
ndroid/camera/app/CameraAppUI.java
|
| a26123b9dffb7d186696c72cc2db44d24cbadd58 |
29-Jan-2014 |
Doris Liu <tianliu@google.com> |
am 5e6c3e78: Merge "Fix mode transition jank and stretched video preview" into gb-ub-photos-denali
* commit '5e6c3e7840b41685ebd27c40ee243a7ae75e7229':
Fix mode transition jank and stretched video preview
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.java
ndroid/camera/VideoUI.java
ndroid/camera/app/AppController.java
ndroid/camera/app/CameraAppUI.java
|
| d64a351fb730a2f0d15970d1072e72cb751383e3 |
28-Jan-2014 |
Seth Raphael <magicseth@google.com> |
am 8513f7bb: Merge "Clearcut Logs" into gb-ub-photos-denali
* commit '8513f7bbf8ebc2563702b1e35d4894bd8ab7b21f':
Clearcut Logs
|
| 8513f7bbf8ebc2563702b1e35d4894bd8ab7b21f |
28-Jan-2014 |
Seth Raphael <magicseth@google.com> |
Merge "Clearcut Logs" into gb-ub-photos-denali
|
| 5e09d01d80b64c81f21c57f1b99dd9dc1afed18d |
18-Dec-2013 |
Seth Raphael <magicseth@google.com> |
Clearcut Logs
Change-Id: I564a2452cb7f02f899760ac086e56eaa76b174eb
ndroid/camera/CameraActivity.java
ndroid/camera/FocusOverlayManager.java
ndroid/camera/ListPreference.java
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.java
ndroid/camera/util/CameraUtil.java
ndroid/camera/widget/FilmstripView.java
|
| fcf030c184d2279bd2e6d682a6677b720e03a8a6 |
25-Jan-2014 |
Spike Sprague <spikuru@google.com> |
am 7f749f2c: Merge "reset capture button state on swipes" into gb-ub-photos-denali
* commit '7f749f2c7a4061bd4426561b2b4dcbd3b9246640':
reset capture button state on swipes
|
| 7f749f2c7a4061bd4426561b2b4dcbd3b9246640 |
25-Jan-2014 |
Spike Sprague <spikuru@google.com> |
Merge "reset capture button state on swipes" into gb-ub-photos-denali
|
| 87f7af57932a826d54a74eb2b22b5bfa7a94f583 |
25-Jan-2014 |
Spike Sprague <spikuru@google.com> |
reset capture button state on swipes
bug: 12550678
Change-Id: I9678e55cdd19ca319686665b69e76a9984fa7a6a
ndroid/camera/ui/BottomBar.java
|
| 47bfd80640c23b35e3f278c886d85682fa3c83c7 |
25-Jan-2014 |
Spike Sprague <spikuru@google.com> |
am 41f68008: restore video bottom bar on app background during video capture
* commit '41f68008374c34ca206691fefbd12494e95e92fe':
restore video bottom bar on app background during video capture
|
| 41f68008374c34ca206691fefbd12494e95e92fe |
25-Jan-2014 |
Spike Sprague <spikuru@google.com> |
restore video bottom bar on app background during video capture
bug: 12726013
Change-Id: I3e69daad21835e7ce46427398531d0236703cb5a
ndroid/camera/VideoModule.java
|
| 88d673c08b13e6d13fff4420e2f8ca1e862977ce |
25-Jan-2014 |
Doris Liu <tianliu@google.com> |
am 1143ebd4: Fix NPE by adding a onPause check
* commit '1143ebd49f8f90ffa634925d70cb53e4f0184d5d':
Fix NPE by adding a onPause check
|
| 1143ebd49f8f90ffa634925d70cb53e4f0184d5d |
24-Jan-2014 |
Doris Liu <tianliu@google.com> |
Fix NPE by adding a onPause check
Bug: 12682478
Change-Id: Ida9c79287751089449569ec26dcf1c1f195afde9
ndroid/camera/VideoModule.java
|
| f2994f02c46e6351fbaadc8a2b24f8feefa53892 |
24-Jan-2014 |
Sascha Haeberling <haeberling@google.com> |
A first approach for a remote shutter API.
Change-Id: Idd00c6eeef487d32f333ff19eae01dc47856cd09
ndroid/camera/PhotoModule.java
ndroid/camera/app/CameraApp.java
ndroid/camera/app/CameraServices.java
ndroid/camera/remote/RemoteCameraModule.java
ndroid/camera/remote/RemoteShutterListener.java
|
| 4af3b04dbed19579af379213028f76e655e58f2f |
24-Jan-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Adds an API for temporary session storage." into gb-ub-photos-denali
|
| a86b048709342fc53cee92aa047a15a22462c71c |
23-Jan-2014 |
Sascha Haeberling <haeberling@google.com> |
Adds an API for temporary session storage.
Bug: 12064183
This is required so that we can have all modules that have sessions
use the same logic for creating and deleting them.
Change-Id: I20591310d6b4534e564ab60608049eec87f823f9
ndroid/camera/app/CameraApp.java
ndroid/camera/session/CaptureSessionManager.java
ndroid/camera/session/CaptureSessionManagerImpl.java
ndroid/camera/session/SessionStorageManager.java
ndroid/camera/session/SessionStorageManagerImpl.java
ndroid/camera/util/FileUtil.java
|
| 61044000a3baec7b0a7d8bb22314c1dc8fec3c88 |
23-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Use ninepatch for indicator background.
Bug: 12602711
Change-Id: Id513f526331b4dbefcfae1f2bff548cbf4bbac94
ndroid/camera/widget/IndicatorOverlay.java
|
| 2fd7a500a5d96902fc805449183074edb3064e51 |
22-Jan-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Move focus overlay into generic_module." into gb-ub-photos-denali
|
| e2914fddcd6d4f78d812ef818d43364d9aa469d4 |
18-Jan-2014 |
Sascha Haeberling <haeberling@google.com> |
Move focus overlay into generic_module.
Bug: 12563457
Also cleans up the focus overlay API.
Change-Id: I8a63b7abf7cc9390cc709c275807b1d3d2e344a6
ndroid/camera/FocusOverlayManager.java
ndroid/camera/PhotoUI.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/FocusOverlay.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
ndroid/camera/CameraActivity.java
|
| 4235a2aab49d3c6990549de6249d8e210f0651d4 |
22-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Add hdr option and indicator" into gb-ub-photos-denali
|
| 5ae34031a009fe20dcbdfee4f6664f2caa94839a |
22-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Fix the build: use exported panorama values in helper class." into gb-ub-photos-denali
|
| d706ea69a87229dca5cb8f16125decfbcbc5303d |
22-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Fix the build: use exported panorama values in helper class.
Change-Id: I5b22fe0504fa113f3867d7e626087c9880bbccdd
ndroid/camera/app/CameraAppUI.java
ndroid/camera/widget/IndicatorIconController.java
|
| 50f66b17273046767ee131a559fbf402348e8fe9 |
22-Jan-2014 |
Angus Kong <shkong@google.com> |
Merge "Adjust bottom control button positions." into gb-ub-photos-denali
|
| b9c4232ca171ac5ae659e0bcac177bedfc8b4e8a |
18-Jan-2014 |
Angus Kong <shkong@google.com> |
Adjust bottom control button positions.
bug:12138517
Change-Id: Ife7511e232ba9f02ac83800df129fafaf65c0f46
ndroid/camera/app/FilmstripBottomControls.java
|
| e7d745c15f1ee0f3a160e7601715e70f9646e6c0 |
21-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Add hdr option and indicator
Bug: 12440745
Change-Id: I2e5b8d860a19cd1fd1299dc42d13b26b6b5e88ec
ndroid/camera/ButtonManager.java
ndroid/camera/widget/IndicatorIconController.java
|
| a1fab413bcbe5f62ae1d829bac0539519fef96a6 |
21-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Support for panorama and photosphere bottom bar ui.
Bug: 12438294
Change-Id: If8a6f3b8aafd81980290655fb3ad461928f9c520
ndroid/camera/ButtonManager.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/settings/SettingsCache.java
ndroid/camera/settings/SettingsManager.java
ndroid/camera/ui/BottomBar.java
ndroid/camera/widget/IndicatorIconController.java
|
| b1641f5df0cf839b54385ea4d2e43521620fc237 |
15-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Remove global UI elements based on supported camera parameters.
Bug: 12192238
Change-Id: I6373adeaa9c95385a2a4ca8d81cf7656550911f2
ndroid/camera/ButtonManager.java
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
ndroid/camera/VideoModule.java
ndroid/camera/VideoUI.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/hardware/HardwareSpec.java
ndroid/camera/hardware/HardwareSpecImpl.java
ndroid/camera/module/ModuleController.java
|
| 847136dafd90effab61e3a462ecac573a9dec007 |
18-Jan-2014 |
Doris Liu <tianliu@google.com> |
Merge "Improve responsiveness of mode selection highlight" into gb-ub-photos-denali
|
| 108a8e71d0f8d1c86fa8e6095f69519320e3cd68 |
18-Jan-2014 |
Sascha Haeberling <haeberling@google.com> |
Change order of modules to spec.
Bug: 12607061
Change-Id: Iff142b2571f17f71f7a76d629119ac4c8c7f2764
ndroid/camera/module/ModulesInfo.java
|
| 82f133fdab566c83701d97e370a705cb3267d1dc |
18-Jan-2014 |
Doris Liu <tianliu@google.com> |
Improve responsiveness of mode selection highlight
Bug: 12449459
Change-Id: Ifc5e42119e216827a187f6bb0b6f3c7d2f2bf672
ndroid/camera/ui/ModeListView.java
|
| f0ff06568be3404d5f0abfc6bf5d953b98b4a7fc |
17-Jan-2014 |
Spike Sprague <spikuru@google.com> |
Merge "black background in image_capture intent review ui." into gb-ub-photos-denali
|
| d4c5070dfcd7007654ad71ab292d1909c0091ceb |
17-Jan-2014 |
Spike Sprague <spikuru@google.com> |
black background in image_capture intent review ui.
bug: 12606986
Change-Id: I1ee01eba431b7576094445c86c5c577a851c90c3
ndroid/camera/ui/BottomBar.java
|
| f77f5d207fc7e8b1c6a863ea9a177e48648ab4d2 |
17-Jan-2014 |
Andy Huibers <andyhuibers@google.com> |
Merge "Fix for video parameter setting bug on Nexus 5. Fixes b/12250181 and b/12481202." into gb-ub-photos-denali
|
| a0e8347f9cfb583f90543635c5c86dc9252526e1 |
16-Jan-2014 |
Kevin Gabayan <gabayan@google.com> |
Measure time to first valid preview frame in testImageCapture.
Bug: 11999851
Change-Id: Iec695d7de98454435fc9ae239a500fedb9eee894
ndroid/camera/CameraActivity.java
ndroid/camera/app/CameraAppUI.java
|
| 64abfe999a7f7e64404eb0ec7372f5f85e45087c |
15-Jan-2014 |
Andy Huibers <andyhuibers@google.com> |
Fix for video parameter setting bug on Nexus 5.
Fixes b/12250181 and b/12481202.
Change-Id: I64da29470a0c9e2a418fd614e41d181c42ece388
ndroid/camera/VideoModule.java
|
| 38c6bc33c306873f6dfdfa3714386be305934392 |
17-Jan-2014 |
Doris Liu <tianliu@google.com> |
Hide focus UI during recording
Bug: 12584173
Change-Id: Ibca621b9b961a480b48950f668eb7f6da9055619
ndroid/camera/VideoModule.java
ndroid/camera/VideoUI.java
|
| 284a7d5af25d6d89364b4255ead1d0ef659b3625 |
16-Jan-2014 |
Carlos Hernandez <chernand@google.com> |
Merge "Pass CameraServices to ProcessingTask" into gb-ub-photos-denali
|
| 8066ce460f506506881502d7a9e397fb826a3bad |
16-Jan-2014 |
Spike Sprague <spikuru@google.com> |
Merge "video capture button tweak" into gb-ub-photos-denali
|
| 4897f4c39628a01ee82206f9cd56e418ddcc10cc |
16-Jan-2014 |
Spike Sprague <spikuru@google.com> |
build break fix
Change-Id: I0178453fc19acb76cb612e84e43a0530d2fb7e49
ndroid/camera/ui/BottomBar.java
|
| 4dae414b0e4ad4d6528ee04f0761fbe9eacca5ce |
16-Jan-2014 |
Spike Sprague <spikuru@google.com> |
video capture button tweak
bug: 12563852
Change-Id: I39a242ca4cd3832eefd2e205d287d64ceba309b1
ndroid/camera/ui/BottomBar.java
|
| 6bc9ecc2999bd3869248eaa55bdef5839c9afd45 |
16-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Set the shutter button icon across all modes." into gb-ub-photos-denali
|
| 8d72bc60c9bb45ff49db280dd898ee7f34e690cf |
16-Jan-2014 |
Spike Sprague <spikuru@google.com> |
Merge "button background press states" into gb-ub-photos-denali
|
| fecd723c1cfd90332cd2805be79a24f26643ebb9 |
16-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Set the shutter button icon across all modes.
Bug: 12552362
Change-Id: I55d4238b0ddbc4bb3ea206dc577381b6de2f68a7
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoUI.java
ndroid/camera/VideoModule.java
ndroid/camera/VideoUI.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/util/CameraUtil.java
|
| 57d2f873a78807bca84d4846e39cb2b73a0c8f82 |
16-Jan-2014 |
Carlos Hernandez <chernand@google.com> |
Pass CameraServices to ProcessingTask
Change-Id: Ie9c06fe4e03afc6eb051a9bb17ee985251b53d62
ndroid/camera/processing/ProcessingService.java
ndroid/camera/processing/ProcessingTask.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
ndroid/camera/CameraActivity.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/app/FilmstripBottomControls.java
|
| 66a3e6ceb306833355acb740711ccb5c53576e0a |
15-Jan-2014 |
Spike Sprague <spikuru@google.com> |
button background press states
bug: 12450227
Change-Id: I9008a4d57545bd081a4c6539c64d23b939d4ab95
ndroid/camera/MultiToggleImageButton.java
ndroid/camera/ui/BottomBar.java
|
| 6a3fa7357fc80273a2c5ec784683cf89da71b4bb |
16-Jan-2014 |
Doris Liu <tianliu@google.com> |
Merge "Fix focus indicator slightly off center during CAF" into gb-ub-photos-denali
|
| c30ca9776999611863cbf7cb623c6d9d47ecbb1c |
16-Jan-2014 |
Doris Liu <tianliu@google.com> |
Merge "Add quick switch support for advanced camera" into gb-ub-photos-denali
|
| 61c2b0d43a040123ff725a28038bb7cc01370ed5 |
16-Jan-2014 |
Doris Liu <tianliu@google.com> |
Fix focus indicator slightly off center during CAF
Change-Id: I5eaf14682e81d95f738a356985eb8d40bdc54524
ndroid/camera/FocusOverlayManager.java
|
| cf8b653a7697406d6bed2bf8f9b970b17e47e4ef |
16-Jan-2014 |
Doris Liu <tianliu@google.com> |
Add quick switch support for advanced camera
Bug: 12429444
Change-Id: I62d5a5b3ce2b8d0ca8d19c8f3a35363114815b20
ndroid/camera/CameraActivity.java
ndroid/camera/app/ModuleManagerImpl.java
ndroid/camera/settings/SettingsCache.java
ndroid/camera/settings/SettingsManager.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
|
| dc9f119b2c4473c418811db28963b579b659b2be |
16-Jan-2014 |
Angus Kong <shkong@google.com> |
Merge "Make up affordance dependent on installed packages" 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
ndroid/camera/CameraActivity.java
ndroid/camera/util/IntentHelper.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
ndroid/camera/CameraActivity.java
ndroid/camera/VideoModule.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/MainActivityLayout.java
|
| 9066d369ba3b39576029b6acc511d839132b1248 |
16-Jan-2014 |
Spike Sprague <spikuru@google.com> |
Merge "adjusted capture button highlight as per comments in b/12560596" into gb-ub-photos-denali
|
| e3f095bd84ba5a07d5fba1020a28d40d067d187c |
16-Jan-2014 |
Spike Sprague <spikuru@google.com> |
adjusted capture button highlight as per comments in b/12560596
Change-Id: I9326121e8836898035ecfc6254467567f7b4c431
ndroid/camera/ui/BottomBar.java
|
| 3f787e389fc9912955ac58e42028b14a0776ef9e |
16-Jan-2014 |
Spike Sprague <spikuru@google.com> |
Merge "snappier video bottom bar animation" into gb-ub-photos-denali
|
| 6c5a5375524efe7e5160f92edcaad121c7fbdb07 |
15-Jan-2014 |
Doris Liu <tianliu@google.com> |
Open mode draw at a constant speed when there's a fast fling
Bug:12544207
Change-Id: I104d81c0a74bb46f38ff8cd61dd9f13a2d615ed7
ndroid/camera/ui/ModeListView.java
|
| 217512ce074220090a8ede01adf0406a70f4958f |
15-Jan-2014 |
Spike Sprague <spikuru@google.com> |
snappier video bottom bar animation
bug: 12568407
Change-Id: I827b5d6c0e39ad704bd0b8aef1a8feaad7d6614f
ndroid/camera/ui/BottomBar.java
|
| 85abf32f41e18e0825dd0d5588d2ee0d1711822a |
15-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "On screen indicators in top right in landscape." into gb-ub-photos-denali
|
| cf9010d314a5a263a3f0e9fa9abf16a80f26d281 |
15-Jan-2014 |
Spike Sprague <spikuru@google.com> |
refine capture button hilight area
bug: 12560596
Change-Id: Ib0032bc6be21107361605f109caa5e5de7e4b682
ndroid/camera/ui/BottomBar.java
|
| 59401045bf479b2617c981075aec92190ec59aeb |
15-Jan-2014 |
Doris Liu <tianliu@google.com> |
Fix face view in simple camera
Part II at ag/407562
Bug: 12460604
Change-Id: I9532d5dae7c156568fef944b81127c6ff194a394
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
ndroid/camera/ui/FaceView.java
|
| 0c46e2c5d626abc206cf4b0d1a9829a4e916f591 |
15-Jan-2014 |
Angus Kong <shkong@google.com> |
Merge "Returns unwrapped refreshed in-progress data." into gb-ub-photos-denali
|
| 22e74c1014f6710cceb33fd801fde0e34247851d |
15-Jan-2014 |
Angus Kong <shkong@google.com> |
Returns unwrapped refreshed in-progress data.
bug:12550918
Change-Id: Ia5794abb96abb980c06e874f4fd5d08ca5884343
ndroid/camera/data/InProgressDataWrapper.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
ndroid/camera/CameraActivity.java
|
| 42ad3668e3d41d30bee01e88ba648362529d91b6 |
15-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
On screen indicators in top right in landscape.
Bug: 12525286
Change-Id: I5c56d0498504b2ec37211523c6212b6925ec7bf5
ndroid/camera/widget/IndicatorOverlay.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
ndroid/camera/CameraActivity.java
ndroid/camera/filmstrip/FilmstripController.java
ndroid/camera/widget/FilmstripLayout.java
ndroid/camera/widget/FilmstripView.java
|
| 796a3099e03efe661e4a58ef26c5b554734f1898 |
14-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Fix stale button references." into gb-ub-photos-denali
|
| f1b2e407b20ff16fe793158c598e59799c1990ef |
14-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Fix stale button references.
Bug: 12537343
Change-Id: I9c48f9dcfe82afbf89562010daf94b767d53911c
ndroid/camera/ButtonManager.java
ndroid/camera/app/CameraAppUI.java
|
| eaa4d37f8bfb25ffea438f9045867140a63ba0e1 |
14-Jan-2014 |
Spike Sprague <spikuru@google.com> |
fix for bottom bar not taking set color immediately
half of b/12537343
Change-Id: Ib9fe344be9c6d24af6b6b246f13070d4c21d00f1
ndroid/camera/ui/BottomBar.java
|
| a1ec04a9f9526418f5cb17a5afbfc48aca1e02d0 |
14-Jan-2014 |
Doris Liu <tianliu@google.com> |
Add aggressive continuous auto focus to video preview
Also added touch to focus for video preview
Part II is at ag/407029
Bug: 12368866
Change-Id: I8dd544d5bb6b5128ae99c9b7fe4dffeb1f843ab9
ndroid/camera/FocusOverlayManager.java
ndroid/camera/PhotoController.java
ndroid/camera/PhotoModule.java
ndroid/camera/TextureViewHelper.java
ndroid/camera/VideoModule.java
ndroid/camera/VideoUI.java
ndroid/camera/ui/BottomBar.java
ndroid/camera/ui/CaptureAnimationOverlay.java
ndroid/camera/ui/PreviewOverlay.java
ndroid/camera/ui/PreviewStatusListener.java
ndroid/camera/widget/IndicatorOverlay.java
|
| b92910e04c4da91fc4ea5a9484b83f9ecba1c896 |
14-Jan-2014 |
Spike Sprague <spikuru@google.com> |
capture button pressed colors
Change-Id: Ia568be11e6f9b6160f3f8332b504866cbe6ac94f
ndroid/camera/CameraActivity.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/BottomBar.java
ndroid/camera/util/CameraUtil.java
|
| 39f8a7647aa4051a1c260b9496c2db82f93f8667 |
13-Jan-2014 |
Spike Sprague <spikuru@google.com> |
new video bottom bar ui
crossfade record <-> stop
full bar <-> single button cicle wipe
Change-Id: I58e0ddd94221374809acd52a6f0649e419203f54
ndroid/camera/ButtonManager.java
ndroid/camera/PhotoUI.java
ndroid/camera/VideoModule.java
ndroid/camera/VideoUI.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/BottomBar.java
|
| dc07ee44ba52f8918f5c629fe6ffcc5ec41c9083 |
14-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Sync dependencies between bottom bar options." into gb-ub-photos-denali
|
| 1560566618696dc8a7aedc8f11da8b36afdf74da |
14-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Match dimens of TopRightMostOverlay child with the ReferenceView." into gb-ub-photos-denali
|
| 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
ndroid/camera/ButtonManager.java
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
ndroid/camera/VideoModule.java
ndroid/camera/VideoUI.java
ndroid/camera/app/AppController.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/module/ModuleController.java
|
| 626961145aab5cb2186d33c5cd44071fb9ee7a61 |
13-Jan-2014 |
Angus Kong <shkong@google.com> |
Merge "Clear the camera instance before switching." into gb-ub-photos-denali
|
| ede9a42724ae235ea4f1cdfb1398841a1e1a3eb2 |
13-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Match dimens of TopRightMostOverlay child with the ReferenceView.
Change-Id: I356059893bcc3bb8ffda1aef9726f8df4466f42c
ndroid/camera/ui/TopRightMostOverlay.java
|
| cae54999e15d871cb93bf923423f9066f0330ba3 |
13-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Ensure that SharedPreference listeners respond to known keys." into gb-ub-photos-denali
|
| ed413d8a432c88c91af5334e700edefdb927bbe6 |
13-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Make Front and back camera a mode specific setting." into gb-ub-photos-denali
|
| 6346ddcab47fc0a4b0b9dd7f96e3ef0002939960 |
13-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Ensure that SharedPreference listeners respond to known keys.
Bug: 12439970
Change-Id: Ic4cbfd9823a17294af3b2d3eecd654131bf92cd5
ndroid/camera/settings/SettingsManager.java
|
| d186f22622752ae9735715f31e8a4318290c987d |
10-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Make Front and back camera a mode specific setting.
Bug: 12467987
Change-Id: I69b788565979bb45df511974e1e494f7a5ffe9d8
ndroid/camera/CameraActivity.java
ndroid/camera/settings/SettingsManager.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
ndroid/camera/CameraActivity.java
ndroid/camera/data/CameraDataAdapter.java
ndroid/camera/data/InProgressDataWrapper.java
ndroid/camera/data/SimpleViewData.java
|
| 712f9a8c449ae22c9b923242a6019a12a0f1f18f |
10-Jan-2014 |
Spike Sprague <spikuru@google.com> |
Merge "make buttons opaque when bottom bar is translucent" into gb-ub-photos-denali
|
| f63967a175cabd57fcbc20275cc7918bc34b2baf |
02-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Show registered modes as default camera options.
Bug: 12178782
Change-Id: I1dc4c3d9a6bf6448e0083b508210577584a35a1c
ndroid/camera/CameraActivity.java
ndroid/camera/SettingsController.java
ndroid/camera/ui/SettingsView.java
|
| 18bc7e0a3102fa67b719a6f8b5b2e9590a6d4a6c |
10-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Add a refocus on screen indicator." into gb-ub-photos-denali
|
| 6346571cd8cda5880fa80214d36b6e7800ca7e9c |
10-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Close bottom bar options menu on specific triggers." into gb-ub-photos-denali
|
| 56688f7019fbe4dee110b7600349f48da9fff601 |
09-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Close bottom bar options menu on specific triggers.
* on touching anywhere in the preview
* after n milliseconds after touching an option
Bug: 12447283
Change-Id: If44d83a601b4281711f7006b2ab771edfd588117
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/BottomBar.java
ndroid/camera/ui/PreviewOverlay.java
|
| a906809bd3e67f3ceaa070baefbdca8c9cb3d766 |
10-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Add a refocus on screen indicator.
Bug: 12475491
Change-Id: Icf62df3232c2f129cd8c09f4b27464d4e645d762
ndroid/camera/app/CameraAppUI.java
ndroid/camera/widget/IndicatorIconController.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
ndroid/camera/CameraActivity.java
ndroid/camera/filmstrip/FilmstripContentPanel.java
ndroid/camera/widget/FilmstripLayout.java
ndroid/camera/widget/FilmstripView.java
|
| 0cbeaaadce1b50200701a33afc5dff1a4fe4bcd7 |
09-Jan-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Move Refocus' processing service to common code." into gb-ub-photos-denali
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
ndroid/camera/app/AppController.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/app/ModuleManager.java
ndroid/camera/app/ModuleManagerImpl.java
ndroid/camera/module/ModulesInfo.java
ndroid/camera/ui/ModeListView.java
ndroid/camera/util/CameraUtil.java
ndroid/camera/widget/IndicatorIconController.java
|
| c9fb1e8a9d9ed163ad2c70da178bcccb36626dde |
09-Jan-2014 |
Spike Sprague <spikuru@google.com> |
make buttons opaque when bottom bar is translucent
bug: 12450498
Change-Id: I61891ab4118efd9b4ebca1c1a4a9a00eabb213cb
ndroid/camera/ui/BottomBar.java
|
| 6b174190b43bb4c2d7a5493e4f117ef6aac5f684 |
09-Jan-2014 |
Spike Sprague <spikuru@google.com> |
video capture icon
bug: 12440820
Change-Id: I276e1260c494519beaf95258129e1f240bdafd59
ndroid/camera/ButtonManager.java
ndroid/camera/PhotoUI.java
ndroid/camera/VideoUI.java
|
| dd2d9e610aa9dc71fe0938f38de43bb0e26f3bb2 |
07-Jan-2014 |
Sascha Haeberling <haeberling@google.com> |
Move Refocus' processing service to common code.
Bug: 12080035
Bug: 12211113
Also mimic the ServiceManager interface we use for Photo Sphere
to make interacting with the service easier. It now starts up
automatically and shuts down after the queue is processed.
Change-Id: Ie48ec8bc1ab55ff10ce6965a660239eb579b5499
ndroid/camera/app/CameraApp.java
ndroid/camera/processing/ProcessingService.java
ndroid/camera/processing/ProcessingServiceManager.java
ndroid/camera/processing/ProcessingTask.java
|
| e2a1f54fbf6a8a7beff5b7695654ca21e63643af |
08-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Add dynamically sized transparent background to indicators.
Change-Id: Ie9d8214b665ae134fda66c17707d50040cf3f837
ndroid/camera/app/CameraAppUI.java
ndroid/camera/widget/IndicatorIconController.java
ndroid/camera/widget/IndicatorOverlay.java
|
| 7aec5f79ed4492cd89033c8c0a7afc39dba6742e |
09-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Layout on screen indicators in landscape startup." into gb-ub-photos-denali
|
| aacd26b956967c4e3f085979ce9fb2edbf50ff51 |
08-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Layout on screen indicators in landscape startup.
Change-Id: I20ca5b54a6f7417b0d2c0bda743d08f53a369039
ndroid/camera/ui/RotatableLinearLayout.java
|
| d4109bc69f48cebedc3feec0effddbf65c93f353 |
09-Jan-2014 |
Angus Kong <shkong@google.com> |
Clear the camera instance before switching.
bug:12452510
Change-Id: If8bbd4d8a15ce2ba65659c02063da3a2960142ce
ndroid/camera/PhotoModule.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
ndroid/camera/CameraActivity.java
ndroid/camera/app/AppController.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/settings/SettingsCache.java
ndroid/camera/settings/SettingsManager.java
ndroid/camera/ui/ModeListView.java
|
| f05962f4e05a9e29faef001ddf3a206f2b554d42 |
26-Dec-2013 |
Emil Arfvidsson <ear@google.com> |
Move the Gallery shortcut to the action bar.
Change-Id: I0f2c7c72ff9ed3b5a243350b562cd4432bea1911
ndroid/camera/CameraActivity.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/app/FilmstripBottomControls.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
ndroid/camera/CameraActivity.java
ndroid/camera/CameraBackupAgent.java
ndroid/camera/CameraButtonIntentReceiver.java
ndroid/camera/CameraHolder.java
ndroid/camera/CameraModule.java
ndroid/camera/CameraSettings.java
ndroid/camera/CameraTestDevice.java
ndroid/camera/ComboPreferences.java
ndroid/camera/PhotoModule.java
ndroid/camera/util/CameraUtil.java
|
| cb99b3d61f6451b84e263949910a1fb7b9893a12 |
08-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Unify setting the bottom bar color.
* Camera, Video, Advanced Camera
Change-Id: I862543c52372e0028debda7e89a56ebf8e737270
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoUI.java
ndroid/camera/VideoUI.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
ndroid/camera/ButtonManager.java
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoUI.java
ndroid/camera/VideoUI.java
ndroid/camera/app/AppController.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/widget/IndicatorOverlay.java
|
| a3ea885b11b13fc86bc750e09355313c644d2178 |
07-Jan-2014 |
Spike Sprague <spikuru@google.com> |
Merge "extending button hitbox to entire bar height; added bottom bar touch listerner to fire capture" into gb-ub-photos-denali
|
| ed4bdc0d3f50a6960eae44099a764bf8cdd7a731 |
07-Jan-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Enable lights-out mode at all times." into gb-ub-photos-denali
|
| 3b92e2f8e6d91af1b83c8bee95bd93e7153b96da |
02-Jan-2014 |
Spike Sprague <spikuru@google.com> |
extending button hitbox to entire bar height; added bottom bar touch listerner to fire capture
Change-Id: I4d969060acf2abe2863e15b9c8f2219303e62eca
ndroid/camera/ui/BottomBar.java
ndroid/camera/ui/TopRightWeightedLayout.java
|
| 20639e78e441c19752d22ceb54e48115c6084c73 |
07-Jan-2014 |
Sascha Haeberling <haeberling@google.com> |
Enable lights-out mode at all times.
Bug: 12429885
Change-Id: I92481003b408cd63334dd8dd4b2df1603b7432e3
ndroid/camera/CameraActivity.java
|
| 972444354413f33c28f043a40dd3c7afd1560808 |
07-Jan-2014 |
Doris Liu <tianliu@google.com> |
Merge "Handle camera orientation change when device is flipped" into gb-ub-photos-denali
|
| 11ddd7389b89e9a876eba607e246e8b8d0dfecdf |
07-Jan-2014 |
Doris Liu <tianliu@google.com> |
Handle camera orientation change when device is flipped
Bug: 12414864
Bug: 12179046
Change-Id: I645709bdfe6ae5678b4a59b7c4a4c893c2827b52
ndroid/camera/PhotoUI.java
ndroid/camera/VideoUI.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/PreviewStatusListener.java
|
| 49c47c3453242ec035b1d7d40e7cbc51f7994485 |
07-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Make refocus and hdr+ sticky on mode change." into gb-ub-photos-denali
|
| 8da34528738117f2dfe024c04b49578f724cb4fd |
07-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Avoid ConcurrentModificationException in SettingsManager.
Bug: 12433904
Change-Id: I7d7f3ebf0a17f5e01c4e0ea8b5731a0bac9095d2
ndroid/camera/settings/SettingsManager.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
ndroid/camera/CameraActivity.java
ndroid/camera/settings/SettingsManager.java
|
| 8b6a5b8a5c527375b01fae8f90590e840c6dcb18 |
07-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Make flash state sticky on switching to photo mode." into gb-ub-photos-denali
|
| 6a370a2c1d17e3640b1242da2d551dc39b797a56 |
07-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Add on screen indicators." into gb-ub-photos-denali
|
| 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
ndroid/camera/ButtonManager.java
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoModule.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/settings/SettingsManager.java
ndroid/camera/ui/BottomBar.java
ndroid/camera/ui/RotatableLinearLayout.java
ndroid/camera/widget/IndicatorOverlay.java
|
| 865d4bdd7353ec25584321fd25ea828ac7978a21 |
07-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Make flash state sticky on switching to photo mode.
Bug: 12368672
Change-Id: I8ff680efcd4eb55e1773853889580f7f792938a5
ndroid/camera/PhotoModule.java
|
| 361ab77563cc10cd7ed1cd82f33f3480a0193476 |
07-Jan-2014 |
Doris Liu <tianliu@google.com> |
Remove old faceview offset for centering surface texture
Bug: 12413526
We used to offset face view to take into account the translation
needed to center the scaled surface texture in the view. That's no
longer needed because the live preview in this new design aligns
top left.
Change-Id: Ic38ef697dbbda1ad5b80a5797ba1d01fc3dd6ad8
ndroid/camera/ui/FaceView.java
|
| eb601c44476c996655f113cb638114812d2e1513 |
06-Jan-2014 |
Spike Sprague <spikuru@google.com> |
Merge "hide bottom bar during video capture" into gb-ub-photos-denali
|
| 1ca357294fb9b78fd40c9d9ba4e818cc499abca8 |
06-Jan-2014 |
Spike Sprague <spikuru@google.com> |
hide bottom bar during video capture
simple visibilty change; jarring but good for a first pass
bug: 12368245
Change-Id: Ief01aae1e9f3d9fd229952dc664f766328ac1e0c
ndroid/camera/VideoModule.java
|
| de3b2d4bab3dc04e6bda1a0c8bdc1d01bd3260dc |
06-Jan-2014 |
Doris Liu <tianliu@google.com> |
Merge "Center preview UI in the live preview rect" into gb-ub-photos-denali
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/FocusOverlayManager.java
ndroid/camera/PhotoModule.java
ndroid/camera/PieController.java
ndroid/camera/PreviewGestures.java
ndroid/camera/SettingsController.java
ndroid/camera/SurfaceTextureRenderer.java
ndroid/camera/VideoUI.java
ndroid/camera/app/AndroidCameraManagerImpl.java
ndroid/camera/app/OrientationManagerImpl.java
ndroid/camera/data/CameraDataAdapter.java
ndroid/camera/data/LocalData.java
ndroid/camera/data/LocalMediaData.java
ndroid/camera/data/RotationTask.java
ndroid/camera/ui/CountDownView.java
ndroid/camera/ui/PreviewOverlay.java
ndroid/camera/ui/RenderOverlay.java
ndroid/camera/ui/ZoomRenderer.java
|
| 96f99f43987a4b24bfbe21e12cec1dae752e5178 |
06-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Update camera parameters when setting has changed." into gb-ub-photos-denali
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoModule.java
ndroid/camera/settings/SettingsManager.java
|
| 1587b049d4a0ae36630b429804cf52991ffbf66f |
03-Jan-2014 |
Angus Kong <shkong@google.com> |
Remove unused code in PhotoModule.
Change-Id: I28611ab68343effffab8b8a00649e5884472fc8a
ndroid/camera/PhotoModule.java
|
| ca4a5668c5bcda027bd896ebf17c8ef374e2ac75 |
03-Jan-2014 |
Doris Liu <tianliu@google.com> |
Center preview UI in the live preview rect
Center flash animation
Center zoom animation
Center focus indicator for auto focus
TODO: Gcam focus indicator is not centered in the live preview
Bug: 12114128
Change-Id: I5e7f79fdf6a705789d995fc3bf3570262bc8bb49
ndroid/camera/FocusOverlayManager.java
ndroid/camera/PhotoModule.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/CaptureAnimationOverlay.java
ndroid/camera/ui/FocusOverlay.java
ndroid/camera/ui/PreviewOverlay.java
|
| 8dcccb160b2f82e5ddc97bad96d4812bc6cfa043 |
03-Jan-2014 |
Angus Kong <shkong@google.com> |
Check filmstrip visibility to pass down key events
bug:12196741
Change-Id: I7ef5c65060b4c5481adc41f45f47f9c817f3a8b6
ndroid/camera/CameraActivity.java
|
| b000e760360f09c0014272407f50ca24b9e685a7 |
21-Dec-2013 |
Sascha Häberling <haeberling@google.com> |
Merge "Temp fix the crash going out of photosphere" into gb-ub-photos-denali
|
| 15b9961c5ca49fc6ac9d036e7a967797987e46ee |
21-Dec-2013 |
Doris Liu <tianliu@google.com> |
Part II of ag/401462
Change-Id: I569179e712d5c4d690a815a16dde31240c396b7f
ndroid/camera/FocusOverlayManager.java
ndroid/camera/PhotoModule.java
ndroid/camera/TextureViewHelper.java
ndroid/camera/ui/FocusOverlay.java
|
| 482de029dc20e0a577388a602985fb31c3200309 |
19-Dec-2013 |
Doris Liu <tianliu@google.com> |
Touch to focus
Change-Id: I69860bd05426e3a04bc5fd7d0dd581b5d6ff768d
ndroid/camera/CameraActivity.java
ndroid/camera/FocusOverlayManager.java
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
ndroid/camera/TextureViewHelper.java
ndroid/camera/app/AppController.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/BottomBar.java
ndroid/camera/ui/FocusOverlay.java
ndroid/camera/ui/PreviewStatusListener.java
|
| c42677f21836df8dac60ba73d6a2bd0b4ef33f44 |
21-Dec-2013 |
Doris Liu <tianliu@google.com> |
Temp fix the crash going out of photosphere
Change-Id: I88cc9619a6057e9984d091ea9c92d80209df8cb5
ndroid/camera/app/CameraAppUI.java
|
| 4d49016bde526681e100c9b66c842380dfc007cc |
21-Dec-2013 |
Kevin Gabayan <gabayan@google.com> |
Fallback to Legacy location provider upon connection failure (Camera2)
Change-Id: Ibeea4802a93a76c02ea8f6f7558f2d49fbbfe41b
ndroid/camera/app/LocationProvider.java
|
| efa2e210f0bc1146ad01e7db01efeda66d9ef195 |
21-Dec-2013 |
Spike Sprague <spikuru@google.com> |
Merge "removing unneeded member variable" into gb-ub-photos-denali
|
| 0982a7405add0c0537c50e158e5f5d9074ed0c39 |
21-Dec-2013 |
Seth Raphael <magicseth@google.com> |
Merge "Allow capture during accordion shimmy" into gb-ub-photos-denali
|
| 5bac89b81d9dbdf55d434bad3cd2470f673a6543 |
21-Dec-2013 |
Spike Sprague <spikuru@google.com> |
removing unneeded member variable
Change-Id: I856b291cd7216c606ee937379d78ce21d54fdd30
ndroid/camera/ui/MainActivityLayout.java
|
| cc04a4bcf54f693a73e943cc930870b691830dc1 |
21-Dec-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Two new getters for the session API." into gb-ub-photos-denali
|
| 298c06604bbf390da2fe1775f5ed834a592d5bb0 |
21-Dec-2013 |
Sascha Haeberling <haeberling@google.com> |
Two new getters for the session API.
Bug: 12236950
Change-Id: I1ac8809688e48ffa4cbde16c212fb90e1a1e5c01
ndroid/camera/session/CaptureSession.java
ndroid/camera/session/CaptureSessionManagerImpl.java
|
| 5e2ace6c4b421a31e19463ca84b6bc9c3e165d7b |
21-Dec-2013 |
Spike Sprague <spikuru@google.com> |
Merge "disabling swipe gestures for capture intents" into gb-ub-photos-denali
|
| db290c33bd0250b473c475254cbfbbd19dd72430 |
21-Dec-2013 |
Erin Dahlgren <edahlgren@google.com> |
Merge "New Capture UI." into gb-ub-photos-denali
|
| 312c2dce9b2d870bd5619a75e3139d1c07e9385d |
21-Dec-2013 |
Andy Huibers <andyhuibers@google.com> |
Merge "Increase bitmap resolution when zooming in filmstrip" into gb-ub-photos-denali
|
| 908bace4c8ceb9ebf4644827350a0792cbd44331 |
21-Dec-2013 |
Seth Raphael <magicseth@google.com> |
Allow capture during accordion shimmy
Change-Id: I0027bf1c138efb67b1b2c9bc6599cb2a837c0caf
ndroid/camera/ui/ModeListView.java
|
| 4efa8b54c1df4e06f2d3caed2568015a737f9dda |
18-Dec-2013 |
Erin Dahlgren <edahlgren@google.com> |
New Capture UI.
* depends on ag/400799
Change-Id: Ieb0e27447659bcb04dee57348583f68d680408d2
ndroid/camera/ButtonManager.java
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
ndroid/camera/VideoModule.java
ndroid/camera/VideoUI.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/module/ModuleController.java
ndroid/camera/module/ModulesInfo.java
ndroid/camera/settings/SettingsCache.java
ndroid/camera/settings/SettingsManager.java
ndroid/camera/ui/BottomBar.java
ndroid/camera/ui/ModeListView.java
ndroid/camera/ui/TopRightMostOverlay.java
ndroid/camera/ui/TopRightWeightedLayout.java
|
| c050a9475312db95bcd6d3ec8480065ee8104954 |
20-Dec-2013 |
Spike Sprague <spikuru@google.com> |
disabling swipe gestures for capture intents
Change-Id: I65ac74ac855fe3ee95339a29aecdab1fe74e4659
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/MainActivityLayout.java
|
| caca8c7b2e97bd76e4df1ea98c08acaa48b21557 |
14-Dec-2013 |
Andy Huibers <andyhuibers@google.com> |
Increase bitmap resolution when zooming in filmstrip
Bug:11137777
Change-Id: I6f947e2981d012c1693ef0475a2776a7e6275de5
ndroid/camera/data/CameraDataAdapter.java
ndroid/camera/data/FixedFirstDataAdapter.java
ndroid/camera/data/FixedLastDataAdapter.java
ndroid/camera/data/InProgressDataWrapper.java
ndroid/camera/data/LocalData.java
ndroid/camera/data/LocalMediaData.java
ndroid/camera/data/SimpleViewData.java
ndroid/camera/filmstrip/DataAdapter.java
ndroid/camera/widget/FilmstripView.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
ndroid/camera/CameraActivity.java
ndroid/camera/data/AbstractLocalDataAdapterWrapper.java
ndroid/camera/data/CameraDataAdapter.java
ndroid/camera/data/FixedFirstDataAdapter.java
ndroid/camera/data/FixedLastDataAdapter.java
ndroid/camera/data/LocalDataAdapter.java
ndroid/camera/data/LocalMediaData.java
|
| f5ae9d8a234646a59bce465d623b50589f0e267a |
20-Dec-2013 |
Doris Liu <tianliu@google.com> |
Merge "Hook up with camera for accurate timing of new frame" into gb-ub-photos-denali
|
| 77d24065a133adfb4f94db367aafea176aa56270 |
20-Dec-2013 |
Sascha Haeberling <haeberling@google.com> |
Change naming to reflect that it's 'allowed' memory.
... and not current usage.
Change-Id: Ifcbdf95c33112d74cb6a21f66a079ad0d6e7ebd5
ndroid/camera/app/MemoryManager.java
ndroid/camera/app/MemoryManagerImpl.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
ndroid/camera/CameraActivity.java
ndroid/camera/app/AndroidCameraManagerImpl.java
ndroid/camera/app/AppController.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/app/CameraController.java
ndroid/camera/app/CameraManager.java
|
| 10809bdc41ec2203e5f4f4aa3d1016c0e94b97df |
20-Dec-2013 |
Sascha Haeberling <haeberling@google.com> |
Implement the method to determine our max native memory usage.
Bug: 12246801
Change-Id: I5af99bd802be090df9e4c7f909de8e2ca3600f40
ndroid/camera/app/MemoryManager.java
ndroid/camera/app/MemoryManagerImpl.java
|
| e1052c6501f9c1150aeaed99b57744f3afde61ff |
20-Dec-2013 |
Spike Sprague <spikuru@google.com> |
Merge "removing *_disabled.png assets for mode icons" into gb-ub-photos-denali
|
| b9b7240d62dd2ad245f2c0e09fd1056a28687978 |
20-Dec-2013 |
Doris Liu <tianliu@google.com> |
Hide mode drawer when back is pressed
Bug: 12105158
Change-Id: I0c17fe979e732dad465798ea647d90fb30077c26
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/ModeListView.java
|
| ab76f0b4e0f53f065e458e46f5dfdc35b80b6ba7 |
20-Dec-2013 |
Spike Sprague <spikuru@google.com> |
removing *_disabled.png assets for mode icons
bug: 12234456
Change-Id: I978e0f43c3ca3bf5dfd5198a9c45048299b43c0e
ndroid/camera/ui/ModeListView.java
|
| cc43d66f99e5c7a7022eb9c30f5b980e043b41a7 |
20-Dec-2013 |
Angus Kong <shkong@google.com> |
Fix wrong decoding due to parallel execution.
Change-Id: I8d38eb57ce3b35d0747be07a23fc80fc06fff600
ndroid/camera/data/LocalMediaData.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
|
| 56102c6a83104cea1371114d77a57e1934f2c648 |
19-Dec-2013 |
Angus Kong <shkong@google.com> |
Fix build.
Update LocalData implementations with new methods.
Change-Id: I9642dd2277d9e3d5745230fbee911cf03eb2905c
ndroid/camera/data/FixedFirstDataAdapter.java
ndroid/camera/data/InProgressDataWrapper.java
ndroid/camera/data/LocalMediaData.java
ndroid/camera/data/SimpleViewData.java
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/data/AbstractLocalDataAdapterWrapper.java
ndroid/camera/data/CameraDataAdapter.java
ndroid/camera/data/FixedFirstDataAdapter.java
ndroid/camera/data/FixedLastDataAdapter.java
ndroid/camera/data/LocalData.java
ndroid/camera/data/LocalDataAdapter.java
ndroid/camera/data/LocalMediaData.java
ndroid/camera/data/MetadataLoader.java
|
| ffbc43c3dd3c94a968a41431fb07645a13696c4a |
09-Dec-2013 |
Kevin Gabayan <gabayan@google.com> |
Use Fused Location Provider when gms is available.
Bug: 8295289
Change-Id: I3dba25c35fd3754ff70ed3ecea33052505274feb
ndroid/camera/CameraActivity.java
ndroid/camera/LocationManager.java
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
ndroid/camera/SettingsController.java
ndroid/camera/VideoModule.java
ndroid/camera/app/AppController.java
ndroid/camera/app/LegacyLocationProvider.java
ndroid/camera/app/LocationProvider.java
|
| 58598dc16e1f5a747fe1407ec1641a5529f423e5 |
19-Dec-2013 |
Sascha Haeberling <haeberling@google.com> |
Clean up unused imports.
Change-Id: If53a35571522c879304ac9af0ebfca79ed536be0
ndroid/camera/ButtonManager.java
|
| 298811e116518a7fa75e30c0dddd04e8e26e91e4 |
19-Dec-2013 |
Sascha Haeberling <haeberling@google.com> |
Advanced mode icon fix.
A recent CL accidentally switched the icon back to the craft icon.
Change-Id: I0f7d456daac85a22c565e530a2c3914f905b5b37
ndroid/camera/ui/ModeListView.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
ndroid/camera/CameraActivity.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/app/FilmstripBottomControls.java
ndroid/camera/data/AbstractLocalDataAdapterWrapper.java
ndroid/camera/data/CameraDataAdapter.java
ndroid/camera/data/InProgressDataWrapper.java
ndroid/camera/data/LocalData.java
ndroid/camera/data/LocalDataAdapter.java
ndroid/camera/data/LocalMediaData.java
ndroid/camera/data/PanoramaMetadataLoader.java
ndroid/camera/data/RgbzMetadataLoader.java
ndroid/camera/data/SimpleViewData.java
ndroid/camera/filmstrip/FilmstripContentPanel.java
ndroid/camera/filmstrip/FilmstripController.java
ndroid/camera/filmstrip/ImageData.java
ndroid/camera/widget/FilmstripView.java
|
| aa0e4524488e2f01b44c247fe2e119daaeb9e292 |
18-Dec-2013 |
Spike Sprague <spikuru@google.com> |
Merge "adding new icon resources" into gb-ub-photos-denali
|
| cc0161c31a29848a822377845b5e7ffafeacca61 |
18-Dec-2013 |
Spike Sprague <spikuru@google.com> |
adding new icon resources
bug: 12128194
Change-Id: I1b34100821113aa7ba996fab3faf14752e766030
ndroid/camera/ButtonManager.java
ndroid/camera/ui/ModeListView.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
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoController.java
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
ndroid/camera/TextureViewHelper.java
ndroid/camera/VideoController.java
ndroid/camera/VideoModule.java
ndroid/camera/VideoUI.java
ndroid/camera/app/AppController.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/BottomBar.java
ndroid/camera/ui/PreviewStatusListener.java
|
| db44ef57cdb576704b1aafb2b81e30bf9ff261ad |
14-Dec-2013 |
Spike Sprague <spikuru@google.com> |
video intent ui
Change-Id: I85e346274c51ec87e0d95e8e30f5c261f08f4d34
ndroid/camera/ButtonManager.java
ndroid/camera/VideoUI.java
|
| d2f6ac73e46d721704ce8198a8f84a5aec4cee1e |
17-Dec-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Change the mode switcher order, color, text." into gb-ub-photos-denali
|
| 601921e746832bdef40503c606a95b4469f1bedb |
17-Dec-2013 |
Sascha Haeberling <haeberling@google.com> |
Change the mode switcher order, color, text.
Bug: 12179634
Bug: 12179736
Bug: 12180159
Also re-enable wide angle mode.
Change-Id: I075d7e2311fc560ed3d757585891c0eb2da08ea0
ndroid/camera/module/ModulesInfo.java
ndroid/camera/ui/ModeListView.java
|
| fa50cf0773893971d84ab54dacf1710f034d73c4 |
17-Dec-2013 |
Angus Kong <shkong@google.com> |
Merge "Launch activity through the controller." into gb-ub-photos-denali
|
| 4a010db8a60008b2bf67b93b64f77f63affc29f3 |
17-Dec-2013 |
Doris Liu <tianliu@google.com> |
Fix hdr+ preview wrong rotation
TextureView has accumulated OnLayoutChangeListener's over time: Modules
add a new listener to it when initialized, but never remove the listeners.
As a result, stale listeners are called when there is a layout change, and
consequently change the transform matrix incorrectly.
Bug: 12168516
Change-Id: I1aa77e682427ed074e8dc2d0574ea013e9e01fc6
ndroid/camera/PhotoUI.java
ndroid/camera/VideoUI.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/PreviewStatusListener.java
|
| 0eaf01670a1198c95b6472ec0dc076c9f84971de |
17-Dec-2013 |
Angus Kong <shkong@google.com> |
Launch activity through the controller.
bug:12173532
Change-Id: Ia99f53b6a5220c962f261ab598270d49366065ff
ndroid/camera/CameraActivity.java
ndroid/camera/app/AppController.java
|
| b897a1e924394cb2196929975cf0c5cb542dd85c |
17-Dec-2013 |
Doris Liu <tianliu@google.com> |
Fix HDR+ 100% view finder
Change-Id: I46fe8821ace8cc58a692bee83c162acd2e027c56
ndroid/camera/app/CameraAppUI.java
|
| 543224f36396be8c3af3be3167fa66eaf8cc2ba7 |
17-Dec-2013 |
Spike Sprague <spikuru@google.com> |
Merge "prevent touch events on bottom control bar from triggering capture" into gb-ub-photos-denali
|
| 9540c4f43bfa385fffaed191619e8e1092e66ba1 |
17-Dec-2013 |
Angus Kong <shkong@google.com> |
Merge "Reset zoomed view in filmstrip when after deletion" into gb-ub-photos-denali
|
| e3b0e946924e45f6788db69aaa8f48a2d81031f0 |
17-Dec-2013 |
Spike Sprague <spikuru@google.com> |
prevent touch events on bottom control bar from triggering capture
bug: 12138522
Change-Id: I041cacbcfa353864409d3d63acaa7bea6a69df59
ndroid/camera/ui/BottomBar.java
|
| fd1dd0b93f5e7a865e717a38cdecfcaee494d5a8 |
17-Dec-2013 |
Angus Kong <shkong@google.com> |
Merge "Remove redundant call of onReload in FilmstripView" into gb-ub-photos-denali
|
| bc2f0e76c63663153fb3936c422881b61be20897 |
16-Dec-2013 |
Spike Sprague <spikuru@google.com> |
removing stray code tied to now defunct focus ring toggle
Change-Id: I76dcba650e189ed4b1fc6d83ce987fc2b0e9773d
ndroid/camera/PhotoUI.java
|
| c6953a4de0005456cd50bbbb0acb27162c9b3c8d |
16-Dec-2013 |
Angus Kong <shkong@google.com> |
Reset zoomed view in filmstrip when after deletion
bug:11806155
Change-Id: Icd734dc9ad3b0821b90f28452256477bb0af4b40
ndroid/camera/widget/FilmstripView.java
|
| cb8942b384399ea21052aec66249d5bfa28be3cb |
16-Dec-2013 |
Angus Kong <shkong@google.com> |
Remove redundant call of onReload in FilmstripView
bug:11136116
Change-Id: I1db0a4244589b594778454d8388d26a2990dbbbd
ndroid/camera/data/CameraDataAdapter.java
|
| 1d997499522e80a3a078cbc3994bbd6a4ad2ddad |
16-Dec-2013 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Have the CameraAppUI manage refocus UI." into gb-ub-photos-denali
|
| 29cea2bc00fff30992b75ea31f7d0c9ae0f746b9 |
16-Dec-2013 |
Spike Sprague <spikuru@google.com> |
Merge "removing FR and IMM debug toggle buttons" into gb-ub-photos-denali
|
| e9a6f801c249e2c705bc2931359fe921f69165b7 |
16-Dec-2013 |
Spike Sprague <spikuru@google.com> |
removing FR and IMM debug toggle buttons
bug: 12165442
Change-Id: Id188babfc8878ad06df4d774144851bf39e83cc2
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
|
| 67019c70d08c0726b9005dc7777a9485e3c2015a |
14-Dec-2013 |
Sascha Haeberling <haeberling@google.com> |
Fix bottom bar transparency issue in video mode.
Change-Id: Iafe1f3a863370cc5867074d3236e700f280213fb
ndroid/camera/VideoUI.java
|
| ee408db25ab578488b6f761478b743c6c1a6318b |
14-Dec-2013 |
Doris Liu <tianliu@google.com> |
Merge "Improve mode switch jank by reducing redundant transform matrix change" into gb-ub-photos-denali
|
| c62f14802ba01ecef5d883d51444edb78906ee6c |
14-Dec-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Fix secure camera." into gb-ub-photos-denali
|
| 10e7ca2f12018703657d8f6136bfaedf5f447eb4 |
14-Dec-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Clean up unused camera controls." into gb-ub-photos-denali
|
| 4417e2a9bc380e0386dccfcd73c4782ab9a9444e |
14-Dec-2013 |
Sascha Haeberling <haeberling@google.com> |
Fix secure camera.
Let's not crash in memory manager when removing a listener that was not
added. This was to do with pause() being called twice in secure mode.
Instead just issue a warning.
Change-Id: I72ad41fd72c92e746d4972014f23ad0a86082b2d
ndroid/camera/app/MemoryManagerImpl.java
|
| ab05a742fb03b2016d2792c7b06f268d3dd82701 |
14-Dec-2013 |
Sascha Haeberling <haeberling@google.com> |
Clean up unused camera controls.
These are only used by LightCycle right now and will eventually
disappear completely when we introduce the new bottom bar.
Change-Id: I2e81db63b8f3602bc0be58edeef7017e91cad04b
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/CameraControls.java
|
| e038c161389b5d1c0476e315736df31562328894 |
14-Dec-2013 |
Doris Liu <tianliu@google.com> |
Improve mode switch jank by reducing redundant transform matrix change
Change-Id: I2ab4167d9645fe9156a0be98d3e93fa179b8936f
ndroid/camera/VideoModule.java
ndroid/camera/VideoUI.java
ndroid/camera/app/CameraAppUI.java
|
| e4002f3a703a1835dce30d74ccfc22e00956e13f |
14-Dec-2013 |
Angus Kong <shkong@google.com> |
Avoid double tapping the share button.
Might fire the share intent twice.
Change-Id: Ib4efb2302a2bee8fa6b9eaab6896fc75512734f3
ndroid/camera/CameraActivity.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/app/FilmstripBottomControls.java
|
| 5b78da09b188370a8939f06ce50b8aff7370df58 |
14-Dec-2013 |
Angus Kong <shkong@google.com> |
Merge "Keep tracking the direction of swipe in filmstrip." into gb-ub-photos-denali
|
| 69f0964a91a035c222d1765768dbb8d175c3b0f7 |
14-Dec-2013 |
Angus Kong <shkong@google.com> |
Keep tracking the direction of swipe in filmstrip.
bug:12129544
Change-Id: I2950479d087af681e39a5d6df8b5907ed179886b
ndroid/camera/widget/FilmstripView.java
|
| c67c07b42eaf918c26cbb785b211a08a6ebc88a1 |
14-Dec-2013 |
Sascha Haeberling <haeberling@google.com> |
Adding two comments missing from ag/399533.
Change-Id: I9413c11a33750f46f1f06ee8a175ee1231afc2d6
ndroid/camera/data/LocalData.java
ndroid/camera/data/LocalMediaData.java
|
| 9f95ac2fd4d922928cb9b0959f4e251073a807b7 |
14-Dec-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Disable wideangle mode for the weekend build." into gb-ub-photos-denali
|
| 53b60ba3a1332d4ce8ae58a33f3df8cb8d4b3079 |
14-Dec-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Add placeholder image support." into gb-ub-photos-denali
|
| 42db0359a5bb73e175b5b3b8a44315955f2242b1 |
14-Dec-2013 |
Sascha Haeberling <haeberling@google.com> |
Disable wideangle mode for the weekend build.
The code is not ready yet for the extended fishfood.
Change-Id: I6e7fd7061f4b68a4270efcc4ac946d596bfa698c
ndroid/camera/module/ModulesInfo.java
|
| 0788b14b3b90964455a907dc673e292390990a8e |
14-Dec-2013 |
Doris Liu <tianliu@google.com> |
Fix small flickering when starting mode drawer
Change-Id: Ie1775010527911933302b24b4296d7bffee9ff69
ndroid/camera/ui/ModeListView.java
|
| b6eaa8c70da19fb3233c3c4b1a2625ce90fc35af |
12-Dec-2013 |
Doris Liu <tianliu@google.com> |
Mode selection animation
Change-Id: I3741f71add7e506a974602cefa6edfdbeb442fa0
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/ModeListView.java
ndroid/camera/ui/ModeSelectorItem.java
ndroid/camera/widget/AnimationEffects.java
|
| 14ff6c8df2924ccad083591c0fc873322c6828c0 |
13-Dec-2013 |
Sascha Haeberling <haeberling@google.com> |
Add placeholder image support.
Bug: 12132677
Change-Id: I2add5837f82a956901c132cacae71b193007d482
ndroid/camera/CameraActivity.java
ndroid/camera/Storage.java
ndroid/camera/data/AbstractLocalDataAdapterWrapper.java
ndroid/camera/data/CameraDataAdapter.java
ndroid/camera/data/FixedFirstDataAdapter.java
ndroid/camera/data/FixedLastDataAdapter.java
ndroid/camera/data/InProgressDataWrapper.java
ndroid/camera/data/LocalData.java
ndroid/camera/data/LocalDataAdapter.java
ndroid/camera/data/LocalMediaData.java
ndroid/camera/data/SimpleViewData.java
ndroid/camera/session/CaptureSession.java
ndroid/camera/session/CaptureSessionManager.java
ndroid/camera/session/CaptureSessionManagerImpl.java
ndroid/camera/session/PlaceholderManager.java
|
| 79fcbe48d7bef83469573782d095df5551895a65 |
14-Dec-2013 |
Erin Dahlgren <edahlgren@google.com> |
Have the CameraAppUI manage refocus UI.
Change-Id: I47bfd4a3b9e79ed0186cbac1c735d010b504362e
ndroid/camera/CameraActivity.java
|
| 83ebad2e83e9b0917b263d17623f43764665ad7b |
14-Dec-2013 |
Doris Liu <tianliu@google.com> |
Merge "Flash animation parameter tweaking per latest spec" into gb-ub-photos-denali
|
| ce1658060e0a85424faed623a970bfb891490759 |
14-Dec-2013 |
Doris Liu <tianliu@google.com> |
Flash animation parameter tweaking per latest spec
Change-Id: I455878c4ce55ddd863e32487db1561e2ec759f69
ndroid/camera/ui/CaptureAnimationOverlay.java
|
| bdebd04c258f163ab5e8e7fcf639de83dfe5a271 |
13-Dec-2013 |
Doris Liu <tianliu@google.com> |
Merge "Update Panorama mode name, color, icon" into gb-ub-photos-denali
|
| 49a52f211869c44d862ba762a97b937411d37e31 |
13-Dec-2013 |
Doris Liu <tianliu@google.com> |
Update Panorama mode name, color, icon
Bug: 12108651
Change-Id: I9edda88577702e41429a6845986e5d87c9abe3c7
ndroid/camera/ui/ModeListView.java
|
| eb3134f6ecc42f7d98625ca2c0ddfb06c9f07c43 |
12-Dec-2013 |
Spike Sprague <spikuru@google.com> |
intent ui
Change-Id: I34c2b73a07d64b55b8aeb36515cae5d4e4e92813
ndroid/camera/ButtonManager.java
ndroid/camera/PhotoUI.java
ndroid/camera/ui/BottomBar.java
|
| fce8a0b023bf88b2320b614dfaf7c67dcf00c9be |
13-Dec-2013 |
Erin Dahlgren <edahlgren@google.com> |
Add a flash callback for video mode toggle.
Bug: 12089860
Change-Id: I97941468f79b4fb39aefb6f0662a7540c6121abe
ndroid/camera/VideoModule.java
ndroid/camera/VideoUI.java
|
| 42f74103b691203b5e5c30ea86c9615efb98f805 |
13-Dec-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Clean up and fix notifications." into gb-ub-photos-denali
|
| d3de171d6afa5ebd74d56dde6d4818b14a001286 |
13-Dec-2013 |
Angus Kong <shkong@google.com> |
Enable gallery button.
bug:11898278
Change-Id: Id7953f5fa95a6597e5cd223094ab7ccb21f53e2c
ndroid/camera/CameraActivity.java
ndroid/camera/app/FilmstripBottomControls.java
|
| 1dbb339102336c7a14ca67a946ac82d7212b29c4 |
13-Dec-2013 |
Sascha Haeberling <haeberling@google.com> |
Clean up and fix notifications.
This fixes the issue where mutliple processes didn't properly create
their own notifications.
This also fixes the wording and messages for the notifications, which
are now always shown.
Change-Id: I829a80c8457e08fd6a3838393ef1080ef5fed433
ndroid/camera/app/CameraApp.java
ndroid/camera/session/CaptureSessionManagerImpl.java
ndroid/camera/session/ProcessingNotificationManager.java
|
| 1dfe7828fd60741b9752553af3ee439c04e758a0 |
12-Dec-2013 |
Doris Liu <tianliu@google.com> |
New flash animation
Change-Id: I266b631a5c6feac114467e0a05799ad5e1ffae92
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoController.java
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
ndroid/camera/VideoController.java
ndroid/camera/VideoModule.java
ndroid/camera/VideoUI.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/CaptureAnimationOverlay.java
|
| 437ddd7a5e538585719ae362391bda186a7304be |
13-Dec-2013 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Make hdr plus a global preference." into gb-ub-photos-denali
|
| ba6994d8834db0cb2df60893ccb9af091b23bfce |
13-Dec-2013 |
Erin Dahlgren <edahlgren@google.com> |
Make hdr plus a global preference.
Bug: 12112662
Change-Id: I4d5b80aa2412982717bd66e4903deef5331a152b
ndroid/camera/PhotoModule.java
ndroid/camera/settings/SettingsManager.java
|
| dd245b3feb3375fc6e681aecb4113c1aef679238 |
13-Dec-2013 |
Angus Kong <shkong@google.com> |
Merge "Enable share from filmstrip." into gb-ub-photos-denali
|
| 662fbf4637e5b1a28338613af05f21832cd820cb |
12-Dec-2013 |
Angus Kong <shkong@google.com> |
Enable share from filmstrip.
bug:11898278
Change-Id: I3c7986666cfcf05f87fa0c4a15024262afc2dc4f
ndroid/camera/CameraActivity.java
|
| 06ba05f6f87f06ded0c1cdc6decd710625b1bf0e |
12-Dec-2013 |
Andy Huibers <andyhuibers@google.com> |
Merge "Implement new Zoom UI." into gb-ub-photos-denali
|
| ebac6398e5ccf3f73d7c3d98ab63be4128e9d123 |
12-Dec-2013 |
Spike Sprague <spikuru@google.com> |
Merge "fix simple camera not capturing bug" into gb-ub-photos-denali
|
| 9e95b1da932c3a877a1bcf025a28376b0d42681d |
24-Nov-2013 |
Andy Huibers <andyhuibers@google.com> |
Implement new Zoom UI.
Change-Id: Ie390230dc85de9a9ba19d6e14e2e9f7f890c52d5
ndroid/camera/ui/PreviewOverlay.java
ndroid/camera/ui/ZoomRenderer.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
ndroid/camera/CameraActivity.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/app/FilmstripBottomControls.java
ndroid/camera/data/LocalData.java
ndroid/camera/data/LocalMediaData.java
ndroid/camera/widget/FilmstripBottomLayout.java
ndroid/camera/widget/FilmstripView.java
|
| 215f6b08c4dc025b8243baff369da144844f22e2 |
12-Dec-2013 |
Spike Sprague <spikuru@google.com> |
fix simple camera not capturing bug
Change-Id: I9136b5f4f0738251ddb3cb97ebba150d7e0846f0
ndroid/camera/PhotoModule.java
|
| 6088b0b35be3a6de42de3e29614ee3432e657a8b |
12-Dec-2013 |
Spike Sprague <spikuru@google.com> |
Merge "unify preview and bottom bar resizing code move bottom bar button into own layout files" into gb-ub-photos-denali
|
| 56f9fc218f258b0655e7c402ba34783a46e3fbde |
12-Dec-2013 |
Angus Kong <shkong@google.com> |
Merge "Dim the background when filmstrip shows." into gb-ub-photos-denali
|
| 2d55076d723075e9f98fb755c35f970d3ea5e0c0 |
12-Dec-2013 |
Angus Kong <shkong@google.com> |
Dim the background when filmstrip shows.
bug:11898278
Change-Id: I4bb4d89c3f22170044e20cd3c38364a9c063830f
ndroid/camera/widget/FilmstripLayout.java
|
| 1ae8409538ac624ef1bb012fc9a25bdced6d112d |
12-Dec-2013 |
Doris Liu <tianliu@google.com> |
Fix mode cover for hdr+ mode
Change-Id: Icb3c60946a6b5b280119e3a4d9c989ee6cc50e61
ndroid/camera/ui/ModeListView.java
|
| 5387d921d715c0810293f2626a9f0cd55ea52547 |
12-Dec-2013 |
Angus Kong <shkong@google.com> |
Merge "Fix the jitter by a stupid search-and-replace." into gb-ub-photos-denali
|
| 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
ndroid/camera/ButtonManager.java
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoUI.java
ndroid/camera/VideoUI.java
ndroid/camera/app/AppController.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/BottomBar.java
|
| c602807bcf1fd0225f7c5a8627cd9e167eea4316 |
12-Dec-2013 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Refactor ProgressRenderer out of PieRenderer." into gb-ub-photos-denali
|
| 6ca4411fd938e935028f713c1f32ed8e274debd4 |
12-Dec-2013 |
Angus Kong <shkong@google.com> |
Fix the jitter by a stupid search-and-replace.
Change-Id: Id97b1ffe53cbb3a69d131f6069cb2cf4ca99a02f
ndroid/camera/widget/FilmstripLayout.java
|
| a21945c7d628aadee74410013782b950a7aa93ff |
12-Dec-2013 |
Angus Kong <shkong@google.com> |
Merge "A small refactor of ImageData and LocalData." into gb-ub-photos-denali
|
| 5ce035e98ca289b0b0ca884c4d2bb2fd43d8c187 |
11-Dec-2013 |
Erin Dahlgren <edahlgren@google.com> |
Refactor ProgressRenderer out of PieRenderer.
* Depends on ag/397902
Change-Id: I7c5f46acae9eb3c57a67f3ddf01554f0faff082d
ndroid/camera/ui/PieRenderer.java
ndroid/camera/ui/ProgressOverlay.java
ndroid/camera/ui/ProgressRenderer.java
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/CameraModule.java
ndroid/camera/FocusOverlayManager.java
ndroid/camera/PhotoModule.java
ndroid/camera/Storage.java
ndroid/camera/VideoModule.java
ndroid/camera/app/AppManagerFactory.java
ndroid/camera/app/CameraApp.java
ndroid/camera/app/CameraServices.java
ndroid/camera/app/ImageTaskManager.java
ndroid/camera/app/MemoryManager.java
ndroid/camera/app/MemoryManagerImpl.java
ndroid/camera/app/PlaceholderManager.java
ndroid/camera/crop/ImageLoader.java
ndroid/camera/data/CameraDataAdapter.java
ndroid/camera/module/ModuleController.java
ndroid/camera/session/CaptureSession.java
ndroid/camera/session/CaptureSessionManager.java
ndroid/camera/session/CaptureSessionManagerImpl.java
ndroid/camera/session/PlaceholderManager.java
ndroid/camera/session/ProcessingNotificationManager.java
ndroid/camera/settings/SettingsManager.java
ndroid/camera/ui/RenderOverlay.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
ndroid/camera/CameraActivity.java
ndroid/camera/data/CameraDataAdapter.java
ndroid/camera/data/InProgressDataWrapper.java
ndroid/camera/data/LocalData.java
ndroid/camera/data/LocalMediaData.java
ndroid/camera/data/SimpleViewData.java
ndroid/camera/filmstrip/ImageData.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
ndroid/camera/CameraActivity.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/filmstrip/BottomControls.java
ndroid/camera/filmstrip/FilmstripContentPanel.java
ndroid/camera/filmstrip/FilmstripController.java
ndroid/camera/widget/FilmstripBottomLayout.java
ndroid/camera/widget/FilmstripLayout.java
ndroid/camera/widget/FilmstripView.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
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.java
ndroid/camera/app/AppController.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/ModeTransitionView.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
ndroid/camera/CameraActivity.java
|
| 3d793c4680ac467ec62bc3e9f47415f5f80ec6d3 |
11-Dec-2013 |
Angus Kong <shkong@google.com> |
Merge "Move/refactor filmstrip related files around." into gb-ub-photos-denali
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/data/CameraDataAdapter.java
ndroid/camera/data/CameraPreviewData.java
ndroid/camera/data/FixedFirstDataAdapter.java
ndroid/camera/data/FixedLastDataAdapter.java
ndroid/camera/data/LocalData.java
ndroid/camera/data/LocalDataAdapter.java
ndroid/camera/data/LocalMediaData.java
ndroid/camera/data/SimpleViewData.java
ndroid/camera/filmstrip/BottomControls.java
ndroid/camera/filmstrip/DataAdapter.java
ndroid/camera/filmstrip/FilmstripContentPanel.java
ndroid/camera/filmstrip/FilmstripController.java
ndroid/camera/filmstrip/FilmstripDataAdapter.java
ndroid/camera/filmstrip/FilmstripImageData.java
ndroid/camera/filmstrip/FilmstripListener.java
ndroid/camera/filmstrip/ImageData.java
ndroid/camera/ui/FilmstripBottomControls.java
ndroid/camera/ui/FilmstripLayout.java
ndroid/camera/ui/FilmstripView.java
ndroid/camera/ui/MainActivityLayout.java
ndroid/camera/widget/FilmstripBottomLayout.java
ndroid/camera/widget/FilmstripLayout.java
ndroid/camera/widget/FilmstripView.java
|
| a8d4afebe65d72b87c411393fe473c63e4b8ddf3 |
10-Dec-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Don't show tap-to-focus message." into gb-ub-photos-denali
|
| cec03e68f4acd533687e9c432ffe73a5853efb98 |
10-Dec-2013 |
Erin Dahlgren <edahlgren@google.com> |
Support continous zoom ranges in PreviewOverlay.
Change-Id: I46ee4f515ef159bbd2018dde43310c0327fa6e48
ndroid/camera/ui/PreviewOverlay.java
|
| 29f6056b703e627bc65efa74294c7c374a0b8957 |
10-Dec-2013 |
Sascha Haeberling <haeberling@google.com> |
Don't show tap-to-focus message.
Bug: 12028253
Change-Id: Ifc4385c177dd895f2959429e2575d3ef1d5fcfe3
ndroid/camera/PhotoModule.java
|
| b95699ed89d02a465950c48ea9b6147d90c80389 |
07-Dec-2013 |
Angus Kong <shkong@google.com> |
Move data-related controls with filmstrip.
bug:12015169
Change-Id: I3185acc37adec23fc696f6693236178779a7459e
ndroid/camera/CameraActivity.java
ndroid/camera/ui/FilmstripLayout.java
|
| 2784c7cd90e5531e4e561e863db06ccc633bd15e |
10-Dec-2013 |
Angus Kong <shkong@google.com> |
Merge "Catch some corner cases for filmstrip." into gb-ub-photos-denali
|
| ec2fb473c094f8dfd1cc0cf5205d470e412d3919 |
10-Dec-2013 |
Angus Kong <shkong@google.com> |
Catch some corner cases for filmstrip.
1. When no items on the filmstrip, don't show the filmstrip.
2. NPEs when start with empty filmstrip.
3. More comments.
Change-Id: I8b8a592e7f64d870e7ff7ecf0255a57b289de7bf
ndroid/camera/ui/FilmstripLayout.java
ndroid/camera/ui/FilmstripView.java
|
| 06db742814dd635d100639f977fcfdc904deb778 |
10-Dec-2013 |
Doris Liu <tianliu@google.com> |
Setup preview status listener for preview related changes
Change-Id: Ibd8341dfbe5e03ec77c149e671f4dd991833e678
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
ndroid/camera/VideoModule.java
ndroid/camera/VideoUI.java
ndroid/camera/app/AppController.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/PreviewStatusListener.java
|
| ee5eeef3b9c988e4aef73135d493a291fc5b489a |
10-Dec-2013 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Make RenderOverlay only respond to tap listener events." into gb-ub-photos-denali
|
| c5f08b0de26b054b4e49005e57ed789f3bb686dc |
10-Dec-2013 |
Erin Dahlgren <edahlgren@google.com> |
Make RenderOverlay only respond to tap listener events.
* Note: this is temporary and makes refactoring the UI of
Gcam easier. Soon RenderOverlay will not be a dependency.
Change-Id: I7a328f3f7a33a495a1b51bb4bf8b5b558f3ff43e
ndroid/camera/ui/RenderOverlay.java
|
| a20074f0efeaa62a29b05838110d04a1b7271418 |
10-Dec-2013 |
Doris Liu <tianliu@google.com> |
Only display supported modes in mode drawer
Change-Id: I1891de0ca485db7d24982b2e73ac5d415480813e
ndroid/camera/CameraActivity.java
ndroid/camera/app/ModuleManager.java
ndroid/camera/app/ModuleManagerImpl.java
ndroid/camera/ui/ModeListView.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
ndroid/camera/CameraActivity.java
ndroid/camera/CameraModule.java
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.java
ndroid/camera/app/AppController.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/filmstrip/FilmstripController.java
ndroid/camera/filmstrip/FilmstripListener.java
ndroid/camera/module/ModuleController.java
ndroid/camera/ui/FilmstripLayout.java
ndroid/camera/ui/FilmstripView.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
ndroid/camera/ButtonManager.java
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoUI.java
ndroid/camera/VideoUI.java
ndroid/camera/settings/SettingsManager.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
ndroid/camera/CameraActivity.java
ndroid/camera/app/AppController.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/FilmstripLayout.java
|
| b41034b16b0dce997544d2592db5029e7db4e238 |
07-Dec-2013 |
Doris Liu <tianliu@google.com> |
Keep swipe left/right functioning in all modules
Change-Id: I230b93c713a038595a06581cf10f48f49f50196b
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/MainActivityLayout.java
|
| be6dc1ecf5f17e2792c2cf0985b3410d129a8a29 |
07-Dec-2013 |
Angus Kong <shkong@google.com> |
Merge "Add CameraProvider methods to check camera facing." into gb-ub-photos-denali
|
| 39b460b805adaa54f310d8637868b3a5c792b2f5 |
07-Dec-2013 |
Angus Kong <shkong@google.com> |
Add CameraProvider methods to check camera facing.
Change-Id: Iba0f21a65a44bed1a26fa375a050e4879701bd72
ndroid/camera/app/CameraController.java
ndroid/camera/app/CameraProvider.java
|
| c6c9740d996bf073a157721aa3eb2a1aa60c477d |
07-Dec-2013 |
Doris Liu <tianliu@google.com> |
Cleanup after camera root is moved out of filmstrip
Change-Id: I9e6efea3848f2f618aefc888ba7cca364fb64085
ndroid/camera/CameraActivity.java
ndroid/camera/app/CameraAppUI.java
|
| b7d3ce145dd7b1cf0ac51f53d5bc73dbbf35f6e6 |
07-Dec-2013 |
Doris Liu <tianliu@google.com> |
Refining shimmy
Bug: 11858581
Change-Id: I7eefc5189caefc6d23d2dbbca243632db716b0c3
ndroid/camera/CameraActivity.java
ndroid/camera/ui/ModeListView.java
|
| b15eb56aefa6dc6a185aa62cba408d853ff4e6bb |
07-Dec-2013 |
Doris Liu <tianliu@google.com> |
Merge "Mode drawer with more fluid dragging" into gb-ub-photos-denali
|
| cfaf7b0226e5d556ce12b34793f9bd0901652c62 |
06-Dec-2013 |
Doris Liu <tianliu@google.com> |
Mode drawer with more fluid dragging
Change-Id: Ie897988a5efd6180a9b92c61487497b08ca16324
ndroid/camera/ui/ModeListView.java
|
| 30279d866783c0f2b01d2d60d3195b8e27bbec46 |
07-Dec-2013 |
Doris Liu <tianliu@google.com> |
Merge "Redesign preview Overlay for simplicity" into gb-ub-photos-denali
|
| f9e4f8fbd1f761443d7a1eecbb5aa221ed3a06a8 |
05-Dec-2013 |
Doris Liu <tianliu@google.com> |
Redesign preview Overlay for simplicity
Simplify how preview overlay should be setup from each module
Refactored PhotoUI and VideoUI to use the new Overlay
Change-Id: Ia8c7c71215007c9aaba69e55353b554e8fdf3c90
ndroid/camera/PhotoController.java
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
ndroid/camera/VideoModule.java
ndroid/camera/VideoUI.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/PreviewOverlay.java
|
| 248f42b1926294ffa1855fd4319036a02b5f39a1 |
07-Dec-2013 |
Angus Kong <shkong@google.com> |
Change the home logo and the behavior of actionbar
Change-Id: I2a930fafd22ea36ae2a84b749c54f64c67a7d06d
ndroid/camera/CameraActivity.java
|
| 6245518699bb391356c08d3b9ffa1cc90480ae2f |
06-Dec-2013 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Create a ButtonManager for managing common button behaviors." into gb-ub-photos-denali
|
| 138af5122a9e875f903ddfdb2b084ae5844d9ea5 |
06-Dec-2013 |
Angus Kong <shkong@google.com> |
Merge "Remove build target and codes for legacy panorama." into gb-ub-photos-denali
|
| 18e2ef6d2b2d36abcaa7378a0f7df792ecf8ed81 |
05-Dec-2013 |
Erin Dahlgren <edahlgren@google.com> |
Create a ButtonManager for managing common button behaviors.
Change-Id: I02d99c393a01e6de9ffb2f4f351a832b4eae9e37
ndroid/camera/ButtonManager.java
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoMenu.java
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
ndroid/camera/VideoMenu.java
ndroid/camera/VideoModule.java
ndroid/camera/VideoUI.java
|
| 0fa5fcd82ac6fbda0b1ac3d6c1a4759fea13e219 |
06-Dec-2013 |
Angus Kong <shkong@google.com> |
Merge "Add quantum paper background for filmstrip." into gb-ub-photos-denali
|
| 43596cd34e7020d6a0aafcdc31297237ad98496c |
05-Dec-2013 |
Angus Kong <shkong@google.com> |
Add quantum paper background for filmstrip.
Also fix the issue of flickering when swiping out filmstrip.
bug:11898278
Change-Id: I0fd0c394cd8c14d70fd7ef1c912ab05d2a5c6668
ndroid/camera/ui/FilmstripLayout.java
ndroid/camera/ui/FilmstripView.java
|
| 4583f053f5f3205e6016e1cb6c2a5475e0588bdf |
05-Dec-2013 |
Angus Kong <shkong@google.com> |
Remove build target and codes for legacy panorama.
bug:11811982
Change-Id: I733e80511d8eecdd1dbc90daf9b7f9fb709a2766
ndroid/camera/Mosaic.java
ndroid/camera/MosaicFrameProcessor.java
ndroid/camera/MosaicPreviewRenderer.java
ndroid/camera/MosaicRenderer.java
ndroid/camera/WideAnglePanoramaController.java
ndroid/camera/WideAnglePanoramaModule.java
ndroid/camera/WideAnglePanoramaUI.java
ndroid/camera/module/ModulesInfo.java
|
| aeaef40c8285e5c2c0c5e13a8f8229cdb531836c |
05-Dec-2013 |
Angus Kong <shkong@google.com> |
Merge "Replace legacy wide-angle panorama with new one." into gb-ub-photos-denali
|
| aff95be4930147d00a754b7544e6418e17667900 |
05-Dec-2013 |
Angus Kong <shkong@google.com> |
Replace legacy wide-angle panorama with new one.
Change-Id: I55977b1a3346bfc45782eed3791e34cac423ee96
ndroid/camera/module/ModulesInfo.java
|
| 7824cd3c905e6cb72ebb22da0e7b5c1173c823a2 |
05-Dec-2013 |
Doris Liu <tianliu@google.com> |
Merge "Change mode drawer text weight to light, change camera mode color" into gb-ub-photos-denali
|
| 53b3ddbae16c5efbac842e158525720d0b9108cb |
05-Dec-2013 |
Doris Liu <tianliu@google.com> |
Change mode drawer text weight to light, change camera mode color
Bug: 11996762
Bug: 11996767
Change-Id: I51ca31795856b91bc78f6d579dd33ec527c1f57b
ndroid/camera/ui/ModeSelectorItem.java
ndroid/camera/util/ApiHelper.java
|
| a07e94c1ed57fa014e7428345927223768532d32 |
05-Dec-2013 |
Erin Dahlgren <edahlgren@google.com> |
Remove dependency on preference groups from video mode.
Change-Id: I40f69fa1267d0500125c786bb550052bbd200f9e
ndroid/camera/MultiToggleImageButton.java
ndroid/camera/VideoMenu.java
ndroid/camera/VideoModule.java
ndroid/camera/VideoUI.java
|
| 14d9bbc8b4f259696ad89e39480c7b7ec22c8314 |
05-Dec-2013 |
Angus Kong <shkong@google.com> |
Merge "Implement the new filmstrip UI - first step." into gb-ub-photos-denali
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/FilmStripGestureRecognizer.java
ndroid/camera/ui/FilmstripGestureRecognizer.java
ndroid/camera/ui/FilmstripLayout.java
ndroid/camera/ui/FilmstripView.java
ndroid/camera/ui/MainActivityLayout.java
|
| e419b1919ed54d8d94d19faec2d02e773ae7ecdb |
03-Dec-2013 |
Erin Dahlgren <edahlgren@google.com> |
Remove photo mode dependency on preference groups.
Bug: 11967053
Change-Id: I3058a1931d92fa006da9e16bdcc2b5f864b1eacb
ndroid/camera/FocusOverlayManager.java
ndroid/camera/PhotoMenu.java
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
ndroid/camera/SettingsController.java
ndroid/camera/settings/SettingsCache.java
ndroid/camera/settings/SettingsManager.java
|
| f954236c21f06a6a2d1bb060f1098a622f35923d |
30-May-2013 |
Michael Kolb <kolby@google.com> |
Fix samsung video recording
Patching Bryce CL into Denali
Bug: 9056573
Change-Id: I81fc31e24fe26bef4179bfc4428def2e8b7d94e9
Conflicts:
src/com/android/camera/VideoModule.java
ndroid/camera/VideoModule.java
|
| 095fa44f760234376946cd97ccf262e3df0cd7d6 |
03-Dec-2013 |
Angus Kong <shkong@google.com> |
Merge "Make onLayoutOrientationChanged to take a boolean." into gb-ub-photos-denali
|
| 5996d47f069b10e7891c100fb60df79e8561f64c |
03-Dec-2013 |
Doris Liu <tianliu@google.com> |
Merge "Remove deprecated fitSystemWindows logic" into gb-ub-photos-denali
|
| b05794393444ebd13bd24c2ecfb3fbd9963f688e |
11-Jul-2013 |
Michael Kolb <kolby@google.com> |
Revert fixed focus area in CAF mode
Bug: 9306098
This doesn't set the faces as focus/exp areas yet, but resets the focus area to null
in CAF mode to let the HAL decide focus/exp area.
Cherrypick of Bryce CL into Denali.
Change-Id: I38e31937f64ecdb23d6c79f96040c46652d1d7d0
Conflicts:
src/com/android/camera/FocusOverlayManager.java
ndroid/camera/FocusOverlayManager.java
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.java
ndroid/camera/WideAnglePanoramaModule.java
ndroid/camera/WideAnglePanoramaUI.java
ndroid/camera/module/ModuleController.java
|
| d3253f20d9fc971f7cb6bdef6cd6f96b21f7dd63 |
12-Jul-2013 |
Michael Kolb <kolby@google.com> |
Always set focus mode first before applying scene mode
Patching Bryce CL into Denali.
Bug: 9577903
Change-Id: I2c300e443a47c7bc0c20f6aaec6f6e4b6c238880
ndroid/camera/PhotoModule.java
|
| 63233419b09c73e1b45e61acae2c8a2b2d9fd226 |
03-Dec-2013 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Remove ComboPreferences from video mode." into gb-ub-photos-denali
|
| ca2b4025adc409a5c8927d4e3d4a68e6a01a3861 |
03-Dec-2013 |
Doris Liu <tianliu@google.com> |
Remove deprecated fitSystemWindows logic
Change-Id: I6393db86b017652dfc16f41a0a915fc5e7cff6a0
ndroid/camera/CameraActivity.java
ndroid/camera/ui/FilmstripView.java
ndroid/camera/ui/MainActivityLayout.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
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
ndroid/camera/VideoModule.java
ndroid/camera/VideoUI.java
ndroid/camera/WideAnglePanoramaModule.java
ndroid/camera/WideAnglePanoramaUI.java
ndroid/camera/ui/CameraRootView.java
|
| 637c75c9286f04671f2ba0f83b96a3196e17c898 |
03-Dec-2013 |
Angus Kong <shkong@google.com> |
Merge "Change to have finer callbacks." into gb-ub-photos-denali
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.java
ndroid/camera/WideAnglePanoramaModule.java
ndroid/camera/WideAnglePanoramaUI.java
ndroid/camera/module/ModuleController.java
|
| bd3da269e2b2533e68b670e27ac304837a2eff2b |
02-Dec-2013 |
Erin Dahlgren <edahlgren@google.com> |
Remove ComboPreferences from video mode.
Change-Id: Iab54672feee066e23543c7a7dbb19e5118ec214c
ndroid/camera/VideoMenu.java
ndroid/camera/VideoModule.java
ndroid/camera/VideoUI.java
ndroid/camera/settings/SettingsManager.java
|
| 4497326732ad1ecd836e03fdb386cf9c66cbef1f |
27-Nov-2013 |
Seth Raphael <magicseth@google.com> |
Reduce logging of flattened Preferences
Bug: 11901390
Change-Id: I9f2e27e769fd745be01bb2c12a7f07b45aa0b905
ndroid/camera/PhotoModule.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
ndroid/camera/CameraActivity.java
ndroid/camera/SettingsController.java
ndroid/camera/ui/SettingsView.java
|
| 0744e4ab3ec5f0270bdad33e7c477f52ba680bbd |
22-Nov-2013 |
Marco Nelissen <marcone@google.com> |
initial simple camera pruning and refactoring
100% preview and new ui bottom bar
bug: 11514604
Change-Id: I010c8aaa41ad6791ce2443ef159ea22cc1e8346f
ndroid/camera/CameraSettings.java
ndroid/camera/FocusOverlayManager.java
ndroid/camera/MultiToggleImageButton.java
ndroid/camera/PhotoMenu.java
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
ndroid/camera/ToggleImageButton.java
ndroid/camera/VideoModule.java
ndroid/camera/VideoUI.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/BottomBar.java
ndroid/camera/ui/RenderOverlay.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
ndroid/camera/CameraActivity.java
ndroid/camera/CameraSettings.java
ndroid/camera/VideoModule.java
ndroid/camera/WideAnglePanoramaModule.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
ndroid/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
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoUI.java
ndroid/camera/ui/SettingsView.java
|
| 2c8cc45f91df492d515ba861508fa2012fbb6679 |
06-Nov-2013 |
Sameer Padala <sxp@google.com> |
Update SmartCamera UI
Change-Id: Icf04a24656aaaf2a4dfc948e9d4e9a16b2a51f69
ndroid/camera/PhotoModule.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
ndroid/camera/CameraActivity.java
ndroid/camera/CameraSettings.java
ndroid/camera/FocusOverlayManager.java
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
ndroid/camera/SettingsController.java
ndroid/camera/settings/SettingsCache.java
ndroid/camera/settings/SettingsManager.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
ndroid/camera/CameraActivity.java
ndroid/camera/CameraModule.java
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.java
ndroid/camera/WideAnglePanoramaModule.java
ndroid/camera/app/AppController.java
ndroid/camera/module/ModuleController.java
|
| 357b7673f03d9b45d281d585cc3f4f87dc7d727b |
21-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
Build out the SettingsManager model.
Change-Id: Ie831dbf624efc5c7e27924785a0ec193b3ce53bd
ndroid/camera/CameraActivity.java
ndroid/camera/CameraSettings.java
ndroid/camera/FocusOverlayManager.java
ndroid/camera/ListPreference.java
ndroid/camera/PhotoController.java
ndroid/camera/PhotoMenu.java
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
ndroid/camera/PieController.java
ndroid/camera/RecordLocationPreference.java
ndroid/camera/SettingsController.java
ndroid/camera/SettingsManager.java
ndroid/camera/app/AppController.java
ndroid/camera/settings/SettingsManager.java
ndroid/camera/ui/SettingsView.java
|
| e767c0f64968a52a162c1c4a50e391ceaec50a16 |
24-Nov-2013 |
Doris Liu <tianliu@google.com> |
Change asset name
Change-Id: I60ef126dc992afb4ab9d7ea2f6a3c48298663c3a
ndroid/camera/ui/SettingsView.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
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
ndroid/camera/VideoModule.java
ndroid/camera/VideoUI.java
ndroid/camera/app/AppController.java
ndroid/camera/app/CameraAppUI.java
ndroid/camera/ui/MainActivityLayout.java
ndroid/camera/ui/ModeListView.java
ndroid/camera/ui/ModeSelectorItem.java
ndroid/camera/ui/ModeTransitionView.java
ndroid/camera/ui/PieRenderer.java
ndroid/camera/ui/RenderOverlay.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
ndroid/camera/CameraActivity.java
ndroid/camera/CameraModule.java
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.java
ndroid/camera/WideAnglePanoramaModule.java
ndroid/camera/app/AppController.java
ndroid/camera/app/ModuleManager.java
ndroid/camera/module/ModulesInfo.java
|
| 18500a493634b593dc8ba1e74b46d1f10bb6d031 |
22-Nov-2013 |
Angus Kong <shkong@google.com> |
Refactor PhotoSphere and Refocus: new camera open
This is part of the Denali refactor work. Now PhotoSphere and Refocus both uses
the new camera start up process so the camera is not released between modules.
See http://ag/392043/
Change-Id: I6ae9b111ba1fda33912159e0967f3a12d02937ba
ndroid/camera/app/CameraController.java
ndroid/camera/app/CameraProvider.java
ndroid/camera/module/ModulesInfo.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
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoModule.java
|
| d3393ec6aeb54c2826e2e7514990259b83fc17d2 |
22-Nov-2013 |
Marco Nelissen <marcone@google.com> |
Merge "Use audio focus instead of music command broadcast" into gb-ub-photos-denali
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/CameraModule.java
ndroid/camera/MediaSaveService.java
ndroid/camera/MediaSaverImpl.java
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.java
ndroid/camera/WideAnglePanoramaModule.java
ndroid/camera/app/AppController.java
ndroid/camera/app/CameraApp.java
ndroid/camera/app/CameraServices.java
ndroid/camera/app/ModuleManager.java
ndroid/camera/app/ModuleManagerImpl.java
ndroid/camera/data/InProgressDataWrapper.java
ndroid/camera/data/LocalData.java
ndroid/camera/data/LocalMediaData.java
ndroid/camera/data/RgbzMetadataLoader.java
ndroid/camera/data/SimpleViewData.java
ndroid/camera/filmstrip/FilmstripImageData.java
ndroid/camera/module/ModulesInfo.java
ndroid/camera/tinyplanet/TinyPlanetFragment.java
ndroid/camera/ui/FilmstripBottomControls.java
ndroid/camera/ui/FilmstripView.java
|
| 20694b23b61a94e38f98b16f302dda55055eabdb |
29-Oct-2013 |
Marco Nelissen <marcone@google.com> |
Use audio focus instead of music command broadcast
Change-Id: I29066248c0145abed747f54c9bf4d93fdb76e45d
ndroid/camera/VideoModule.java
|
| c120b0f6e5ea919fcbb87f832a2b6c82509a2114 |
19-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
Custom settings ui with dialogs.
Change-Id: I117744135e5b08370c1feb63fe4abcccfe325659
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoModule.java
ndroid/camera/SettingsController.java
ndroid/camera/SettingsManager.java
ndroid/camera/app/AppController.java
ndroid/camera/ui/ModeListView.java
ndroid/camera/ui/SettingsView.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
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
ndroid/camera/VideoModule.java
ndroid/camera/WideAnglePanoramaModule.java
|
| 612321f39ca524de2efced1e826db9ec523bd6dc |
19-Nov-2013 |
Angus Kong <shkong@google.com> |
Centralize the module information.
Change-Id: I4d9fdbe480a518c7b6ca0268aa9beee49d22610c
ndroid/camera/CameraActivity.java
ndroid/camera/app/ModuleManager.java
ndroid/camera/app/ModuleManagerImpl.java
ndroid/camera/module/ModulesInfo.java
ndroid/camera/ui/ModeListView.java
|
| 188cfc34c0c1e105c27029e2521fb06e10aaab48 |
17-Nov-2013 |
Angus Kong <shkong@google.com> |
Change capture request to pass a message.
To be consistent with other camera operations, change the capture request to
send a message instead of posting a runnable.
Change-Id: I28538a4adbb8b892608d53d4ee59bca3a5064488
ndroid/camera/app/AndroidCameraManagerImpl.java
|
| 0e57fc1baa471ea2acdd6b5bf8b961aa43b1a4a8 |
18-Nov-2013 |
Angus Kong <shkong@google.com> |
Fix a potential CameraManagerFactory memory leak
Change-Id: I5fca4cce0baaa9250eca1f74d5e3df950f618cc9
ndroid/camera/CameraActivity.java
ndroid/camera/app/CameraManagerFactory.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
ndroid/camera/AndroidCameraManagerImpl.java
ndroid/camera/CameraActivity.java
ndroid/camera/CameraHolder.java
ndroid/camera/CameraManager.java
ndroid/camera/CameraManagerFactory.java
ndroid/camera/CameraModule.java
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
ndroid/camera/VideoModule.java
ndroid/camera/WideAnglePanoramaModule.java
ndroid/camera/app/AndroidCameraManagerImpl.java
ndroid/camera/app/AppController.java
ndroid/camera/app/CameraController.java
ndroid/camera/app/CameraManager.java
ndroid/camera/app/CameraManagerFactory.java
ndroid/camera/app/CameraProvider.java
ndroid/camera/app/ModuleManager.java
ndroid/camera/app/ModuleManagerImpl.java
ndroid/camera/module/ModuleController.java
ndroid/camera/util/CameraUtil.java
|
| 9e039852f11dc5c546df174dd91ef6994b87698e |
12-Nov-2013 |
Seth Raphael <magicseth@google.com> |
Add parameters and deduplicate parameter changes
Bug: 11646117
Change-Id: If52182a856d7ee8143a351c7f79a76d13840c61e
(cherry picked from commit 77775f170a4596421fd566005522f56f82b1c276)
ndroid/camera/ComboPreferences.java
ndroid/camera/ListPreference.java
ndroid/camera/PhotoModule.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
ndroid/camera/CameraActivity.java
ndroid/camera/ui/ModeListView.java
ndroid/camera/ui/ModeSelectorItem.java
|
| d7b8cb57ecbd8776c858b98ca9d1aeed3f22da88 |
15-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
Fix a bad rebase.
Change-Id: I8447ba6bbe37e7bea7b1ac579560150830688704
ndroid/camera/PhotoModule.java
|
| dc282e118c398c5138c8f8859b3a1037b3cea672 |
12-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
Revert parallel opening camera in photo mode.
Reverts:
* ag/386409
* ag/386206
* ag/385573
Bug: 11598948
Bug: 11625767
Bug: 11627454
Bug: 11255097
Change-Id: Iad28e32dbcbbce42d9ee261c961cdd5a7712ede5
Conflicts:
src/com/android/camera/PhotoModule.java
ndroid/camera/PhotoModule.java
|
| 49ea51ab31f8e39fd48577b704695cb437f644af |
14-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
Fix issue of focus indicator staying on without being hidden
Bug: 11505806
A mix up in the previous 100% CL caused this. This CL here also
makes it more robust by making the 100% extra time time-based instead
of frame-based.
Change-Id: I52c53d4b5816570c2c805e0e8ff193de684f2a64
ndroid/camera/ui/PieRenderer.java
ndroid/camera/ui/ProgressRenderer.java
|
| b7b73ec15e05605db6cc2b7f42bbc61d441da1d2 |
13-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
Show the 100% state of the progress at least one frame.
Bug: 11505806
Change-Id: I5fe8456ff93cd50da53e022ac2cf2dd9ac633b2f
ndroid/camera/ui/PieRenderer.java
ndroid/camera/ui/ProgressRenderer.java
|
| 7e33d53a60a0c1f5405d6d1598ac48d5237a1810 |
13-Nov-2013 |
Angus Kong <shkong@google.com> |
Merge "Update CL http://ag/387747" into gb-ub-photos-denali
|
| 32226b936ceee5dc418385fa214dc4b89aafc3a6 |
13-Nov-2013 |
Angus Kong <shkong@google.com> |
Update CL http://ag/387747
Accidentally submitted the patch set 1 before uploading this one.
Change-Id: Iee3c751473b67140ea07c84bdde7811b06060bb4
ndroid/camera/data/InProgressDataWrapper.java
ndroid/camera/filmstrip/FilmstripDataAdapter.java
ndroid/camera/filmstrip/FilmstripImageData.java
ndroid/camera/filmstrip/FilmstripListener.java
ndroid/camera/ui/FilmstripView.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
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
ndroid/camera/VideoModule.java
ndroid/camera/VideoUI.java
ndroid/camera/WideAnglePanoramaUI.java
ndroid/camera/ui/CameraControls.java
ndroid/camera/ui/CameraRootView.java
ndroid/camera/ui/FilmstripView.java
ndroid/camera/ui/MainActivityLayout.java
ndroid/camera/ui/ModeListView.java
ndroid/camera/ui/ModeSelectorItem.java
ndroid/camera/ui/ModuleSwitcher.java
ndroid/camera/util/Gusterpolator.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
ndroid/camera/CameraActivity.java
ndroid/camera/app/AppUi.java
ndroid/camera/data/CameraDataAdapter.java
ndroid/camera/data/FixedFirstDataAdapter.java
ndroid/camera/data/FixedLastDataAdapter.java
ndroid/camera/data/InProgressDataWrapper.java
ndroid/camera/data/LocalData.java
ndroid/camera/data/LocalMediaData.java
ndroid/camera/data/SimpleViewData.java
ndroid/camera/filmstrip/FilmstripController.java
ndroid/camera/filmstrip/FilmstripDataAdapter.java
ndroid/camera/filmstrip/FilmstripImageData.java
ndroid/camera/filmstrip/FilmstripListener.java
ndroid/camera/module/ModuleController.java
ndroid/camera/ui/FilmstripView.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
|
| 661585132d65f5f3612c169bab0fae0217f6583a |
12-Nov-2013 |
ztenghui <ztenghui@google.com> |
resolved conflicts for merge of aae09fb1 to gb-ub-photos-denali
Change-Id: Iac6011795fe5e5ac6cc5181188144cf68d617194
|
| aae09fb1ab292932504233da4be5181ce74db763 |
12-Nov-2013 |
ztenghui <ztenghui@google.com> |
Merge "Differentiate the InProgressData from the normal PhotoData." 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.
|
| 8e64647afd70d6306ab638e25f47623c85b5fac0 |
12-Nov-2013 |
ztenghui <ztenghui@google.com> |
Differentiate the InProgressData from the normal PhotoData.
When we load from MediaStore, we should differentiate the data still in
progress, e.g. HDR+, which should show the progress bar and hide the action bar
items.
bug:11634500
bug:11598186
Change-Id: I8179d39747218c8768977d5b3ce71eadbdfb8b58
ndroid/camera/data/CameraDataAdapter.java
|
| 249653e41763cffbd9bd5ef2298c5120488897fb |
12-Nov-2013 |
Andy Huibers <andyhuibers@google.com> |
Close mode menus if another control is touched
Bug: 11598901
Bug: 11635865
Change-Id: I9c6237bacef9a28de1fa238e1e7378a57abfc573
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoUI.java
ndroid/camera/VideoUI.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
ndroid/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
ndroid/camera/CameraActivity.java
ndroid/camera/VideoModule.java
ndroid/camera/WideAnglePanoramaModule.java
ndroid/camera/app/AppController.java
ndroid/camera/app/OrientationManager.java
ndroid/camera/app/OrientationManagerImpl.java
ndroid/camera/module/ModuleController.java
|
| fb6f63262c892c2b0dd10194e0f040555e980fdf |
11-Nov-2013 |
Angus Kong <shkong@google.com> |
Fix build.
Change-Id: I46d88fb17f1d593a4b19cd6657adc28596e6db56
ndroid/camera/ui/FilmstripView.java
|
| ac6c8597f444957fc13916f62bc37828e6d38765 |
11-Nov-2013 |
ztenghui <ztenghui@google.com> |
am 6a42c3ae: Add a null check to fix NPE
* commit '6a42c3ae157c4495db56541ef87f6ee56b5d10b3':
Add a null check to fix NPE
|
| 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
ndroid/camera/AndroidCameraManagerImpl.java
ndroid/camera/CameraActivity.java
ndroid/camera/CameraHolder.java
ndroid/camera/CameraManager.java
ndroid/camera/ImageTaskManager.java
ndroid/camera/app/AppUi.java
ndroid/camera/app/ImageTaskManager.java
ndroid/camera/app/PlaceholderManager.java
ndroid/camera/data/CameraDataAdapter.java
ndroid/camera/data/CameraPreviewData.java
ndroid/camera/data/FixedFirstDataAdapter.java
ndroid/camera/data/FixedLastDataAdapter.java
ndroid/camera/data/LocalData.java
ndroid/camera/data/LocalDataAdapter.java
ndroid/camera/data/LocalMediaData.java
ndroid/camera/data/SimpleViewData.java
ndroid/camera/filmstrip/FilmstripController.java
ndroid/camera/filmstrip/FilmstripDataAdapter.java
ndroid/camera/filmstrip/FilmstripImageData.java
ndroid/camera/filmstrip/FilmstripListener.java
ndroid/camera/module/ModuleController.java
ndroid/camera/ui/FilmStripView.java
ndroid/camera/ui/FilmstripView.java
ndroid/camera/util/CameraUtil.java
|
| 6a42c3ae157c4495db56541ef87f6ee56b5d10b3 |
09-Nov-2013 |
ztenghui <ztenghui@google.com> |
Add a null check to fix NPE
bug: 11594111
Change-Id: Ica2ffe315c4e4eaa818aa609d9600d5e67e54b3b
ndroid/camera/ui/FilmStripView.java
|
| ed78521eafd4e32897af965c16c9e14504f778f5 |
09-Nov-2013 |
Angus Kong <shkong@google.com> |
Merge "Add more interfaces for app and modules." into gb-ub-photos-denali
|
| 51ae7a844570f85b68a989034f7391260d88a783 |
08-Nov-2013 |
Angus Kong <shkong@google.com> |
Add more interfaces for app and modules.
Change-Id: Ie67f90f227b5bc74bc7ac39fca72dfd1741140ca
ndroid/camera/app/AppController.java
ndroid/camera/module/ModuleController.java
|
| c62cd6fd71df0cd4769e97eab4713fd5e211db58 |
09-Nov-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Close cursor in CameraDataAdapter to prevent resource leaks.
Bug: 11352359
Change-Id: I4939d8ff52f8d14ae237ae8464a318daa059e2a2
ndroid/camera/data/CameraDataAdapter.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
ndroid/camera/CameraActivity.java
ndroid/camera/ComboPreferences.java
ndroid/camera/FocusOverlayManager.java
ndroid/camera/PhotoModule.java
ndroid/camera/WideAnglePanoramaModule.java
ndroid/camera/ui/FilmStripView.java
ndroid/camera/util/CameraUtil.java
|
| 7974ac9e39bdd13ffa96a788b6322653a5d851ec |
08-Nov-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 36d84c1d: Merge "Ensure mOpenCameraThread has been setup before dereferencing." into gb-ub-photos-carlsbad
* commit '36d84c1d273faf24c6907e173cf95f233db71592':
Ensure mOpenCameraThread has been setup before dereferencing.
|
| 36d84c1d273faf24c6907e173cf95f233db71592 |
08-Nov-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Ensure mOpenCameraThread has been setup before dereferencing." into gb-ub-photos-carlsbad
|
| acf9ab7c3ddc976bc9d6239ae54523b9805c876d |
08-Nov-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Ensure mOpenCameraThread has been setup before dereferencing.
Bug: 11579062
Change-Id: Iabccdbfd3468eaa47115de1dbcafa7f9e456603b
ndroid/camera/PhotoModule.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
ndroid/camera/CameraActivity.java
ndroid/camera/CameraModule.java
ndroid/camera/MediaSaveService.java
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.java
ndroid/camera/WideAnglePanoramaModule.java
ndroid/camera/app/MediaSaver.java
ndroid/camera/tinyplanet/TinyPlanetFragment.java
|
| 88eabecc304f817e6f945f25a2374412f742caa7 |
08-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
am 2b78c0c0: Merge "Add GCam progress indicator." into gb-ub-photos-carlsbad
* commit '2b78c0c048fe906beaeadeee3e267524c808c340':
Add GCam progress indicator.
|
| 2b78c0c048fe906beaeadeee3e267524c808c340 |
08-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Add GCam progress indicator." into gb-ub-photos-carlsbad
|
| e0ecc64979a29e5bbdd1084712b231070b1d57bf |
07-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
Add GCam progress indicator.
Bug: 11505806
Change-Id: I823c44b3761bb3c6dce56b1ec1b8d667023da820
ndroid/camera/ui/PieRenderer.java
ndroid/camera/ui/ProgressRenderer.java
|
| 88f7dbe2e40a9651053c22d5ebbb060eac43a258 |
07-Nov-2013 |
Andy Huibers <andyhuibers@google.com> |
am fccf83bd: hide preview cover on arrival of new preview data if hidden
* commit 'fccf83bd342a3a83dc284525488e69f25e4667c4':
hide preview cover on arrival of new preview data if hidden
|
| fccf83bd342a3a83dc284525488e69f25e4667c4 |
06-Nov-2013 |
Andy Huibers <andyhuibers@google.com> |
hide preview cover on arrival of new preview data if hidden
Bug: 11433257
Change-Id: I7225ebf1d84bbefd2f952cfa524720a7e76e7181
ndroid/camera/PhotoUI.java
ndroid/camera/VideoUI.java
ndroid/camera/WideAnglePanoramaUI.java
|
| 90018374f067d35a0fc2e49392532e1ac0c18b68 |
07-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 2f878d54: Merge "Fix photo mode is getting stuck in a single CameraState." into gb-ub-photos-carlsbad
* commit '2f878d54ecbb62ef09aa2b0152dea983e598724f':
Fix photo mode is getting stuck in a single CameraState.
|
| 2f878d54ecbb62ef09aa2b0152dea983e598724f |
07-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Fix photo mode is getting stuck in a single CameraState." into gb-ub-photos-carlsbad
|
| 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.
|
| c5effbada57112445656bf4929f13f9942afb14c |
07-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
Fix photo mode is getting stuck in a single CameraState.
Bug: 11574716
Change-Id: Ieb3622103798077071bb9350773851b7acbff756
ndroid/camera/PhotoModule.java
|
| 05a04924312fbcda2161da01e0749eb80c2663d1 |
07-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
Show chooser on EDIT intents that have no activity for action.
Bug: 11571947
Change-Id: I40ef0f9ae6b4567557064d91b9c3942cd524a60b
ndroid/camera/CameraActivity.java
|
| 0c61d3c523e242f5030b710801f59f413060ea5b |
07-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 7e6e947f: Merge "Parallelize opening the camera with view handling in photo mode." into gb-ub-photos-carlsbad
* commit '7e6e947f0e530c14b32785bdb3094ea473000a12':
Parallelize opening the camera with view handling in photo mode.
|
| 7e6e947f0e530c14b32785bdb3094ea473000a12 |
07-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Parallelize opening the camera with view handling in photo mode." into gb-ub-photos-carlsbad
|
| b09b53efcd179d55836014dcd054cff6f7d688d8 |
06-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
Parallelize opening the camera with view handling in photo mode.
Bug: 11255097
Change-Id: I8da16a97ee46555267ae8cfee0e7940d3f53f98f
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.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
|
| 6d3938a9bd68c2a42b3325576d8cb7323d7db5ec |
07-Nov-2013 |
Angus Kong <shkong@google.com> |
Merge "Introducing new architect." into gb-ub-photos-denali
|
| fa27423125e78f43d8dbae987c34314a238f205c |
07-Nov-2013 |
Angus Kong <shkong@google.com> |
Introducing new architect.
Change-Id: Iedcc7c264d66a933725fae73eb00c70cc544db8c
ndroid/camera/app/AppController.java
ndroid/camera/module/ModuleController.java
|
| 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
ndroid/camera/CameraActivity.java
|
| 278c75c5ed7c059733230685cc81873bdf446ab9 |
06-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
am eb605b4a: Don\'t crash Photo Sphere on back button press in filmstrip.
* commit 'eb605b4a27be212915db5bc23e9a82b857036a1c':
Don't crash Photo Sphere on back button press in filmstrip.
|
| eb605b4a27be212915db5bc23e9a82b857036a1c |
06-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
Don't crash Photo Sphere on back button press in filmstrip.
Bug: 11554580
Change-Id: I983713eecbd6f13bd90f94b24a0fa1ecc26e1c56
ndroid/camera/SurfaceTextureRenderer.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.
|
| 982542701ef5737456f5ee204684a36620db5475 |
06-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Make image editor intent general." into gb-ub-photos-carlsbad
|
| 6eec93c996c10fcd9cffb87674fe3dc63e38b455 |
06-Nov-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 404d7eb0: Merge "camera: Ensure camera release for lockscreen transition." into gb-ub-photos-carlsbad
* commit '404d7eb0029e1dcb94d38b0595fdd84345207b0a':
camera: Ensure camera release for lockscreen transition.
|
| 404d7eb0029e1dcb94d38b0595fdd84345207b0a |
06-Nov-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "camera: Ensure camera release for lockscreen transition." into gb-ub-photos-carlsbad
|
| a08c5ea78279f2b2a326097ee134f30ab47ec8ee |
06-Nov-2013 |
Doris Liu <tianliu@google.com> |
am d1b4ab3e: Merge "Make sure preview aspect ratio is updated" into gb-ub-photos-carlsbad
* commit 'd1b4ab3e3899ed4ee1d5c90f124db0a6748cc3a4':
Make sure preview aspect ratio is updated
|
| d1b4ab3e3899ed4ee1d5c90f124db0a6748cc3a4 |
06-Nov-2013 |
Doris Liu <tianliu@google.com> |
Merge "Make sure preview aspect ratio is updated" into gb-ub-photos-carlsbad
|
| c883a30eff16435909471874d2106acbb63eba03 |
06-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
Make image editor intent general.
Bug: 11372979
Change-Id: I7649eb995fbd78f9b29c76da777aca83777c49fc
ndroid/camera/CameraActivity.java
|
| 5914783e3f0a1c1c5581361cbf6e0d9ab2cf789d |
06-Nov-2013 |
Ruben Brunk <rubenbrunk@google.com> |
camera: Ensure camera release for lockscreen transition.
Bug: 11063890
Change-Id: Iec7fb672571166ee5a560a8245b56affa627e88b
ndroid/camera/PhotoModule.java
|
| 95405749e5a96ff680b9bcafbfe2bab33c16e1ee |
06-Nov-2013 |
Doris Liu <tianliu@google.com> |
Make sure preview aspect ratio is updated
Bug: 11509233
Change-Id: Ide6f5bbe0abe7ed45e56b3f34c19204c1294afc7
ndroid/camera/PhotoModule.java
|
| 07ae1ad139e3f32892b177801b998d5a333436f2 |
04-Nov-2013 |
Doris Liu <tianliu@google.com> |
am 3493ba2a: Merge "Preserve high resolution image on touch during zoom" into gb-ub-photos-carlsbad
* commit '3493ba2a0a2e91a093c5fddad60bc1f1e56b91b5':
Preserve high resolution image on touch during zoom
|
| b0288ec84e06b83923180a04e1b546724fcfd258 |
04-Nov-2013 |
Doris Liu <tianliu@google.com> |
Preserve high resolution image on touch during zoom
Bug: 11477449
Change-Id: I08b33cee258de1f90e5fa60e6483834dd5197bd2
ndroid/camera/ui/FilmStripView.java
|
| 192958df23013627d81d34e1d7b8f33eda5e232d |
04-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
am ba1b30b7: Check for media service being present before capture.
* commit 'ba1b30b7793a8a881493a9fc48f27d503db2405b':
Check for media service being present before capture.
|
| ba1b30b7793a8a881493a9fc48f27d503db2405b |
04-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
Check for media service being present before capture.
Bug: 11508325
Change-Id: I0997f9bff63b1cdb3c33272acc8617b30c07424a
ndroid/camera/PhotoModule.java
|
| 03e0145861f790b633118dfc1d53ff89160c193a |
07-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
Add Refocus module.
Bug: 10073814
Change-Id: Ibeeeaa6627dce77034f2786040fb3be8e0c19da9
ndroid/camera/CameraActivity.java
ndroid/camera/ui/ModuleSwitcher.java
|
| abd7a4d8ea11f72e2b6caa45d4ee8bb93af29ae3 |
31-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Revert smart camera interface to the PhotoModule: ag/356625" into gb-ub-photos-denali
|
| cb0f9f0f6fad0c52e0e120715b4df50675589456 |
31-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
Revert smart camera interface to the PhotoModule: ag/356625
Bug: 11462288
Change-Id: I6a9dba0d749c7b8c0127ad6bce9ad38aca52715d
ndroid/camera/PhotoModule.java
|
| f84e775f7add86ab488309cdeb324c5cbdb285f5 |
31-Oct-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 6ff701f5: Merge "gcam: Add generic preview fps range selection." into gb-ub-photos-carlsbad
* commit '6ff701f5c8744583a73588f301374ff7e683ff15':
gcam: Add generic preview fps range selection.
|
| 6ff701f5c8744583a73588f301374ff7e683ff15 |
31-Oct-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "gcam: Add generic preview fps range selection." into gb-ub-photos-carlsbad
|
| 249a7f7cdfc3a0a92b2e91cb06b7d48a90d7ffc0 |
30-Oct-2013 |
Alan Newberger <alann@google.com> |
am 761306fa: Remove CameraUtil.launchGallery, ensure SecureCamera uses Gallery up icon
* commit '761306fadfa94b538f43e8cf3463bf6d22814947':
Remove CameraUtil.launchGallery, ensure SecureCamera uses Gallery up icon
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/util/CameraUtil.java
|
| 2a74dfd414217d9a774e0bf95c5991daa5f53e4c |
30-Oct-2013 |
Ruben Brunk <rubenbrunk@google.com> |
gcam: Add generic preview fps range selection.
Bug: 11433097
Change-Id: Ice0f7ad3cd0684183298ce03bab3038a41316cf6
ndroid/camera/util/CameraUtil.java
|
| 1591dea20c40f2652f66763a200a054a36765e7d |
30-Oct-2013 |
Andy Huibers <andyhuibers@google.com> |
am cec75e40: Fix rotation bug for animated thumbnail shown after capture.
* commit 'cec75e408a2d451b90bac5f06e10906ffcafff33':
Fix rotation bug for animated thumbnail shown after capture.
|
| cec75e408a2d451b90bac5f06e10906ffcafff33 |
30-Oct-2013 |
Andy Huibers <andyhuibers@google.com> |
Fix rotation bug for animated thumbnail shown after capture.
Bug: 11420737
Change-Id: I55b90137b362d0b3b98aba34114537e0f6107b8c
ndroid/camera/PhotoUI.java
|
| d77a6278bc2bd94621f555608e278fecf3ff5949 |
29-Oct-2013 |
Doris Liu <tianliu@google.com> |
am af714f9e: Merge "Fix the mapping between preview UI and camera sensor" into gb-ub-photos-carlsbad
* commit 'af714f9ec3264211cb00139ffe0f05d55085ffc2':
Fix the mapping between preview UI and camera sensor
|
| af714f9ec3264211cb00139ffe0f05d55085ffc2 |
29-Oct-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix the mapping between preview UI and camera sensor" into gb-ub-photos-carlsbad
|
| dccff141ee1ffe464a28605036fa41225617f413 |
28-Oct-2013 |
ztenghui <ztenghui@google.com> |
am e546d48b: Merge "Fix crash when trying to reopen the camera." into gb-ub-photos-carlsbad
* commit 'e546d48b4acfbf2441b685b2c7d6a4e14241f34b':
Fix crash when trying to reopen the camera.
|
| e546d48b4acfbf2441b685b2c7d6a4e14241f34b |
28-Oct-2013 |
ztenghui <ztenghui@google.com> |
Merge "Fix crash when trying to reopen the camera." into gb-ub-photos-carlsbad
|
| cfc148d8373ab69d352c274374ffb34caf4a8d2c |
28-Oct-2013 |
ztenghui <ztenghui@google.com> |
Fix crash when trying to reopen the camera.
In this case, another app is using the Camera, such that the camera.open will
hit an exception. We should show an dialog here.
bug:11258139
Change-Id: I0bd2d05fe4d4d9c5e4b87b39f3ef48910cfb7111
ndroid/camera/AndroidCameraManagerImpl.java
ndroid/camera/PhotoModule.java
|
| 36ebcb11b15fb00d3a641499c0f8a16745a2fbb0 |
28-Oct-2013 |
Doris Liu <tianliu@google.com> |
Fix the mapping between preview UI and camera sensor
Bug: 11409659
Change-Id: I46ae3d7797590d59befbdc394d5304f14a212a80
ndroid/camera/FocusOverlayManager.java
ndroid/camera/PhotoController.java
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
ndroid/camera/util/CameraUtil.java
|
| 42eae8aad760b018224eb73342785d96757e8e3f |
28-Oct-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 0a64e00e: Merge "gcam: Add placeholder image." into gb-ub-photos-carlsbad
* commit '0a64e00e88514ae07c3514e19126c166dda0ca82':
gcam: Add placeholder image.
|
| 0a64e00e88514ae07c3514e19126c166dda0ca82 |
28-Oct-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "gcam: Add placeholder image." into gb-ub-photos-carlsbad
|
| 7cfcafdf8f4a439c8fa87b612616fe409979e8a4 |
18-Oct-2013 |
Ruben Brunk <rubenbrunk@google.com> |
gcam: Add placeholder image.
Bug: 11050749
Change-Id: I374c5919d6da0609fccd21c09775fa91894d5a24
ndroid/camera/CameraActivity.java
ndroid/camera/Storage.java
ndroid/camera/WideAnglePanoramaModule.java
ndroid/camera/app/AppManagerFactory.java
ndroid/camera/app/PlaceholderManager.java
ndroid/camera/data/InProgressDataWrapper.java
|
| 9aa1a325710e9305427d1dac5f43634795139679 |
28-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 5250fb28: Merge "Fix memory leak due to inner class for handler." into gb-ub-photos-carlsbad
* commit '5250fb28143d45c41673a572b4c5b350e6563eb0':
Fix memory leak due to inner class for handler.
|
| 66cc74bcb739c8a185f215083dcc3229af102f70 |
28-Oct-2013 |
Doris Liu <tianliu@google.com> |
am d053a5b2: Update aspect ratio when preview aspect ratio changes
* commit 'd053a5b2aa8cd9cb09bd40962b305ef34e7d404b':
Update aspect ratio when preview aspect ratio changes
|
| 5250fb28143d45c41673a572b4c5b350e6563eb0 |
28-Oct-2013 |
ztenghui <ztenghui@google.com> |
Merge "Fix memory leak due to inner class for handler." into gb-ub-photos-carlsbad
|
| e1aa59ba7b3a9fb578995ee8ffcd232c11a97842 |
25-Oct-2013 |
ztenghui <ztenghui@google.com> |
Fix memory leak due to inner class for handler.
To keep the existing interface, we just overwrite the handler here.
bug:11336965
Change-Id: I77b2f577279244439ee9f81344f47bf5773e527b
ndroid/camera/AndroidCameraManagerImpl.java
|
| d053a5b2aa8cd9cb09bd40962b305ef34e7d404b |
26-Oct-2013 |
Doris Liu <tianliu@google.com> |
Update aspect ratio when preview aspect ratio changes
Bug: 11250125
Change-Id: If4047860f056cd81bf7d74045a68f5c0b85ad067
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
|
| a17f7241a531c41ebb46d8730f5e27ed67ad08e8 |
26-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 5737b932: Fix skipped hide review layout calls
* commit '5737b93254f451859c7924792c46354d385da946':
Fix skipped hide review layout calls
|
| 5737b93254f451859c7924792c46354d385da946 |
25-Oct-2013 |
Doris Liu <tianliu@google.com> |
Fix skipped hide review layout calls
Bug: 11338381
Change-Id: I39c9541638f3e8c2a2f96ae4b1be7692a6db0e1c
ndroid/camera/WideAnglePanoramaModule.java
|
| 0ef3ad27bfe89635dcdab19acdd47cc60ff10f41 |
21-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 65e2389b: Merge "Update preview controls on deleting all items." into gb-ub-photos-carlsbad
* commit '65e2389b3de5992c49732d95902e6e742e44821b':
Update preview controls on deleting all items.
|
| 65e2389b3de5992c49732d95902e6e742e44821b |
21-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Update preview controls on deleting all items." into gb-ub-photos-carlsbad
|
| fd7f0a9ffd8e7db21e556b1a60a7602ef5d0fe29 |
21-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
Update preview controls on deleting all items.
Bug: 11219537
Change-Id: I897b65bd7c594b904aa29462e056a10d0e9c52a2
ndroid/camera/CameraActivity.java
|
| 80822ebdae89d0bc93f1d74d3c308e81b610d4e4 |
21-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 68c1c1e0: The initial focus value should be true.
* commit '68c1c1e02143e3d2c2dbc658645a3a981f58cdd5':
The initial focus value should be true.
|
| 0467e95d452e7e2e4423fff61fc50194b1b6541d |
21-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 56e44af2: Don\'t call onCurrentDataChanged for CameraPreview when reloading.
* commit '56e44af257d65d730f04d1e90c87f5674abd7f26':
Don't call onCurrentDataChanged for CameraPreview when reloading.
|
| 68c1c1e02143e3d2c2dbc658645a3a981f58cdd5 |
21-Oct-2013 |
ztenghui <ztenghui@google.com> |
The initial focus value should be true.
Every time when we enter the wide angel (SRI) module, the preview should be
in focus.
bug:11234723
Change-Id: I218573946609f1e0e4415621a71b96a20775237d
ndroid/camera/WideAnglePanoramaModule.java
|
| 56e44af257d65d730f04d1e90c87f5674abd7f26 |
16-Oct-2013 |
ztenghui <ztenghui@google.com> |
Don't call onCurrentDataChanged for CameraPreview when reloading.
In this case, camera preview didn't change, so there is no need to call
onCurrentDataChanged.
bug:11237255
Change-Id: I788a2ee4e7337721d0bbd6aa75e7da6d382bf282
ndroid/camera/ui/FilmStripView.java
|
| 364433992649dcbba1fcbdbdd4933d90cc19af65 |
19-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 891a8075: Merge "Fix SRI orientation on manta" into gb-ub-photos-carlsbad
* commit '891a80756166a8621f063c727000c9a943cf5465':
Fix SRI orientation on manta
|
| 891a80756166a8621f063c727000c9a943cf5465 |
19-Oct-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix SRI orientation on manta" into gb-ub-photos-carlsbad
|
| 209a165bd776c938cad388fcf0b1ed27eef4ed83 |
19-Oct-2013 |
Doris Liu <tianliu@google.com> |
Fix SRI orientation on manta
Bug: 11292213
Change-Id: I7977de4c5bb906eec5431e706e28118837a682e7
ndroid/camera/WideAnglePanoramaController.java
ndroid/camera/WideAnglePanoramaModule.java
ndroid/camera/WideAnglePanoramaUI.java
|
| ec81fe0a249baa47e6824dacf019456e28d7e2ba |
19-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 464f2201: Don\'t crash when preview surface could not be set.
* commit '464f22013750a416f9fc9a1e32007576d0b655d6':
Don't crash when preview surface could not be set.
|
| 4f156d2da4d29168f7b8cfd275b1e02dab81c0c4 |
19-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 8470cae9: Merge "Show a preview cover until real preview is ready" into gb-ub-photos-carlsbad
* commit '8470cae9049959ee6bb28cde1c53185f2ffd10a1':
Show a preview cover until real preview is ready
|
| 69c8b5130570cccd065572ad8cfb1390815a8b7a |
19-Oct-2013 |
ztenghui <ztenghui@google.com> |
am f149ec53: Merge "Don\'t allow swipe into the film strip view when swipe is disabled" into gb-ub-photos-carlsbad
* commit 'f149ec53a0fa3330617ce01751964662d3273c88':
Don't allow swipe into the film strip view when swipe is disabled
|
| 239447c5e0d71d035b553a4557b9aa161342bc73 |
19-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 9db92826: Merge "Send an message to decouple the gcam module change." into gb-ub-photos-carlsbad
* commit '9db9282667d9e272702cd2ee32d7415204084530':
Send an message to decouple the gcam module change.
|
| 8bf7b071ba720f9586ffc2339a4953eac3221bfc |
19-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 7bd95307: Merge "Fix shutter covering pie menu" into gb-ub-photos-carlsbad
* commit '7bd95307ecdca5c7661bc3fb1765313ceb62e92a':
Fix shutter covering pie menu
|
| a68ef3613d65295559fcc89f7980135b09419358 |
19-Oct-2013 |
Igor Murashkin <iam@google.com> |
am 5e82f81a: Merge "gcam: Fix AF spinner not to reset when changing position" into gb-ub-photos-carlsbad
* commit '5e82f81a7c7daaf8ac86dbd688b344027f97ff64':
gcam: Fix AF spinner not to reset when changing position
|
| 027cc0ef35cb0a54dcc9d2b18f9235585dd9ac1b |
19-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 08749a4e: Merge "Dismiss switcher popup when shutter button is clicked" into gb-ub-photos-carlsbad
* commit '08749a4ed22c5001aa476a9a30df323b00a6df7d':
Dismiss switcher popup when shutter button is clicked
|
| b16b64668c9f3a98827233183d823c6af4f536ef |
18-Oct-2013 |
Igor Murashkin <iam@google.com> |
resolved conflicts for merge of d3e75bd7 to gb-ub-photos-denali
Change-Id: I18356130f8fafa269495cc8abebfb5599400e7fe
ndroid/camera/util/CameraUtil.java
|
| 5e28cb9249d7fe71e5a07988dcbc892ac6f24f84 |
18-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 177c4b05: Merge "Do not show any bottom controls in secure camera to prevent launching out of app behavior." into gb-ub-photos-carlsbad
* commit '177c4b05ed8e9f71afc526e5cad339f245563450':
Do not show any bottom controls in secure camera to prevent launching out of app behavior.
|
| 464f22013750a416f9fc9a1e32007576d0b655d6 |
18-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
Don't crash when preview surface could not be set.
Bug: 11021188
Change-Id: Idfc1cf5c50ac1f3f46956079c3231cbdda32e1a4
ndroid/camera/AndroidCameraManagerImpl.java
|
| 8470cae9049959ee6bb28cde1c53185f2ffd10a1 |
17-Oct-2013 |
Doris Liu <tianliu@google.com> |
Merge "Show a preview cover until real preview is ready" into gb-ub-photos-carlsbad
|
| f149ec53a0fa3330617ce01751964662d3273c88 |
17-Oct-2013 |
ztenghui <ztenghui@google.com> |
Merge "Don't allow swipe into the film strip view when swipe is disabled" into gb-ub-photos-carlsbad
|
| 9db9282667d9e272702cd2ee32d7415204084530 |
17-Oct-2013 |
ztenghui <ztenghui@google.com> |
Merge "Send an message to decouple the gcam module change." into gb-ub-photos-carlsbad
|
| 367c7c82a22ec007771059beec4aeff3ef96310e |
16-Oct-2013 |
ztenghui <ztenghui@google.com> |
Send an message to decouple the gcam module change.
In this particular case, we try to enter GCam module directly which cause the
mCameraDevice to become null for photo module.
Therefore we post a message to switch into GCam to make sure current mode
switch complete first.
bug:11252237
Change-Id: Ibd33815e7bee74425faa758247e1dec85a2f17cb
ndroid/camera/PhotoModule.java
|
| 7bd95307ecdca5c7661bc3fb1765313ceb62e92a |
16-Oct-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix shutter covering pie menu" into gb-ub-photos-carlsbad
|
| 0ba8eaaa5d26f0a806e7bc987676bbc29ad1085c |
16-Oct-2013 |
Doris Liu <tianliu@google.com> |
Fix shutter covering pie menu
Bug: 11247988
Change-Id: I2018075a0b8adf7cacb302774ed64df92fc2fa7c
ndroid/camera/PhotoUI.java
ndroid/camera/ui/RotatableLayout.java
ndroid/camera/util/CameraUtil.java
|
| 3a45c33d74fe0ad0ade9be3d037560a53891c627 |
16-Oct-2013 |
Doris Liu <tianliu@google.com> |
Show a preview cover until real preview is ready
Bug: 11211650
Change-Id: Ic4b26ef0f03eac0682e7be0d4bcb1c4632d85f39
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
ndroid/camera/VideoModule.java
ndroid/camera/VideoUI.java
ndroid/camera/WideAnglePanoramaModule.java
ndroid/camera/WideAnglePanoramaUI.java
|
| 5e82f81a7c7daaf8ac86dbd688b344027f97ff64 |
15-Oct-2013 |
Igor Murashkin <iam@google.com> |
Merge "gcam: Fix AF spinner not to reset when changing position" into gb-ub-photos-carlsbad
|
| 7be0e2b8439d525c70cb062c6616d10c4fc004aa |
15-Oct-2013 |
ztenghui <ztenghui@google.com> |
Don't allow swipe into the film strip view when swipe is disabled
The swipe is supposed to be intercepted by FilmStripView, however, when the
children is not handling the scroll / fling gestures, FilmStripView will still
has to handle it.
In this case, we need to detect whether or not the swipe has been disabled.
bug:11234333
bug:11221594
Change-Id: I1d0fbac65050aef225fb880a41df735e98bf48db
ndroid/camera/ui/FilmStripView.java
|
| d9b229be6fa942920317fc5e031e803e408adc1d |
15-Oct-2013 |
Igor Murashkin <iam@google.com> |
gcam: Fix AF spinner not to reset when changing position
Bug: 10936156
Change-Id: If9b73415e95684e2acbcbc15457e865bd133f366
ndroid/camera/ui/PieRenderer.java
|
| 08749a4ed22c5001aa476a9a30df323b00a6df7d |
15-Oct-2013 |
Doris Liu <tianliu@google.com> |
Merge "Dismiss switcher popup when shutter button is clicked" into gb-ub-photos-carlsbad
|
| d3e75bd748ce2be8fdcb30575bbde9bd07536bd3 |
15-Oct-2013 |
Igor Murashkin <iam@google.com> |
Merge "CameraUtil: add float clamp function" into gb-ub-photos-carlsbad
|
| b7e90f88c7aa1fb5ce35b17ef98a255c06e8d613 |
15-Oct-2013 |
Doris Liu <tianliu@google.com> |
Dismiss switcher popup when shutter button is clicked
Bug: 11224722
Change-Id: Id9813c83e22e951f06cb7a885fdb34820f62b545
ndroid/camera/PhotoUI.java
|
| 177c4b05ed8e9f71afc526e5cad339f245563450 |
15-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Do not show any bottom controls in secure camera to prevent launching out of app behavior." into gb-ub-photos-carlsbad
|
| 3cb2004b2897129c67181316b7c9f62607858618 |
15-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
Do not show any bottom controls in secure camera to prevent launching out of app behavior.
Bug: 11235651
Change-Id: Iafc0b7930c8c016bd6ab11b13d6572241c5ef074
ndroid/camera/ui/FilmStripView.java
|
| f26bb76965259f8f2fea1c889643d3868efef686 |
15-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 487200db: Merge "Prevent crash after deleting album from Gallery by checking for more null pointers." into gb-ub-photos-carlsbad
* commit '487200db7f4d73e85ae568221d268b46fad19726':
Prevent crash after deleting album from Gallery by checking for more null pointers.
|
| 487200db7f4d73e85ae568221d268b46fad19726 |
15-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Prevent crash after deleting album from Gallery by checking for more null pointers." into gb-ub-photos-carlsbad
|
| bd1ab9e4f0432c132706f4533729cec9d032f544 |
15-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 0e6efbcc: Merge "NPE fix when we failed to open the camera" into gb-ub-photos-carlsbad
* commit '0e6efbccdb196ef0847e00b23165ed94a77c9f3d':
NPE fix when we failed to open the camera
|
| 0e6efbccdb196ef0847e00b23165ed94a77c9f3d |
15-Oct-2013 |
ztenghui <ztenghui@google.com> |
Merge "NPE fix when we failed to open the camera" into gb-ub-photos-carlsbad
|
| f9ef1ae9d31977c106eefc7ab1a74158bcdcfd39 |
15-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
Prevent crash after deleting album from Gallery by checking for more null pointers.
Bug: 10950130
Change-Id: I284e2016676e15c7f2ad23de71a965ab50c5d743
ndroid/camera/ui/FilmStripView.java
|
| 366a04d7ce3d8d6d54b257784755d77071cb4061 |
15-Oct-2013 |
Mangesh Ghiware <mghiware@google.com> |
am 2d939fe7: Use Gallery intents by default.
* commit '2d939fe70e52ba4805c6783b01530c8c1c67fb33':
Use Gallery intents by default.
|
| 2d939fe70e52ba4805c6783b01530c8c1c67fb33 |
15-Oct-2013 |
Mangesh Ghiware <mghiware@google.com> |
Use Gallery intents by default.
Bug: 11226016
Change-Id: I4f6a5856dd8141930fb0fef19b9ded0b37ea1ce5
ndroid/camera/util/CameraUtil.java
|
| 65f365b1df3122f4c36ac755e419b9439fec608c |
15-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 831da613: Merge "Set camera controls visibility based on whether the camera preview is centered." into gb-ub-photos-carlsbad
* commit '831da6132122d9d9a35183ef832994be659c3740':
Set camera controls visibility based on whether the camera preview is centered.
|
| 831da6132122d9d9a35183ef832994be659c3740 |
15-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Set camera controls visibility based on whether the camera preview is centered." into gb-ub-photos-carlsbad
|
| ef01a315078587883d3c800d31df6af302b702a9 |
15-Oct-2013 |
ztenghui <ztenghui@google.com> |
NPE fix when we failed to open the camera
At the same time, some error check code never get turned on.
Remove those stale codes and make sure we check the CameraDevice for null
correctly.
We didn't intensively log the error here since they should be logged by
the CameraOpenErrorCallback already.
bug:11215576
Change-Id: Ib1e1b9011a169607b719c833d6d5eddbd9be8a9d
ndroid/camera/VideoModule.java
|
| 160b036386b1b60ff3fce9742ce66bfcd54d6430 |
14-Oct-2013 |
Igor Murashkin <iam@google.com> |
CameraUtil: add float clamp function
Bug: 10936156
Change-Id: I5fbaf399ed8ca0206d23aa7d0af11c9b8a1debe5
ndroid/camera/util/CameraUtil.java
|
| f0637d7c10d6f9502f4508eec732adb1aa6ee30c |
14-Oct-2013 |
Doris Liu <tianliu@google.com> |
am ce75de57: Merge "Fix SRI upside down preview in reverse landscape and reverse portrait" into gb-ub-photos-carlsbad
* commit 'ce75de57dca5398b7786ad7262cb016e5f6b24ee':
Fix SRI upside down preview in reverse landscape and reverse portrait
|
| ce75de57dca5398b7786ad7262cb016e5f6b24ee |
14-Oct-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix SRI upside down preview in reverse landscape and reverse portrait" into gb-ub-photos-carlsbad
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/CameraModule.java
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
ndroid/camera/VideoModule.java
ndroid/camera/VideoUI.java
ndroid/camera/WideAnglePanoramaModule.java
ndroid/camera/WideAnglePanoramaUI.java
ndroid/camera/ui/FilmStripView.java
|
| 8ec57b6453fc38eafd2f5e7f986087facb92bdd7 |
14-Oct-2013 |
ztenghui <ztenghui@google.com> |
am b27668f0: Merge "Only delete the Uri coming from onMediaSaved" into gb-ub-photos-carlsbad
* commit 'b27668f0d0a1d5049759a8448e1701e199e05c71':
Only delete the Uri coming from onMediaSaved
|
| b27668f0d0a1d5049759a8448e1701e199e05c71 |
14-Oct-2013 |
ztenghui <ztenghui@google.com> |
Merge "Only delete the Uri coming from onMediaSaved" into gb-ub-photos-carlsbad
|
| 70bd024ea2019da185de5c999fd50beb0e30215e |
14-Oct-2013 |
ztenghui <ztenghui@google.com> |
Only delete the Uri coming from onMediaSaved
The incoming Uri can be null, or a file Uri, which we don't want to delete.
The Uri from onMediaSaved has been inserted to the MediaStore and pass null
check.
bug:11218007
Change-Id: Ie4b08cae94e22a8014ea2436f0a82eba2541a667
ndroid/camera/VideoModule.java
|
| 352b014552d77948193d84ec177c7673552eb1ee |
14-Oct-2013 |
Doris Liu <tianliu@google.com> |
Fix SRI upside down preview in reverse landscape and reverse portrait
Also make sure preview is not upside down after device flip, and
fix camera controls jiggering during rotation
Bug: 11216647
Bug: 11174540
Change-Id: I764e5b86549fa87c2224d8e85ff06f57f0a315d1
ndroid/camera/WideAnglePanoramaModule.java
ndroid/camera/WideAnglePanoramaUI.java
|
| b0b60370c3b36f3e8b3bd1aa515837a64cf0a7f6 |
14-Oct-2013 |
Angus Kong <shkong@google.com> |
am ae169730: Merge "Ignore clicks on disabled pie menu items." into gb-ub-photos-carlsbad
* commit 'ae1697302b4ef59bbfebdf1127bc73531ce550b7':
Ignore clicks on disabled pie menu items.
|
| ae1697302b4ef59bbfebdf1127bc73531ce550b7 |
14-Oct-2013 |
Angus Kong <shkong@google.com> |
Merge "Ignore clicks on disabled pie menu items." into gb-ub-photos-carlsbad
|
| c0f42717d9c54f9a7ee6fb88f58aeff61615b695 |
14-Oct-2013 |
Angus Kong <shkong@google.com> |
am 24d94d61: Merge "Workaround to prevent the data focus callback." into gb-ub-photos-carlsbad
* commit '24d94d6140ee5ecdf66b28218e8dd9dfe5edfb19':
Workaround to prevent the data focus callback.
|
| 24d94d6140ee5ecdf66b28218e8dd9dfe5edfb19 |
14-Oct-2013 |
Angus Kong <shkong@google.com> |
Merge "Workaround to prevent the data focus callback." into gb-ub-photos-carlsbad
|
| d90d0ffc3e69316b105b6f9d03dc98cd5b40ecbf |
14-Oct-2013 |
Angus Kong <shkong@google.com> |
Ignore clicks on disabled pie menu items.
bug:11205671
Change-Id: I8b7c8c6b95f2cedadc064747470acd742280eb7f
ndroid/camera/PieController.java
|
| 02cafdfb92a2d53b76c2bb180ee5289a80f4f4ac |
14-Oct-2013 |
Angus Kong <shkong@google.com> |
Workaround to prevent the data focus callback.
bug:11205669
Change-Id: I5b2d33422ec5f6fe21c81e39d24f36ec8b61ce4e
ndroid/camera/CameraActivity.java
ndroid/camera/ui/FilmStripView.java
ndroid/camera/ui/PieMenuButton.java
|
| b3f45ec3ed96e4f037a1a6c835a68a98b2823a25 |
14-Oct-2013 |
Doris Liu <tianliu@google.com> |
am c937ab7f: Merge "Fix for mis-placed camera controls" into gb-ub-photos-carlsbad
* commit 'c937ab7f9bac633aa425da62348f9eb07c248450':
Fix for mis-placed camera controls
|
| c937ab7f9bac633aa425da62348f9eb07c248450 |
14-Oct-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix for mis-placed camera controls" into gb-ub-photos-carlsbad
|
| 3068c52499b43b679d2af8018d7f1ab0b1a7e863 |
13-Oct-2013 |
Doris Liu <tianliu@google.com> |
Fix for mis-placed camera controls
Bug: 11205682
Change-Id: Ie74e906a059158db825977af898445b2b2ba5a48
ndroid/camera/ui/RotatableLayout.java
|
| 469e2e77ac417f2184d99c966f0e691a34e2ed55 |
13-Oct-2013 |
Angus Kong <shkong@google.com> |
am 2d5c7478: Don\'t load data when it\'s secure camera.
* commit '2d5c74785d19f1944cab92948a6fa8233086ebc1':
Don't load data when it's secure camera.
|
| 2d5c74785d19f1944cab92948a6fa8233086ebc1 |
13-Oct-2013 |
Angus Kong <shkong@google.com> |
Don't load data when it's secure camera.
bug:11063164
Change-Id: I7e44a13f4d841d16807bd36133b588a0a8c40e49
ndroid/camera/CameraActivity.java
|
| 7525160b9cfcdfbe09c1ae9ea8b769bd60a3fb7d |
13-Oct-2013 |
Angus Kong <shkong@google.com> |
am f1582c9c: Adjust the position after layout change.
* commit 'f1582c9c075e9cd5790b4bbe1101c94a45ac15d2':
Adjust the position after layout change.
|
| f1582c9c075e9cd5790b4bbe1101c94a45ac15d2 |
13-Oct-2013 |
Angus Kong <shkong@google.com> |
Adjust the position after layout change.
bug:10993660
Change-Id: Ia07b8238a09e761a02fe11577b738776ab965b30
ndroid/camera/ui/FilmStripView.java
|
| d6b6031c379cd41580013b28d40761e5e5aa3823 |
12-Oct-2013 |
Doris Liu <tianliu@google.com> |
am a5002410: Merge "Correct initial orientation of camera controls" into gb-ub-photos-carlsbad
* commit 'a500241084f9e267e5f154b55e7a76a09623e6d8':
Correct initial orientation of camera controls
|
| a500241084f9e267e5f154b55e7a76a09623e6d8 |
12-Oct-2013 |
Doris Liu <tianliu@google.com> |
Merge "Correct initial orientation of camera controls" into gb-ub-photos-carlsbad
|
| 86ad8435b60a91fc97abf9d188b1e1af457e4885 |
12-Oct-2013 |
Doris Liu <tianliu@google.com> |
Correct initial orientation of camera controls
Bug: 8878379
Change-Id: I3ecf190b19e91ae963e67ae2930b7388c4f92c70
ndroid/camera/ui/RotatableLayout.java
|
| 854a6be70f34ca314e839580cc09ff1efa353a3b |
12-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 27562534: Merge "Finish the secure camera activity when user try to play a video." into gb-ub-photos-carlsbad
* commit '275625342769eba3e2b461e249aec83165e4e7f1':
Finish the secure camera activity when user try to play a video.
|
| 275625342769eba3e2b461e249aec83165e4e7f1 |
12-Oct-2013 |
ztenghui <ztenghui@google.com> |
Merge "Finish the secure camera activity when user try to play a video." into gb-ub-photos-carlsbad
|
| 98b2a282a212b74d756c169a445e8d3f6089fb66 |
12-Oct-2013 |
ztenghui <ztenghui@google.com> |
Finish the secure camera activity when user try to play a video.
bug:11190995
Change-Id: I8aa1a538496c291d34ca25d489a7eb03f0c90b53
ndroid/camera/util/CameraUtil.java
|
| 6d01890aebe277cba6e9bf095c153ea27092cf60 |
12-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 87d093d6: Merge "Bring full screen window flag back to camera" into gb-ub-photos-carlsbad
* commit '87d093d6145524b1c8f5c052dfe40c18b52e5235':
Bring full screen window flag back to camera
|
| 87d093d6145524b1c8f5c052dfe40c18b52e5235 |
12-Oct-2013 |
Doris Liu <tianliu@google.com> |
Merge "Bring full screen window flag back to camera" into gb-ub-photos-carlsbad
|
| 97cb1ea3dbcf03b4e1fc6b149bf475ef3f3920fc |
12-Oct-2013 |
Doris Liu <tianliu@google.com> |
Bring full screen window flag back to camera
Bug: 11027091
Change-Id: Iee41d7dd040a9b7816a4b5e99d89201dc068f362
ndroid/camera/CameraActivity.java
|
| b1e3a5c1cf75766cd5cfbd1be5cac9cf74aff947 |
12-Oct-2013 |
Seth Raphael <magicseth@google.com> |
am 3772d2f4: restore Usage Statistics
* commit '3772d2f48ee5af8516f203f0f0519a2075042d6b':
restore Usage Statistics
|
| 3772d2f48ee5af8516f203f0f0519a2075042d6b |
11-Oct-2013 |
Seth Raphael <magicseth@google.com> |
restore Usage Statistics
initialize was not being called anywhere.
Bug: 11188914
Change-Id: I9b3ae094b2d22605c368c1ac38de80090a336894
ndroid/camera/app/CameraApp.java
|
| b15ce577b47d4c09391a1e788d143e9d4940c39a |
11-Oct-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am f0622191: Merge "gcam: Allow debugging postcapture image to be added to mediastore." into gb-ub-photos-carlsbad
* commit 'f06221914bf40b6345cacd1a5904d773c6eddcb0':
gcam: Allow debugging postcapture image to be added to mediastore.
|
| f06221914bf40b6345cacd1a5904d773c6eddcb0 |
11-Oct-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "gcam: Allow debugging postcapture image to be added to mediastore." into gb-ub-photos-carlsbad
|
| 1adbeaebb8ac70cd806c804c1cff937dcf073b13 |
11-Oct-2013 |
Angus Kong <shkong@google.com> |
am 81ef40bc: Merge "Avoid unnecessary bringChildToFront() calls." into gb-ub-photos-carlsbad
* commit '81ef40bc4923e7014f52f03d8c7ddcf7a4344f70':
Avoid unnecessary bringChildToFront() calls.
|
| 81ef40bc4923e7014f52f03d8c7ddcf7a4344f70 |
11-Oct-2013 |
Angus Kong <shkong@google.com> |
Merge "Avoid unnecessary bringChildToFront() calls." into gb-ub-photos-carlsbad
|
| 53aedc0ee671c2d11341a66c444bbb6cdc97b150 |
11-Oct-2013 |
Angus Kong <shkong@google.com> |
Avoid unnecessary bringChildToFront() calls.
bug:10750719
Change-Id: I831d9ecead91d64c7a0b6a665e9c842ef17d8a8a
ndroid/camera/ui/FilmStripView.java
|
| d748827206f4fd065b7f083f521c7bb9a78f85a3 |
11-Oct-2013 |
Ruben Brunk <rubenbrunk@google.com> |
gcam: Allow debugging postcapture image to be added to mediastore.
Bug: 11010544
Change-Id: Iaa5a2d8bcc3ece583376517e006018b0c8b75587
ndroid/camera/PhotoModule.java
|
| 4a1cc7bddbddc1f9e0e996d0e614f36789f4ea36 |
11-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 64cea6aa: Don\'t show a details dialog if there are no details.
* commit '64cea6aadb912067e31f1a158044c5efeb3e64af':
Don't show a details dialog if there are no details.
|
| 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
ndroid/camera/CameraActivity.java
|
| 0cb322c5781564721fa37d53c52ecf94ec66d11a |
11-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 2a959b83: Merge "Don\'t initialize photo module if it\'s paused." into gb-ub-photos-carlsbad
* commit '2a959b838d9a20830d15f916a8a698f18582da5c':
Don't initialize photo module if it's paused.
|
| 2a959b838d9a20830d15f916a8a698f18582da5c |
11-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Don't initialize photo module if it's paused." into gb-ub-photos-carlsbad
|
| 330dafba33f0d75929591095028779f068459431 |
11-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
Don't initialize photo module if it's paused.
Bug: 11028614
The main visible issue with this is that we register additional
location listeners, thus draining battery as we don't unregister
them ever.
Change-Id: Ibd39171681867a12bc00abe9705f4281b9945ec1
ndroid/camera/PhotoModule.java
|
| bd0d34b049e6f068a9fea069ac4051ec67aadc00 |
11-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 36c21ca1: Merge "Check both the requestId of current item and total items in filmstrip for bottom controls." into gb-ub-photos-carlsbad
* commit '36c21ca1365c0c3832742bc0cf75d3409723254b':
Check both the requestId of current item and total items in filmstrip for bottom controls.
|
| 36c21ca1365c0c3832742bc0cf75d3409723254b |
11-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Check both the requestId of current item and total items in filmstrip for bottom controls." into gb-ub-photos-carlsbad
|
| 01382295e900da9c765227bab5df6ffe75daa927 |
11-Oct-2013 |
Doris Liu <tianliu@google.com> |
am d70f0fb6: Add fling support in zoom view
* commit 'd70f0fb68064e170fb2cf041a707ed04d68040f9':
Add fling support in zoom view
|
| d70f0fb68064e170fb2cf041a707ed04d68040f9 |
04-Oct-2013 |
Doris Liu <tianliu@google.com> |
Add fling support in zoom view
Bug: 10679704
Change-Id: I7ab72fdf4e836495b2471c65fd57f952e863f1dd
ndroid/camera/ui/FilmStripView.java
|
| 5b7316c1dec6d858eef0bcb7a45b719e7719d231 |
11-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 8c807823: Merge "Remove display change listener for mode switch" into gb-ub-photos-carlsbad
* commit '8c80782326d1cdc764b9a9a791b2c5525e8ef234':
Remove display change listener for mode switch
|
| 8c80782326d1cdc764b9a9a791b2c5525e8ef234 |
11-Oct-2013 |
Doris Liu <tianliu@google.com> |
Merge "Remove display change listener for mode switch" into gb-ub-photos-carlsbad
|
| 59390061e26d3d481c6e0c9b22fb3ee8ec8387b0 |
11-Oct-2013 |
Doris Liu <tianliu@google.com> |
Remove display change listener for mode switch
Bug: 10928549
Change-Id: I333e1a47e7f5c5cadca9b0b6cfd368f455fc3670
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
ndroid/camera/VideoModule.java
ndroid/camera/VideoUI.java
ndroid/camera/ui/CameraRootView.java
|
| 90cbaa9ba3d1f3be217d885cc29902754dd51d8f |
11-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am ada31cbe: Merge "Hide the status bar and switch into lights-out mode when popup is dimissed." into gb-ub-photos-carlsbad
* commit 'ada31cbe4010e192825b7eb9b7093d4d75cf3558':
Hide the status bar and switch into lights-out mode when popup is dimissed.
|
| ada31cbe4010e192825b7eb9b7093d4d75cf3558 |
11-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Hide the status bar and switch into lights-out mode when popup is dimissed." into gb-ub-photos-carlsbad
|
| 62c72ca1b5d0a608d549615928d66e9d1911062f |
10-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
Check both the requestId of current item and total items in filmstrip for bottom controls.
Bug: 11169201
Change-Id: I9d42b168efe62712f76165db5221757a1f20013f
ndroid/camera/ui/FilmStripView.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
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoUI.java
ndroid/camera/VideoUI.java
|
| 79953260e073967da981a0ace2674ff550e8bb57 |
10-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 23df6752: Merge "Workaround for re-applying transform on new surface texuture" into gb-ub-photos-carlsbad
* commit '23df6752f1bf0cc7d13b3aa68e87a8dde36af2d4':
Workaround for re-applying transform on new surface texuture
|
| 23df6752f1bf0cc7d13b3aa68e87a8dde36af2d4 |
10-Oct-2013 |
Doris Liu <tianliu@google.com> |
Merge "Workaround for re-applying transform on new surface texuture" into gb-ub-photos-carlsbad
|
| 18f20b9f460a8e329dd5af1e035d23931e7e1910 |
10-Oct-2013 |
Doris Liu <tianliu@google.com> |
Workaround for re-applying transform on new surface texuture
Bug: 10981460
Change-Id: Ic7fca757f3c1171317c76cd90fad43ff5c5ae5d2
ndroid/camera/PhotoUI.java
|
| 6a351e5b7324069d2c15459323876ac446b92f4c |
10-Oct-2013 |
ztenghui <ztenghui@google.com> |
am d46d6f8e: Merge "Fix flash issue" into gb-ub-photos-carlsbad
* commit 'd46d6f8e729b0e40878b53763387604a9193385a':
Fix flash issue
|
| d46d6f8e729b0e40878b53763387604a9193385a |
10-Oct-2013 |
ztenghui <ztenghui@google.com> |
Merge "Fix flash issue" into gb-ub-photos-carlsbad
|
| 167f49287ef67ecacd94942cf1b596a384fd1d80 |
10-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 048bf4d0: Initialize GCam with GServices values.
* commit '048bf4d0b46c4c34d8caa801c8ddc8c1ff4e79cf':
Initialize GCam with GServices values.
|
| 048bf4d0b46c4c34d8caa801c8ddc8c1ff4e79cf |
07-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
Initialize GCam with GServices values.
Bug: 11103065
Change-Id: Ic8d3c9825abdc5d79c5e4c7b0e96770ab0941036
ndroid/camera/CameraActivity.java
ndroid/camera/CameraSettings.java
ndroid/camera/ui/ModuleSwitcher.java
|
| e914700b35ca7edfbb447710b1db6ea1e33d14e2 |
10-Oct-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am c14bfe6a: Merge "gcam: Add postcapture for gcam debugging." into gb-ub-photos-carlsbad
* commit 'c14bfe6a287d31c8ee5c7a698a60acfdc7e7e393':
gcam: Add postcapture for gcam debugging.
|
| c14bfe6a287d31c8ee5c7a698a60acfdc7e7e393 |
10-Oct-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "gcam: Add postcapture for gcam debugging." into gb-ub-photos-carlsbad
|
| 54e21cc19f5faf2098218db778f3a8d70960e037 |
10-Oct-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am b5eb1ffa: Merge "gcam: Fix preview FOV." into gb-ub-photos-carlsbad
* commit 'b5eb1ffab6db3f311def4f9b28a189a991396537':
gcam: Fix preview FOV.
|
| b5eb1ffab6db3f311def4f9b28a189a991396537 |
10-Oct-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "gcam: Fix preview FOV." into gb-ub-photos-carlsbad
|
| 285a5be7ce327eb4c169e60ecc4a9cd8d583e65d |
10-Oct-2013 |
ztenghui <ztenghui@google.com> |
Fix flash issue
The flash light should show up at the same time as the control show up.
Also, when we change the flash mode, we should update the flash on screen
indicator.
bug:11064667
Change-Id: I888d3ce76ac618a4c7b40a288ecce13555c89ab0
ndroid/camera/VideoModule.java
ndroid/camera/VideoUI.java
|
| 714d4d0f6cf3b04b70efd7f9bfc0a29ae03b7964 |
10-Oct-2013 |
Ruben Brunk <rubenbrunk@google.com> |
gcam: Fix preview FOV.
Bug: 11150965
Change-Id: Iacdcc7ad37193f5343d2c5d5de3fabecee1f05df
ndroid/camera/util/CameraUtil.java
|
| 9234c57d8f0157f49c59d901e1ccd32af00477bd |
10-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 71686048: Merge "Update bottom edit control for photos inside secure and insecure mode." into gb-ub-photos-carlsbad
* commit '716860487554b5e214d355f88effc9b8c316d54e':
Update bottom edit control for photos inside secure and insecure mode.
|
| 716860487554b5e214d355f88effc9b8c316d54e |
10-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Update bottom edit control for photos inside secure and insecure mode." into gb-ub-photos-carlsbad
|
| 39ca527f2647d7af6ae9f326bec1fa627c675989 |
09-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
Update bottom edit control for photos inside secure and insecure mode.
Bug: 11067201
Change-Id: I21a775d46c26206e340c830fceafaf52e7a06ac5
ndroid/camera/ui/FilmStripView.java
|
| f64e2d801b6a464affe4647772a8f8abff975e12 |
09-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 70d24b5b: Merge "Fix another potential issue related to video capture intent." into gb-ub-photos-carlsbad
* commit '70d24b5b602ae56784d7f7bd6d79af7d37095553':
Fix another potential issue related to video capture intent.
|
| 70d24b5b602ae56784d7f7bd6d79af7d37095553 |
09-Oct-2013 |
ztenghui <ztenghui@google.com> |
Merge "Fix another potential issue related to video capture intent." into gb-ub-photos-carlsbad
|
| 7a205c62c51257812839ac1eb510d3f408432fbe |
09-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 26862c30: Update bottom controls and action bar with a tighter bounds on data change.
* commit '26862c304a8163016b1f8196c715769750ba1720':
Update bottom controls and action bar with a tighter bounds on data change.
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/ui/FilmStripView.java
|
| d217ed0fa931d2a080a159c24e4012697baf5ae3 |
09-Oct-2013 |
Ruben Brunk <rubenbrunk@google.com> |
gcam: Add postcapture for gcam debugging.
Bug: 11010544
Change-Id: I782bf3bd52f7b37cf47291501560ba771951760a
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoModule.java
|
| 638bf9ae74f28ce7b6c0b3e6cbe3d6e09b677138 |
09-Oct-2013 |
ztenghui <ztenghui@google.com> |
Fix another potential issue related to video capture intent.
We don't want to delete the Uri sent from the intent.
When we are in review mode, the mCurrentVideoUri should be from the capture
result.
bug:11136978
Change-Id: I148135326e3516936f7d6463941c6b50dbc389db
ndroid/camera/VideoModule.java
|
| 9bf4da841b4f97d57459595f3f4a7cf5a89beb29 |
09-Oct-2013 |
Sameer Padala <sxp@google.com> |
Merge "Initial commit of SmartCamera." into gb-ub-photos-denali
|
| 52beb04d45ff906dfaffb1799a6d93859f1d83bd |
09-Oct-2013 |
ztenghui <ztenghui@google.com> |
Merge "Fix NPE in video intent." into gb-ub-photos-carlsbad
|
| 6939d143cb52a012b1b9cd9a141156357367b212 |
09-Oct-2013 |
Angus Kong <shkong@google.com> |
Merge "Make the transition animation identical." into gb-ub-photos-carlsbad
|
| da568b23002859e9672271bb135808303c2e07cb |
09-Oct-2013 |
Angus Kong <shkong@google.com> |
Make the transition animation identical.
The animation of transition between camera preview and filmstrip should be a
special case to prevent jank.
bug:11011577
Change-Id: If611599203e845d098cd6e4acb56d5631d085ffe
ndroid/camera/ui/FilmStripView.java
|
| 6ddd31b9284bbbfcf891766f9d6238bfd5cde721 |
09-Oct-2013 |
Angus Kong <shkong@google.com> |
Enter fullscreen if all items are removed.
bug:11066937
Change-Id: Ibf9b03adc0d00838ba23c65361aa7c783c835d90
ndroid/camera/ui/FilmStripView.java
|
| b04dcdb5cea6ac42f8ba0d699dc45e965d104a5e |
09-Oct-2013 |
Angus Kong <shkong@google.com> |
Merge "Don't go into Gcam when it's capture intent." into gb-ub-photos-carlsbad
|
| 5b4ccd2e6334e2eb0a7ac2e6db6a386fd26f0479 |
10-Sep-2013 |
Sameer Padala <sxp@google.com> |
Initial commit of SmartCamera.
These are the stubs that are going into AOSP
* Added s/c/a/camera/util/SmartCameraHelper.java stub
* Added barcode hook to s/c/a/c/PhotoModule.java
Change-Id: Ic76304d129552be27c0a43e279d190c24313dcf9
ndroid/camera/PhotoModule.java
|
| dfe5b152788b970944078afc7e57f9d8684571c7 |
09-Oct-2013 |
ztenghui <ztenghui@google.com> |
Fix NPE in video intent.
bug:11136978
Change-Id: I6076581131e3dcdc456d8ac8865a5cc6f84e9da4
ndroid/camera/VideoModule.java
|
| 3179f6a49516833761be5155c4e1244ac0aa17fe |
09-Oct-2013 |
Doris Liu <tianliu@google.com> |
Allow scaling beyond 1:1 in zoom view
Bug: 10950226
Change-Id: I38828edaf4010170f6c6db18b8c5fdeef91b4f11
ndroid/camera/ui/FilmStripView.java
ndroid/camera/ui/ZoomView.java
|
| 607634cafd9a0b626de8390d855bdabe23a4738b |
09-Oct-2013 |
Doris Liu <tianliu@google.com> |
Merge "Do not allow navigation to filmstrip during video recording" into gb-ub-photos-carlsbad
|
| f5aa51e6e8da349c8f1a604b431af243cc0802c0 |
08-Oct-2013 |
Angus Kong <shkong@google.com> |
Add shutter click sound in SoundClips.
bug:11135055
Change-Id: Ib4396ada73021beff9845c49fee7c5eb8f4cc96d
ndroid/camera/SoundClips.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
ndroid/camera/CameraActivity.java
ndroid/camera/CameraSettings.java
ndroid/camera/PhotoModule.java
|
| fe6596c3474f0ffbf03a2b7a7d89ea9cc9d9d61d |
08-Oct-2013 |
Doris Liu <tianliu@google.com> |
Do not allow navigation to filmstrip during video recording
Bug: 11064867
Change-Id: I168136a193008578b3ad2642cba764650bcc2487
ndroid/camera/VideoModule.java
ndroid/camera/VideoUI.java
|
| c502bc9d50ded1f2eec28f4809c7193ec4ec5298 |
08-Oct-2013 |
Doris Liu <tianliu@google.com> |
Correct sample factor for rotated images in zoom view
Bug: 11067085
Change-Id: I52093052393fb1b2db08f105b8a16b68c3d3c95a
ndroid/camera/ui/ZoomView.java
|
| 06578b59bf15c1ac35dbbffd979f40479b1cbda9 |
07-Oct-2013 |
ztenghui <ztenghui@google.com> |
Keep the ImageData size info consistent with MediaStore and Exif
Basically, the width and hight in the ImageData will be pre-rotation.
bug:11067085
Change-Id: I377caf2f1d49d26b4d6823d4e72168a055d80858
ndroid/camera/data/LocalMediaData.java
ndroid/camera/data/RotationTask.java
ndroid/camera/ui/FilmStripView.java
|
| 4de788063b51cc2d3f65122bdcc7f862170ba761 |
07-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
Revert CL that added broadcast receivers for shutter control.
Bug: 11006189
This was added for Gem support but causes us trouble. As it's not
essential, we'll remove it now.
Original CL was http://ag/342589
Change-Id: I9e137411cf5beb0fbdad611ee85803960feef14a
ndroid/camera/PhotoModule.java
|
| 4ab4879eec785faf40ccb346b96963f04af9b0e6 |
04-Oct-2013 |
ztenghui <ztenghui@google.com> |
Don't show the option for Gcam when using front camera.
bug:11051221
Change-Id: I802eb0bc73adb3c573a2bf62b312bc681152223d
ndroid/camera/CameraSettings.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
ndroid/camera/CameraActivity.java
|
| 77dd14930b24816369560a73cfb0610c1f745d05 |
03-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Make space for photosphere rendering text" into gb-ub-photos-carlsbad
|
| 238799e97077ee72a53a5a04d9d3068aebb82bf7 |
03-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Change icons and code from HQ to HDR+ mode." into gb-ub-photos-carlsbad
|
| 5bca6f4cf43732edf459010f418d3719e07f3c8a |
03-Oct-2013 |
Angus Kong <shkong@google.com> |
Merge "Don't allow actions on items in progress." into gb-ub-photos-carlsbad
|
| 3250987bd014d1c5463b8a39bbe988165ab1cc3f |
03-Oct-2013 |
Angus Kong <shkong@google.com> |
Don't allow actions on items in progress.
bug:11049529
Change-Id: Id6bd0f912f153b8b8e6b1a525a383ad8cadbe3dd
ndroid/camera/CameraActivity.java
ndroid/camera/data/InProgressDataWrapper.java
ndroid/camera/data/LocalData.java
ndroid/camera/data/LocalMediaData.java
ndroid/camera/data/RotationTask.java
ndroid/camera/data/SimpleViewData.java
|
| 930b9b41185a2f59c05fe527300248776d3993a0 |
03-Oct-2013 |
Doris Liu <tianliu@google.com> |
Merge "Leave ROI not set except in tap-to-focus scenario" into gb-ub-photos-carlsbad
|
| 9bf0fd606a624138b8c1123d168f06a24c4d20a3 |
03-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
Change icons and code from HQ to HDR+ mode.
Bug: 11047147
Change-Id: Ib0ab1675788f6584d2b06b63a113468d2e775f23
ndroid/camera/CameraSettings.java
ndroid/camera/OnScreenIndicators.java
ndroid/camera/PhotoMenu.java
ndroid/camera/PhotoModule.java
ndroid/camera/util/ApiHelper.java
|
| 88641ad117189fe1a3440dc82e57312507879bab |
03-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
Make space for photosphere rendering text
Bug: 11005014
Change-Id: I1f92322ff5a53b8bf6752841efd3a59e366d78fb
ndroid/camera/ui/FilmStripView.java
|
| cbdd373181fdd389f02e71a8079e9aab5f11fbad |
03-Oct-2013 |
Doris Liu <tianliu@google.com> |
Leave ROI not set except in tap-to-focus scenario
Bug: 11005574
Change-Id: If1837ef6c29d6d48388e3cf8d9bb85bd70a133c9
ndroid/camera/FocusOverlayManager.java
ndroid/camera/PhotoModule.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
ndroid/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
ndroid/camera/CameraActivity.java
|
| cf7babd5cbe69cf99d96e46c306d6733837f48eb |
02-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Reads PhotoSphere metadata once fully loaded so that PhotoSphere viewer icon is visible." into gb-ub-photos-carlsbad
|
| 45f5976f2c1d4eda46be4ea591c6196c683f2ded |
02-Oct-2013 |
Angus Kong <shkong@google.com> |
Merge "Make scroll animation smoother." into gb-ub-photos-carlsbad
|
| 1f36cf1c97faf2b7824bbecd62942456847f0e13 |
02-Oct-2013 |
Angus Kong <shkong@google.com> |
Make scroll animation smoother.
bug:10802703
Change-Id: I2e759a5b45eb8f68eb63163ad7e42cc670971bf4
ndroid/camera/ui/FilmStripView.java
|
| 6416ba8a428025c669782a2d3226f06ad5a86921 |
02-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Fix FilmStrip crash by checking if photos are present before updating action bar" into gb-ub-photos-carlsbad
|
| b7a52a4caafd270dbb6aaa41f890a516359e44b8 |
01-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
Reads PhotoSphere metadata once fully loaded so that PhotoSphere viewer icon is visible.
Bug: 10715651
Change-Id: Ib71a3e4469d1ecee87b9423b03b8898294a7ffa6
ndroid/camera/ui/FilmStripView.java
|
| 1f69e36bc45ccf0090cb1d8392d603cfe2a4e8bf |
02-Oct-2013 |
Doris Liu <tianliu@google.com> |
A workaround for crash in zoom view
Bug: 10636636
Change-Id: Iffa126781fd71796b8816d637263450911cb7e8e
ndroid/camera/ui/ZoomView.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
ndroid/camera/CameraActivity.java
|
| 7fc104e4e75ac881269fd4a093513da01565e5d6 |
01-Oct-2013 |
Angus Kong <shkong@google.com> |
Prevent NPE in gesture handling.
bug:11023769
Change-Id: Iee9e5c2d295378f327c3b01349eda5d80a579ed7
ndroid/camera/PreviewGestures.java
|
| e2d59dcccf177fdd158949a6b2f741a75d504416 |
01-Oct-2013 |
Doris Liu <tianliu@google.com> |
Merge "Double tap to full screen from filmstrip" into gb-ub-photos-carlsbad
|
| ad3003bbb275b91d7564568e413400fc187dbcd4 |
01-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Updates newly centered photos in FilmStrip after a delete." into gb-ub-photos-carlsbad
|
| a1cb57beb56e17f8d64b82cb1465dcb63cce74b1 |
01-Oct-2013 |
Angus Kong <shkong@google.com> |
Merge "Don't adjust the position while scrolling." into gb-ub-photos-carlsbad
|
| 4d21fc2e3f7e7e64e5910b9ee4f6b7662a441427 |
01-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Show status bar in filmstrip mode" 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
ndroid/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
ndroid/camera/CameraActivity.java
ndroid/camera/ui/CameraRootView.java
ndroid/camera/ui/FilmStripView.java
|
| 4feabff8b87e1b71e8040dbcd6289a313bf9f593 |
30-Sep-2013 |
ztenghui <ztenghui@google.com> |
Fix MediaStore correction code.
This reverts commit fb344efde20ffab903fae7c6e5a2e1c90b4ef085.
And this CL make sure we handle rotated image correctly and update the
MediaStore according to the bitmap size.
bug:10988273
Change-Id: I9acb60e0dd485292748bcc586801f76bc7a543dc
ndroid/camera/data/LocalMediaData.java
|
| a5d6b243d3d742cf9dd2ffdac88d386abacd123a |
01-Oct-2013 |
Angus Kong <shkong@google.com> |
Don't adjust the position while scrolling.
bug:10802703
Change-Id: I493c36b87c99de97275add1243f5ac363a28787e
ndroid/camera/ui/FilmStripView.java
|
| fb344efde20ffab903fae7c6e5a2e1c90b4ef085 |
30-Sep-2013 |
Alan Newberger <alann@google.com> |
Temporary removal of resize code to evaluate GCam image bug
removes LocalMediaData resize code to evaluate black screenshots.
this results in correct display of GCam photos newly taking in KRS91; prior GCam photos will look distorted due to incorrect EXIF.
Bug: 10988273
Change-Id: I7fedffeeb1823da857f4c92433c6213d6697bda0
ndroid/camera/data/LocalMediaData.java
|
| ac5cb2430408f9a1854a4e22e8297733279bf75b |
28-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Add basic EXIF to the tiny planet so that rotate succeeds." into gb-ub-photos-carlsbad
|
| b7be228d192cb8f91079caaa2f77a884a40b1160 |
21-Sep-2013 |
ztenghui <ztenghui@google.com> |
Fix incorrect width and height from MediaStore.
bug:10768232
Change-Id: I53673b8ef341f7388a9a4aaa7b03f804485928cf
ndroid/camera/data/CameraDataAdapter.java
ndroid/camera/data/FixedFirstDataAdapter.java
ndroid/camera/data/FixedLastDataAdapter.java
ndroid/camera/data/LocalData.java
ndroid/camera/data/LocalMediaData.java
ndroid/camera/data/SimpleViewData.java
|
| 21a2e9cb07caba660120b7f5eba6e053a6cb3ac3 |
27-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
Add basic EXIF to the tiny planet so that rotate succeeds.
Bug: 10861115
Change-Id: I1eec2bf4d6879c227a07c5364bc821749ace312b
ndroid/camera/data/RotationTask.java
ndroid/camera/tinyplanet/TinyPlanetFragment.java
|
| 5326f0265206ccd8a2f3424bb983da674b20a31e |
27-Sep-2013 |
Doris Liu <tianliu@google.com> |
Double tap to full screen from filmstrip
Also fix the first photo going from full screen to filmstrip on single tap
Bug: 10948166
Change-Id: I15df0325f495722f43b17e0713d6196e8585aa75
ndroid/camera/ui/FilmStripView.java
|
| 9ba47bf4b755337786bb2bbc810ab69a5772e38f |
27-Sep-2013 |
Angus Kong <shkong@google.com> |
Merge "Restore HQ preference in GCam module." into gb-ub-photos-carlsbad
|
| af41aaa4005d7abcc45ea3c7fb87af098ef49ce8 |
27-Sep-2013 |
ztenghui <ztenghui@google.com> |
Don't update the width and height in MediaStore after rotation
bug:10917681
Change-Id: I897d883636991f5b95290acf57c2a84eadd7c5d2
ndroid/camera/data/RotationTask.java
|
| 2396e609321f38be61151dd6530d8fd0b0dc2f63 |
27-Sep-2013 |
Angus Kong <shkong@google.com> |
Restore HQ preference in GCam module.
bug:10860305
Change-Id: Ibb563c53b63efb2d0656b59c09148423af2ee41b
ndroid/camera/PhotoModule.java
|
| 3cde3ece3e6e384f831a02f21c677e292a824df8 |
27-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Add orientation information to the details dialog." into gb-ub-photos-carlsbad
|
| bfd919aff7007f5dc26c74dfb97705c8e23e09b8 |
27-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
Add orientation information to the details dialog.
Bug: 10649902
Change-Id: Icaf17abdbd48a86d55e1555115fdb7817faf6359
ndroid/camera/data/LocalMediaData.java
ndroid/camera/ui/DetailsDialog.java
|
| 2b86d873ca4fb3a921139633ed7be9959ab452df |
27-Sep-2013 |
Doris Liu <tianliu@google.com> |
Fix memory leak of context in LocalMediaObserver
Bug: 10728773
Change-Id: Ie5a50590e71fd4b853cb7590db4fa14f5b6dc73b
ndroid/camera/CameraActivity.java
ndroid/camera/data/LocalMediaObserver.java
|
| 667880948de7a051f62359878cb61c1e0a867e24 |
26-Sep-2013 |
Seth Raphael <magicseth@google.com> |
Remove PopupManager to remove a memory leak
PopupManager had been previously refactored out
but vestiges remained. They were causing a memory
leak of Activities in its hash map.
Bug: 10728773
Change-Id: Ia6d98db1f0d30b4e879984033b471e8c802bc1c1
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.java
ndroid/camera/WideAnglePanoramaModule.java
ndroid/camera/ui/PopupManager.java
|
| 67685a78a29a0311043f38f8766a1fbbf881a599 |
26-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
Add HQ icon indicator support.
Bug: 10785988
Change-Id: If844caaedc3468dce8153cb434bd89328a4a92ca
ndroid/camera/OnScreenIndicators.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
|
| 2ba03263340639635120be467f8cabec2889aa08 |
26-Sep-2013 |
Doris Liu <tianliu@google.com> |
Make ROI size 1/8 of longer edge of the image
Bug: 10863323
Change-Id: Iabe0685e48ecbf5f456d377af6a73d10dcdf0eda
ndroid/camera/FocusOverlayManager.java
|
| f2c14330a49abb55f75bfae6b3bae67a0dad115b |
26-Sep-2013 |
Doris Liu <tianliu@google.com> |
Finalize deletion when app exits and for last photo
Bug: 10892925
Change-Id: I94a29ec26f657b5c6c2f784f05b63d45e5e3e010
ndroid/camera/CameraActivity.java
|
| 15ccccf6df50b465514eef85f64393d6f2022e0d |
25-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Fix the checks for when to remove the HDR/HQ icons from the pie menu." into gb-ub-photos-carlsbad
|
| dfe80098600f092735e9fcb23d8a17b8de23cdef |
25-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
Fix the checks for when to remove the HDR/HQ icons from the pie menu.
Bug: 10932511
Change-Id: I4d80d028335c2f45c5c59d56898846a76755ec44
ndroid/camera/CameraSettings.java
|
| c9c1504408819bda3fb6b2b264f9dbf6012f9b7f |
25-Sep-2013 |
Angus Kong <shkong@google.com> |
Merge "Checks for low storage in wide-angle pano mode." into gb-ub-photos-carlsbad
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoModule.java
ndroid/camera/Storage.java
ndroid/camera/VideoModule.java
ndroid/camera/WideAnglePanoramaModule.java
|
| 0537d4f7abe9e137f626e5cff3fcf252bb04c626 |
25-Sep-2013 |
Doris Liu <tianliu@google.com> |
Merge "Increase ROI size to 1/8 of the image width" into gb-ub-photos-carlsbad
|
| b3749f2071f866c43ea5f70de219f23157097077 |
25-Sep-2013 |
Doris Liu <tianliu@google.com> |
Increase ROI size to 1/8 of the image width
Bug: 10863323
Change-Id: I962afbb0b49a6902fac0bbd5209b52591604ed20
ndroid/camera/FocusOverlayManager.java
ndroid/camera/PhotoController.java
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
|
| be7dc6279dfe17cb93fab8cf88d1115966acb2e0 |
25-Sep-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fix HQ mode change to allow return to regular photo mode.
Bug: 10848559
Change-Id: I6645bc17d29af664b9689e4bd05164100b155aa3
ndroid/camera/PhotoModule.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
ndroid/camera/CameraActivity.java
ndroid/camera/CameraSettings.java
ndroid/camera/PhotoMenu.java
ndroid/camera/PhotoModule.java
ndroid/camera/ui/ModuleSwitcher.java
ndroid/camera/util/ApiHelper.java
|
| 4601f5d987ad2f57db6b1b65a716f00308e5ae99 |
25-Sep-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Enable gcam as HDR pie menu option.
Bug: 10430748
Change-Id: I0f589126bac895b31ef7475afd093680766de39e
ndroid/camera/CameraSettings.java
ndroid/camera/PhotoModule.java
ndroid/camera/ui/ModuleSwitcher.java
|
| 4863db01e3629a0a29c718b94445332ef74441e9 |
24-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
Remove hideybars from Camera.
Bug: 10859173
Change-Id: I6e6677ace3d1c35c974e003bebd25c9a43d43719
ndroid/camera/CameraActivity.java
ndroid/camera/ui/CameraRootView.java
|
| 3180ac90af3e63ed7d9b487de5a35ba216d9463f |
24-Sep-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix SRI UX issues and improve UI efficiency" into gb-ub-photos-carlsbad
|
| 105aaf4dd5a381d4c5098fc1d7ace29a3c240c9e |
24-Sep-2013 |
Doris Liu <tianliu@google.com> |
Fix SRI UX issues and improve UI efficiency
Bug: 10674078
Change-Id: I0bb820b5866e3acb8534592a4eec246df24fd441
ndroid/camera/WideAnglePanoramaUI.java
|
| c74825b1666857cbfd0ad3750f0d509de8e86953 |
24-Sep-2013 |
Angus Kong <shkong@google.com> |
Merge "Allow user to tap on lock icon from secure camera." into gb-ub-photos-carlsbad
|
| 690dc4722d068a1838b16dc0eabe9c7d518d524c |
21-Sep-2013 |
Angus Kong <shkong@google.com> |
Allow user to tap on lock icon from secure camera.
bug:10857973
Change-Id: Id3c03f4d83c676986748ed083e85e85cea8eb507
ndroid/camera/CameraActivity.java
ndroid/camera/util/CameraUtil.java
|
| 8fed926c9f1a3b205165a2f9aad05379c85ececd |
24-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Localize the numbers in the time laps popup." into gb-ub-photos-carlsbad
|
| 3e058558dc0aaea971d084bf9c72e1cfa0c5ebd9 |
24-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
Localize the numbers in the time laps popup.
Bug: 10889796
Change-Id: I44c476519b785a83af1c72aed07378c5e02d9073
ndroid/camera/ui/TimeIntervalPopup.java
|
| 4c478ffe556bff91f9c7574384ab6d482c947627 |
23-Sep-2013 |
ztenghui <ztenghui@google.com> |
Merge "Sort and select the preview fps range for still image." into gb-ub-photos-carlsbad
|
| 16a35206473b5a49821edccea93bbde54c52be49 |
23-Sep-2013 |
ztenghui <ztenghui@google.com> |
Sort and select the preview fps range for still image.
bug:10842868
Change-Id: Ic7d64aead7fd877e2c404d22ce42fd2d3566e57b
ndroid/camera/PhotoModule.java
ndroid/camera/util/CameraUtil.java
|
| b21215a1a59812592380f31891becedbdec7468b |
21-Sep-2013 |
Angus Kong <shkong@google.com> |
Improve the animation to filmstrip.
1. Remove the snap-in-center check at the end of scale animation.
2. Don't go back to full-screen when animating from camera preview
to filmstrip.
bug:10806298
bug:10864100
Change-Id: I751040a22e2758709c22e7230a5418a871ef85f9
ndroid/camera/data/CameraPreviewData.java
ndroid/camera/data/LocalMediaData.java
ndroid/camera/data/SimpleViewData.java
ndroid/camera/ui/FilmStripView.java
ndroid/camera/util/CameraUtil.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
ndroid/camera/CameraActivity.java
ndroid/camera/ui/FilmStripView.java
ndroid/camera/ui/FilmstripBottomControls.java
|
| cdbba4c8395cd765b3464e2d980a8a0ea1ff54c7 |
20-Sep-2013 |
Angus Kong <shkong@google.com> |
Merge "Refine Filmstrip gesture/position handling." into gb-ub-photos-carlsbad
|
| 7d2388d96522975307cf5c40f7ac911ad963c44d |
19-Sep-2013 |
Angus Kong <shkong@google.com> |
Refine Filmstrip gesture/position handling.
bug:10749052
bug:10802996
bug:10711578
Change-Id: I9080a930209118a5c1bdc11b1ef7b316c55a741e
ndroid/camera/ui/FilmStripView.java
ndroid/camera/ui/FilmstripBottomControls.java
ndroid/camera/util/CameraUtil.java
|
| 19ab725a5e640a1a20b1a6def083e37d1d1c1e20 |
19-Sep-2013 |
nicolasroard <nicolasroard@google.com> |
Add crop activity
bug:10367125
Change-Id: I8dce6d799e7469ff048d419598d87b0c04bef2a0
ndroid/camera/CameraActivity.java
ndroid/camera/crop/BoundedRect.java
ndroid/camera/crop/CropActivity.java
ndroid/camera/crop/CropDrawingUtils.java
ndroid/camera/crop/CropExtras.java
ndroid/camera/crop/CropMath.java
ndroid/camera/crop/CropObject.java
ndroid/camera/crop/CropView.java
ndroid/camera/crop/GeometryMathUtils.java
ndroid/camera/crop/ImageLoader.java
ndroid/camera/crop/SaveImage.java
ndroid/camera/crop/Utils.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
ndroid/camera/CameraActivity.java
ndroid/camera/data/LocalMediaData.java
ndroid/camera/data/LocalMediaObserver.java
|
| a5682ab08e1d42fe272ec877929478b4adb769f5 |
19-Sep-2013 |
Mangesh Ghiware <mghiware@google.com> |
Bring back NFC beam support to filmstrip
Bug: 10805211
Change-Id: I457d47625c69fcdaba663e53f46d461d29c7cb92
ndroid/camera/CameraActivity.java
ndroid/camera/util/ApiHelper.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
ndroid/camera/CameraActivity.java
ndroid/camera/CameraHolder.java
ndroid/camera/MediaSaveService.java
ndroid/camera/PhotoModule.java
ndroid/camera/ui/ModuleSwitcher.java
|
| 5df64b0a818d4f85cb14602db725f05b0055c1d9 |
19-Sep-2013 |
Mangesh Ghiware <mghiware@google.com> |
Make Up button in filmstrip go to Gallery.
Bug: 10748904
Change-Id: If80f3354071893dc4f8bd60e4ca605d3626ecdf9
ndroid/camera/CameraActivity.java
ndroid/camera/util/ApiHelper.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
ndroid/camera/AndroidCameraManagerImpl.java
ndroid/camera/CameraActivity.java
ndroid/camera/CameraManager.java
ndroid/camera/CameraSettings.java
ndroid/camera/EffectsRecorder.java
ndroid/camera/FocusOverlayManager.java
ndroid/camera/MosaicPreviewRenderer.java
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
ndroid/camera/SoundClips.java
ndroid/camera/VideoModule.java
ndroid/camera/VideoUI.java
ndroid/camera/ui/CameraRootView.java
ndroid/camera/ui/EffectSettingPopup.java
ndroid/camera/ui/FaceView.java
ndroid/camera/ui/ModuleSwitcher.java
ndroid/camera/ui/RotateLayout.java
ndroid/camera/ui/Switch.java
ndroid/camera/util/ApiHelper.java
ndroid/camera/util/CameraUtil.java
ndroid/camera/util/MotionEventHelper.java
|
| 4ed20592482d2ab2f3f48ee72d5b1c06bf009034 |
13-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
Adding Hideybar support for K and up.
Bug: 10723047
Change-Id: Ie1d0bdadfbe6dee6a4e0998facac61ff1fb6e02a
ndroid/camera/CameraActivity.java
ndroid/camera/ui/CameraRootView.java
|
| e1f0f4f1bce2a8d0dca3856aa0211dcfffb74abc |
18-Sep-2013 |
ztenghui <ztenghui@google.com> |
Merge "Delete the captured video if cancel in review." into gb-ub-photos-carlsbad
|
| af3a19761034225333685b90206dcdb8e784a1c4 |
18-Sep-2013 |
ztenghui <ztenghui@google.com> |
Delete the captured video if cancel in review.
In capture intent case, video get inserted all the time before review.
So if cancelled in review mode, the captured video should be deleted.
bug:8897671
Change-Id: I01dd4b0707dd1b70480cda94b2a9b9c6ce9194c7
ndroid/camera/VideoModule.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
ndroid/camera/CameraActivity.java
|
| 483d25a21058094303b94e44cc67cbd8fecd4bf8 |
18-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Don't crash the app if camera is not available." into gb-ub-photos-carlsbad
|
| 4ee4d99cfc519847bd8f84aca9ece5d2b6519536 |
18-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Adding a simple done handler interface." into gb-ub-photos-carlsbad
|
| 02db77fc8bdcd6aeb1b36217d939bc11355822e6 |
18-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
Don't crash the app if camera is not available.
Bug: 10747001
Change-Id: I8a4e302a9b458c73901776a95a0118da0e4e8b6c
ndroid/camera/AndroidCameraManagerImpl.java
|
| 9c0492a606ca48dbc3e56b03051ea9242d952e3e |
18-Sep-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix camera controls rotation for secure camera" into gb-ub-photos-carlsbad
|
| 8cecf837f8f25418890344a53f7cb3ae44ef0b03 |
18-Sep-2013 |
Doris Liu <tianliu@google.com> |
Fix camera controls rotation for secure camera
Bug: 8878379
Change-Id: I80b06d98010dbed14a46994f365d1fbb9aa8ba49
ndroid/camera/ui/RotatableLayout.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
ndroid/camera/AndroidCameraManagerImpl.java
ndroid/camera/CameraActivity.java
ndroid/camera/CameraButtonIntentReceiver.java
ndroid/camera/CameraHolder.java
ndroid/camera/CameraManager.java
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.java
ndroid/camera/WideAnglePanoramaModule.java
ndroid/camera/util/CameraUtil.java
|
| 828c9190aafc9b57126f5a4868e5cee922cf9f2c |
17-Sep-2013 |
ztenghui <ztenghui@google.com> |
Merge "Use a new Intent to work around issues in framework" into gb-ub-photos-carlsbad
|
| 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
ndroid/camera/CameraActivity.java
|
| 2065e606b68f7e8532317f076c7f688a2093186d |
17-Sep-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix zoom for images with orientation tag" into gb-ub-photos-carlsbad
|
| 87fc5e1568f737e03327770cb3dee03c4b939c59 |
16-Sep-2013 |
Doris Liu <tianliu@google.com> |
Fix zoom for images with orientation tag
Bug: 10780042
Change-Id: I518bf8a6e2b53647398180e60b55533960ebe318
ndroid/camera/data/LocalMediaData.java
ndroid/camera/data/SimpleViewData.java
ndroid/camera/ui/FilmStripView.java
ndroid/camera/ui/ZoomView.java
|
| 5bee41c6d727c730c7b10fba886862284a489257 |
17-Sep-2013 |
Angus Kong <shkong@google.com> |
Merge "Set correct alpha for views in filmstrip." into gb-ub-photos-carlsbad
|
| d028dd4908e68c7d4d0e7438efa74fa2c67e5f2a |
14-Sep-2013 |
Angus Kong <shkong@google.com> |
Set correct alpha for views in filmstrip.
bug:10713813
Change-Id: I2715b7c3ecb2e0c995e8f66e710c91561e9cf231
ndroid/camera/ui/FilmStripView.java
|
| 2f92d309de115b2a41692b93d77fcbffd1260781 |
16-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
Adding a simple done handler interface.
Bug: 10747001
Needed by http://ag/360619
Change-Id: I942cb601391a8cdd2c30ea152415f56d38fd0918
ndroid/camera/util/DoneHandler.java
|
| d688c0c31d4287c03b664f6fca5c6498a1e4bd7d |
16-Sep-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix flicker when zooming images smaller than screen" into gb-ub-photos-carlsbad
|
| c29156954bcbf0218a78c308c3ba8f25e00aeecc |
16-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
Avoid expensive O(n) main-thread operation when adding Photo Sphere.
Bug: 10747001
Change-Id: I8dcc3c5e7dd12879a927aa82e71bea0c6370ccda
ndroid/camera/data/CameraDataAdapter.java
ndroid/camera/data/LocalDataList.java
|
| 79dcb12bbbcb9b3650ace5290897e26451218fe1 |
16-Sep-2013 |
Doris Liu <tianliu@google.com> |
Fix flicker when zooming images smaller than screen
Bug: 10733300
Change-Id: Ifa753722132b1fd81265b5fc105a0b96602b6fd2
ndroid/camera/ui/FilmStripView.java
|
| 44974d4b8014ec1f3c8ef1b9d77aae990bbba821 |
13-Sep-2013 |
Angus Kong <shkong@google.com> |
Don't show menu/indicators in wide-angle mode.
bug:10674078
Change-Id: I08edd11ead1c71cd6b81274938c92f788c039a8f
ndroid/camera/WideAnglePanoramaUI.java
|
| 7e1e10f34dcb77566d0551b7fb8b0b4e7e18ca25 |
13-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Fix potential deadlock while rendering the preview." into gb-ub-photos-carlsbad
|
| a29e0bfcafa292adba7fff2daf0f754627e47137 |
13-Sep-2013 |
Angus Kong <shkong@google.com> |
Merge "Always leave full-screen when swip from camera." into gb-ub-photos-carlsbad
|
| 6100053eea36f0258091ee12be5f72c501209ad0 |
13-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
Fix potential deadlock while rendering the preview.
Bug: 10748013
Change-Id: Id03053f47ee3c066347dd136b6abe9fb1a5d6502
ndroid/camera/tinyplanet/TinyPlanetPreview.java
|
| 539b9eec067c012d17f482975cf8053e04a11759 |
13-Sep-2013 |
Angus Kong <shkong@google.com> |
Merge "Avoid flickering after swipe to delete." into gb-ub-photos-carlsbad
|
| a7035394b246b238c19230c92672dbda2ab1f88c |
13-Sep-2013 |
ztenghui <ztenghui@google.com> |
Merge "Fix crash due to a hole in setDataSource." into gb-ub-photos-carlsbad
|
| 1e689c254960f0ced0d19d91067cc5ef703dec64 |
13-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
Fix DeadLock in TinyPlanet.
Bug: 10393598
Now that we acquire the lock inside doInBackground, we need to make
sure to run the AsyncTasks in parallel.
Change-Id: If253f375d56c352c30076f00cf923dfa521f2db4
ndroid/camera/tinyplanet/TinyPlanetFragment.java
|
| edbba628dc2e31057b304c6a431f44dbca125891 |
12-Sep-2013 |
Angus Kong <shkong@google.com> |
Avoid flickering after swipe to delete.
bug:10624385
Change-Id: Id4d65a391b2d13a5d6cc08ae9c1b787610c94c46
ndroid/camera/ui/FilmStripView.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
ndroid/camera/CameraActivity.java
ndroid/camera/MediaSaveService.java
ndroid/camera/tinyplanet/TinyPlanetFragment.java
ndroid/camera/tinyplanet/TinyPlanetNative.java
ndroid/camera/tinyplanet/TinyPlanetPreview.java
ndroid/camera/ui/FilmStripView.java
ndroid/camera/util/XmpUtil.java
|
| 368bc8441a76e2193859bfd73121787936a0977d |
13-Sep-2013 |
ztenghui <ztenghui@google.com> |
Fix crash due to a hole in setDataSource.
setDataSource() somehow throws a RuntimeException instead of
IllegalArgumentException when seeing unsupported video file.
bug:10732664
Change-Id: I79ab1f1afd8750bb37df0c8fc9448dbb2e00230a
ndroid/camera/data/LocalMediaData.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
ndroid/camera/CameraActivity.java
ndroid/camera/ui/FilmStripView.java
|
| 45f9b06b31666c2b880c24cf32f1ca8b21435422 |
12-Sep-2013 |
Angus Kong <shkong@google.com> |
Always leave full-screen when swip from camera.
bug:10714779
Change-Id: Ifa10f151974ac0598a0c27751e23c77d525d332e
ndroid/camera/ui/FilmStripView.java
|
| a29a0ad0fa7667177025a26d3043cb601ae17a6c |
13-Sep-2013 |
ztenghui <ztenghui@google.com> |
Merge "When current data is preview, don't show the action bar." into gb-ub-photos-carlsbad
|
| 8566dd777cd219254c945240a31ac97de28792a2 |
12-Sep-2013 |
ztenghui <ztenghui@google.com> |
When current data is preview, don't show the action bar.
bug:10678458
Change-Id: Ia48ca694ddca47438338e7223e9fa19c2c65dd5d
ndroid/camera/CameraActivity.java
ndroid/camera/ui/FilmStripView.java
|
| 36e56fba281292255a01ee00b4bee067fa09ab59 |
12-Sep-2013 |
Doris Liu <tianliu@google.com> |
Show captured image rather than frozen preview for capture intent
Bug: 10570887
Change-Id: Ie986c865bdf452973b833efcdcb397c27bef2420
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.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
ndroid/camera/CameraActivity.java
ndroid/camera/CameraModule.java
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
ndroid/camera/VideoModule.java
ndroid/camera/VideoUI.java
ndroid/camera/WideAnglePanoramaModule.java
ndroid/camera/ui/FilmStripView.java
|
| 20703f72e087a01e6a589c2875819cf817581a51 |
11-Sep-2013 |
Angus Kong <shkong@google.com> |
Merge "Flinging back should stop at the first photo first." into gb-ub-photos-carlsbad
|
| 5fbe134c3cf1f7c2c82ccef223cab7eb43cd92f1 |
11-Sep-2013 |
Angus Kong <shkong@google.com> |
Flinging back should stop at the first photo first.
bug:10634016
Change-Id: I44e715268b913902a444c977c136d1e0381b3833
ndroid/camera/ui/FilmStripView.java
|
| e1d5ba4fc5470043e8645984e3018b712f5dfcff |
10-Sep-2013 |
Doris Liu <tianliu@google.com> |
Hide zoom view when going to full screen
Bug: 10654903
Change-Id: Ibeed1e02e203dffc4aba69a52b748206a734294f
ndroid/camera/ui/FilmStripView.java
|
| 6aae9177ac432df82971facab214b365e92b4a04 |
10-Sep-2013 |
Angus Kong <shkong@google.com> |
Merge "Fix images being off-center in filmstrip." into gb-ub-photos-carlsbad
|
| 563a289f1aed4dd7bf760959851ff6ad72c7627f |
10-Sep-2013 |
Angus Kong <shkong@google.com> |
Fix images being off-center in filmstrip.
bug:10609827
bug:10650966
Change-Id: Ie06beaeb7c6a616d5d7ca751cfaa65a64844332c
ndroid/camera/ui/FilmStripView.java
|
| e074fcbdb7d7bb20dde8173b969cbbafb53b92a9 |
10-Sep-2013 |
Doris Liu <tianliu@google.com> |
Merge "Hide zoom view when back is pressed" into gb-ub-photos-carlsbad
|
| 03b75411538c60021799ccc7acc8ed4798253b6d |
10-Sep-2013 |
Doris Liu <tianliu@google.com> |
Hide zoom view when back is pressed
Bug: 10677244
Change-Id: I2e42d35382dded28bdd47dbdca173a1fd2bf6ac7
ndroid/camera/ui/FilmStripView.java
|
| f8b877c2dd4fed2c962c51d619e2548923888525 |
10-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
Update indicators at the right time to show the correct state.
Bug: 10620907
Change-Id: I19de5820aff4b99709326a625765f416d8a5a5f5
ndroid/camera/VideoModule.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
ndroid/camera/CameraActivity.java
ndroid/camera/VideoModule.java
ndroid/camera/data/CameraDataAdapter.java
ndroid/camera/data/FixedFirstDataAdapter.java
ndroid/camera/data/FixedLastDataAdapter.java
ndroid/camera/data/LocalData.java
ndroid/camera/data/LocalMediaData.java
ndroid/camera/data/SimpleViewData.java
ndroid/camera/ui/FilmStripView.java
ndroid/camera/util/CameraUtil.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
ndroid/camera/CameraActivity.java
|
| a71946012df0eee8fe4859a22da3c56feba0344e |
07-Sep-2013 |
Angus Kong <shkong@google.com> |
Disable swipe in capture intent mode.
bug:10606988
Change-Id: Iaf80cdef5b463795b9847f2ab9ab5c70f3f0083c
ndroid/camera/CameraActivity.java
|
| 56ad83f797ab09af240d1f67d63e55dd602160c1 |
06-Sep-2013 |
Angus Kong <shkong@google.com> |
Merge "Respect system auto-rotate setting." into gb-ub-photos-carlsbad
|
| 080f868350a0f8c7666f5f5935db1e2b0a75f7f1 |
06-Sep-2013 |
Angus Kong <shkong@google.com> |
Merge "Improve swipe gesture in filmstrip." into gb-ub-photos-carlsbad
|
| 17e669d695ef2a38d28d5ba2512937836293e9ca |
06-Sep-2013 |
Angus Kong <shkong@google.com> |
Improve swipe gesture in filmstrip.
bug:10552605
bug:10645736
Change-Id: I7f524c191b0d8bd051ce9e1399a1265d0cac2f25
ndroid/camera/ui/FilmStripView.java
|
| 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
ndroid/camera/CameraActivity.java
|
| ce2b94917098f211cacaaebaa0f6b40021d3e3fa |
06-Sep-2013 |
Angus Kong <shkong@google.com> |
Respect system auto-rotate setting.
bug:10623244
Change-Id: I66757e50daf487680ac4f49d854c0f49d672b6ff
ndroid/camera/CameraActivity.java
ndroid/camera/VideoModule.java
ndroid/camera/WideAnglePanoramaModule.java
ndroid/camera/app/OrientationManager.java
|
| fffc6a5a3458cd0a29a49f10ff5ea1834c1c98fc |
05-Sep-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix black screen in mode switching" into gb-ub-photos-carlsbad
|
| 564343e34ab0e43e131566bf74a9448d1e982ad7 |
05-Sep-2013 |
Doris Liu <tianliu@google.com> |
Fix black screen in mode switching
Bug: 10632592
Change-Id: I3c8bc1f6a17709d39ec88b51a22edfbbab828bde
ndroid/camera/ui/FilmStripView.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
ndroid/camera/CameraActivity.java
|
| 33035c19cc47adfb738c20cef66652ae451c8e10 |
23-Aug-2013 |
Mangesh Ghiware <mghiware@google.com> |
Bring back 'share 360 photosphere' to filmstrip
Bug: 10367406
Change-Id: Icb07e9e890a72bec6ed3b4c5a7e33400be3446f8
ndroid/camera/CameraActivity.java
ndroid/camera/ui/FilmStripView.java
|
| 121022cb590955e37f1264f77190ce4711159976 |
04-Sep-2013 |
Doris Liu <tianliu@google.com> |
Double tap to zoom all the way in and out
Bug: 10308195
Change-Id: Id6c1bd6c95a812c3aae0c292ca53e3de6eea2d55
ndroid/camera/ui/FilmStripGestureRecognizer.java
ndroid/camera/ui/FilmStripView.java
ndroid/camera/ui/ZoomView.java
|
| ed15d1a140986473bbe7fffd72ec9618c41c5979 |
20-Aug-2013 |
Angus Kong <shkong@google.com> |
Bring back wide angle panorama.
bug:10293937
Change-Id: I23a977e87b7416f07ecac20025b6c142ae61be05
ndroid/camera/CameraActivity.java
ndroid/camera/Mosaic.java
ndroid/camera/MosaicFrameProcessor.java
ndroid/camera/MosaicPreviewRenderer.java
ndroid/camera/MosaicRenderer.java
ndroid/camera/PanoProgressBar.java
ndroid/camera/PanoUtil.java
ndroid/camera/PhotoUI.java
ndroid/camera/PreviewFrameLayout.java
ndroid/camera/VideoUI.java
ndroid/camera/WideAnglePanoramaController.java
ndroid/camera/WideAnglePanoramaModule.java
ndroid/camera/WideAnglePanoramaUI.java
ndroid/camera/app/AppManagerFactory.java
ndroid/camera/app/CameraApp.java
ndroid/camera/app/OrientationManager.java
ndroid/camera/app/OrientationSource.java
ndroid/camera/ui/CameraRootView.java
ndroid/camera/ui/CameraSwitcher.java
ndroid/camera/ui/LayoutChangeHelper.java
ndroid/camera/ui/LayoutChangeNotifier.java
ndroid/camera/ui/LayoutNotifyView.java
ndroid/camera/ui/ModuleSwitcher.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
ndroid/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
ndroid/camera/CameraActivity.java
|
| 0dff7ce1f701816b4a634b612bcaaaae6de0da34 |
31-Aug-2013 |
Doris Liu <tianliu@google.com> |
Merge "Reset zoom view when user exits app or rotate device" into gb-ub-photos-carlsbad
|
| b2f0968c90a352cca43f508d216c3f28c3d2cc16 |
31-Aug-2013 |
Angus Kong <shkong@google.com> |
Merge "Make the preview thumbnail clicable after scaling." into gb-ub-photos-carlsbad
|
| 93a38d80b202a95cc0336e5cc04dbad92e43253d |
31-Aug-2013 |
Angus Kong <shkong@google.com> |
Make the preview thumbnail clicable after scaling.
bug:10552110
Change-Id: I81abd96ad971543412597dbe8f7f57eeb6d3c1fa
ndroid/camera/AnimationManager.java
|
| f9ddb6034e560684e4d3ddd460ef9dff345e4e91 |
31-Aug-2013 |
Doris Liu <tianliu@google.com> |
Reset zoom view when user exits app or rotate device
Bug:10308195
Change-Id: Icf1acc4b17611b28a9c65ec809083ac58da5bd8f
ndroid/camera/ui/FilmStripView.java
|
| 750e73c4a4b04a5695540d3c982774662307b58e |
31-Aug-2013 |
Doris Liu <tianliu@google.com> |
Merge "Measure all children to ensure correct layout position" into gb-ub-photos-carlsbad
|
| 8d2c6b830131a3d2e6ec7f2f8158b37506403dbd |
31-Aug-2013 |
Angus Kong <shkong@google.com> |
Merge "Skip bitmaps with 0 dimension." into gb-ub-photos-carlsbad
|
| de84c22cf14f8005002af473f19ff0244d520f6c |
31-Aug-2013 |
Doris Liu <tianliu@google.com> |
Measure all children to ensure correct layout position
Bug: 10412775
Change-Id: Ia64d6d4d0d023b208edb70066b4d4670e4ad2bbb
ndroid/camera/ui/CameraControls.java
|
| 62a622b22717b454d3de26bb3311536a27492b6e |
31-Aug-2013 |
Angus Kong <shkong@google.com> |
Skip bitmaps with 0 dimension.
bug:10514553
Change-Id: I0d26a324ede55b281e60cedc174869f5b863ca31
ndroid/camera/data/LocalMediaData.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
ndroid/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
ndroid/camera/CameraActivity.java
ndroid/camera/ui/FilmStripView.java
|
| 1b44336b29d2145eaaf0786be47c08e2b5304bcf |
30-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Let the Camera app remember which mode it was started in last." into gb-ub-photos-carlsbad
|
| b3d4d8e58831f6fffc078c8a6ee750dfe0f2a123 |
30-Aug-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix gap between camera controls and nav bar" into gb-ub-photos-carlsbad
|
| bdd198ee9047fc180b8e97e1c3a76132256fd36c |
30-Aug-2013 |
Doris Liu <tianliu@google.com> |
Fix gap between camera controls and nav bar
Bug: 10097187
Change-Id: I9918a09a1e0b2d3c5a89330b800a9b7f2c2a6408
ndroid/camera/VideoUI.java
|
| c09c5f0328a28ccfe9a0a9b37d028e91a94ded94 |
30-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Fix of memory issues with bitmaps in filmstrip." into gb-ub-photos-carlsbad
|
| 7f47e6ced2f9305296eadd6ad8647ff92890890f |
30-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Fix of memory issues with bitmaps in filmstrip.
Bug: 10495593
We should use the bigger scale factor of the two, and not the smaller.
Change-Id: I5a1ff6fe7d6b50c0128ff17709daa94cef9cb65b
ndroid/camera/data/LocalMediaData.java
|
| f3d3a5c63bd0d88882f0180ac79186c03c644c70 |
30-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Disable shutter button while picture is being taken." into gb-ub-photos-carlsbad
|
| 8de13111cc4e62da3462ea321d18c7951282e0d0 |
23-Aug-2013 |
Doris Liu <tianliu@google.com> |
1:1 zoom integration
Bug: 10308195
Change-Id: I940891f6aa3e24575174ff888c384fddaaa5b3c8
ndroid/camera/data/LocalData.java
ndroid/camera/data/LocalMediaData.java
ndroid/camera/ui/FilmStripView.java
ndroid/camera/ui/ZoomView.java
|
| 8890194726507573fd230fba7d4042ed00b363e4 |
29-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Disable shutter button while picture is being taken.
Bug: 7328018
Change-Id: I98160d52c542186aa9f2d85f66a4e0120a917e38
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
|
| 0df03318d36f77aaec11238854921bd45f50c035 |
29-Aug-2013 |
Doris Liu <tianliu@google.com> |
Merge "Flip capture thumb when using front facing camera" into gb-ub-photos-carlsbad
|
| 29da2db13029f8896018836693139a05d1139362 |
28-Aug-2013 |
Doris Liu <tianliu@google.com> |
Flip capture thumb when using front facing camera
Bug: 10495008
Change-Id: I9f444625e64be35afe44b0d7f50d81fbd1936ae8
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.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
ndroid/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
ndroid/camera/CameraActivity.java
ndroid/camera/Exif.java
ndroid/camera/MediaSaveService.java
ndroid/camera/PhotoModule.java
ndroid/camera/Storage.java
ndroid/camera/VideoModule.java
ndroid/camera/data/CameraDataAdapter.java
ndroid/camera/data/LocalData.java
ndroid/camera/data/LocalMediaData.java
ndroid/camera/data/MediaDetails.java
ndroid/camera/data/RotationTask.java
ndroid/camera/data/SimpleViewData.java
ndroid/camera/exif/ByteBufferInputStream.java
ndroid/camera/exif/CountedDataInputStream.java
ndroid/camera/exif/ExifData.java
ndroid/camera/exif/ExifInterface.java
ndroid/camera/exif/ExifInvalidFormatException.java
ndroid/camera/exif/ExifModifier.java
ndroid/camera/exif/ExifOutputStream.java
ndroid/camera/exif/ExifParser.java
ndroid/camera/exif/ExifReader.java
ndroid/camera/exif/ExifTag.java
ndroid/camera/exif/IfdData.java
ndroid/camera/exif/IfdId.java
ndroid/camera/exif/JpegHeader.java
ndroid/camera/exif/OrderedDataOutputStream.java
ndroid/camera/exif/Rational.java
ndroid/camera/ui/FilmStripView.java
|
| 09d5983dfbd252fca56ee8368906156e69a9fed0 |
28-Aug-2013 |
Tenghui Zhu <ztenghui@google.com> |
Merge "Revert "Add rotate support in Film Strip"" into gb-ub-photos-carlsbad
|
| 0acda98704a01e20de5af8026875789af1cd56f9 |
28-Aug-2013 |
Tenghui Zhu <ztenghui@google.com> |
Revert "Add rotate support in Film Strip"
This reverts commit 568ad02f9fd3993abf4b973bdd49a34737267c77.
Change-Id: I300376126b55191e4112b8aabf3f9f61cc27fef6
ndroid/camera/CameraActivity.java
ndroid/camera/Exif.java
ndroid/camera/MediaSaveService.java
ndroid/camera/PhotoModule.java
ndroid/camera/Storage.java
ndroid/camera/VideoModule.java
ndroid/camera/data/CameraDataAdapter.java
ndroid/camera/data/LocalData.java
ndroid/camera/data/LocalMediaData.java
ndroid/camera/data/MediaDetails.java
ndroid/camera/data/RotationTask.java
ndroid/camera/data/SimpleViewData.java
ndroid/camera/exif/ByteBufferInputStream.java
ndroid/camera/exif/CountedDataInputStream.java
ndroid/camera/exif/ExifData.java
ndroid/camera/exif/ExifInterface.java
ndroid/camera/exif/ExifInvalidFormatException.java
ndroid/camera/exif/ExifModifier.java
ndroid/camera/exif/ExifOutputStream.java
ndroid/camera/exif/ExifParser.java
ndroid/camera/exif/ExifReader.java
ndroid/camera/exif/ExifTag.java
ndroid/camera/exif/IfdData.java
ndroid/camera/exif/IfdId.java
ndroid/camera/exif/JpegHeader.java
ndroid/camera/exif/OrderedDataOutputStream.java
ndroid/camera/exif/Rational.java
ndroid/camera/ui/FilmStripView.java
|
| 80e2e1eca93d1df72420eb6d1b7db88460620b6e |
28-Aug-2013 |
ztenghui <ztenghui@google.com> |
Merge "Add rotate support in Film Strip" into gb-ub-photos-carlsbad
|
| 568ad02f9fd3993abf4b973bdd49a34737267c77 |
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: I0b8128a806fa9e777a87967b294555daadced1c5
ndroid/camera/CameraActivity.java
ndroid/camera/Exif.java
ndroid/camera/MediaSaveService.java
ndroid/camera/PhotoModule.java
ndroid/camera/Storage.java
ndroid/camera/VideoModule.java
ndroid/camera/data/CameraDataAdapter.java
ndroid/camera/data/LocalData.java
ndroid/camera/data/LocalMediaData.java
ndroid/camera/data/MediaDetails.java
ndroid/camera/data/RotationTask.java
ndroid/camera/data/SimpleViewData.java
ndroid/camera/exif/ByteBufferInputStream.java
ndroid/camera/exif/CountedDataInputStream.java
ndroid/camera/exif/ExifData.java
ndroid/camera/exif/ExifInterface.java
ndroid/camera/exif/ExifInvalidFormatException.java
ndroid/camera/exif/ExifModifier.java
ndroid/camera/exif/ExifOutputStream.java
ndroid/camera/exif/ExifParser.java
ndroid/camera/exif/ExifReader.java
ndroid/camera/exif/ExifTag.java
ndroid/camera/exif/IfdData.java
ndroid/camera/exif/IfdId.java
ndroid/camera/exif/JpegHeader.java
ndroid/camera/exif/OrderedDataOutputStream.java
ndroid/camera/exif/Rational.java
ndroid/camera/ui/FilmStripView.java
|
| 18d1d26a6da997bc0d9aa4d5688203f36c15377a |
27-Aug-2013 |
Mangesh Ghiware <mghiware@google.com> |
Merge "Bring back Share to filmstrip" into gb-ub-photos-carlsbad
|
| 143eb46b81202601e5454d460ea80a4796ecf43d |
27-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Remove Refocus string and icon" into gb-ub-photos-carlsbad
|
| d2219d3023a93ce15725af5009627eb37e982726 |
27-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Remove Refocus string and icon
Bug: 10494566
Change-Id: I49c61a5e1ae31e0458250e6cc624d63547ac0372
ndroid/camera/ui/CameraSwitcher.java
|
| cd2eeb0efc4370f20e9836e20eb11cb974e3b00d |
23-Aug-2013 |
Mangesh Ghiware <mghiware@google.com> |
Bring back Share to filmstrip
Bug: 10367406
Change-Id: I37834442e3af209fb00b98e6da524263ac8c70f0
ndroid/camera/CameraActivity.java
ndroid/camera/data/LocalData.java
ndroid/camera/data/LocalMediaData.java
|
| 3be7f94c1029728a8e236cfcde9c8bce68244095 |
26-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Make parsing integers for details dialog more robust.
Bug: 7141309
Change-Id: I031e2f062ea786acb94d41385c5913c47d719ccd
ndroid/camera/ui/DetailsDialog.java
|
| 80af7dd871547d03ee9ff5023cbec00b1d8677ee |
23-Aug-2013 |
Angus Kong <shkong@google.com> |
Fix full-screen swipe layout.
bug:10428905
Change-Id: Ie4907735cc86f2d10bd936ce2d9af54cccab7ece
ndroid/camera/ui/FilmStripView.java
|
| a2818f58b829f07021d69a36a831dcf339e9258a |
23-Aug-2013 |
Angus Kong <shkong@google.com> |
Merge "Bring back undo delete confirmation." into gb-ub-photos-carlsbad
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/data/CameraDataAdapter.java
ndroid/camera/ui/FilmStripView.java
|
| e2fb9943fb2d5a51a651f138d88473bf7f62e0b9 |
22-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Proper I18N of the Details dialog, especially for RTL.
Bug: 7141309
Change-Id: I27a2efd83b355cf2c7fa6cc6c9b386c1c0496c6b
ndroid/camera/data/LocalMediaData.java
ndroid/camera/data/MediaDetails.java
ndroid/camera/ui/DetailsDialog.java
|
| 00373f8a411042964f019a6355864a4c25fc2238 |
22-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Speed up filmstrip by not decoding with default 3000px." into gb-ub-photos-carlsbad
|
| 1259bc49d956887477ad6d789668fb61f572b046 |
22-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Speed up filmstrip by not decoding with default 3000px.
Bug: 10330214
Bug: 10430152
We need to tell the wrapped data adapters about the size we need. Also,
use a more efficient way to determine the sample size.
Change-Id: Ie2c6fb438f06d97d6e5420afdceccccf41040020
ndroid/camera/data/AbstractLocalDataAdapterWrapper.java
ndroid/camera/data/LocalMediaData.java
|
| ce2acbcb77225b6d429a23e00f69aadde8c2378b |
22-Aug-2013 |
Doris Liu <tianliu@google.com> |
Fix preview thumb orientation
Bug: 10428123
Change-Id: I7c6f37db66d9e10a07f555902b214009156736c1
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
|
| f737ac489200f12b6a48c4d0f7b63c0731eb8713 |
22-Aug-2013 |
Angus Kong <shkong@google.com> |
Merge "Add support to "go-to-next" in film strip." into gb-ub-photos-carlsbad
|
| 734598c39e6a9d809982dae2907dc7d10e0b0e9f |
22-Aug-2013 |
Angus Kong <shkong@google.com> |
Add support to "go-to-next" in film strip.
bug:10328123
Change-Id: I018876df89cc7ed125a32af850e6b26114fb1004
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoUI.java
ndroid/camera/VideoUI.java
ndroid/camera/ui/FilmStripView.java
|
| 56f16746c8b3208e12134fb51843dde988cc79bc |
22-Aug-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix video capture animation and video snapshot animation" into gb-ub-photos-carlsbad
|
| 3973deba115d398a25f0b74c2aea2ff4079355a5 |
21-Aug-2013 |
Doris Liu <tianliu@google.com> |
Fix video capture animation and video snapshot animation
Also removed unused effects recording code
Bug: 10326106
Bug: 10414112
Change-Id: I904a26a0b10c75fcce650dc0ec63d7c11746dc2e
ndroid/camera/MediaSaveService.java
ndroid/camera/VideoModule.java
ndroid/camera/VideoUI.java
|
| 15396ca68c47a4ef14e6b23c6cd009d8915f8ea2 |
22-Aug-2013 |
Angus Kong <shkong@google.com> |
Merge "Fix delete animation in fullscreen mode." into gb-ub-photos-carlsbad
|
| aa2a243bdc91b809dbfe01a9933b02e6b95d983f |
21-Aug-2013 |
Angus Kong <shkong@google.com> |
Fix delete animation in fullscreen mode.
bug:10414539
Change-Id: I798492a824306d0eb479aae4e822cd9c7fbe3530
ndroid/camera/ui/FilmStripView.java
|
| 7e374eb0a450ed2689b556ab42a0a88c8f74df2e |
21-Aug-2013 |
Angus Kong <shkong@google.com> |
Stop the MediaSaveService after unbinding.
bug:10361258
Change-Id: Ie1dc3caac03f7a691aae0c84c468bfb21ce6ae90
ndroid/camera/CameraActivity.java
|
| 025136bb4639d84b2a5a7b95367fabcc92b86415 |
21-Aug-2013 |
Angus Kong <shkong@google.com> |
Support filmstrip swipe in full-screen.
bug:10341731
Change-Id: Ib4a3278f72d3e1070603d2a094f4021a947bdc56
ndroid/camera/ui/FilmStripView.java
|
| 870253516ce315888ac64e1921285e47154a75e7 |
21-Aug-2013 |
Angus Kong <shkong@google.com> |
Merge "Update the final PhotoSphere result correctly." into gb-ub-photos-carlsbad
|
| 304a6360c3b710a4a5781788b887ca479646c86f |
21-Aug-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix nav bar overlapping camera bottom UI controls" into gb-ub-photos-carlsbad
|
| 513f1c1e8b7b4249c599a734307e348355439b67 |
21-Aug-2013 |
Doris Liu <tianliu@google.com> |
Fix nav bar overlapping camera bottom UI controls
Bug: 10394750
Change-Id: Ia46d4903a2c148102bd62ca71516bd81e10fe497
ndroid/camera/ui/FilmStripView.java
|
| d7e01e25dab83af2fe093d73f8f5f705f1a27305 |
21-Aug-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix video snapshot aspect ratio" into gb-ub-photos-carlsbad
|
| 6df2d96e6a3d1f20ef04d2a29c9bb15f3002ad15 |
21-Aug-2013 |
Doris Liu <tianliu@google.com> |
Fix video snapshot aspect ratio
Bug: 10312002
Change-Id: Ibe2037195b3936baa63628797ea2b742825ed701
ndroid/camera/MediaSaveService.java
ndroid/camera/VideoModule.java
|
| 8969a67c926608737f3e49f2d2240298372e8416 |
20-Aug-2013 |
Angus Kong <shkong@google.com> |
Update the final PhotoSphere result correctly.
bug:10400557
Change-Id: I8e8b22b569c3b3a7f4d25e7eb46053332e2dc062
ndroid/camera/ui/FilmStripView.java
|
| 13ca71ebdbb2eb9c492da16262311b1290474f7d |
20-Aug-2013 |
Doris Liu <tianliu@google.com> |
Fix squished preview
Bug: 10330209
Change-Id: I0b208ccd556d8c65474ad6bce0d2ddc3c2bdb7f6
ndroid/camera/PhotoUI.java
|
| 0819304bc06ffd3498d9fd0d8a148c50f0903c46 |
20-Aug-2013 |
nicolasroard <nicolasroard@google.com> |
Add "set as" capability in Film Strip
bug:10367174
Change-Id: I9161e08f26c02edd1d168ac6986de61066d69552
ndroid/camera/CameraActivity.java
|
| 722c86077d15354ccf0d6e1acf5b6384df5da85f |
20-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Rename accessibility text for Photo Sphere mode from 'new panorama'.
Bug: 10075811
Change-Id: I7a0e7f890d0243fe13e8f3746d49378daf1bb962
ndroid/camera/ui/CameraSwitcher.java
|
| b269061daf65d090e6836980b57c408f62039841 |
19-Aug-2013 |
Angus Kong <shkong@google.com> |
Merge "Implement deletion in the menu." into gb-ub-photos-carlsbad
|
| e857cc90a98e280e2008beb03e2446bd642d2ec4 |
19-Aug-2013 |
Angus Kong <shkong@google.com> |
Implement deletion in the menu.
bug:10367402
Change-Id: Ia48544ccb4186808f8cf89c7b4ea6d291aa8cf24
ndroid/camera/CameraActivity.java
|
| b0a5929b1dd0ddc2729e23ba95afdb43a1aecfd5 |
19-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Add video details to the details menu
Bug: 10330505
Also fix a potential NPE issue and some minor reformatting.
Change-Id: I89a32645a497d1f19d935b96bd1997e6fdf902b2
ndroid/camera/data/LocalMediaData.java
ndroid/camera/data/MediaDetails.java
|
| e98a59afc89fc97bc619ef8c3aa66781061592f8 |
19-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Don't refresh item on resume as it leads to a filmstrip bug." into gb-ub-photos-carlsbad
|
| 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
ndroid/camera/CameraActivity.java
|
| 58dfa0fb61e0499fdb108143da90014c463f05a2 |
19-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Enable switching cameras in video mode." into gb-ub-photos-carlsbad
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/data/LocalData.java
ndroid/camera/data/LocalMediaData.java
ndroid/camera/data/SimpleViewData.java
ndroid/camera/ui/FilmStripView.java
ndroid/camera/ui/FilmstripBottomControls.java
|
| 0d63b89ef8e5bfbfe2ef1a8d40505d7208052ff8 |
19-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Enable switching cameras in video mode.
Bug: 10313018
Change-Id: I8e75341d7d37135ba7747d56a1a0e6d19ffb8eaa
ndroid/camera/VideoModule.java
|
| 1571239c21fc4be7fd3c8db6ff1b8dc22f4d7e6f |
19-Aug-2013 |
ztenghui <ztenghui@google.com> |
Merge "Add the trim functionality back to FilmStripView" into gb-ub-photos-carlsbad
|
| c68570335a64be66829727e121afe1622902a74b |
16-Aug-2013 |
Doris Liu <tianliu@google.com> |
Add image 1:1 support
Bug: 10308195
Change-Id: I7b7fcf3b46475a2d39bac27095d01d438582e516
ndroid/camera/ui/ZoomView.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
ndroid/camera/CameraActivity.java
|
| 4ff5a1ab360577c6a7ec953f9197778c84c9d334 |
15-Aug-2013 |
Angus Kong <shkong@google.com> |
Set views in filmstrip invisible when alpha = 0.
bug:10096747
Change-Id: Idcb62448acbf38d581af3a08a9bcbc0cad0ab6be
ndroid/camera/data/CameraDataAdapter.java
ndroid/camera/data/FixedFirstDataAdapter.java
ndroid/camera/data/FixedLastDataAdapter.java
ndroid/camera/data/LocalData.java
ndroid/camera/ui/FilmStripView.java
|
| 394023fb7e3c8d07d4aeafc30bf4b66ed481ebb7 |
16-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Single-tap in fullscreen view toggles ActionBar.
Bug: 10347286
Change-Id: I55e400c957d4ec1ef1307e45007e2127ea5ab7ea
ndroid/camera/CameraActivity.java
ndroid/camera/ui/FilmStripView.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
ndroid/camera/CameraActivity.java
ndroid/camera/data/CameraPreviewData.java
ndroid/camera/data/LocalData.java
ndroid/camera/data/LocalMediaData.java
ndroid/camera/data/SimpleViewData.java
ndroid/camera/ui/FilmStripView.java
ndroid/camera/util/CameraUtil.java
|
| 29a27c76f2f581cdf5ab5c7e196312f635669420 |
15-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Brings back the details menu with most EXIF data in it. Some are still missing and will come back later." into gb-ub-photos-carlsbad
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/data/DataUtils.java
ndroid/camera/data/LocalData.java
ndroid/camera/data/LocalMediaData.java
ndroid/camera/data/MediaDetails.java
ndroid/camera/data/SimpleViewData.java
ndroid/camera/ui/DetailsDialog.java
|
| fca1c5ece5450914ed49115443e1d45737f2ee40 |
15-Aug-2013 |
Dan Aminzade <monzy@google.com> |
Defining broadcast intent strings as constants in CameraUtil.java.
For now I'm leaving the definition within the Camera application. If
we decide we want to publicize and document these intents as part of
the Android API, we could move the definitions to Camera.java.
Change-Id: Ia198b843245b70d7378e1ea81ecb8b7983486446
ndroid/camera/PhotoModule.java
ndroid/camera/util/CameraUtil.java
|
| 7e1c5fe26bc861d979b85014a511ba35bc1f4110 |
15-Aug-2013 |
Angus Kong <shkong@google.com> |
Single tap to full screen mode.
bug:10308911
Change-Id: Ia3213782091eafe6a5683a931dea1ae212e79ba3
ndroid/camera/ui/FilmStripView.java
|
| 0689254ef810c502c65852a7c54bf902e975b38a |
15-Aug-2013 |
Angus Kong <shkong@google.com> |
Merge "Make current view center in filmstrip." into gb-ub-photos-carlsbad
|
| 47721fa8f2dc13cb565ae5629a417dc4ed298e81 |
15-Aug-2013 |
Angus Kong <shkong@google.com> |
Make current view center in filmstrip.
bug:10096746
Change-Id: I458a3f1b1a2c78239e1cfaa91d6d5e1cec19507e
ndroid/camera/ui/FilmStripView.java
|
| 92ae10ec320405d07c85a9e80be40293c65d85e0 |
13-Aug-2013 |
Dan Aminzade <monzy@google.com> |
Add support for remote shutter control via broadcast intents.
Send CAMERA_STOPPED and CAMERA_STARTED intents on pause/resume, to
notify Gem to hide and show the camera card, and receive the SHUTTER
broadcast intent to trigger the shutter.
This change resolves b/10185077.
Change-Id: I1e38039874b74460f5c815e9d2672789691e9e2f
ndroid/camera/PhotoModule.java
|
| 0989e394420705b66867a8c1cf273b5904c8e4eb |
14-Aug-2013 |
Angus Kong <shkong@google.com> |
Handle unexpected exceptions when loading videos.
bug:10313671
bug:9757517
Change-Id: I8cb922599c4185a585f90007c3975841d14e179a
ndroid/camera/PhotoUI.java
ndroid/camera/data/LocalMediaData.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
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoController.java
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
ndroid/camera/VideoModule.java
ndroid/camera/data/CameraDataAdapter.java
ndroid/camera/data/FixedFirstDataAdapter.java
ndroid/camera/ui/FilmStripView.java
|
| 1e3353427a04b945bfc6e167e38b63e814329a9f |
14-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Don't take a snapshot if video recording is not in progress." into gb-ub-photos-carlsbad
|
| e96a4ad86489b86d0ce2f7ce156723f4d9d94dba |
14-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Clean up unused code." into gb-ub-photos-carlsbad
|
| 0abbdb370b4cd722a739cf65c7b5845ceef535b8 |
14-Aug-2013 |
ztenghui <ztenghui@google.com> |
Merge "Hide the actionbar and title at the beginning" into gb-ub-photos-carlsbad
|
| 50df47071c776703a36dbc4cb90ec8d1df3c0f6e |
14-Aug-2013 |
ztenghui <ztenghui@google.com> |
Hide the actionbar and title at the beginning
bug:10245009
Change-Id: I39640e9f7add0c8ae20257dd5c71cefd4a927a0e
ndroid/camera/CameraActivity.java
|
| a514b14dd769f67478c3296451bd9cd05676fa5f |
14-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Don't take a snapshot if video recording is not in progress.
Bug:10312841
Change-Id: Ie6931d054089d0825e7a57206a8de129a79b741f
ndroid/camera/VideoModule.java
|
| ddef7798808fb8871650a5a803aec1f169a08bcb |
13-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Clean up unused code.
Change-Id: Ib7d05cd1bd908708ad96a8b215c79162950e0221
ndroid/camera/PhotoController.java
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.java
|
| 02ed1b27b8cd2d0493ed18aea1ce304b6837ef64 |
14-Aug-2013 |
ztenghui <ztenghui@google.com> |
Merge "Add the menu items back" into gb-ub-photos-carlsbad
|
| 0353ca2e048543bd6e233b4c2110a1df1070cd3f |
13-Aug-2013 |
ztenghui <ztenghui@google.com> |
Add the menu items back
bug:10245009
Change-Id: I4e11e0cd64800bd9c07158d1a46ea5765ba51d15
ndroid/camera/CameraActivity.java
|
| 386057407167d69636d441a287e8ebef9708c533 |
14-Aug-2013 |
Doris Liu <tianliu@google.com> |
Check for device support before taking video snapshots
Bug: 9496097
Change-Id: I6f5d0489848b583fac3b1fd3b605351002be08ba
ndroid/camera/VideoModule.java
|
| 57549631449fab8cd4d8dffe730bee4d5c4d8890 |
13-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Remove Refocus from Camera UI.
Bug:10073814
Change-Id: I023c7f61463690b02492705cedec8c74159c515d
ndroid/camera/CameraActivity.java
ndroid/camera/ui/CameraSwitcher.java
|
| 0a08b3a280bf7934d362c94a49e43646c9b3bc4f |
13-Aug-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix video capture intent handling" into gb-ub-photos-carlsbad
|
| 2a7f44cac888de5683d05bef5708f846ee950f43 |
13-Aug-2013 |
Doris Liu <tianliu@google.com> |
Fix video capture intent handling
Bug: 10296343
Change-Id: I55fb6c71b59a1559ebb58c65e71d510379367435
ndroid/camera/CameraActivity.java
ndroid/camera/VideoModule.java
ndroid/camera/VideoUI.java
|
| c27d21bc3b9322936004827ab005fb7d1facfacf |
13-Aug-2013 |
Angus Kong <shkong@google.com> |
Add local data types.
We need local data types to generate different menus.
bug:10245009
Change-Id: I95f947c11ad3f39172c43f75f4108bf720148278
ndroid/camera/data/CameraPreviewData.java
ndroid/camera/data/LocalData.java
ndroid/camera/data/LocalMediaData.java
ndroid/camera/data/SimpleViewData.java
ndroid/camera/ui/FilmStripView.java
|
| d806e6528092fd309bb2128ad5a539c72f52fd42 |
13-Aug-2013 |
Angus Kong <shkong@google.com> |
Don't return null if there's no images to load.
bug:10294250
Change-Id: Id6744f5bf36715527badc098de77bf11d67ae549
ndroid/camera/data/CameraDataAdapter.java
|
| 39685480a9705a949275c4b9cb0cca46c6c3cbc4 |
12-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Don't set mImages to null, as we call .size() later.
Bug: 10293573
Change-Id: I5fab2bc4fe355c4c26dcab9b6b71ff14e7216502
ndroid/camera/data/CameraDataAdapter.java
|
| a0bd080a978fd7e9a67436b412f929c5b3cf8854 |
12-Aug-2013 |
ztenghui <ztenghui@google.com> |
Merge "Add the basic action bar back." into gb-ub-photos-carlsbad
|
| ce0879836ae753cdda3cf45f2b0eb050f27f8258 |
10-Aug-2013 |
Angus Kong <shkong@google.com> |
Merge "Clean up Gallery codes." 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
ndroid/camera/CameraActivity.java
|
| b50b5cbfbc0a67db6fc43373363b10381c9c61a3 |
09-Aug-2013 |
Angus Kong <shkong@google.com> |
Clean up Gallery codes.
bug:10263696
Change-Id: I3a16dba3aabe52b8103a2c591cfa39907265a263
ndroid/camera/AndroidCameraManagerImpl.java
ndroid/camera/CameraActivity.java
ndroid/camera/CameraHolder.java
ndroid/camera/CameraManager.java
ndroid/camera/CameraScreenNail.java
ndroid/camera/CameraSettings.java
ndroid/camera/CaptureAnimManager.java
ndroid/camera/EffectsRecorder.java
ndroid/camera/FocusOverlayManager.java
ndroid/camera/ListPreference.java
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
ndroid/camera/PreviewFrameLayout.java
ndroid/camera/RotateDialogController.java
ndroid/camera/SoundClips.java
ndroid/camera/StaticBitmapScreenNail.java
ndroid/camera/Storage.java
ndroid/camera/SwitchAnimManager.java
ndroid/camera/Util.java
ndroid/camera/VideoModule.java
ndroid/camera/VideoUI.java
ndroid/camera/app/CameraApp.java
ndroid/camera/app/OrientationManager.java
ndroid/camera/app/OrientationSource.java
ndroid/camera/data/LocalMediaData.java
ndroid/camera/support/app/OrientationManager.java
ndroid/camera/support/app/StitchingChangeListener.java
ndroid/camera/support/common/ApiHelper.java
ndroid/camera/support/common/Utils.java
ndroid/camera/support/filtershow/crop/CropExtras.java
ndroid/camera/support/glrenderer/BasicTexture.java
ndroid/camera/support/glrenderer/BitmapTexture.java
ndroid/camera/support/glrenderer/ExtTexture.java
ndroid/camera/support/glrenderer/GLCanvas.java
ndroid/camera/support/glrenderer/GLId.java
ndroid/camera/support/glrenderer/GLPaint.java
ndroid/camera/support/glrenderer/NinePatchChunk.java
ndroid/camera/support/glrenderer/NinePatchTexture.java
ndroid/camera/support/glrenderer/RawTexture.java
ndroid/camera/support/glrenderer/ResourceTexture.java
ndroid/camera/support/glrenderer/Texture.java
ndroid/camera/support/glrenderer/UploadedTexture.java
ndroid/camera/support/ui/BitmapScreenNail.java
ndroid/camera/support/ui/OrientationSource.java
ndroid/camera/support/ui/ScreenNail.java
ndroid/camera/support/ui/SurfaceTextureScreenNail.java
ndroid/camera/support/util/AccessibilityUtils.java
ndroid/camera/support/util/MotionEventHelper.java
ndroid/camera/ui/CameraRootView.java
ndroid/camera/ui/CameraSwitcher.java
ndroid/camera/ui/EffectSettingPopup.java
ndroid/camera/ui/FaceView.java
ndroid/camera/ui/PreviewSurfaceView.java
ndroid/camera/ui/RotatableLayout.java
ndroid/camera/ui/RotateLayout.java
ndroid/camera/ui/RotateTextToast.java
ndroid/camera/ui/Switch.java
ndroid/camera/util/AccessibilityUtils.java
ndroid/camera/util/ApiHelper.java
ndroid/camera/util/CameraUtil.java
ndroid/camera/util/MotionEventHelper.java
|
| 81c5992f805517b6dd8937d4ff6b11724b23c228 |
10-Aug-2013 |
Angus Kong <shkong@google.com> |
Fix NPE after capture when camera roll is empty.
Use empty array instead of null.
bug:10264304
Change-Id: I486a26810dc4e0d4b562809dc243f52448dbd258
ndroid/camera/data/CameraDataAdapter.java
|
| c3679c0961521165499380c77344acc69072b2ac |
09-Aug-2013 |
Doris Liu <tianliu@google.com> |
Use PopupWindow for settings popup
Bug:10261902
Change-Id: Ia77cff276615db8c3fbb9e859bf099249b4021cf
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
ndroid/camera/VideoModule.java
ndroid/camera/VideoUI.java
|
| 3d0b691b8f7a844093e8de9267ffa2ce16d0c5a9 |
09-Aug-2013 |
Angus Kong <shkong@google.com> |
Fix DataAdapter wrapper classes callback mechanism.
Also to fix FilmStripView to avoid NPE before data is loaded.
Change-Id: I6c8a3d215d9f1dc72b4207e52023c1e27e9df123
ndroid/camera/data/FixedFirstDataAdapter.java
ndroid/camera/ui/FilmStripView.java
|
| 70466a0f15b91efdfdfd97a718e3d4089666a51c |
08-Aug-2013 |
Angus Kong <shkong@google.com> |
Merge "Refactor data/LocalData." into gb-ub-photos-carlsbad
|
| eee0d4e9b1c65f86ecbb303b759868ccbf9de597 |
08-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Changes required for building GoogleCamera.
Change-Id: I2ea7f4714e3003ff05eadb6cb8b93af721b39ac6
ndroid/camera/app/CameraApp.java
|
| bd26069d391830856c57c2141cd2efbc8423d871 |
07-Aug-2013 |
Angus Kong <shkong@google.com> |
Refactor data/LocalData.
Make the design more easily understood.
Change-Id: I4f7dbe7d3f0a0534c13996b773f1767997848746
ndroid/camera/CameraActivity.java
ndroid/camera/data/CameraDataAdapter.java
ndroid/camera/data/CameraPreviewData.java
ndroid/camera/data/LocalData.java
ndroid/camera/data/LocalMediaData.java
ndroid/camera/data/SimpleViewData.java
|
| 764b07e6d5143b09c6f1bdd5504a89b81f7a7e74 |
07-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Remove refocus icon if it's not enabled or present.
Change-Id: I0c885a7a56abfe2365d832fa5ca8c1d74ce2edc8
ndroid/camera/ui/CameraSwitcher.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
ndroid/camera/AnimationManager.java
ndroid/camera/CameraActivity.java
ndroid/camera/ImageTaskManager.java
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
ndroid/camera/Util.java
ndroid/camera/VideoModule.java
ndroid/camera/VideoUI.java
ndroid/camera/data/AbstractLocalDataAdapterWrapper.java
ndroid/camera/data/CameraDataAdapter.java
ndroid/camera/data/FixedFirstDataAdapter.java
ndroid/camera/data/FixedLastDataAdapter.java
ndroid/camera/data/LocalData.java
ndroid/camera/data/LocalDataAdapter.java
ndroid/camera/ui/FilmStripView.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
ndroid/camera/AndroidCameraManagerImpl.java
ndroid/camera/CameraActivity.java
ndroid/camera/CameraManager.java
ndroid/camera/CameraPreference.java
ndroid/camera/CameraScreenNail.java
ndroid/camera/CameraSettings.java
ndroid/camera/CaptureAnimManager.java
ndroid/camera/ComboPreferences.java
ndroid/camera/CountDownTimerPreference.java
ndroid/camera/EffectsRecorder.java
ndroid/camera/FocusOverlayManager.java
ndroid/camera/IconListPreference.java
ndroid/camera/ListPreference.java
ndroid/camera/OnScreenHint.java
ndroid/camera/OnScreenIndicators.java
ndroid/camera/PhotoMenu.java
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
ndroid/camera/PreviewFrameLayout.java
ndroid/camera/RotateDialogController.java
ndroid/camera/SoundClips.java
ndroid/camera/StaticBitmapScreenNail.java
ndroid/camera/Storage.java
ndroid/camera/SwitchAnimManager.java
ndroid/camera/Util.java
ndroid/camera/VideoMenu.java
ndroid/camera/VideoModule.java
ndroid/camera/VideoUI.java
ndroid/camera/app/CameraApp.java
ndroid/camera/data/CameraDataAdapter.java
ndroid/camera/data/LocalData.java
ndroid/camera/data/PanoramaMetadataLoader.java
ndroid/camera/support/app/OrientationManager.java
ndroid/camera/support/app/StitchingChangeListener.java
ndroid/camera/support/common/ApiHelper.java
ndroid/camera/support/common/Utils.java
ndroid/camera/support/filtershow/crop/CropExtras.java
ndroid/camera/support/glrenderer/BasicTexture.java
ndroid/camera/support/glrenderer/BitmapTexture.java
ndroid/camera/support/glrenderer/ExtTexture.java
ndroid/camera/support/glrenderer/GLCanvas.java
ndroid/camera/support/glrenderer/GLId.java
ndroid/camera/support/glrenderer/GLPaint.java
ndroid/camera/support/glrenderer/NinePatchChunk.java
ndroid/camera/support/glrenderer/NinePatchTexture.java
ndroid/camera/support/glrenderer/RawTexture.java
ndroid/camera/support/glrenderer/ResourceTexture.java
ndroid/camera/support/glrenderer/Texture.java
ndroid/camera/support/glrenderer/UploadedTexture.java
ndroid/camera/support/ui/BitmapScreenNail.java
ndroid/camera/support/ui/OrientationSource.java
ndroid/camera/support/ui/ScreenNail.java
ndroid/camera/support/ui/SurfaceTextureScreenNail.java
ndroid/camera/support/util/AccessibilityUtils.java
ndroid/camera/support/util/MotionEventHelper.java
ndroid/camera/ui/AbstractSettingPopup.java
ndroid/camera/ui/CameraControls.java
ndroid/camera/ui/CameraRootView.java
ndroid/camera/ui/CameraSwitcher.java
ndroid/camera/ui/CountDownView.java
ndroid/camera/ui/CountdownTimerPopup.java
ndroid/camera/ui/EffectSettingPopup.java
ndroid/camera/ui/FaceView.java
ndroid/camera/ui/FilmStripView.java
ndroid/camera/ui/InLineSettingCheckBox.java
ndroid/camera/ui/InLineSettingItem.java
ndroid/camera/ui/InLineSettingMenu.java
ndroid/camera/ui/ListPrefSettingPopup.java
ndroid/camera/ui/MoreSettingPopup.java
ndroid/camera/ui/PieRenderer.java
ndroid/camera/ui/RotateLayout.java
ndroid/camera/ui/RotateTextToast.java
ndroid/camera/ui/Switch.java
ndroid/camera/ui/TimeIntervalPopup.java
ndroid/camera/ui/ZoomRenderer.java
ndroid/gallery3d/anim/AlphaAnimation.java
ndroid/gallery3d/anim/Animation.java
ndroid/gallery3d/anim/CanvasAnimation.java
ndroid/gallery3d/anim/FloatAnimation.java
ndroid/gallery3d/anim/StateTransitionAnimation.java
ndroid/gallery3d/app/AbstractGalleryActivity.java
ndroid/gallery3d/app/ActivityState.java
ndroid/gallery3d/app/AlbumDataLoader.java
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/AlbumPicker.java
ndroid/gallery3d/app/AlbumSetDataLoader.java
ndroid/gallery3d/app/AlbumSetPage.java
ndroid/gallery3d/app/AppBridge.java
ndroid/gallery3d/app/BatchService.java
ndroid/gallery3d/app/CommonControllerOverlay.java
ndroid/gallery3d/app/Config.java
ndroid/gallery3d/app/ControllerOverlay.java
ndroid/gallery3d/app/DialogPicker.java
ndroid/gallery3d/app/EyePosition.java
ndroid/gallery3d/app/FilmstripPage.java
ndroid/gallery3d/app/FilterUtils.java
ndroid/gallery3d/app/Gallery.java
ndroid/gallery3d/app/GalleryActionBar.java
ndroid/gallery3d/app/GalleryApp.java
ndroid/gallery3d/app/GalleryAppImpl.java
ndroid/gallery3d/app/GalleryContext.java
ndroid/gallery3d/app/LoadingListener.java
ndroid/gallery3d/app/Log.java
ndroid/gallery3d/app/ManageCachePage.java
ndroid/gallery3d/app/MovieActivity.java
ndroid/gallery3d/app/MovieControllerOverlay.java
ndroid/gallery3d/app/MoviePlayer.java
ndroid/gallery3d/app/MuteVideo.java
ndroid/gallery3d/app/NotificationIds.java
ndroid/gallery3d/app/OrientationManager.java
ndroid/gallery3d/app/PackagesMonitor.java
ndroid/gallery3d/app/PanoramaMetadataSupport.java
ndroid/gallery3d/app/PhotoDataAdapter.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/app/PhotoPageBottomControls.java
ndroid/gallery3d/app/PhotoPageProgressBar.java
ndroid/gallery3d/app/PickerActivity.java
ndroid/gallery3d/app/SinglePhotoDataAdapter.java
ndroid/gallery3d/app/SinglePhotoPage.java
ndroid/gallery3d/app/SlideshowDataAdapter.java
ndroid/gallery3d/app/SlideshowPage.java
ndroid/gallery3d/app/StateManager.java
ndroid/gallery3d/app/StitchingChangeListener.java
ndroid/gallery3d/app/TimeBar.java
ndroid/gallery3d/app/TransitionStore.java
ndroid/gallery3d/app/TrimControllerOverlay.java
ndroid/gallery3d/app/TrimTimeBar.java
ndroid/gallery3d/app/TrimVideo.java
ndroid/gallery3d/app/VideoUtils.java
ndroid/gallery3d/app/Wallpaper.java
ndroid/gallery3d/data/ActionImage.java
ndroid/gallery3d/data/BucketHelper.java
ndroid/gallery3d/data/BytesBufferPool.java
ndroid/gallery3d/data/CameraShortcutImage.java
ndroid/gallery3d/data/ChangeNotifier.java
ndroid/gallery3d/data/ClusterAlbum.java
ndroid/gallery3d/data/ClusterAlbumSet.java
ndroid/gallery3d/data/ClusterSource.java
ndroid/gallery3d/data/Clustering.java
ndroid/gallery3d/data/ComboAlbum.java
ndroid/gallery3d/data/ComboAlbumSet.java
ndroid/gallery3d/data/ComboSource.java
ndroid/gallery3d/data/ContentListener.java
ndroid/gallery3d/data/DataManager.java
ndroid/gallery3d/data/DataSourceType.java
ndroid/gallery3d/data/DecodeUtils.java
ndroid/gallery3d/data/DownloadCache.java
ndroid/gallery3d/data/DownloadEntry.java
ndroid/gallery3d/data/DownloadUtils.java
ndroid/gallery3d/data/EmptyAlbumImage.java
ndroid/gallery3d/data/Exif.java
ndroid/gallery3d/data/Face.java
ndroid/gallery3d/data/FaceClustering.java
ndroid/gallery3d/data/FilterDeleteSet.java
ndroid/gallery3d/data/FilterEmptyPromptSet.java
ndroid/gallery3d/data/FilterSource.java
ndroid/gallery3d/data/FilterTypeSet.java
ndroid/gallery3d/data/ImageCacheRequest.java
ndroid/gallery3d/data/ImageCacheService.java
ndroid/gallery3d/data/LocalAlbum.java
ndroid/gallery3d/data/LocalAlbumSet.java
ndroid/gallery3d/data/LocalImage.java
ndroid/gallery3d/data/LocalMediaItem.java
ndroid/gallery3d/data/LocalMergeAlbum.java
ndroid/gallery3d/data/LocalSource.java
ndroid/gallery3d/data/LocalVideo.java
ndroid/gallery3d/data/LocationClustering.java
ndroid/gallery3d/data/Log.java
ndroid/gallery3d/data/MediaDetails.java
ndroid/gallery3d/data/MediaItem.java
ndroid/gallery3d/data/MediaObject.java
ndroid/gallery3d/data/MediaSet.java
ndroid/gallery3d/data/MediaSource.java
ndroid/gallery3d/data/MtpClient.java
ndroid/gallery3d/data/PanoramaMetadataJob.java
ndroid/gallery3d/data/Path.java
ndroid/gallery3d/data/PathMatcher.java
ndroid/gallery3d/data/SecureAlbum.java
ndroid/gallery3d/data/SecureSource.java
ndroid/gallery3d/data/SingleItemAlbum.java
ndroid/gallery3d/data/SizeClustering.java
ndroid/gallery3d/data/SnailAlbum.java
ndroid/gallery3d/data/SnailItem.java
ndroid/gallery3d/data/SnailSource.java
ndroid/gallery3d/data/TagClustering.java
ndroid/gallery3d/data/TimeClustering.java
ndroid/gallery3d/data/UnlockImage.java
ndroid/gallery3d/data/UriImage.java
ndroid/gallery3d/data/UriSource.java
ndroid/gallery3d/filtershow/CenteredLinearLayout.java
ndroid/gallery3d/filtershow/EditorPlaceHolder.java
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/cache/ImageLoader.java
ndroid/gallery3d/filtershow/category/Action.java
ndroid/gallery3d/filtershow/category/CategoryAdapter.java
ndroid/gallery3d/filtershow/category/CategoryPanel.java
ndroid/gallery3d/filtershow/category/CategoryTrack.java
ndroid/gallery3d/filtershow/category/CategoryView.java
ndroid/gallery3d/filtershow/category/MainPanel.java
ndroid/gallery3d/filtershow/colorpicker/ColorGridDialog.java
ndroid/gallery3d/filtershow/colorpicker/ColorListener.java
ndroid/gallery3d/filtershow/colorpicker/ColorOpacityView.java
ndroid/gallery3d/filtershow/colorpicker/ColorPickerDialog.java
ndroid/gallery3d/filtershow/colorpicker/ColorRectView.java
ndroid/gallery3d/filtershow/colorpicker/ColorValueView.java
ndroid/gallery3d/filtershow/colorpicker/RGBListener.java
ndroid/gallery3d/filtershow/controller/ActionSlider.java
ndroid/gallery3d/filtershow/controller/BasicParameterInt.java
ndroid/gallery3d/filtershow/controller/BasicParameterStyle.java
ndroid/gallery3d/filtershow/controller/BasicSlider.java
ndroid/gallery3d/filtershow/controller/Control.java
ndroid/gallery3d/filtershow/controller/FilterView.java
ndroid/gallery3d/filtershow/controller/Parameter.java
ndroid/gallery3d/filtershow/controller/ParameterActionAndInt.java
ndroid/gallery3d/filtershow/controller/ParameterInteger.java
ndroid/gallery3d/filtershow/controller/ParameterSet.java
ndroid/gallery3d/filtershow/controller/ParameterStyles.java
ndroid/gallery3d/filtershow/controller/StyleChooser.java
ndroid/gallery3d/filtershow/controller/TitledSlider.java
ndroid/gallery3d/filtershow/crop/BoundedRect.java
ndroid/gallery3d/filtershow/crop/CropActivity.java
ndroid/gallery3d/filtershow/crop/CropDrawingUtils.java
ndroid/gallery3d/filtershow/crop/CropExtras.java
ndroid/gallery3d/filtershow/crop/CropMath.java
ndroid/gallery3d/filtershow/crop/CropObject.java
ndroid/gallery3d/filtershow/crop/CropView.java
ndroid/gallery3d/filtershow/data/FilterStackDBHelper.java
ndroid/gallery3d/filtershow/data/FilterStackSource.java
ndroid/gallery3d/filtershow/data/UserPresetsManager.java
ndroid/gallery3d/filtershow/editors/BasicEditor.java
ndroid/gallery3d/filtershow/editors/Editor.java
ndroid/gallery3d/filtershow/editors/EditorChanSat.java
ndroid/gallery3d/filtershow/editors/EditorCrop.java
ndroid/gallery3d/filtershow/editors/EditorCurves.java
ndroid/gallery3d/filtershow/editors/EditorDraw.java
ndroid/gallery3d/filtershow/editors/EditorGrad.java
ndroid/gallery3d/filtershow/editors/EditorInfo.java
ndroid/gallery3d/filtershow/editors/EditorMirror.java
ndroid/gallery3d/filtershow/editors/EditorPanel.java
ndroid/gallery3d/filtershow/editors/EditorRedEye.java
ndroid/gallery3d/filtershow/editors/EditorRotate.java
ndroid/gallery3d/filtershow/editors/EditorStraighten.java
ndroid/gallery3d/filtershow/editors/EditorTinyPlanet.java
ndroid/gallery3d/filtershow/editors/EditorVignette.java
ndroid/gallery3d/filtershow/editors/EditorZoom.java
ndroid/gallery3d/filtershow/editors/ImageOnlyEditor.java
ndroid/gallery3d/filtershow/editors/ParametricEditor.java
ndroid/gallery3d/filtershow/editors/SwapButton.java
ndroid/gallery3d/filtershow/filters/BaseFiltersManager.java
ndroid/gallery3d/filtershow/filters/ColorSpaceMatrix.java
ndroid/gallery3d/filtershow/filters/FilterBasicRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterChanSatRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterCropRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterCurvesRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterDirectRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterDrawRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterFxRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterGradRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterMirrorRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterPoint.java
ndroid/gallery3d/filtershow/filters/FilterPointRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterRotateRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterStraightenRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterTinyPlanetRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterUserPresetRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterVignetteRepresentation.java
ndroid/gallery3d/filtershow/filters/FiltersManagerInterface.java
ndroid/gallery3d/filtershow/filters/IconUtilities.java
ndroid/gallery3d/filtershow/filters/ImageFilter.java
ndroid/gallery3d/filtershow/filters/ImageFilterBorder.java
ndroid/gallery3d/filtershow/filters/ImageFilterBwFilter.java
ndroid/gallery3d/filtershow/filters/ImageFilterChanSat.java
ndroid/gallery3d/filtershow/filters/ImageFilterContrast.java
ndroid/gallery3d/filtershow/filters/ImageFilterCurves.java
ndroid/gallery3d/filtershow/filters/ImageFilterDownsample.java
ndroid/gallery3d/filtershow/filters/ImageFilterDraw.java
ndroid/gallery3d/filtershow/filters/ImageFilterEdge.java
ndroid/gallery3d/filtershow/filters/ImageFilterExposure.java
ndroid/gallery3d/filtershow/filters/ImageFilterFx.java
ndroid/gallery3d/filtershow/filters/ImageFilterGrad.java
ndroid/gallery3d/filtershow/filters/ImageFilterHighlights.java
ndroid/gallery3d/filtershow/filters/ImageFilterHue.java
ndroid/gallery3d/filtershow/filters/ImageFilterKMeans.java
ndroid/gallery3d/filtershow/filters/ImageFilterNegative.java
ndroid/gallery3d/filtershow/filters/ImageFilterParametricBorder.java
ndroid/gallery3d/filtershow/filters/ImageFilterRS.java
ndroid/gallery3d/filtershow/filters/ImageFilterRedEye.java
ndroid/gallery3d/filtershow/filters/ImageFilterSaturated.java
ndroid/gallery3d/filtershow/filters/ImageFilterShadows.java
ndroid/gallery3d/filtershow/filters/ImageFilterSharpen.java
ndroid/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
ndroid/gallery3d/filtershow/filters/ImageFilterVibrance.java
ndroid/gallery3d/filtershow/filters/ImageFilterVignette.java
ndroid/gallery3d/filtershow/filters/ImageFilterWBalance.java
ndroid/gallery3d/filtershow/filters/RedEyeCandidate.java
ndroid/gallery3d/filtershow/filters/SimpleImageFilter.java
ndroid/gallery3d/filtershow/filters/SplineMath.java
ndroid/gallery3d/filtershow/filters/convolve3x3.rs
ndroid/gallery3d/filtershow/filters/grad.rs
ndroid/gallery3d/filtershow/filters/grey.rs
ndroid/gallery3d/filtershow/filters/saturation.rs
ndroid/gallery3d/filtershow/history/HistoryItem.java
ndroid/gallery3d/filtershow/history/HistoryManager.java
ndroid/gallery3d/filtershow/imageshow/ControlPoint.java
ndroid/gallery3d/filtershow/imageshow/EclipseControl.java
ndroid/gallery3d/filtershow/imageshow/GeometryMathUtils.java
ndroid/gallery3d/filtershow/imageshow/GradControl.java
ndroid/gallery3d/filtershow/imageshow/ImageCrop.java
ndroid/gallery3d/filtershow/imageshow/ImageCurves.java
ndroid/gallery3d/filtershow/imageshow/ImageDraw.java
ndroid/gallery3d/filtershow/imageshow/ImageGrad.java
ndroid/gallery3d/filtershow/imageshow/ImageMirror.java
ndroid/gallery3d/filtershow/imageshow/ImagePoint.java
ndroid/gallery3d/filtershow/imageshow/ImageRedEye.java
ndroid/gallery3d/filtershow/imageshow/ImageRotate.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
ndroid/gallery3d/filtershow/imageshow/ImageStraighten.java
ndroid/gallery3d/filtershow/imageshow/ImageTinyPlanet.java
ndroid/gallery3d/filtershow/imageshow/ImageVignette.java
ndroid/gallery3d/filtershow/imageshow/Line.java
ndroid/gallery3d/filtershow/imageshow/MasterImage.java
ndroid/gallery3d/filtershow/imageshow/Oval.java
ndroid/gallery3d/filtershow/imageshow/Spline.java
ndroid/gallery3d/filtershow/pipeline/Buffer.java
ndroid/gallery3d/filtershow/pipeline/CacheProcessing.java
ndroid/gallery3d/filtershow/pipeline/CachingPipeline.java
ndroid/gallery3d/filtershow/pipeline/FilterEnvironment.java
ndroid/gallery3d/filtershow/pipeline/HighresRenderingRequestTask.java
ndroid/gallery3d/filtershow/pipeline/ImagePreset.java
ndroid/gallery3d/filtershow/pipeline/ImageSavingTask.java
ndroid/gallery3d/filtershow/pipeline/PipelineInterface.java
ndroid/gallery3d/filtershow/pipeline/ProcessingService.java
ndroid/gallery3d/filtershow/pipeline/ProcessingTask.java
ndroid/gallery3d/filtershow/pipeline/ProcessingTaskController.java
ndroid/gallery3d/filtershow/pipeline/RenderingRequest.java
ndroid/gallery3d/filtershow/pipeline/RenderingRequestCaller.java
ndroid/gallery3d/filtershow/pipeline/RenderingRequestTask.java
ndroid/gallery3d/filtershow/pipeline/SharedBuffer.java
ndroid/gallery3d/filtershow/pipeline/SharedPreset.java
ndroid/gallery3d/filtershow/pipeline/UpdatePreviewTask.java
ndroid/gallery3d/filtershow/presets/PresetManagementDialog.java
ndroid/gallery3d/filtershow/presets/UserPresetsAdapter.java
ndroid/gallery3d/filtershow/provider/SharedImageProvider.java
ndroid/gallery3d/filtershow/state/DragListener.java
ndroid/gallery3d/filtershow/state/PanelTrack.java
ndroid/gallery3d/filtershow/state/State.java
ndroid/gallery3d/filtershow/state/StateAdapter.java
ndroid/gallery3d/filtershow/state/StatePanel.java
ndroid/gallery3d/filtershow/state/StatePanelTrack.java
ndroid/gallery3d/filtershow/state/StateView.java
ndroid/gallery3d/filtershow/tools/IconFactory.java
ndroid/gallery3d/filtershow/tools/MatrixFit.java
ndroid/gallery3d/filtershow/tools/SaveImage.java
ndroid/gallery3d/filtershow/tools/XmpPresets.java
ndroid/gallery3d/filtershow/ui/ExportDialog.java
ndroid/gallery3d/filtershow/ui/FramedTextButton.java
ndroid/gallery3d/filtershow/ui/SelectionRenderer.java
ndroid/gallery3d/gadget/LocalPhotoSource.java
ndroid/gallery3d/gadget/MediaSetSource.java
ndroid/gallery3d/gadget/PhotoAppWidgetProvider.java
ndroid/gallery3d/gadget/WidgetClickHandler.java
ndroid/gallery3d/gadget/WidgetConfigure.java
ndroid/gallery3d/gadget/WidgetDatabaseHelper.java
ndroid/gallery3d/gadget/WidgetService.java
ndroid/gallery3d/gadget/WidgetSource.java
ndroid/gallery3d/gadget/WidgetTypeChooser.java
ndroid/gallery3d/gadget/WidgetUtils.java
ndroid/gallery3d/glrenderer/BasicTexture.java
ndroid/gallery3d/glrenderer/BitmapTexture.java
ndroid/gallery3d/glrenderer/CanvasTexture.java
ndroid/gallery3d/glrenderer/ColorTexture.java
ndroid/gallery3d/glrenderer/ExtTexture.java
ndroid/gallery3d/glrenderer/FadeInTexture.java
ndroid/gallery3d/glrenderer/FadeOutTexture.java
ndroid/gallery3d/glrenderer/FadeTexture.java
ndroid/gallery3d/glrenderer/GLCanvas.java
ndroid/gallery3d/glrenderer/GLES11Canvas.java
ndroid/gallery3d/glrenderer/GLES11IdImpl.java
ndroid/gallery3d/glrenderer/GLES20Canvas.java
ndroid/gallery3d/glrenderer/GLES20IdImpl.java
ndroid/gallery3d/glrenderer/GLId.java
ndroid/gallery3d/glrenderer/GLPaint.java
ndroid/gallery3d/glrenderer/MultiLineTexture.java
ndroid/gallery3d/glrenderer/NinePatchChunk.java
ndroid/gallery3d/glrenderer/NinePatchTexture.java
ndroid/gallery3d/glrenderer/RawTexture.java
ndroid/gallery3d/glrenderer/ResourceTexture.java
ndroid/gallery3d/glrenderer/StringTexture.java
ndroid/gallery3d/glrenderer/Texture.java
ndroid/gallery3d/glrenderer/TextureUploader.java
ndroid/gallery3d/glrenderer/TiledTexture.java
ndroid/gallery3d/glrenderer/UploadedTexture.java
ndroid/gallery3d/ingest/ImportTask.java
ndroid/gallery3d/ingest/IngestActivity.java
ndroid/gallery3d/ingest/IngestService.java
ndroid/gallery3d/ingest/MtpDeviceIndex.java
ndroid/gallery3d/ingest/SimpleDate.java
ndroid/gallery3d/ingest/adapter/CheckBroker.java
ndroid/gallery3d/ingest/adapter/MtpAdapter.java
ndroid/gallery3d/ingest/adapter/MtpPagerAdapter.java
ndroid/gallery3d/ingest/data/BitmapWithMetadata.java
ndroid/gallery3d/ingest/data/MtpBitmapFetch.java
ndroid/gallery3d/ingest/ui/DateTileView.java
ndroid/gallery3d/ingest/ui/IngestGridView.java
ndroid/gallery3d/ingest/ui/MtpFullscreenView.java
ndroid/gallery3d/ingest/ui/MtpImageView.java
ndroid/gallery3d/ingest/ui/MtpThumbnailTileView.java
ndroid/gallery3d/onetimeinitializer/GalleryWidgetMigrator.java
ndroid/gallery3d/provider/GalleryProvider.java
ndroid/gallery3d/ui/AbstractSlotRenderer.java
ndroid/gallery3d/ui/ActionModeHandler.java
ndroid/gallery3d/ui/AlbumLabelMaker.java
ndroid/gallery3d/ui/AlbumSetSlidingWindow.java
ndroid/gallery3d/ui/AlbumSetSlotRenderer.java
ndroid/gallery3d/ui/AlbumSlidingWindow.java
ndroid/gallery3d/ui/AlbumSlotRenderer.java
ndroid/gallery3d/ui/AnimationTime.java
ndroid/gallery3d/ui/BitmapLoader.java
ndroid/gallery3d/ui/BitmapScreenNail.java
ndroid/gallery3d/ui/BitmapTileProvider.java
ndroid/gallery3d/ui/CacheStorageUsageInfo.java
ndroid/gallery3d/ui/CaptureAnimation.java
ndroid/gallery3d/ui/DetailsAddressResolver.java
ndroid/gallery3d/ui/DetailsHelper.java
ndroid/gallery3d/ui/DialogDetailsView.java
ndroid/gallery3d/ui/DownUpDetector.java
ndroid/gallery3d/ui/EdgeEffect.java
ndroid/gallery3d/ui/EdgeView.java
ndroid/gallery3d/ui/FlingScroller.java
ndroid/gallery3d/ui/GLRoot.java
ndroid/gallery3d/ui/GLRootView.java
ndroid/gallery3d/ui/GLView.java
ndroid/gallery3d/ui/GestureRecognizer.java
ndroid/gallery3d/ui/Log.java
ndroid/gallery3d/ui/ManageCacheDrawer.java
ndroid/gallery3d/ui/MeasureHelper.java
ndroid/gallery3d/ui/MenuExecutor.java
ndroid/gallery3d/ui/OrientationSource.java
ndroid/gallery3d/ui/Paper.java
ndroid/gallery3d/ui/PhotoFallbackEffect.java
ndroid/gallery3d/ui/PhotoView.java
ndroid/gallery3d/ui/PopupList.java
ndroid/gallery3d/ui/PositionController.java
ndroid/gallery3d/ui/PreparePageFadeoutTexture.java
ndroid/gallery3d/ui/ProgressSpinner.java
ndroid/gallery3d/ui/RelativePosition.java
ndroid/gallery3d/ui/ScreenNail.java
ndroid/gallery3d/ui/ScrollBarView.java
ndroid/gallery3d/ui/ScrollerHelper.java
ndroid/gallery3d/ui/SelectionManager.java
ndroid/gallery3d/ui/SelectionMenu.java
ndroid/gallery3d/ui/SlideshowView.java
ndroid/gallery3d/ui/SlotView.java
ndroid/gallery3d/ui/SurfaceTextureScreenNail.java
ndroid/gallery3d/ui/SynchronizedHandler.java
ndroid/gallery3d/ui/TileImageView.java
ndroid/gallery3d/ui/TileImageViewAdapter.java
ndroid/gallery3d/ui/TiledScreenNail.java
ndroid/gallery3d/ui/UndoBarView.java
ndroid/gallery3d/ui/UserInteractionListener.java
ndroid/gallery3d/ui/WakeLockHoldingProgressListener.java
ndroid/gallery3d/util/AccessibilityUtils.java
ndroid/gallery3d/util/BucketNames.java
ndroid/gallery3d/util/CacheManager.java
ndroid/gallery3d/util/GalleryUtils.java
ndroid/gallery3d/util/Holder.java
ndroid/gallery3d/util/IdentityCache.java
ndroid/gallery3d/util/IntArray.java
ndroid/gallery3d/util/InterruptableOutputStream.java
ndroid/gallery3d/util/JobLimiter.java
ndroid/gallery3d/util/LinkedNode.java
ndroid/gallery3d/util/Log.java
ndroid/gallery3d/util/MediaSetUtils.java
ndroid/gallery3d/util/MotionEventHelper.java
ndroid/gallery3d/util/Profile.java
ndroid/gallery3d/util/ProfileData.java
ndroid/gallery3d/util/RangeArray.java
ndroid/gallery3d/util/RangeBoolArray.java
ndroid/gallery3d/util/RangeIntArray.java
ndroid/gallery3d/util/ReverseGeocoder.java
ndroid/gallery3d/util/SaveVideoFileInfo.java
ndroid/gallery3d/util/SaveVideoFileUtils.java
ndroid/gallery3d/util/UpdateHelper.java
ndroid/photos/AlbumActivity.java
ndroid/photos/AlbumFragment.java
ndroid/photos/AlbumSetFragment.java
ndroid/photos/BitmapRegionTileSource.java
ndroid/photos/FullscreenViewer.java
ndroid/photos/GalleryActivity.java
ndroid/photos/MultiChoiceManager.java
ndroid/photos/MultiSelectGridFragment.java
ndroid/photos/PhotoFragment.java
ndroid/photos/PhotoSetFragment.java
ndroid/photos/SelectionManager.java
ndroid/photos/adapters/AlbumSetCursorAdapter.java
ndroid/photos/adapters/PhotoThumbnailAdapter.java
ndroid/photos/data/AlbumSetLoader.java
ndroid/photos/data/BitmapDecoder.java
ndroid/photos/data/FileRetriever.java
ndroid/photos/data/GalleryBitmapPool.java
ndroid/photos/data/MediaCache.java
ndroid/photos/data/MediaCacheDatabase.java
ndroid/photos/data/MediaCacheUtils.java
ndroid/photos/data/MediaRetriever.java
ndroid/photos/data/NotificationWatcher.java
ndroid/photos/data/PhotoDatabase.java
ndroid/photos/data/PhotoProvider.java
ndroid/photos/data/PhotoSetLoader.java
ndroid/photos/data/SQLiteContentProvider.java
ndroid/photos/data/SparseArrayBitmapPool.java
ndroid/photos/drawables/AutoThumbnailDrawable.java
ndroid/photos/drawables/DataUriThumbnailDrawable.java
ndroid/photos/shims/BitmapJobDrawable.java
ndroid/photos/shims/LoaderCompatShim.java
ndroid/photos/shims/MediaItemsLoader.java
ndroid/photos/shims/MediaSetLoader.java
ndroid/photos/views/BlockingGLTextureView.java
ndroid/photos/views/GalleryThumbnailView.java
ndroid/photos/views/HeaderGridView.java
ndroid/photos/views/SquareImageView.java
ndroid/photos/views/TiledImageRenderer.java
ndroid/photos/views/TiledImageView.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
ndroid/camera/CameraActivity.java
|
| 08a7c5ee848874759f28be0b5998269e5a32293c |
02-Aug-2013 |
nicolasroard <nicolasroard@google.com> |
Fix display bug with highres
Change-Id: I8961beca6bf80efdf3cf1c3b6cae691dd0f473ed
ndroid/gallery3d/filtershow/pipeline/CachingPipeline.java
ndroid/gallery3d/filtershow/pipeline/HighresRenderingRequestTask.java
|
| 8f0065ba9aefe1c6b53c941b6d2438b7b9cb2c66 |
02-Aug-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Add quality selector to export.
- Adds the option to change the quality of the jpeg compression
when flattening an exported bitmap.
Change-Id: I252913fc15ff32a0fcff683edb5b33e17b5daac4
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/pipeline/ImageSavingTask.java
ndroid/gallery3d/filtershow/pipeline/ProcessingService.java
ndroid/gallery3d/filtershow/tools/SaveImage.java
ndroid/gallery3d/filtershow/ui/ExportDialog.java
|
| dd9432a31e18c2cb1479ec51f41defced345173a |
02-Aug-2013 |
John Hoford <hoford@google.com> |
Merge "add Per Channel Saturation" into gb-ub-photos-carlsbad
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoUI.java
ndroid/camera/data/AbstractLocalDataAdapterWrapper.java
ndroid/camera/data/CameraDataAdapter.java
ndroid/camera/data/CameraPreviewData.java
ndroid/camera/data/FixedFirstDataAdapter.java
ndroid/camera/data/FixedLastDataAdapter.java
ndroid/camera/data/LocalData.java
ndroid/camera/data/LocalDataAdapter.java
ndroid/camera/ui/FilmStripView.java
|
| 014bbe68d6e407269a0d843083be56f8df58adba |
30-Jul-2013 |
John Hoford <hoford@google.com> |
add Per Channel Saturation
Change-Id: Icfd24c817674b81ac9caecc2d73348dc7734f037
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/controller/BasicParameterInt.java
ndroid/gallery3d/filtershow/editors/EditorChanSat.java
ndroid/gallery3d/filtershow/filters/BaseFiltersManager.java
ndroid/gallery3d/filtershow/filters/FilterChanSatRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterGradRepresentation.java
ndroid/gallery3d/filtershow/filters/ImageFilterChanSat.java
ndroid/gallery3d/filtershow/filters/saturation.rs
ndroid/gallery3d/filtershow/pipeline/ImagePreset.java
|
| bfed27177046f4b1325bf1bc145ce3bb6b82b1ec |
02-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Adds back the PhotoSphere View icon in filmstrip." into gb-ub-photos-carlsbad
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/data/CameraDataAdapter.java
ndroid/camera/data/LocalData.java
ndroid/camera/data/PanoramaMetadataLoader.java
ndroid/camera/ui/FilmStripView.java
|
| 203eb404a7cd6a80397535e63d22b3772939f03d |
19-Jul-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Refactoring Geometry handling.
Bug: 9170644
Bug: 9366654
Bug: 9366263
- Consolidates all the geometry transforms in GeometryMathUtils and
significantly reduces complexity.
- Removes GeometryMetadata object and dependent code.
- Removes ImageGeometry and geometry update callbacks.
Change-Id: I59add51907459593244c9ebaadef585efc7486d5
ndroid/gallery3d/filtershow/EditorPlaceHolder.java
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/crop/BoundedRect.java
ndroid/gallery3d/filtershow/crop/CropMath.java
ndroid/gallery3d/filtershow/crop/CropObject.java
ndroid/gallery3d/filtershow/crop/CropView.java
ndroid/gallery3d/filtershow/editors/Editor.java
ndroid/gallery3d/filtershow/editors/EditorCrop.java
ndroid/gallery3d/filtershow/editors/EditorFlip.java
ndroid/gallery3d/filtershow/editors/EditorMirror.java
ndroid/gallery3d/filtershow/editors/EditorPanel.java
ndroid/gallery3d/filtershow/editors/EditorRotate.java
ndroid/gallery3d/filtershow/editors/EditorStraighten.java
ndroid/gallery3d/filtershow/filters/BaseFiltersManager.java
ndroid/gallery3d/filtershow/filters/FilterCropRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterMirrorRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterRotateRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterStraightenRepresentation.java
ndroid/gallery3d/filtershow/filters/ImageFilter.java
ndroid/gallery3d/filtershow/filters/ImageFilterGeometry.java
ndroid/gallery3d/filtershow/filters/ImageFilterStraighten.java
ndroid/gallery3d/filtershow/imageshow/GeometryListener.java
ndroid/gallery3d/filtershow/imageshow/GeometryMath.java
ndroid/gallery3d/filtershow/imageshow/GeometryMathUtils.java
ndroid/gallery3d/filtershow/imageshow/GeometryMetadata.java
ndroid/gallery3d/filtershow/imageshow/ImageCrop.java
ndroid/gallery3d/filtershow/imageshow/ImageDraw.java
ndroid/gallery3d/filtershow/imageshow/ImageFlip.java
ndroid/gallery3d/filtershow/imageshow/ImageGeometry.java
ndroid/gallery3d/filtershow/imageshow/ImageMirror.java
ndroid/gallery3d/filtershow/imageshow/ImagePoint.java
ndroid/gallery3d/filtershow/imageshow/ImageRotate.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
ndroid/gallery3d/filtershow/imageshow/ImageStraighten.java
ndroid/gallery3d/filtershow/imageshow/MasterImage.java
ndroid/gallery3d/filtershow/pipeline/CacheProcessing.java
ndroid/gallery3d/filtershow/pipeline/CachingPipeline.java
ndroid/gallery3d/filtershow/pipeline/FilterEnvironment.java
ndroid/gallery3d/filtershow/pipeline/ImagePreset.java
|
| 3a5bc6b23096365e1a814f8999937028bc12b401 |
01-Aug-2013 |
nicolasroard <nicolasroard@google.com> |
Fix problem with N-1 caching when no filters / one filter
- also fix equals() for geometry
Change-Id: I6f6f21d1e274b3b95ac4b5189b2fa7f419912864
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/filters/FilterCropRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterMirrorRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterRotateRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterStraightenRepresentation.java
ndroid/gallery3d/filtershow/imageshow/GeometryMetadata.java
ndroid/gallery3d/filtershow/pipeline/CacheProcessing.java
|
| bb2848ab2a8d532956f4730c8cf7434eb3a8600f |
01-Aug-2013 |
Angus Kong <shkong@google.com> |
Merge "Add wrapper for face detection listener." into gb-ub-photos-carlsbad
|
| 5c9925a5ad7298c3e3a49bfa8fa09f7691b18c4a |
01-Aug-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Implements N-1 Caching" into gb-ub-photos-carlsbad
|
| 7f2b1e548ad3b5cdf8775b0a12f8f9b389477f21 |
31-Jul-2013 |
nicolasroard <nicolasroard@google.com> |
Implements N-1 Caching
Change-Id: Ief1a04dbe4f6ced15f937177a556733cfcdb5879
ndroid/gallery3d/filtershow/filters/FilterVignetteRepresentation.java
ndroid/gallery3d/filtershow/pipeline/CacheProcessing.java
ndroid/gallery3d/filtershow/pipeline/CachingPipeline.java
ndroid/gallery3d/filtershow/pipeline/ImagePreset.java
|
| 9e76552adff6ecf8b8e4070ecd61699cb6d18269 |
31-Jul-2013 |
Angus Kong <shkong@google.com> |
Add wrapper for face detection listener.
bug:10113532
Change-Id: I01dc051d7b25cb97153b5e3e4cf06744dccb9fd4
ndroid/camera/AndroidCameraManagerImpl.java
ndroid/camera/CameraManager.java
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
|
| 3f7e00441f65ebd463a68d4c687589a65980ac5b |
31-Jul-2013 |
Doris Liu <tianliu@google.com> |
Set default video quality to the highest
Bug: 9886141
Change-Id: I4741d5c898ac666923cfc12abc78d5d3517cb05f
ndroid/camera/CameraSettings.java
ndroid/camera/VideoModule.java
|
| 6d29a648f497f827d623d7af0b679e98ea58bf90 |
31-Jul-2013 |
Angus Kong <shkong@google.com> |
Fix switching camera failure.
bug:10110830
Change-Id: I1adcefc229ce4a245880bc037a086c949c73da55
ndroid/camera/AndroidCameraManagerImpl.java
|
| 996669f26a5c526561f5779a5d04702a551f4230 |
31-Jul-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Do antialiasing on wallpaper preview." into gb-ub-photos-carlsbad
|
| d031ce88398f90961a6f1a2cd8f989510d256140 |
31-Jul-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Do antialiasing on wallpaper preview.
Bug: 9052851
Change-Id: I890fae2d4bb9907c7204cc6fa34c42c7fe7c7309
ndroid/gallery3d/filtershow/crop/CropView.java
|
| 28d86a33744fc5ae60949a43ff27930579b9bda8 |
31-Jul-2013 |
John Hoford <hoford@google.com> |
Merge "clean up some bugs and update the icons" into gb-ub-photos-carlsbad
|
| e887fa594f5eb3a88601e68c4c7b073bd719e565 |
31-Jul-2013 |
John Hoford <hoford@google.com> |
clean up some bugs and update the icons
Change-Id: I6952bae8cfea2ec64064f3126eece93687c02eae
ndroid/gallery3d/filtershow/filters/FilterGradRepresentation.java
ndroid/gallery3d/filtershow/filters/ImageFilterGrad.java
ndroid/gallery3d/filtershow/filters/grad.rs
ndroid/gallery3d/filtershow/imageshow/ImageGrad.java
|
| 13ae2608e04998f0d13bc3f58cda5237bdde0b7d |
15-Jul-2013 |
nicolasroard <nicolasroard@google.com> |
Add user presets saving/loading
Change-Id: I85c5dd0df1e9264a01c8d7a6d44602e87799890c
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/category/Action.java
ndroid/gallery3d/filtershow/category/CategoryAdapter.java
ndroid/gallery3d/filtershow/category/CategoryTrack.java
ndroid/gallery3d/filtershow/data/FilterStackSource.java
ndroid/gallery3d/filtershow/data/UserPresetsManager.java
ndroid/gallery3d/filtershow/filters/BaseFiltersManager.java
ndroid/gallery3d/filtershow/filters/FilterUserPresetRepresentation.java
ndroid/gallery3d/filtershow/pipeline/FilterEnvironment.java
ndroid/gallery3d/filtershow/pipeline/ImagePreset.java
ndroid/gallery3d/filtershow/presets/PresetManagementDialog.java
ndroid/gallery3d/filtershow/presets/UserPresetsAdapter.java
|
| 7d1433ac9191fa7b7c79a0187d4d0f30c16f84d9 |
30-Jul-2013 |
John Hoford <hoford@google.com> |
Merge "add Grad filter" into gb-ub-photos-carlsbad
|
| 52e9277b6774bc938a9e55694640c20e4ba90365 |
20-Jul-2013 |
John Hoford <hoford@google.com> |
add Grad filter
Change-Id: I30fc0810c54f3daa31726188a4c3762df33953a7
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/editors/EditorGrad.java
ndroid/gallery3d/filtershow/filters/BaseFiltersManager.java
ndroid/gallery3d/filtershow/filters/FilterGradRepresentation.java
ndroid/gallery3d/filtershow/filters/ImageFilterGrad.java
ndroid/gallery3d/filtershow/filters/grad.rs
ndroid/gallery3d/filtershow/imageshow/GradControl.java
ndroid/gallery3d/filtershow/imageshow/ImageGrad.java
ndroid/gallery3d/filtershow/imageshow/Line.java
|
| 9ef9925131835743f5316393758c14532c06277d |
19-Jul-2013 |
Angus Kong <shkong@google.com> |
Refactor CameraManager.
1. CameraManager should be the only class accessing android.hardware.Camera.
2. For potential future upgrade in Camera HAL and android.hardward.Camera API
upgrade, CameraManager should be just an interface instead of concrete
implementation.
3. waitDone() in CameraProxy is removed.
4. ShutterCallback, PreviewCallback, PictureCallback and AF Callbacks are
wrapped by our own interfaces.
Change-Id: I595da17a1a9c6d476ee805b71c7f45ebb609e465
ndroid/camera/AndroidCameraManagerImpl.java
ndroid/camera/CameraHolder.java
ndroid/camera/CameraManager.java
ndroid/camera/CameraManagerFactory.java
ndroid/camera/EffectsRecorder.java
ndroid/camera/PhotoModule.java
ndroid/camera/Util.java
ndroid/camera/VideoModule.java
|
| 9d1cd3ec768cac1142de259a676893a08141a6d3 |
27-Jul-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Refocus integration phase 1." into gb-ub-photos-carlsbad
|
| 3dbed24b638141342323373d97954532c44320ac |
26-Jul-2013 |
nicolasroard <nicolasroard@google.com> |
Fix disappearing fragment
Change-Id: Ic478ad75a458bb36001c91f8627aab7643fa0a47
ndroid/gallery3d/filtershow/FilterShowActivity.java
|
| a5c138bdac37dddf53acd37807a364aac753acb6 |
26-Jul-2013 |
nicolasroard <nicolasroard@google.com> |
Fix geometry serialization
Change-Id: I3040cfdb08f6cc6dbd4fd1eb5444b3395a68c7da
ndroid/gallery3d/filtershow/pipeline/ImagePreset.java
|
| 16967913de669502464cdd1aa2a389c24d123f70 |
25-Jul-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Added support to export to a flattened photo.
Bug: 10008212
- Adds a menu item to allow a photo with edits to be flattened
into a separate photo.
- Fixes bug where crop intents fail to save cropped images.
Change-Id: I1dcf1bb9ba22e72378f24e7971a74f81b8db7564
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/pipeline/ImageSavingTask.java
ndroid/gallery3d/filtershow/pipeline/ProcessingService.java
ndroid/gallery3d/filtershow/tools/SaveImage.java
|
| 77fb852da18c6ee8ba1f1037f385319eb47bdce6 |
24-Jul-2013 |
Sascha Haeberling <haeberling@google.com> |
Refocus integration phase 1.
Bug: 9966846
Change-Id: I591ce1ee878a9f4d6bd63eddef6e79608ffd69ec
ndroid/camera/CameraActivity.java
ndroid/camera/ui/CameraSwitcher.java
|
| 6a8e8a1a0f3e8e62cd350733e275047475380d6b |
19-Jul-2013 |
Angus Kong <shkong@google.com> |
Remove legacy code ActivityBase.java.
Change-Id: I7b372e5d69c3d01b4012ab61bbf725a7fec8a445
ndroid/camera/ActivityBase.java
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoModule.java
|
| 2641302a93350698b2eeee2bc90b6a9836e23007 |
24-Jul-2013 |
nicolasroard <nicolasroard@google.com> |
Fix geometry transform
Change-Id: I0c3af6f4122d045f5a8656bc709127aa7ae2ecab
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
|
| d2fe86415ac281d0f223ac5bf4e32d73abb9df10 |
23-Jul-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Move ImageCurves to the ImageShow package" into gb-ub-photos-carlsbad
|
| 6f441a571084b039553c1b8bea29b44381776cf3 |
22-Jul-2013 |
nicolasroard <nicolasroard@google.com> |
Move ImageCurves to the ImageShow package
Change-Id: I458d20df930b9228dcbc60c3ec27f74b152d38cf
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/editors/EditorCurves.java
ndroid/gallery3d/filtershow/filters/FilterCurvesRepresentation.java
ndroid/gallery3d/filtershow/filters/ImageFilterCurves.java
ndroid/gallery3d/filtershow/imageshow/ControlPoint.java
ndroid/gallery3d/filtershow/imageshow/ImageCurves.java
ndroid/gallery3d/filtershow/imageshow/Spline.java
ndroid/gallery3d/filtershow/ui/ControlPoint.java
ndroid/gallery3d/filtershow/ui/ImageCurves.java
ndroid/gallery3d/filtershow/ui/Spline.java
|
| fa07148c9336b520de25acec7aa077e3c7b22427 |
22-Jul-2013 |
ztenghui <ztenghui@google.com> |
Fix saving issues with online image.
bug:9468909
Change-Id: I10762dba307999d87fac08b3a2ce7e104264a813
ndroid/gallery3d/filtershow/tools/SaveImage.java
|
| 76d39416cba8f8fe9f09f3387c324895d72b7afc |
20-Jul-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Remove FilteringPipeline" into gb-ub-photos-carlsbad
|
| 58019558c7465a8dce8dfb49d68292a296c6b408 |
19-Jul-2013 |
nicolasroard <nicolasroard@google.com> |
Remove FilteringPipeline
Reorganize things around the filtering service.
- add HighresRenderingTask
- add RenderingRequestTask
- add UpdatePreviewTask
Change-Id: I3da34fee8c624fb55311c3e1639857fc1bcdadad
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/category/Action.java
ndroid/gallery3d/filtershow/imageshow/MasterImage.java
ndroid/gallery3d/filtershow/pipeline/FilteringPipeline.java
ndroid/gallery3d/filtershow/pipeline/HighresRenderingRequestTask.java
ndroid/gallery3d/filtershow/pipeline/ProcessingService.java
ndroid/gallery3d/filtershow/pipeline/ProcessingTask.java
ndroid/gallery3d/filtershow/pipeline/ProcessingTaskController.java
ndroid/gallery3d/filtershow/pipeline/RenderingRequest.java
ndroid/gallery3d/filtershow/pipeline/RenderingRequestTask.java
ndroid/gallery3d/filtershow/pipeline/UpdatePreviewTask.java
|
| c19f078c8a65c0b90b1d1b88e6f60f521a54ed1d |
20-Jul-2013 |
ztenghui <ztenghui@google.com> |
Merge "Update Uri instead of removing" into gb-ub-photos-carlsbad
|
| d32b92d96ad07f15f6130a8608a67ab96c962a96 |
18-Jul-2013 |
ztenghui <ztenghui@google.com> |
Update Uri instead of removing
In this way, the processing service can have a better presentation.
The cache key now include the file Uri and local abs path if exists.
bug:9468909
Change-Id: I0919c09ad26bea2e798c99ad376996547f8f2bf8
ndroid/gallery3d/data/ImageCacheRequest.java
ndroid/gallery3d/data/ImageCacheService.java
ndroid/gallery3d/data/LocalImage.java
ndroid/gallery3d/data/LocalVideo.java
ndroid/gallery3d/filtershow/tools/SaveImage.java
|
| 6798c34ddb5248f038f351674c6a6c7a20992c8c |
17-Jul-2013 |
Angus Kong <shkong@google.com> |
Add stitching manager in Camera.
Change-Id: I2f27c2c0e77ed3d618df890e709ca09076591f70
ndroid/camera/CameraActivity.java
ndroid/camera/ImageTaskManager.java
|
| c40c411683da5db1e393e2172a451c3f9c511811 |
18-Jul-2013 |
Angus Kong <shkong@google.com> |
Refine MediaSaveService to use memory limit.
Change-Id: Ieeb06eddbd742896ecb7c50f0f51facaa77b2d21
ndroid/camera/MediaSaveService.java
|
| c0d712e074fc38463464516befb7ea145654d21b |
16-Jul-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Refactoring GeometryMetadata.
Bug: 9170644
- First part of multi-step refactor, splits
GeometryMetadata functionality into 4
FilterRepresentation subclasses as requested.
Change-Id: I212193db8c154f64c550adb9735c0502bcaa7468
ndroid/gallery3d/filtershow/filters/FilterCropRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterMirrorRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterRotateRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterStraightenRepresentation.java
ndroid/gallery3d/filtershow/filters/ImageFilterGeometry.java
ndroid/gallery3d/filtershow/imageshow/GeometryMetadata.java
ndroid/gallery3d/filtershow/imageshow/ImageCrop.java
ndroid/gallery3d/filtershow/imageshow/ImageFlip.java
ndroid/gallery3d/filtershow/imageshow/ImageGeometry.java
ndroid/gallery3d/filtershow/imageshow/ImageRotate.java
ndroid/gallery3d/filtershow/pipeline/ImagePreset.java
|
| 4264520a6a231d42f65168b07e7e793cda7b1a8d |
16-Jul-2013 |
John Hoford <hoford@google.com> |
remove clone
Change-Id: Ia9f4c1778e06416018eeb07be657bcdd0af1496b
ndroid/gallery3d/filtershow/filters/BaseFiltersManager.java
ndroid/gallery3d/filtershow/filters/FilterBasicRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterCurvesRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterDirectRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterDrawRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterFxRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterPointRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterTinyPlanetRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterVignetteRepresentation.java
ndroid/gallery3d/filtershow/history/HistoryItem.java
ndroid/gallery3d/filtershow/imageshow/GeometryMetadata.java
ndroid/gallery3d/filtershow/pipeline/ImagePreset.java
|
| 720ff62d92f678a86c650ed580c6b27523bb82a9 |
17-Jul-2013 |
John Reck <jreck@google.com> |
Fix help for GalleryGoogle builds
Bug: 9886976
Change-Id: I23fc78b924f3757f8ab12f84d3a0c97c1adc2333
(cherry picked from commit 7a43c8c3b85d6f9162651d8ed8b3a11a87490824)
ndroid/gallery3d/app/AlbumSetPage.java
ndroid/gallery3d/util/HelpUtils.java
|
| cf76723e40171afef891d494d4c537200597acbb |
13-Jul-2013 |
nicolasroard <nicolasroard@google.com> |
Add background processing service
bug:7298624
Change-Id: Ie79f88fd84fdf8f4dab6a8071f06a819e247b357
ndroid/gallery3d/data/LocalImage.java
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/cache/ImageLoader.java
ndroid/gallery3d/filtershow/crop/CropActivity.java
ndroid/gallery3d/filtershow/filters/BaseFiltersManager.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
ndroid/gallery3d/filtershow/imageshow/MasterImage.java
ndroid/gallery3d/filtershow/pipeline/CachingPipeline.java
ndroid/gallery3d/filtershow/pipeline/FilteringPipeline.java
ndroid/gallery3d/filtershow/pipeline/ImagePreset.java
ndroid/gallery3d/filtershow/pipeline/ImageSavingTask.java
ndroid/gallery3d/filtershow/pipeline/ProcessingService.java
ndroid/gallery3d/filtershow/pipeline/ProcessingTask.java
ndroid/gallery3d/filtershow/pipeline/ProcessingTaskController.java
ndroid/gallery3d/filtershow/tools/SaveCopyTask.java
ndroid/gallery3d/filtershow/tools/SaveImage.java
ndroid/gallery3d/util/SaveVideoFileUtils.java
|
| 6d13e422b2ca68dce029c96e3b8789bae990a88c |
16-Jul-2013 |
ztenghui <ztenghui@google.com> |
Merge "Add equality check into FilterCurveRep" into gb-ub-photos-carlsbad
|
| 4e7deb5f4f56ca570858c10c5614ca8083f4b6ed |
16-Jul-2013 |
Angus Kong <shkong@google.com> |
Merge "Remove unnecessary startPreview thread in video." into gb-ub-photos-carlsbad
|
| 395ee2d6d3c8fa9e16363517dc9e8afc8cbd609e |
15-Jul-2013 |
Angus Kong <shkong@google.com> |
Remove unnecessary startPreview thread in video.
Change-Id: I42dc46748fad3b321178280069555ecdd5c4a962
ndroid/camera/VideoController.java
ndroid/camera/VideoModule.java
ndroid/camera/VideoUI.java
|
| 9448b353e8cb1936fb62262b8c4962cfd3765bab |
16-Jul-2013 |
ztenghui <ztenghui@google.com> |
Add equality check into FilterCurveRep
Consequently add equality check support in Spline and ControlPoint.
bug:9468909
Change-Id: I8078b994beac4056ca92e76da0e15d618389e56e
ndroid/gallery3d/filtershow/filters/FilterCurvesRepresentation.java
ndroid/gallery3d/filtershow/imageshow/MasterImage.java
ndroid/gallery3d/filtershow/ui/ControlPoint.java
ndroid/gallery3d/filtershow/ui/Spline.java
|
| d4d6505a75371dbfac01beaa2059e0b2075e990f |
15-Jul-2013 |
ztenghui <ztenghui@google.com> |
FilterDirectRepresentation always should be considered as has modification.
Therefore isNil should be false.
bug:9468909
Change-Id: I9946d060e7a1c73b6dc27c73d8f3b7986343de98
ndroid/gallery3d/filtershow/filters/FilterDirectRepresentation.java
|
| 0dca1b590f4cae2fe42afc9245f1a8ea81f9e6d3 |
13-Jul-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Combine ImageLoader and CropLoader utility classes.
Bug: 9356969
Bug: 9170644
- Refactor to eliminate code duplication in image loading classes.
- Fix bugs caused by the inability to determine MIME types for images
that aren't in Gallery's content provider (causes b/9356969).
Change-Id: I30c2ba5c0cd37aac624681a2cec9abddaa78f9c2
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/cache/ImageLoader.java
ndroid/gallery3d/filtershow/crop/CropActivity.java
ndroid/gallery3d/filtershow/crop/CropLoader.java
ndroid/gallery3d/filtershow/filters/ImageFilterDraw.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
ndroid/gallery3d/filtershow/imageshow/MasterImage.java
ndroid/gallery3d/filtershow/tools/SaveCopyTask.java
|
| 1b9362e03c56e98a27879a15b9d133f1e50fc4d4 |
12-Jul-2013 |
Doris Liu <tianliu@google.com> |
Use ValueAnimator to ensure callbacks get called
Bug: 9597743
Change-Id: I6b119bb7a6f8bbba76ccc09c28293eb7b5a0457e
ndroid/camera/ui/PieRenderer.java
|
| 3ea8558300780ca5269d75230f78eadf4100876c |
09-Jul-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Refactoring ImageLoader.
- Moves state (history, loadlisteners, bitmaps, etc.)
from ImageLoader to MasterImage.
- Makes ImageLoader into a utility class.
Change-Id: I7a8a988c61848694a86a4b2919bf8f30bfd2be8c
ndroid/gallery3d/filtershow/EditorPlaceHolder.java
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/cache/ImageLoader.java
ndroid/gallery3d/filtershow/editors/Editor.java
ndroid/gallery3d/filtershow/editors/EditorCrop.java
ndroid/gallery3d/filtershow/editors/EditorFlip.java
ndroid/gallery3d/filtershow/editors/EditorRotate.java
ndroid/gallery3d/filtershow/editors/EditorStraighten.java
ndroid/gallery3d/filtershow/filters/ImageFilter.java
ndroid/gallery3d/filtershow/filters/ImageFilterDownsample.java
ndroid/gallery3d/filtershow/filters/ImageFilterDraw.java
ndroid/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
ndroid/gallery3d/filtershow/imageshow/GeometryMetadata.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
ndroid/gallery3d/filtershow/imageshow/ImageVignette.java
ndroid/gallery3d/filtershow/imageshow/MasterImage.java
ndroid/gallery3d/filtershow/pipeline/CachingPipeline.java
ndroid/gallery3d/filtershow/pipeline/FilteringPipeline.java
ndroid/gallery3d/filtershow/pipeline/ImagePreset.java
ndroid/gallery3d/filtershow/pipeline/RenderingRequest.java
|
| 9bba45787308782a8e4c2edae4b754f9537605d0 |
11-Jul-2013 |
nicolasroard <nicolasroard@google.com> |
Fix selection in categories
Change-Id: Ica9ff5ba4a6d195f8b1ea1a686e9bbc6772d655f
ndroid/gallery3d/filtershow/category/CategoryAdapter.java
ndroid/gallery3d/filtershow/category/CategoryPanel.java
|
| 3fa5bfbdbb0c38c342fcf1a31d1285f4345710ce |
11-Jul-2013 |
nicolasroard <nicolasroard@google.com> |
Fix state panel
Labels were not reflecting looks changes
bug:9746512
Change-Id: Ia2dd2a760f38dbd48c8a4d43e3d46ee2b875771f
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/imageshow/MasterImage.java
ndroid/gallery3d/filtershow/state/State.java
|
| b477b42906a3f8b299ddaeede3940e6344fb6825 |
09-Jul-2013 |
Angus Kong <shkong@google.com> |
Measure children after the dimension is determined.
Also, the setMeasuredDimension() in onMeasure() is not necessary as we already
called super.
bug:9680271
Change-Id: I639454e515edb3027c9e79347d2124a1fcaa529b
ndroid/camera/ui/FilmStripView.java
|
| 7fef4963161ddc60472b6414be0b3d57744deb6b |
03-Jul-2013 |
nicolasroard <nicolasroard@google.com> |
Remove FilterIconButton
Change-Id: Ie1d7c4e8d3f397323f702eba2809f2589b8071f0
ndroid/gallery3d/filtershow/category/CategoryAdapter.java
ndroid/gallery3d/filtershow/ui/FilterIconButton.java
ndroid/gallery3d/filtershow/ui/IconButton.java
|
| d77e55a4bf326b4bfc1f3880f24d068cb79af1ce |
03-Jul-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Improves portrait categories buttons" into gb-ub-photos-carlsbad
|
| bacd1788f3e966bf78c5fb34e481b25797e2ad42 |
03-Jul-2013 |
nicolasroard <nicolasroard@google.com> |
Improves portrait categories buttons
- use only CategoryView, no FilterIconButton
- add xml values for the font size/margins
- for now reuse the same Action bitmap
- add accessibility contentDescription
Change-Id: Ic1ae8015abba27bea0b3c4a2bccbd1a7c9ff4731
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/category/Action.java
ndroid/gallery3d/filtershow/category/CategoryAdapter.java
ndroid/gallery3d/filtershow/category/CategoryPanel.java
ndroid/gallery3d/filtershow/category/CategoryView.java
|
| 67bf67eafefeda59bb0d2db8e048a5b989076850 |
28-Jun-2013 |
ztenghui <ztenghui@google.com> |
Try to restore the original file instead of copying when appropiate.
bug:9468909
Change-Id: I09ac244459389b0fdf6f64a79987c176ba8756d8
ndroid/gallery3d/filtershow/tools/SaveCopyTask.java
|
| f51cdda5060a742863d0d74d57040d48d9ab394d |
03-Jul-2013 |
nicolasroard <nicolasroard@google.com> |
Move classes to pipeline package
Change-Id: I9d664537d845d9daeb352c8006d0296a3f546dca
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/cache/CachingPipeline.java
ndroid/gallery3d/filtershow/cache/FilteringPipeline.java
ndroid/gallery3d/filtershow/cache/ImageLoader.java
ndroid/gallery3d/filtershow/cache/RenderingRequest.java
ndroid/gallery3d/filtershow/cache/RenderingRequestCaller.java
ndroid/gallery3d/filtershow/category/Action.java
ndroid/gallery3d/filtershow/category/CategoryAdapter.java
ndroid/gallery3d/filtershow/controller/BasicParameterStyle.java
ndroid/gallery3d/filtershow/controller/FilterView.java
ndroid/gallery3d/filtershow/controller/ParameterStyles.java
ndroid/gallery3d/filtershow/controller/StyleChooser.java
ndroid/gallery3d/filtershow/editors/Editor.java
ndroid/gallery3d/filtershow/filters/BaseFiltersManager.java
ndroid/gallery3d/filtershow/filters/ImageFilter.java
ndroid/gallery3d/filtershow/filters/ImageFilterDraw.java
ndroid/gallery3d/filtershow/filters/ImageFilterRS.java
ndroid/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
ndroid/gallery3d/filtershow/filters/ImageFilterVignette.java
ndroid/gallery3d/filtershow/history/HistoryItem.java
ndroid/gallery3d/filtershow/imageshow/ImageGeometry.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
ndroid/gallery3d/filtershow/imageshow/MasterImage.java
ndroid/gallery3d/filtershow/pipeline/Buffer.java
ndroid/gallery3d/filtershow/pipeline/CachingPipeline.java
ndroid/gallery3d/filtershow/pipeline/FilterEnvironment.java
ndroid/gallery3d/filtershow/pipeline/FilteringPipeline.java
ndroid/gallery3d/filtershow/pipeline/ImagePreset.java
ndroid/gallery3d/filtershow/pipeline/PipelineInterface.java
ndroid/gallery3d/filtershow/pipeline/RenderingRequest.java
ndroid/gallery3d/filtershow/pipeline/RenderingRequestCaller.java
ndroid/gallery3d/filtershow/pipeline/SharedPreset.java
ndroid/gallery3d/filtershow/presets/FilterEnvironment.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
ndroid/gallery3d/filtershow/presets/PipelineInterface.java
ndroid/gallery3d/filtershow/tools/SaveCopyTask.java
ndroid/gallery3d/filtershow/tools/XmpPresets.java
ndroid/gallery3d/filtershow/ui/FilterIconButton.java
ndroid/gallery3d/filtershow/ui/ImageCurves.java
|
| 68ff24597aa829f4ef4d9bd1ab21c3ff9e42f217 |
03-Jul-2013 |
nicolasroard <nicolasroard@google.com> |
Fix crash in geometry
Change-Id: I4c9292b539643f2e2738d788dcb58f0a129254f9
ndroid/gallery3d/filtershow/editors/Editor.java
|
| 68ce09f03fdf73c48295d3d2b6615b21d72b1399 |
03-Jul-2013 |
nicolasroard <nicolasroard@google.com> |
Speed up load times
Compute the small res image on the fly
Load the high res preview image after first load
Change-Id: Icc556c2204cb4fd25766d90064a5756c877b11cc
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/cache/CachingPipeline.java
ndroid/gallery3d/filtershow/cache/FilteringPipeline.java
ndroid/gallery3d/filtershow/cache/ImageLoader.java
|
| dbc7b1ebe939d68cbc7f01878e038ca3e9c35f89 |
02-Jul-2013 |
nicolasroard <nicolasroard@google.com> |
Add stop check in ImageFilterFX
speed up switching / interrupting of rendering.
Change-Id: I3ef4b1d16047b00a062c86d72cdfff2bfe9817a2
ndroid/gallery3d/filtershow/filters/IconUtilities.java
ndroid/gallery3d/filtershow/filters/ImageFilterFx.java
|
| e6af6d79fdaebcf566f9281ed6a29778d284dc42 |
02-Jul-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Pipeline refactoring" into gb-ub-photos-carlsbad
|
| f1f0d01da7742d46a546176081b441bdd23378f6 |
02-Jul-2013 |
nicolasroard <nicolasroard@google.com> |
Pipeline refactoring
Remove the temp representations and instead use a triple
buffer for ImagePresets.
Change-Id: I4cdcfbe4941af72b38fe42385085ff4a20eb78cc
ndroid/gallery3d/filtershow/cache/CachingPipeline.java
ndroid/gallery3d/filtershow/cache/FilteringPipeline.java
ndroid/gallery3d/filtershow/filters/FilterRepresentation.java
ndroid/gallery3d/filtershow/imageshow/MasterImage.java
ndroid/gallery3d/filtershow/pipeline/Buffer.java
ndroid/gallery3d/filtershow/pipeline/SharedBuffer.java
ndroid/gallery3d/filtershow/pipeline/SharedPreset.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
|
| 6a83d528b09c55ade6ad44b82c81d4476ac57441 |
02-Jul-2013 |
Doris Liu <tianliu@google.com> |
Add in carlsbad: Avoid duplicated location popups
Bug: 9505556
Change-Id: I00859d8d851ea3c75d3bda4fcf5df373f06c2ee0
ndroid/camera/PhotoController.java
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
|
| a9be5b3d573b1b5511300272fca5b320bdc0aae0 |
02-Jul-2013 |
nicolasroard <nicolasroard@google.com> |
Pipeline refactoring
Add SharedBuffer and Buffer class
Change-Id: I823a9520541e3be5321a3deb5e58a358588b6cf3
ndroid/gallery3d/filtershow/cache/CachingPipeline.java
ndroid/gallery3d/filtershow/cache/FilteringPipeline.java
ndroid/gallery3d/filtershow/cache/TripleBufferBitmap.java
ndroid/gallery3d/filtershow/imageshow/MasterImage.java
ndroid/gallery3d/filtershow/pipeline/Buffer.java
ndroid/gallery3d/filtershow/pipeline/SharedBuffer.java
ndroid/gallery3d/filtershow/presets/FilterEnvironment.java
|
| a18a161d3b46152b9114a5005efe8a043286c19d |
02-Jul-2013 |
ztenghui <ztenghui@google.com> |
Merge "Fix the save button issue." into gb-ub-photos-carlsbad
|
| 2185e9b81380f7e43608419743c983c5afee43c4 |
28-Jun-2013 |
ztenghui <ztenghui@google.com> |
Fix the save button issue.
When dealing with non Fx filters, the hasModification() really need to go deep
to figure out whether things has changed.
bug:9468909
Change-Id: I89495f147f7af7c35490def84805aae98e3f917f
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/filters/FilterRepresentation.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
ndroid/gallery3d/filtershow/imageshow/MasterImage.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
|
| 03f97f549f8b27b770dee5c5199a819fa8603c53 |
01-Jul-2013 |
George Mount <mount@google.com> |
Ensure no account duplicates.
Bug 9502314
Add a uniqueness constraint to account name.
Change-Id: I1f0607e5ce9b90054b3b98bed1557b223d7e89a7
ndroid/photos/data/PhotoDatabase.java
|
| cbb45ff9079b4f1ec19f26a1a43fb72e2c179502 |
28-Jun-2013 |
ztenghui <ztenghui@google.com> |
Merge "Add a switch to turn on/off the aux directory saving" into gb-ub-photos-carlsbad
|
| 59e60d36233f4acd67c4542bf849a0bcfce54adc |
28-Jun-2013 |
ztenghui <ztenghui@google.com> |
Add a switch to turn on/off the aux directory saving
bug:9468909
Change-Id: Iaecda20a74a02556d883f0e97250e9ec4d856677
ndroid/gallery3d/filtershow/tools/SaveCopyTask.java
|
| bfb76a89af606e65eb34099d08c27b471f8d1b29 |
28-Jun-2013 |
John Hoford <hoford@google.com> |
small bug in reading presets
Change-Id: I791a8407d72b92f5e46a33c254d44747308b2ba5
ndroid/gallery3d/filtershow/presets/ImagePreset.java
|
| 39f4ad6d7e663778d74a47c8b25768c4f221fbdc |
27-Jun-2013 |
nicolasroard <nicolasroard@google.com> |
Refactor HistoryAdapter
- Remove the adapter part
- Rename into HistoryManager
Change-Id: I58de5661770f8796882ff4a633aec700bd8bc1a5
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/cache/ImageLoader.java
ndroid/gallery3d/filtershow/editors/EditorPanel.java
ndroid/gallery3d/filtershow/history/HistoryAdapter.java
ndroid/gallery3d/filtershow/history/HistoryManager.java
ndroid/gallery3d/filtershow/imageshow/MasterImage.java
|
| dfaf4c5b5b901dbbd4904fd86995b71f4acfd47c |
24-Jun-2013 |
ztenghui <ztenghui@google.com> |
Save button now behaves correctly for filter changes.
Basically, save the original filter from the file's XMP.
Compare the current filter against original one to decide whether or not the
file has been modified and needed to be saved.
At the same time, make sure we don't save "None" filter in the ImagePreset.
bug:9468909
Change-Id: I5b86ab95556b6b010367c9577b02c0bb42ffb824
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/filters/FilterRepresentation.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
ndroid/gallery3d/filtershow/imageshow/MasterImage.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
|
| 83b16cf2b02773370e00d3659e201efff20d788d |
27-Jun-2013 |
nicolasroard <nicolasroard@google.com> |
Move history classes to their own package
Change-Id: Ib4f50c56b445788cad3b973673008d8a89244867
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/HistoryAdapter.java
ndroid/gallery3d/filtershow/HistoryItem.java
ndroid/gallery3d/filtershow/cache/ImageLoader.java
ndroid/gallery3d/filtershow/editors/EditorPanel.java
ndroid/gallery3d/filtershow/history/HistoryAdapter.java
ndroid/gallery3d/filtershow/history/HistoryItem.java
ndroid/gallery3d/filtershow/imageshow/ImageGeometry.java
ndroid/gallery3d/filtershow/imageshow/MasterImage.java
|
| 56a4e82931ea5eccfd4212c7a5cec0fa1d154aae |
26-Jun-2013 |
nicolasroard <nicolasroard@google.com> |
Fix selected frame in looks and borders
Change-Id: Id1839a028f3044929043d7c910df30a1fcabdda1
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/category/CategoryAdapter.java
ndroid/gallery3d/filtershow/category/CategoryPanel.java
ndroid/gallery3d/filtershow/category/CategoryTrack.java
ndroid/gallery3d/filtershow/category/CategoryView.java
ndroid/gallery3d/filtershow/imageshow/MasterImage.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
|
| 06ed7651d1022d7649de94265f1a382feb791084 |
27-Jun-2013 |
nicolasroard <nicolasroard@google.com> |
ImagePreset cleanup
Get rid of remaining ivars related to history
Change-Id: Ic106ef6a96f4727c6dd46d7be3d059bdc42e5a2a
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/HistoryAdapter.java
ndroid/gallery3d/filtershow/HistoryItem.java
ndroid/gallery3d/filtershow/cache/CachingPipeline.java
ndroid/gallery3d/filtershow/category/CategoryAdapter.java
ndroid/gallery3d/filtershow/imageshow/ImageCrop.java
ndroid/gallery3d/filtershow/imageshow/ImageFlip.java
ndroid/gallery3d/filtershow/imageshow/ImageGeometry.java
ndroid/gallery3d/filtershow/imageshow/ImageRotate.java
ndroid/gallery3d/filtershow/imageshow/ImageStraighten.java
ndroid/gallery3d/filtershow/imageshow/MasterImage.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
|
| 38afc164c9df332dd3789a924db577b67758e673 |
27-Jun-2013 |
John Hoford <hoford@google.com> |
fix icon repaint on simple load
Change-Id: I841475949e67b63fd3d24a2267fda9f2e450898d
ndroid/gallery3d/filtershow/FilterShowActivity.java
|
| 47b0417a6cd824e8bf153ad905d679cec24c447a |
27-Jun-2013 |
John Hoford <hoford@google.com> |
Merge "support non destructive edits of Curves" into gb-ub-photos-carlsbad
|
| 58571d95c24053bb816fe4c8fbc4dd634612dd20 |
27-Jun-2013 |
nicolasroard <nicolasroard@google.com> |
Fix tot
Change-Id: I75b28ac56f9c3b295280690078f5c854fda7eb66
ndroid/gallery3d/filtershow/imageshow/ImageGeometry.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
|
| ca0ecc627396c69bf21f6fae5b1e6b1ac3ea36d9 |
25-Jun-2013 |
John Hoford <hoford@google.com> |
support non destructive edits of Curves
Change-Id: I597be6570a17072a4116bf6227a6a35796266bc3
ndroid/gallery3d/filtershow/filters/FilterCurvesRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterRepresentation.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
|
| c06530222740afc65813a798dfdc5941b81d623c |
27-Jun-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Cleanup in ImagePreset" into gb-ub-photos-carlsbad
|
| 977489b60c2375cd084a481e03c9878c03e6b077 |
26-Jun-2013 |
nicolasroard <nicolasroard@google.com> |
Cleanup in ImagePreset
Move GeometryMetadata to the list of filters
Change-Id: I0bef13ca0d9cb41e68eddd108000ff7bd426b313
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/filters/ImageFilter.java
ndroid/gallery3d/filtershow/imageshow/GeometryMetadata.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
ndroid/gallery3d/filtershow/imageshow/MasterImage.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
ndroid/gallery3d/filtershow/ui/FilterIconButton.java
|
| 3b524fa21f72f5f26e3b417b66364d2fbc68850c |
26-Jun-2013 |
Michael Kolb <kolby@google.com> |
Merge "Clean up PreviewGestures" into gb-ub-photos-carlsbad
|
| a77d6e06ce32eaaa123922a448173f3d12e6ac9d |
26-Jun-2013 |
Michael Kolb <kolby@google.com> |
Clean up PreviewGestures
- remove dead code and state
- fix zoom only mode during video recording
Change-Id: I2238f99b9823ba091d300046d07448c67bc2ad78
ndroid/camera/PreviewGestures.java
ndroid/camera/VideoUI.java
|
| 3be6f26ab847dfd336fb4de58a00d8dac081ebd1 |
26-Jun-2013 |
ztenghui <ztenghui@google.com> |
Merge "Fix ambiguous naming and typo" into gb-ub-photos-carlsbad
|
| 30e5b372e3f573d9ea339cc9c01657deae36a834 |
26-Jun-2013 |
Angus Kong <shkong@google.com> |
Merge "Add fullscreen mode." into gb-ub-photos-carlsbad
|
| d5b9386177313e7b0ffe9a137515a1d001fe87c6 |
26-Jun-2013 |
ztenghui <ztenghui@google.com> |
Fix ambiguous naming and typo
bug:9468909
Change-Id: Ic52f3b6f6b5d0c874e8291ce7b3a76cb6c22f60f
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterFxRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterRepresentation.java
|
| a6a6a730074e9fedd56c41cd8fa8f1212cfac108 |
19-Jun-2013 |
Angus Kong <shkong@google.com> |
Add fullscreen mode.
1. Single tap to center a picture.
2. Double tap to fullscreen
3. In fullscreen, the next picture is on the left but the previous one
is under the current one.
Change-Id: I728da2487ea649162be4f1858a8524331c625157
ndroid/camera/data/LocalData.java
ndroid/camera/ui/FilmStripView.java
|
| 1abc84c3ec015667ed8f15752b82459492db681d |
26-Jun-2013 |
Angus Kong <shkong@google.com> |
Merge "Fix check of failing decoding boundaries calls" into gb-ub-photos-carlsbad
|
| c285458f6809d43333e3ada8790bddac17912e5a |
26-Jun-2013 |
Angus Kong <shkong@google.com> |
Fix check of failing decoding boundaries calls
Change-Id: I7b7780de9988312f9ce79c2a27132b7f6acb1c4e
ndroid/camera/data/CameraDataAdapter.java
ndroid/camera/data/LocalData.java
|
| 41752b2536bede41d81eddb8b813db42579be937 |
26-Jun-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Cleanup ImagePreset to remove special-casing for borders" into gb-ub-photos-carlsbad
|
| 0bb8918bad881fef82ca220298b69fa3e6bbafca |
26-Jun-2013 |
nicolasroard <nicolasroard@google.com> |
Cleanup ImagePreset to remove special-casing
for borders
Change-Id: I6410a7a44d72c3dfa51c1d18f5a6fcba854ba9c2
ndroid/gallery3d/filtershow/presets/ImagePreset.java
|
| a6d9b6f18770fd279fa8dca994e5f92719350697 |
25-Jun-2013 |
Angus Kong <shkong@google.com> |
Don't use post-ICS API View.setBackground().
View.setBackground() is API level 16.
Change-Id: I7e56939efbcaa6e152c19c37a4a54a133bed3b47
ndroid/camera/data/LocalData.java
|
| 4f5dee37d71532693f756ebf724a7880b0a2ef78 |
25-Jun-2013 |
Angus Kong <shkong@google.com> |
Synchronize camera access in start preview thread.
Change-Id: Iba953fea3bd17ecb085d75fb3b2e350c0bf5d3b1
ndroid/camera/VideoModule.java
|
| b43c678f8b6c2d9e202cd1fc0c110d15b15be50f |
25-Jun-2013 |
Doris Liu <tianliu@google.com> |
Merge "Clean up camera switcher" into gb-ub-photos-carlsbad
|
| 22b8228415284ad40cad8d5413e030a8ef396b7a |
25-Jun-2013 |
ztenghui <ztenghui@google.com> |
Merge "Fix the missing filter name after deserialization." into gb-ub-photos-carlsbad
|
| 1c4707a192c2f58b909a40b2cb24e38571c0e2d7 |
25-Jun-2013 |
ztenghui <ztenghui@google.com> |
Fix the missing filter name after deserialization.
bug:9468909
Change-Id: I63aaf0bad02c2afdddf9b162f695fc0a9165befa
ndroid/gallery3d/filtershow/filters/FilterRepresentation.java
|
| 147e26ab7075f0acd3978f0cd0541cd1da4b50e1 |
25-Jun-2013 |
Doris Liu <tianliu@google.com> |
Clean up camera switcher
Change-Id: I9f0495524028528ca02c7ddf94f4698d4e87af14
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoUI.java
ndroid/camera/VideoUI.java
ndroid/camera/ui/CameraSwitcher.java
|
| 957584d0f4bb5e16b4ca9cfef525194f0110d28b |
24-Jun-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Add a MatrixFit class" into gb-ub-photos-carlsbad
|
| e2a1e317ac23e6e5f3f2530f62a243c1de652067 |
21-Jun-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "MTP Importer: show overlay icon on video items" into gb-ub-photos-carlsbad
|
| d073915c54e5852e4533c47be287111194e61b2d |
21-Jun-2013 |
Doris Liu <tianliu@google.com> |
Merge "Remove SRI panorama" into gb-ub-photos-carlsbad
|
| 270bae7b507a361c7ab0bad45127e5e54a95a704 |
21-Jun-2013 |
Bobby Georgescu <georgescu@google.com> |
MTP Importer: show overlay icon on video items
Bug: 4099088
Change-Id: Ia785f889aff91329e9d7c7026238b2588336963d
ndroid/gallery3d/ingest/ui/MtpImageView.java
|
| e4ff95562b8692e4a08199a69bbb69ddccf6e904 |
21-Jun-2013 |
Doris Liu <tianliu@google.com> |
Remove SRI panorama
Change-Id: Icbe154aede474fb678ae4e0b2088626a4a8b31d8
ndroid/camera/Mosaic.java
ndroid/camera/MosaicFrameProcessor.java
ndroid/camera/MosaicPreviewRenderer.java
ndroid/camera/MosaicRenderer.java
ndroid/camera/PanoProgressBar.java
ndroid/camera/PanoUtil.java
|
| 14f35c35dff8209a496eed3bd7d2051d5b06dfae |
20-Jun-2013 |
Bobby Georgescu <georgescu@google.com> |
MTP Importer: improve experience when importing large files
Bug: 4099088
Change-Id: Ie5d9da1be0b8891b9123eceaadfe9c2ec2d3e408
ndroid/gallery3d/ingest/IngestActivity.java
|
| 659f0694f1a63d3c3aadf13425ca1fe027b1152a |
20-Jun-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Add support for importing videos in MTP importer" into gb-ub-photos-carlsbad
|
| 9e908d9cd407778633af5337b2e98f7313bbbb86 |
17-Jun-2013 |
Bobby Georgescu <georgescu@google.com> |
Add support for importing videos in MTP importer
Bug: 4099088
Change-Id: Ic3ac00cb730381dd2d7f4802aa8001a60e439748
ndroid/gallery3d/ingest/ImportTask.java
ndroid/gallery3d/ingest/MtpDeviceIndex.java
ndroid/gallery3d/ingest/ui/MtpImageView.java
|
| 923770ce24214ce3dc2fe96fe7c66b8567d4380f |
20-Jun-2013 |
ztenghui <ztenghui@google.com> |
Merge "Fix LUT3D information lost after re-edit" into gb-ub-photos-carlsbad
|
| ee4eee27d478e12071859a6064c6d6f79fba2752 |
20-Jun-2013 |
ztenghui <ztenghui@google.com> |
Merge "Setup the saving framework to support hiding original photo for editor." into gb-ub-photos-carlsbad
|
| c2e9abdcb39a9b8070889ff7a7d829b3eda0c51b |
19-Jun-2013 |
Doris Liu <tianliu@google.com> |
Add flash animation to photo module
Change-Id: I9faa46e71e27064c4fbcb629c5c31cc4d7b22652
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
|
| 277c428c606bd1de0ac84a35ece703afa89227f0 |
19-Jun-2013 |
ztenghui <ztenghui@google.com> |
Fix LUT3D information lost after re-edit
bug:9427243
Change-Id: I8535c8776c866fd6c84d391a8de82df9cb214694
ndroid/gallery3d/filtershow/filters/FilterFxRepresentation.java
|
| d4702d8906274c64f7e7b08c7ecccf891e8a1a6e |
19-Jun-2013 |
nicolasroard <nicolasroard@google.com> |
Add a MatrixFit class
Change-Id: I67d2eb92fe5bbdff56ff50330c7eed48e7593f75
ndroid/gallery3d/filtershow/tools/MatrixFit.java
|
| 41fd8171292a8a3248fe48eea362834ed5d25b90 |
11-Jun-2013 |
ztenghui <ztenghui@google.com> |
Setup the saving framework to support hiding original photo for editor.
This new approach will try to hide the original image into an auxiliary
directory. User will only see one edited image, while being able to go
back to the original image in the editor.
Refactor SaveCopyTask for more private funcs and more comments.
bug:9468909
Change-Id: I866321d23e6db0b3dbd08fec2a6a7e3142b17b65
ndroid/gallery3d/data/LocalImage.java
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/cache/ImageLoader.java
ndroid/gallery3d/filtershow/tools/SaveCopyTask.java
ndroid/gallery3d/util/SaveVideoFileUtils.java
|
| b84b9738c855a525dc1944165983cc3c342ce446 |
19-Jun-2013 |
Doris Liu <tianliu@google.com> |
Set window flags to show secure camera
Change-Id: I9acb47ae5d6c5b9248aeea5cd267e17243f93c74
ndroid/camera/CameraActivity.java
|
| 4984a6afefe1e9b9514d32c0c4fa874ada57af79 |
18-Jun-2013 |
Doris Liu <tianliu@google.com> |
Merge "Switch over to use new camera activity" into gb-ub-photos-carlsbad
|
| 784000450a39f4b07817c5cefe0c407b6a5f86da |
18-Jun-2013 |
George Mount <mount@google.com> |
Merge "Add decoding to a smaller image by sampling and scaling." into gb-ub-photos-carlsbad
|
| 6432cd65159731a28d9239426b0f0f4d7c44fa98 |
14-Jun-2013 |
Doris Liu <tianliu@google.com> |
Switch over to use new camera activity
Change-Id: Ib907b5ab5d0e818261e95edd182f2e20c3bbebe0
ndroid/camera/CameraActivity.java
ndroid/camera/CameraModule.java
ndroid/camera/NewCameraActivity.java
ndroid/camera/NewCameraModule.java
ndroid/camera/NewPhotoMenu.java
ndroid/camera/NewPhotoModule.java
ndroid/camera/NewPhotoUI.java
ndroid/camera/NewPreviewGestures.java
ndroid/camera/NewVideoMenu.java
ndroid/camera/NewVideoModule.java
ndroid/camera/NewVideoUI.java
ndroid/camera/PanoramaModule.java
ndroid/camera/PhotoMenu.java
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
ndroid/camera/PreviewGestures.java
ndroid/camera/VideoMenu.java
ndroid/camera/VideoModule.java
ndroid/camera/VideoUI.java
ndroid/camera/ui/CameraRootView.java
ndroid/camera/ui/FaceView.java
ndroid/camera/ui/NewCameraRootView.java
ndroid/camera/ui/RenderOverlay.java
ndroid/gallery3d/app/StateManager.java
|
| d90e44e196d4c4e3e4c6f21cec3c8ad8c4d16e9a |
28-May-2013 |
George Mount <mount@google.com> |
Add decoding to a smaller image by sampling and scaling.
This allows opportunistic reuse of bitmaps, but does not
require it when downsampling.
Change-Id: I06f12bb5416f88a242f67bff3d2ca45894101bcd
ndroid/photos/data/BitmapDecoder.java
|
| 608e27fb708aa24afe5790b0f0825c977a7df784 |
18-Jun-2013 |
Bobby Georgescu <georgescu@google.com> |
Add more metrics to Editor
Bug: 9467671
Instrument
- Editor opened
- Number of filters used in save
- Undo/redo/reset/state panel
- Save completed
Change-Id: I4722f36496ccd089829bd616f89d760078922573
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
ndroid/gallery3d/filtershow/tools/SaveCopyTask.java
|
| 3126f4f5c0c241f7fb895cc8222954a7f7cbfdfe |
17-Jun-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Added serialization IDs for frames, adds frames to analytics.
Bug: 9467671
Change-Id: I6f21e7bc9ca7255a290ba7cd1a94e9b07e7b06cb
ndroid/gallery3d/filtershow/imageshow/MasterImage.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
|
| d67ffd653bada5d4dcdca1f7a3c3a7aab1b51360 |
17-Jun-2013 |
Angus Kong <shkong@google.com> |
Merge "Remove files actually." into gb-ub-photos-carlsbad
|
| bbcaf793b27d9ee2976836a1d13b85e24e0aa652 |
17-Jun-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fix IDs for analytics, unlocalize serialization IDs.
Bug: 9467671
Bug: 9336168
Change-Id: Icb0037ab853598b8ad6b931808074f824ea706ed
ndroid/gallery3d/filtershow/filters/BaseFiltersManager.java
ndroid/gallery3d/filtershow/filters/FilterFxRepresentation.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
|
| 082210302a595e665ef0e34e9be216e554b13698 |
14-Jun-2013 |
Angus Kong <shkong@google.com> |
Remove files actually.
Change-Id: Ideba2dfff0678f1049bf2bdc93cee98bbb0e589e
ndroid/camera/NewCameraActivity.java
ndroid/camera/data/CameraDataAdapter.java
ndroid/camera/data/LocalData.java
ndroid/camera/ui/FilmStripView.java
|
| 682c7e316d4cae77c934fc3e6859a2f0f279edb7 |
14-Jun-2013 |
Doris Liu <tianliu@google.com> |
Merge "Add callbacks for switching to camera/filmstrip" into gb-ub-photos-carlsbad
|
| a52f04c1ff32b2f529c21b49861a62ad34359e28 |
06-Jun-2013 |
Doris Liu <tianliu@google.com> |
Add callbacks for switching to camera/filmstrip
Change-Id: I936d59efe3e09232ab0b298603c823d4f7952199
ndroid/camera/NewCameraActivity.java
ndroid/camera/NewCameraModule.java
ndroid/camera/NewPhotoModule.java
ndroid/camera/NewPhotoUI.java
ndroid/camera/NewVideoModule.java
ndroid/camera/NewVideoUI.java
ndroid/camera/ui/FilmStripView.java
ndroid/camera/ui/NewCameraRootView.java
ndroid/camera/ui/RenderOverlay.java
|
| c1b125df4715f9c6c0862b1ee3b09092cc3a2615 |
13-Jun-2013 |
Angus Kong <shkong@google.com> |
Merge "Refactor to separate out EGL part." into gb-ub-photos-carlsbad
|
| a0ab65b489d7c0ba5cbe258be09dfbe36cce2851 |
13-Jun-2013 |
Doris Liu <tianliu@google.com> |
Merge "Update camera orientation when device is flipped" into gb-ub-photos-carlsbad
|
| 4f993f0eab972bca47f9e28e665e44227abf187b |
13-Jun-2013 |
John Hoford <hoford@google.com> |
Merge "fix start up crash" into gb-ub-photos-carlsbad
|
| 0a735860321394741cf42a75fcb265b47bc473ba |
11-Jun-2013 |
John Hoford <hoford@google.com> |
fix start up crash
bug:8734160
Change-Id: Iaf7f6bdbd70ab04011b9af7816a6991724363e49
ndroid/gallery3d/filtershow/FilterShowActivity.java
|
| 4c122cbf4edd0e0132aa72c18cdbd39b3a03d86e |
13-Jun-2013 |
Bobby Georgescu <georgescu@google.com> |
Remove unused and buggy MtpThumbnailDrawable code
Bug: 8793065
Change-Id: Ib8b08ae8b9e08319f8628581d8e3c5a4688ee4a5
ndroid/photos/drawables/MtpThumbnailDrawable.java
|
| 44ab147ed213bf6a1aa6c62e08c20d7fca03503d |
08-Jun-2013 |
Doris Liu <tianliu@google.com> |
Update camera orientation when device is flipped
Bug: 8963053
Change-Id: I909793a7da3903a080a19cd7e271b3720df4ec0a
ndroid/camera/NewPhotoModule.java
ndroid/camera/NewPhotoUI.java
ndroid/camera/NewVideoModule.java
ndroid/camera/NewVideoUI.java
ndroid/camera/PhotoController.java
ndroid/camera/PhotoModule.java
ndroid/camera/VideoController.java
ndroid/camera/VideoModule.java
ndroid/camera/ui/CameraControls.java
ndroid/camera/ui/NewCameraRootView.java
ndroid/camera/ui/RotatableLayout.java
|
| 77f1615264a5641b58e037156f25ad1b30527ef5 |
06-Jun-2013 |
Angus Kong <shkong@google.com> |
Refactor to separate out EGL part.
Change-Id: I90c37b9e221a80f0d35e6e12ab8850078dc03622
ndroid/camera/MosaicPreviewRenderer.java
ndroid/camera/NewCameraActivity.java
ndroid/camera/SurfaceTextureRenderer.java
|
| b22e24cc4a4b65ebd88ff865ec23d592fbd645ea |
12-Jun-2013 |
Doris Liu <tianliu@google.com> |
Merge "In carlesbad, fix image capture on S4" into gb-ub-photos-carlsbad
|
| b81204ad0ccd2f16805b0fd5277be73fc6e8d31f |
12-Jun-2013 |
Doris Liu <tianliu@google.com> |
In carlesbad, fix image capture on S4
Bug: 9390020
Change-Id: I9d7e0609c55f47a267aff8499dcd244dfb2fdb3a
ndroid/camera/NewPhotoModule.java
|
| 8b0498d0cfed3e4cd5aa874760c222826bff64c6 |
12-Jun-2013 |
nicolasroard <nicolasroard@google.com> |
Fix icon sizes and jaggies
bug:9105608
bug:8791729
Change-Id: I828e9d4daf4025f53d505a3412c27dd8c54a607e
ndroid/gallery3d/filtershow/category/Action.java
ndroid/gallery3d/filtershow/tools/IconFactory.java
|
| 5791e2fbe36756806339182fcde4ce058ec1d203 |
12-Jun-2013 |
Doris Liu <tianliu@google.com> |
Merge "Disable zoom when camera does not support zoom" into gb-ub-photos-carlsbad
|
| e991ac8d67ffa09ee285e72ad275d32475de2ded |
11-Jun-2013 |
Doris Liu <tianliu@google.com> |
Disable zoom when camera does not support zoom
Change-Id: I5b4c38636614df37db1ef3166368f1650c9e5fa0
ndroid/camera/NewPhotoModule.java
ndroid/camera/NewPhotoUI.java
ndroid/camera/NewPreviewGestures.java
ndroid/camera/NewVideoModule.java
ndroid/camera/NewVideoUI.java
|
| 1e2b3f8be10ca20f6807ed71f160d6f6a8ab1c81 |
11-Jun-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Mirror CL 319301 in Bryce.
Change-Id: If84a08aa1969415a0d5d9ad3b9153743b1951108
ndroid/gallery3d/filtershow/crop/CropLoader.java
|
| c76547793270371785f9b928e173e1dbc238ef37 |
11-Jun-2013 |
Angus Kong <shkong@google.com> |
Fix build.
Change-Id: I05f73596157fb5a2ee0ebf8581cfffa973a2d1d7
ndroid/camera/NewPhotoModule.java
|
| d82eae2bc5628ee3d0db039076298c93179e7aad |
11-Jun-2013 |
Angus Kong <shkong@google.com> |
Use setPreviewFpsRange instead.
Change-Id: I58f6af667fd906221b67b8a4827d7a67c567e20a
ndroid/camera/NewPhotoModule.java
ndroid/camera/NewVideoModule.java
ndroid/camera/Util.java
|
| b8ecfd5b8726b94341bfb0110f0472ff6a42599f |
11-Jun-2013 |
nicolasroard <nicolasroard@google.com> |
Fix panel anim in ICS
Change-Id: Ie2e5a6a36c5bec309b5848e50a90f089f9aeffa9
ndroid/gallery3d/filtershow/FilterShowActivity.java
|
| e009f521225fac20eb3d73ff3a9a6bb49bf7a64e |
11-Jun-2013 |
nicolasroard <nicolasroard@google.com> |
Fix state panel text size
bug:9377153
Change-Id: Id5243539e2f8d3ee737e24eeb204145fbaa9138d
ndroid/gallery3d/filtershow/state/StateView.java
|
| 2549a552d0b76eed10d2abe34e8d954d8dcab985 |
10-Jun-2013 |
nicolasroard <nicolasroard@google.com> |
Fix warnings
Change-Id: I736364e538c2cb03f58c05b9b38252e7771f23e8
ndroid/gallery3d/filtershow/filters/FilterRepresentation.java
|
| 5644a35e0fa484565cfe27e2c5d4cbcca1ddedd9 |
08-Jun-2013 |
Doris Liu <tianliu@google.com> |
Merge "Add enable/disable swiping to filmstrip" into gb-ub-photos-carlsbad
|
| d483ca1f81704f7a1c6a310bd2ba289aef2ffb65 |
07-Jun-2013 |
Bobby Georgescu <georgescu@google.com> |
Fix NPE in PreparePageFadeoutTexture
Bug: 8837688
Change-Id: Ie8fbd9a42497195b8a01cc5638cb0c44d4532d09
ndroid/gallery3d/ui/PreparePageFadeoutTexture.java
|
| f7758b6cc5ab00ad3955bf9c98af76559644a477 |
07-Jun-2013 |
Doris Liu <tianliu@google.com> |
Add enable/disable swiping to filmstrip
Change-Id: I3e019764a72f947545cd230b9bfe45f67d83dc29
ndroid/camera/NewCameraActivity.java
ndroid/camera/NewPhotoModule.java
ndroid/camera/NewPhotoUI.java
ndroid/camera/NewVideoModule.java
ndroid/camera/NewVideoUI.java
ndroid/camera/data/CameraDataAdapter.java
ndroid/camera/ui/FilmStripView.java
|
| b7d13430b030f7d46ed3335d84ff20f11b44efff |
05-Jun-2013 |
Angus Kong <shkong@google.com> |
Merge "Play video from flim strip." into gb-ub-photos-carlsbad
|
| af7f620c5170821ab3c3dbfa73e011b03664f9a9 |
05-Jun-2013 |
Angus Kong <shkong@google.com> |
Merge "Add interface for swipe checking." into gb-ub-photos-carlsbad
|
| a3bdd2935035548f121815b7c1f66e8f4f59fa85 |
05-Jun-2013 |
John Reck <jreck@google.com> |
Merge "Fix graphical corruption due to tear down race" into gb-ub-photos-carlsbad
|
| 9285dedd138709376b99d3948d563f896857723c |
05-Jun-2013 |
John Reck <jreck@google.com> |
Fix graphical corruption due to tear down race
Bug: 9278945
Change-Id: I7594680322768f60eaed8a1037d139cbadf9706b
ndroid/gallery3d/ui/GLRootView.java
|
| 49448f8631783fa635a0770345afa850bc0f212a |
05-Jun-2013 |
Angus Kong <shkong@google.com> |
Add interface for swipe checking.
And fullscreen notification.
Change-Id: Ib264904cca47f1fc90ae5e392f0672c253e4d833
ndroid/camera/NewCameraActivity.java
ndroid/camera/data/CameraDataAdapter.java
ndroid/camera/ui/FilmStripView.java
|
| 41c100e0dfb2a371c34eb9e9685aa6987d6bf9a6 |
05-Jun-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Removing unused UI fields in FilterRepresentation." into gb-ub-photos-carlsbad
|
| 17fbd7949abfd2dee5b15e443611c56dac2d6ef3 |
04-Jun-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Removing unused UI fields in FilterRepresentation.
Bug: 9170644
Change-Id: Ic197123286e06d9eb64d30eb345f8cc5797659a2
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/category/Action.java
ndroid/gallery3d/filtershow/category/CategoryAdapter.java
ndroid/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterCurvesRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterDrawRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterFxRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterPointRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterTinyPlanetRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterVignetteRepresentation.java
ndroid/gallery3d/filtershow/filters/ImageFilterBwFilter.java
ndroid/gallery3d/filtershow/filters/ImageFilterContrast.java
ndroid/gallery3d/filtershow/filters/ImageFilterDownsample.java
ndroid/gallery3d/filtershow/filters/ImageFilterEdge.java
ndroid/gallery3d/filtershow/filters/ImageFilterExposure.java
ndroid/gallery3d/filtershow/filters/ImageFilterHighlights.java
ndroid/gallery3d/filtershow/filters/ImageFilterHue.java
ndroid/gallery3d/filtershow/filters/ImageFilterKMeans.java
ndroid/gallery3d/filtershow/filters/ImageFilterNegative.java
ndroid/gallery3d/filtershow/filters/ImageFilterSaturated.java
ndroid/gallery3d/filtershow/filters/ImageFilterShadows.java
ndroid/gallery3d/filtershow/filters/ImageFilterSharpen.java
ndroid/gallery3d/filtershow/filters/ImageFilterVibrance.java
ndroid/gallery3d/filtershow/filters/ImageFilterWBalance.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
|
| b40738a104ac056b9a220c1aec71d2df7446108a |
03-Jun-2013 |
Angus Kong <shkong@google.com> |
Play video from flim strip.
Change-Id: Iaedf42d7dabee53f75a20c57f9e6916864ea271f
ndroid/camera/NewCameraActivity.java
ndroid/camera/Util.java
ndroid/camera/data/CameraDataAdapter.java
ndroid/camera/data/LocalData.java
ndroid/camera/ui/FilmStripView.java
|
| 7f555884b919d006e4da2ba06a57d9807be711bb |
04-Jun-2013 |
Doris Liu <tianliu@google.com> |
Merge "Get new camera activity up to date" into gb-ub-photos-carlsbad
|
| 97d5093f721317a3914eb9ba91de961f38c660fd |
04-Jun-2013 |
Doris Liu <tianliu@google.com> |
Fix pie menu button disappearing
Change-Id: Ia664ac3115849227848c465067a78ef3aaf445cb
ndroid/camera/NewPhotoUI.java
|
| 44c5d5ce423bde77019b7dc2c567588b32a51d11 |
04-Jun-2013 |
Angus Kong <shkong@google.com> |
Merge "Add secure camera support." into gb-ub-photos-carlsbad
|
| 29a8d5b95b4b872d7596f0c6fcf27a9537202354 |
04-Jun-2013 |
Doris Liu <tianliu@google.com> |
Get new camera activity up to date
Change-Id: I24241bc6082052a1da90b9c41c3362af72e47b37
ndroid/camera/NewCameraActivity.java
ndroid/camera/NewPhotoModule.java
ndroid/camera/NewPhotoUI.java
ndroid/camera/NewVideoMenu.java
ndroid/camera/NewVideoModule.java
ndroid/camera/NewVideoUI.java
|
| 8ce743f577b2056519fd8e74da272c461ff74e33 |
04-Jun-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fixes save filename for panos after edit." into gb-ub-photos-carlsbad
|
| 2d06a167933509422076d4f8e90e4de212866905 |
03-Jun-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fixes save filename for panos after edit.
Bug: 9258209
Change-Id: Ib7404242e5886a38b9e6f9fd6f28a52f1a703590
ndroid/gallery3d/filtershow/tools/SaveCopyTask.java
|
| 61544549e543aebb69742ceda6e6235bea979630 |
03-Jun-2013 |
Angus Kong <shkong@google.com> |
Add play icon for videos.
Change-Id: Idf73da3c2a8a3beaf45da9f8219ed71c720a5bfd
ndroid/camera/data/LocalData.java
|
| a06b4e2f2664bdd0b966ed3fb24e560cd9be7124 |
03-Jun-2013 |
Angus Kong <shkong@google.com> |
Add secure camera support.
Change-Id: I672d76cb4de37c46394a5e8ee2899cf571158a2c
ndroid/camera/NewCameraActivity.java
ndroid/camera/data/CameraDataAdapter.java
ndroid/camera/data/LocalData.java
|
| 4c400b2f79ff7b4b4f11f5b45326316ac7af075c |
03-Jun-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 8bb4e1a0: Fixes reading exif tags in editor.
* commit '8bb4e1a036e67a3bf4f9cdb8f55d6f558189e5b9':
Fixes reading exif tags in editor.
|
| 1f48263ef924d9c92deb1e11b3b0cf94673ac1c5 |
03-Jun-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fixes reading exif tags in editor.
Bug: 9140401
Change-Id: Ic84efca90c5297ab2c6a65b13d512c4799e623f6
ndroid/gallery3d/filtershow/tools/SaveCopyTask.java
|
| 3939633cad71e4e9da482752dd3b1cde850ef963 |
03-Jun-2013 |
ztenghui <ztenghui@google.com> |
Merge "Add LUT3D filter state saving" into gb-ub-photos-carlsbad
|
| 31f71961edadf2f9d6c137b3bd4cb4d3a3db1f27 |
03-Jun-2013 |
Doris Liu <tianliu@google.com> |
Merge "Add recent changes to new photo module" into gb-ub-photos-carlsbad
|
| 4da5967b9ebdd0156e3bf47de2ab9c32a18d1b77 |
01-Jun-2013 |
Doris Liu <tianliu@google.com> |
Add recent changes to new photo module
Change-Id: Icd29a41e1564094e4feafd6c4d4c809f6253753d
ndroid/camera/NewCameraModule.java
ndroid/camera/NewPhotoMenu.java
ndroid/camera/NewPhotoModule.java
ndroid/camera/NewPhotoUI.java
ndroid/camera/NewVideoModule.java
ndroid/camera/NewVideoUI.java
ndroid/camera/ui/NewCameraRootView.java
|
| 885367cc5add241f6cb9ac243381400b497d630e |
01-Jun-2013 |
Angus Kong <shkong@google.com> |
Add newly taken photos/videos to film strip.
Change-Id: I82d9e83d0a45f14036a194cf1ad5793b436357cd
ndroid/camera/NewCameraActivity.java
ndroid/camera/NewPhotoModule.java
ndroid/camera/NewVideoModule.java
ndroid/camera/data/CameraDataAdapter.java
|
| 71e436c3c839b5dccb409e93abb6509b21144b14 |
01-Jun-2013 |
ztenghui <ztenghui@google.com> |
Add LUT3D filter state saving
Change-Id: I195fad1dcad5639c30a2eb94ce28cfd0a2464018
ndroid/gallery3d/filtershow/filters/BaseFiltersManager.java
ndroid/gallery3d/filtershow/filters/FilterFxRepresentation.java
|
| 5334fa3036425acf843072f32af72565b5547cf3 |
31-May-2013 |
Angus Kong <shkong@google.com> |
Merge "Adjust data id even if it's not currently used." into gb-ub-photos-carlsbad
|
| fb57df15a87f95ce8b2f861e54d960602912e03c |
14-May-2013 |
Doris Liu <tianliu@google.com> |
Improve gesture handling
Change-Id: Ib1e18274480b6bb681bd06f3130f9b9ea198ea98
ndroid/camera/NewPhotoModule.java
ndroid/camera/NewPhotoUI.java
ndroid/camera/NewPreviewGestures.java
ndroid/camera/NewVideoUI.java
ndroid/camera/ui/FilmStripView.java
ndroid/camera/ui/NewCameraRootView.java
ndroid/camera/ui/PieMenuButton.java
ndroid/camera/ui/PieRenderer.java
ndroid/camera/ui/RenderOverlay.java
|
| f464958e6bc926e0c4a776d11a9f2aa8514a866f |
31-May-2013 |
Angus Kong <shkong@google.com> |
Merge "Translate the first/last view too." into gb-ub-photos-carlsbad
|
| d3992d8958aa8067c4803f113bcbab9e7f5a61b0 |
31-May-2013 |
Angus Kong <shkong@google.com> |
Merge "Don't use the same drawable for every view." into gb-ub-photos-carlsbad
|
| 067a56d3e43642e6ddfdad357ba6bdf4b3d2015f |
31-May-2013 |
Angus Kong <shkong@google.com> |
Merge "Fix mistakenly reversed order in FilmStripView." into gb-ub-photos-carlsbad
|
| 111bc7aeea0653f1a823af24174cd073420a9515 |
31-May-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Mirroring google3 for CL 47368174.
Change-Id: Ic29d8d6784870660e0bd83f870ec2cf0c244746d
ndroid/gallery3d/filtershow/filters/FilterRepresentation.java
|
| accc6e55bbf0186be316e81fb4e82da4731f72e0 |
31-May-2013 |
Angus Kong <shkong@google.com> |
Don't use the same drawable for every view.
The placeholder drawable should be cloned for each view using it.
Change-Id: Ic9f7614cc91c95a16105b3b8a9e07c81a8f1a2d7
ndroid/camera/data/CameraDataAdapter.java
|
| c31569ce211414f6db2447cc84ca71115f916b6f |
31-May-2013 |
Angus Kong <shkong@google.com> |
Adjust data id even if it's not currently used.
FilmStripView should adjust the internal info of data id after removal
regardless of the existence of the removed data in the buffer.
Change-Id: I78202997525a96a88f7bba8e0d55b7f6aad2c9cf
ndroid/camera/ui/FilmStripView.java
|
| 0980fe89b2c0d2d8f75cb43a5fe06c00b8c8901e |
29-May-2013 |
Angus Kong <shkong@google.com> |
Translate the first/last view too.
Change-Id: Iea6dfa8acc632596fdf05001b6b11d11d014a8a0
ndroid/camera/ui/FilmStripView.java
|
| 7283c609ccca310cfc39a3d25bb1c58f4198a341 |
30-May-2013 |
Angus Kong <shkong@google.com> |
Fix mistakenly reversed order in FilmStripView.
Change-Id: Ia9b285adbf448383e8f19081a16b8351b3c201e4
ndroid/camera/data/LocalData.java
|
| 9d6561494d28e8e8c6f1add50ab7724df722525b |
30-May-2013 |
Michael Kolb <kolby@google.com> |
am af65d7ba: Merge "Add HTC One picture resolutions" into gb-ub-photos-bryce
* commit 'af65d7ba216eba60651d11d248d20346309375ed':
Add HTC One picture resolutions
|
| d42c203a7fbbef58af268e7dcec295b7cdca6e4a |
30-May-2013 |
Michael Kolb <kolby@google.com> |
Merge "Add HTC One picture resolutions" into gb-ub-photos-bryce
|
| 4a4d4ef24b7edbbdf1614373880681e5406df246 |
30-May-2013 |
Michael Kolb <kolby@google.com> |
Add HTC One picture resolutions
Bug: 9175168
Fixes bug where preview is not stopped before size changes
Change-Id: I2df136482df68a952c9d3ca5c058ba56ff3a6db8
ndroid/camera/PhotoModule.java
|
| 32d50e89e7877a2b38573d20a8251850c87e7851 |
30-May-2013 |
Angus Kong <shkong@google.com> |
am a1db2653: Dismiss settings when showing popup in Video mode.
* commit 'a1db26536913f1259ad74c5e6e952521c05bf2f0':
Dismiss settings when showing popup in Video mode.
|
| 9cbfe8d5ea68308ece1e57b4b8e38bf5f0344951 |
30-May-2013 |
John Reck <jreck@google.com> |
Copy Tiling changes from G+
Change-Id: Id229728182a002c29699884289f1354b6cb6e714
ndroid/photos/BitmapRegionTileSource.java
ndroid/photos/FullscreenViewer.java
ndroid/photos/views/BlockingGLTextureView.java
ndroid/photos/views/TiledImageRenderer.java
ndroid/photos/views/TiledImageView.java
|
| 91fffb39cf1eb7919cab48c56eb1b44727f4e5c2 |
30-May-2013 |
Angus Kong <shkong@google.com> |
Dismiss settings when showing popup in Video mode.
bug:8771618
Change-Id: I889b794c6732b674e26436f950e81f67529012e7
ndroid/camera/VideoUI.java
|
| c58d6414da1cc38f07f0512f4debf92e8c738ca0 |
29-May-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Cleaning up ImageShow.
Bug: 9170644
Change-Id: Iab44ec425462e9afe8c104c52e4a28c4145d4690
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/editors/Editor.java
ndroid/gallery3d/filtershow/editors/EditorPanel.java
ndroid/gallery3d/filtershow/imageshow/ImageDraw.java
ndroid/gallery3d/filtershow/imageshow/ImageGeometry.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
ndroid/gallery3d/filtershow/ui/ImageCurves.java
|
| 45849dc5f3bd76ab28452898d68e524792252dc8 |
29-May-2013 |
John Hoford <hoford@google.com> |
Merge "zoom to center of double tap" into gb-ub-photos-carlsbad
|
| 96ba2fbe1ad0e29673eaf5ceaa1ca256239dedac |
29-May-2013 |
Angus Kong <shkong@google.com> |
Merge "Add UI for insertion in FilmStripView." into gb-ub-photos-carlsbad
|
| 723cd37ea7da0cf6f7264007b271683613ce2f47 |
29-May-2013 |
John Hoford <hoford@google.com> |
zoom to center of double tap
Change-Id: Idfc257f92dd1a97d9109b9f5325299b8e1432c37
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
ndroid/gallery3d/filtershow/imageshow/MasterImage.java
|
| f91b03fd66f37fcabe3581011a58b37977ff2922 |
29-May-2013 |
George Mount <mount@google.com> |
Merge "Recover from bitmap decode failure." into gb-ub-photos-carlsbad
|
| 98df4dc894b8d8b8a6cac932ce193fddb7858e99 |
29-May-2013 |
George Mount <mount@google.com> |
Recover from bitmap decode failure.
Skia errors out when decoding a bitmap into another bitmap
sometimes. When this situation is detected, the decode is
is retried without reusing a bitmap.
Change-Id: I935dec988ed7e115ceda9233a65d3b6083a17468
ndroid/photos/data/BitmapDecoder.java
|
| e78541f2edf2f02660c34660114e76d53b32ab8b |
28-May-2013 |
Angus Kong <shkong@google.com> |
Add UI for insertion in FilmStripView.
Change-Id: Iff389525e3811c5018365b6e6c3b9f8b95b9da9a
ndroid/camera/NewCameraActivity.java
ndroid/camera/ui/FilmStripView.java
|
| 260b999e473f5a4ef616ed0da5edf332a2fce2dd |
28-May-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Removed unused ZoomCache class.
Bug: 9170644
Note: this class doesn't appear to have been used by the zoom
on doubletap.
Change-Id: Ie3319511ade7732976488f2bb7d76c5e1c130db9
ndroid/gallery3d/filtershow/cache/ImageLoader.java
ndroid/gallery3d/filtershow/cache/ZoomCache.java
|
| 88741b480f3dece25ac06a87d3752e995bdd53c5 |
28-May-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Removed unused handling for intent extras in editor.
Bug: 9170644
Change-Id: I569b16d278d1813f5a96f9e0231ed71ff9e33687
ndroid/camera/NewPhotoModule.java
ndroid/camera/PhotoModule.java
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/Wallpaper.java
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/cache/ImageLoader.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
ndroid/gallery3d/filtershow/tools/BitmapTask.java
ndroid/gallery3d/gadget/WidgetConfigure.java
ndroid/photos/MultiChoiceManager.java
|
| 94472c3dc397cfa9a8fad5ba7628253ec6642ed6 |
28-May-2013 |
Doris Liu <tianliu@google.com> |
am 9fb962fe: Merge "Change the order of exposure compensation" into gb-ub-photos-bryce
* commit '9fb962feb94909af05ab6cf872eee7e8928eb9b1':
Change the order of exposure compensation
|
| 3bbe0f9f61e3702b46a43e0537060a7a609104b2 |
28-May-2013 |
Doris Liu <tianliu@google.com> |
Merge "Change the order of exposure compensation" into gb-ub-photos-bryce
|
| f8c7bff9f5b88fb83696e192c3ff343fa810c5b9 |
28-May-2013 |
Bobby Georgescu <georgescu@google.com> |
am e3336dc3: Merge "Prevent lock screen appearing during active slideshow" into gb-ub-photos-bryce
* commit 'e3336dc35f514e3b5dd7a15f9a86eaf6d1572b5e':
Prevent lock screen appearing during active slideshow
|
| 2cca828ec5186105723ae85e618bfca0bb59cdb8 |
28-May-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Prevent lock screen appearing during active slideshow" into gb-ub-photos-bryce
|
| 37eb0e35b34f492e212b373bdd2e0b071e307df0 |
25-May-2013 |
Bobby Georgescu <georgescu@google.com> |
Prevent lock screen appearing during active slideshow
Bug: 9094678
Change-Id: I8efb988911c75275430da934474df1e65265b234
ndroid/gallery3d/app/SlideshowPage.java
|
| 31ce18458f63a2876e2d53c0b8692ef3dd6fca4f |
25-May-2013 |
Doris Liu <tianliu@google.com> |
Change the order of exposure compensation
Bug: 9119379
Change-Id: I2e70ab1e83cf322ee0043850b2d27db962039bf3
ndroid/camera/CameraSettings.java
|
| f22d8c2e1f011a31e56db45cab07c98a2a03ad9a |
24-May-2013 |
Christian Wichner <cwichner@google.com> |
functionality added to transport filter parameter values to following filters. e.g. FixedFrames use the style from Retrolux or Film to tinting the frame.
Change-Id: I87f2497bdaccf8de5d153cbebf9641b979ea15a3
ndroid/gallery3d/filtershow/filters/ImageFilter.java
ndroid/gallery3d/filtershow/presets/FilterEnvironment.java
|
| 4f675e3c7509efea7e0d140bda1631042a21f8ca |
23-May-2013 |
Angus Kong <shkong@google.com> |
Merge "Fix/simplify comparator of LocalData." into gb-ub-photos-carlsbad
|
| dff672d644f3db07d13f6d58bfceb2b1cc10d345 |
23-May-2013 |
Angus Kong <shkong@google.com> |
Fix/simplify comparator of LocalData.
Change-Id: I433516d630de3d0f98d7ab8c35becf0cc6495bef
ndroid/camera/data/LocalData.java
|
| af956d7c25877dc3614a022a608948b6ed9b2e8f |
23-May-2013 |
Angus Kong <shkong@google.com> |
Merge "Refactor to add FilmStripView.Controller." into gb-ub-photos-carlsbad
|
| 8d3445517db4c3456f76e42f4070dd4b512faad3 |
23-May-2013 |
John Hoford <hoford@google.com> |
am a7a6a3a5: Fix issues with Local
* commit 'a7a6a3a5efaf62cdd5d562a9141678671952d27d':
Fix issues with Local
|
| b37d996fa90b1b98ea4aee75a696d9722c535619 |
23-May-2013 |
John Hoford <hoford@google.com> |
am 4d25d129: Merge "fix ellipse logic for portrait" into gb-ub-photos-bryce
* commit '4d25d129d1c9f92033382e12260d3f40521cf3fd':
fix ellipse logic for portrait
|
| 970c0bdd33978839857d05adc98d014dfdd8ef07 |
23-May-2013 |
Bobby Georgescu <georgescu@google.com> |
am cdc87e62: Merge "Fix potential synchronization issue in bitmap pool" into gb-ub-photos-bryce
* commit 'cdc87e62ee28b5022b2e4d0bc756c264cc26d8e9':
Fix potential synchronization issue in bitmap pool
|
| cbb5de929f1fb2d40d5e2f0d616a2ff3ce3f0f83 |
23-May-2013 |
Michael Kolb <kolby@google.com> |
am be4f113f: Fix editor on ICS
* commit 'be4f113fa1fea32e8d8865a52491b9f25760eaba':
Fix editor on ICS
|
| 653642bbfd6aef9b468c3632a112829d32d0ec99 |
23-May-2013 |
Michael Kolb <kolby@google.com> |
am 37be6658: Merge "Fix selection highlight for tablets" into gb-ub-photos-bryce
* commit '37be6658075cac2bad0e30d93705dddeaaf1e421':
Fix selection highlight for tablets
|
| 3d83a13d9c0e60e7a3f7227a8263226dc0c3c00a |
23-May-2013 |
John Reck <jreck@google.com> |
am 01ae91aa: Merge "Fix height" into gb-ub-photos-bryce
* commit '01ae91aa0e347c5a8b335afc8cb0f02459ee5adc':
Fix height
|
| 4e6549b0a894c8c95a105b95f0bd421817ae9c25 |
23-May-2013 |
Sascha Haeberling <haeberling@google.com> |
am 80a3d636: Make capture thumbnail tappable in video mode.
* commit '80a3d636fa38bb78dbc9f224b4944a21a6e3271d':
Make capture thumbnail tappable in video mode.
|
| 6d23f4c77fde7ddf70e0edd48f46cc22b7f7320e |
23-May-2013 |
Angus Kong <shkong@google.com> |
Refactor to add FilmStripView.Controller.
Use controller to control the FilmStripView.
Change-Id: If203d4bf28ce2dc398ada8b56b38be51a1d5dab9
ndroid/camera/ui/FilmStripView.java
|
| d6145d21419680b22a6daa6da95ee566bef72df6 |
23-May-2013 |
John Hoford <hoford@google.com> |
Fix issues with Local
bug:9085638
Change-Id: I8d10373b4cd65b3f1338d88f1816ccb0b3a0166d
ndroid/gallery3d/filtershow/FilterShowActivity.java
|
| c4870f4c07d085ed6b9f220c2f04ef8ea5a1cd6e |
22-May-2013 |
John Hoford <hoford@google.com> |
Merge "fix ellipse logic for portrait" into gb-ub-photos-bryce
|
| a5d7a79da64631dccee8858cb646b4cb373039df |
22-May-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Fix potential synchronization issue in bitmap pool" into gb-ub-photos-bryce
|
| 667035cb00787b57a59e737f2af928ceebf918e4 |
22-May-2013 |
Michael Kolb <kolby@google.com> |
Fix editor on ICS
Bug: 9079902
Change-Id: I1159708b0a9db4a0369044cdf9f3620bca433e14
ndroid/gallery3d/filtershow/category/CategoryAdapter.java
|
| af323d6fe49ab551cb990869d62a9d831c6e8488 |
22-May-2013 |
John Hoford <hoford@google.com> |
fix ellipse logic for portrait
bug:9054114
Change-Id: I4bdc7301a60e74bf663fda031c0f2c76ee34b7ec
ndroid/gallery3d/filtershow/imageshow/EclipseControl.java
|
| fd382ee5142bb87707be00dec9bc7235f01733d1 |
22-May-2013 |
Angus Kong <shkong@google.com> |
Keep camera preview in view hierarchy.
Camera preview is a special case that needs to be kept to avoid unnecessary
start and stop preview.
Change-Id: I6c922d4b35ff86981fa6a3ec3b76417d07a68a0e
ndroid/camera/ui/FilmStripView.java
|
| 2927b07c036431541a8c64ab479637b05bc0c35d |
22-May-2013 |
Angus Kong <shkong@google.com> |
Merge "Fix off-position issue after changing orientation" into gb-ub-photos-carlsbad
|
| d63f8090161e9924911840ef6c7c8e2ef16d2866 |
22-May-2013 |
Michael Kolb <kolby@google.com> |
Merge "Fix selection highlight for tablets" into gb-ub-photos-bryce
|
| af24d28f8938a05d2e3c40155e39cbc7ff4d64b7 |
21-May-2013 |
Angus Kong <shkong@google.com> |
Fix off-position issue after changing orientation
Change-Id: I1c40b9ede5fa85ab46d9bcb9ab586e66c4c132c8
ndroid/camera/ui/FilmStripView.java
|
| 15074e2673f2165188e71dc3d2470f0093fa71e7 |
22-May-2013 |
John Reck <jreck@google.com> |
Merge "Fix height" into gb-ub-photos-bryce
|
| afed6ec95d9cbc83a211c032209fde04c08c611d |
20-May-2013 |
John Reck <jreck@google.com> |
Fix height
Change-Id: I133063acdad4a1afe8e0a9105591dd90354913f0
ndroid/gallery3d/filtershow/category/CategoryAdapter.java
|
| d2d5410fbcb39c12d362644d1cdc91c6ca18711f |
22-May-2013 |
Michael Kolb <kolby@google.com> |
Fix selection highlight for tablets
Bug: 9044356
Fixes selection highlight for the new asset sizes.
Change-Id: Ibf21a1f90d6cd1faf62a221d71d55928dc7a3b4a
ndroid/gallery3d/filtershow/category/CategoryView.java
ndroid/gallery3d/filtershow/ui/SelectionRenderer.java
|
| bc2c0d6cda0955490db62ab3a4f60678ca34b88c |
22-May-2013 |
George Mount <mount@google.com> |
Merge "Combine code for bitmap decoding and add byte array decoding." into gb-ub-photos-carlsbad
|
| 1a833d67f22eefcbc5a76a104d0857a5b1064433 |
21-May-2013 |
George Mount <mount@google.com> |
Combine code for bitmap decoding and add byte array decoding.
Change-Id: Id780f94a5d939e5423b87f2e1d4ddf18b3dfa126
ndroid/photos/data/BitmapDecoder.java
|
| 407fe728f95645ca43d7c2d3254856c6314ad534 |
22-May-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Add comments to bitmap pools" into gb-ub-photos-carlsbad
|
| 6b9ece8710604adec2805b903d977264f90087c6 |
21-May-2013 |
Bobby Georgescu <georgescu@google.com> |
Add comments to bitmap pools
Change-Id: Ie841316629ef0737dcdd5002b3278cf0bca3a768
ndroid/photos/data/GalleryBitmapPool.java
ndroid/photos/data/SparseArrayBitmapPool.java
|
| 4f91ab5d099632afd84dd7bd80a804cbbe1f3588 |
21-May-2013 |
Sascha Haeberling <haeberling@google.com> |
Make capture thumbnail tappable in video mode.
Bug: 9054122
Also make gotoGallery public for LightCycle to use.
Change-Id: I3cd5af26531a756e78c1478de29155dfda709afc
ndroid/camera/ActivityBase.java
ndroid/camera/VideoModule.java
ndroid/camera/VideoUI.java
|
| 430237d7a6f8dd74e03e6c1bae8a03f54ab7cffc |
21-May-2013 |
Bobby Georgescu <georgescu@google.com> |
Fix potential synchronization issue in bitmap pool
Bug: 9072712
Change-Id: I7fcecd6ec63e461e06a6565519be6d86e3246155
ndroid/photos/data/GalleryBitmapPool.java
|
| 19331c408aeed3cf66ba20fca08cbc842b55ddd6 |
21-May-2013 |
Doris Liu <tianliu@google.com> |
am aa77f39a: Merge "Fix camera controls blink on startup" into gb-ub-photos-bryce
* commit 'aa77f39a3a18ee7945177189c358ef6208e6da2b':
Fix camera controls blink on startup
|
| 4a0676ce905ace0eb8dcac4bfd9bce8da0884298 |
21-May-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix camera controls blink on startup" into gb-ub-photos-bryce
|
| 90529c8c1634c35f39033397c6196922d797ea67 |
21-May-2013 |
John Hoford <hoford@google.com> |
am a285bc13: Merge "fix TinyPlanets Filter landscape crash" into gb-ub-photos-bryce
* commit 'a285bc130ff1175c60085410f317e90f6443c39b':
fix TinyPlanets Filter landscape crash
|
| 9eb37145df8adfb0bd68e9023342f5c7a4d12d31 |
21-May-2013 |
John Hoford <hoford@google.com> |
fix TinyPlanets Filter landscape crash
bug:9038163
Change-Id: Ice1e01dfa0e9ac72e5019fac900e76bd38955e05
ndroid/gallery3d/filtershow/FilterShowActivity.java
|
| d6f247be465060c28be6018c9dee4b098d589eba |
21-May-2013 |
Angus Kong <shkong@google.com> |
Merge "Fix jitter in FilmStripView." into gb-ub-photos-carlsbad
|
| 9f02c87cfb5039a72f516ea5edc0378c45ac5779 |
20-May-2013 |
Angus Kong <shkong@google.com> |
Fix jitter in FilmStripView.
The jigger happens when deleting the one before the last. The length of the film
strip might be changed due to the deletion.
Change-Id: I269a5d88eb77ed5fa6e44ae9c86c2941ecd718b1
ndroid/camera/ui/FilmStripView.java
|
| f22ed280bae246a4b9ce31e5fada68a30f211aed |
21-May-2013 |
Doris Liu <tianliu@google.com> |
Fix camera controls blink on startup
Bug: 9052837
Change-Id: Ie15b812c6e6e7879d29d96a345173a2130b2fe91
ndroid/gallery3d/ui/PhotoView.java
|
| 9895f144631ef60056da2bcc3cb911faf9c6b3b1 |
20-May-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 286afab1: Merge "Avoid using region decoder for bad image types when setting wallpaper." into gb-ub-photos-bryce
* commit '286afab10fb4c528ea503981c4f1bdbcfbdbde77':
Avoid using region decoder for bad image types when setting wallpaper.
|
| d165d93679ba8d10d4c7572eb425845243a6e715 |
20-May-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Avoid using region decoder for bad image types when setting wallpaper." into gb-ub-photos-bryce
|
| 3c4b7c568d5de16b738207e581e9cd48e4eb6529 |
20-May-2013 |
Sascha Haeberling <haeberling@google.com> |
am 7af7156a: Merge "Make sure canceling a filter does not undo previous filter." into gb-ub-photos-bryce
* commit '7af7156a809934951877b1f9b9ad1ceeb9c9a5ce':
Make sure canceling a filter does not undo previous filter.
|
| d54f6082ca219c82a525553e2a405cbca92e9dfb |
20-May-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Make sure canceling a filter does not undo previous filter." into gb-ub-photos-bryce
|
| 119db4a01c903a4bce4a68cb7f3caa8b41ecd9a4 |
20-May-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Avoid using region decoder for bad image types when setting wallpaper.
Bug: 8893617
Change-Id: I9830ea0d76acff8a524186cf505963c48d9f1fbe
ndroid/gallery3d/filtershow/crop/CropActivity.java
|
| 875da35b7b769a66edb8f25db4780a8c63aa3a4e |
20-May-2013 |
John Hoford <hoford@google.com> |
am 26e3c48b: Merge "Disable zoom" into gb-ub-photos-bryce
* commit '26e3c48b831e39ced1db18673f12fb3c7a2d56d8':
Disable zoom
|
| 31c1feb195c778c431b4ec69abd80ee01cc9a5e9 |
20-May-2013 |
John Hoford <hoford@google.com> |
Merge "Disable zoom" into gb-ub-photos-bryce
|
| 3f39318ccd887c83aeaab5d2a882671e1280ecf0 |
17-May-2013 |
John Hoford <hoford@google.com> |
Disable zoom
Bug: 8791729
Change-Id: I2ee9d9e644842ce0a7014a1665e6bd1d001e4f06
ndroid/gallery3d/filtershow/imageshow/MasterImage.java
|
| 8dcd1ab3b1d2c0f56b2af8ffd25ca3a6a5cfb657 |
18-May-2013 |
Michael Kolb <kolby@google.com> |
am 1a266f16: Highlight selected option in FX and Borders
* commit '1a266f16edbef7cb0a770d37fcad958fc55a5862':
Highlight selected option in FX and Borders
|
| 01fa94509b880bf80d3c852544c26cda6e882539 |
17-May-2013 |
Michael Kolb <kolby@google.com> |
Highlight selected option in FX and Borders
Bug: 8791729
Change-Id: I8ac2c3deabe7b293df48db9f44f52956443a92a4
ndroid/gallery3d/filtershow/category/CategoryAdapter.java
ndroid/gallery3d/filtershow/category/CategoryPanel.java
ndroid/gallery3d/filtershow/category/CategoryView.java
ndroid/gallery3d/filtershow/category/MainPanel.java
ndroid/gallery3d/filtershow/ui/FilterIconButton.java
ndroid/gallery3d/filtershow/ui/SelectionRenderer.java
|
| 87f9a62f473a3c57505e2877b0a46ab3cb5e62ac |
17-May-2013 |
Angus Kong <shkong@google.com> |
Add remove UI in FilmStripView
1. Add UI support for swipe to delete.
2. Don't set children padding.
Change-Id: I26be97f14d569db3df6a127cd00efe3c0c60f22c
ndroid/camera/NewCameraActivity.java
ndroid/camera/data/CameraDataAdapter.java
ndroid/camera/data/LocalData.java
ndroid/camera/ui/FilmStripGestureRecognizer.java
ndroid/camera/ui/FilmStripView.java
|
| 1bd01a1efc3f1e3fbe89481f08689633a3f15f34 |
17-May-2013 |
Doris Liu <tianliu@google.com> |
Merge "Add new camera activity back and fix build errors" into gb-ub-photos-carlsbad
|
| 2c4dbba15035120aec9b4c66a578d36ad47bbf3e |
17-May-2013 |
John Reck <jreck@google.com> |
am 3b7347da: Merge "Switch back to old crop" into gb-ub-photos-bryce
* commit '3b7347daf572c20996607afe4cc32f9a96f8fe5d':
Switch back to old crop
|
| ce54df0c34bd0d8472e2c1fea4da1e0a9d8fd657 |
17-May-2013 |
John Reck <jreck@google.com> |
Switch back to old crop
Bug: 8950255
Change-Id: I3f78901e65a17a1d5867d3f76a6031cff5f65fed
ndroid/gallery3d/ui/MenuExecutor.java
|
| 7234f4d6ff4fdcd47eb428405d2b31a5711d20ce |
14-May-2013 |
Doris Liu <tianliu@google.com> |
Add new camera activity back and fix build errors
Change-Id: I30b657c7eee2b8cb0317c922966821002ea956f0
ndroid/camera/NewCameraActivity.java
ndroid/camera/NewCameraModule.java
ndroid/camera/NewPhotoMenu.java
ndroid/camera/NewPhotoModule.java
ndroid/camera/NewPhotoUI.java
ndroid/camera/NewPreviewGestures.java
ndroid/camera/NewVideoMenu.java
ndroid/camera/NewVideoModule.java
ndroid/camera/NewVideoUI.java
ndroid/camera/ui/FaceView.java
ndroid/camera/ui/FilmStripGestureRecognizer.java
ndroid/camera/ui/NewCameraRootView.java
|
| 2a88de414efddfe2813dea1fbe121f915e3bd07a |
16-May-2013 |
John Reck <jreck@google.com> |
am 75084da1: Merge "toUpper() some strings" into gb-ub-photos-bryce
* commit '75084da1b34e0ff9f269b5409d206c213532edbc':
toUpper() some strings
|
| b9974cb7e9f117c639399c3b13823e13be47f18e |
16-May-2013 |
John Reck <jreck@google.com> |
Merge "toUpper() some strings" into gb-ub-photos-bryce
|
| 03a49d85713be63a791ba7e4591aa72f3e2a13b1 |
16-May-2013 |
John Reck <jreck@google.com> |
am 5a9716fe: Merge "Fix reset" into gb-ub-photos-bryce
* commit '5a9716fe6de7af4585a24dd1d749b38a4ab48195':
Fix reset
|
| 5e737ffa3eb106518e03d1a9b4d00a58c73640ee |
16-May-2013 |
John Reck <jreck@google.com> |
toUpper() some strings
Bug: 8791729
Change-Id: Icd05eb2d33b83fb589470ef9d98585f919f14deb
ndroid/gallery3d/filtershow/editors/Editor.java
ndroid/gallery3d/filtershow/editors/SwapButton.java
ndroid/gallery3d/filtershow/ui/ImageCurves.java
|
| 436a2bcaf47c32a2a1b1cee2871d936c062ce699 |
15-May-2013 |
John Reck <jreck@google.com> |
Fix reset
Bug: 8791729
Change-Id: Id39ef76f013a38bae3d92f45b02de7cd184edfec
ndroid/gallery3d/filtershow/FilterShowActivity.java
|
| b6ad64dce341b96a68eecca6cc6ceda633c1a521 |
15-May-2013 |
Michael Kolb <kolby@google.com> |
am c2f813a3: Merge "Grey out undo/redo/reset according to state" into gb-ub-photos-bryce
* commit 'c2f813a36711742af3b23743ef1849cec13a9a95':
Grey out undo/redo/reset according to state
|
| e64e28cd164d52e1339f084ff57cf602f1bfd55c |
15-May-2013 |
Michael Kolb <kolby@google.com> |
am 655e208d: Merge "Correct label position after rotation" into gb-ub-photos-bryce
* commit '655e208d5dc1305d9e4eb5301dec0673136151c9':
Correct label position after rotation
|
| 2c81bea7d026c29ad2b0b95031b2a399b88886f5 |
15-May-2013 |
Michael Kolb <kolby@google.com> |
Merge "Grey out undo/redo/reset according to state" into gb-ub-photos-bryce
|
| 3071b12d4586b6dbb908c0fc89ebc04bbd656995 |
15-May-2013 |
Michael Kolb <kolby@google.com> |
Merge "Correct label position after rotation" into gb-ub-photos-bryce
|
| 56f69010c951298634fc85529cb75842442c2528 |
15-May-2013 |
ztenghui <ztenghui@google.com> |
am 4aa8d5fc: Merge "Fix another annoying warning log spam" into gb-ub-photos-bryce
* commit '4aa8d5fc9d3478d511786cb99d5ba704d3e1f426':
Fix another annoying warning log spam
|
| cbe3447fab97f3c4ffb0a792ae4d9cb9d3b558c6 |
15-May-2013 |
ztenghui <ztenghui@google.com> |
Merge "Fix another annoying warning log spam" into gb-ub-photos-bryce
|
| 2b06ff267ca205b72b79ac9b6f8089a623719afe |
15-May-2013 |
Angus Kong <shkong@google.com> |
Merge "Improve bitmap load efficiency." into gb-ub-photos-carlsbad
|
| ea7b3557be2beb76d553a0cfe216c382eb293ee4 |
15-May-2013 |
Michael Kolb <kolby@google.com> |
Grey out undo/redo/reset according to state
Bug: 8791729
Change-Id: I1252a9634870e56c8989688eeb28b1b4c2781827
ndroid/gallery3d/filtershow/HistoryAdapter.java
|
| 60e938e0caed26441e0ab784344fd161954dc8ab |
14-May-2013 |
Michael Kolb <kolby@google.com> |
Correct label position after rotation
Bug: 8963421
Change-Id: If361e0ca6f20612ec3baae74cde444bd26164ab3
ndroid/camera/ui/PieRenderer.java
|
| 7e072be494fa0c46b1f0aeda4cdbf35e8d55fbf5 |
14-May-2013 |
Doris Liu <tianliu@google.com> |
am 26dbb20c: Merge "Pause face detection when review captured images" into gb-ub-photos-bryce
* commit '26dbb20c15e27d22a14efd0a25ec4e50cf5084cc':
Pause face detection when review captured images
|
| 750e8ec8af168afd318d47082b326b95f1cca517 |
06-May-2013 |
Angus Kong <shkong@google.com> |
Improve bitmap load efficiency.
Call prepare before/recycle after using image data.
Change-Id: I3387c8ca68f57c3949fed2aaa3e26490e66c791a
ndroid/camera/data/CameraDataAdapter.java
ndroid/camera/data/LocalData.java
ndroid/camera/ui/FilmStripView.java
|
| d31cdfeb1035df8ba939e877031769f0df247aa6 |
14-May-2013 |
Doris Liu <tianliu@google.com> |
Pause face detection when review captured images
Bug: 8799508
Change-Id: I994299a3ad406bcee5e6699265cb0ab29612e62c
ndroid/camera/PhotoUI.java
|
| 7f9e16ed4a4feb1d7ae15fb9e73d84d95ee53c2d |
14-May-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fix FP rounding error for crop bounds.
Bug: 8874599
Change-Id: I94198e4dcdbb0afa1dd788130645855b33e8f30b
ndroid/gallery3d/filtershow/crop/CropMath.java
|
| 49b9ba2ba89760f297ecc7d6d94d68fb4b836be1 |
13-May-2013 |
Angus Kong <shkong@google.com> |
Dropping back FilmStripView codes.
Ongoing work that doesn't affect builds.
Change-Id: I83d81fa91e87d10787c3ce1d767bc41131341067
ndroid/camera/data/CameraDataAdapter.java
ndroid/camera/ui/FilmStripGestureRecognizer.java
ndroid/camera/ui/FilmStripView.java
|
| f4862f0a3df697db6000972dbfd5387727506072 |
11-May-2013 |
ztenghui <ztenghui@google.com> |
Fix another annoying warning log spam
bug:8771541
When we set up the icon rendering, we need to set the geometry, too.
Change-Id: I331bdb752c5183d5e2611d8387505055c4219b92
ndroid/gallery3d/filtershow/ui/FilterIconButton.java
|
| 362b361849ffc77b646132959d20755959b8336d |
10-May-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Revert "Reinitialize all the filters after Crop is applied."
This reverts commit 1cfbaca7bef29b7d510c5e1de424e68cd8804022.
ndroid/gallery3d/filtershow/filters/BaseFiltersManager.java
ndroid/gallery3d/filtershow/filters/FiltersManagerInterface.java
ndroid/gallery3d/filtershow/filters/ImageFilter.java
ndroid/gallery3d/filtershow/filters/ImageFilterRS.java
|
| d8224654ddc7265e715eefd8b1a86f34f8dbbab1 |
10-May-2013 |
Victor Doba <dobavictor@google.com> |
Reinitialize all the filters after Crop is applied.
Change-Id: I192918a3f28eac400e2e35f3b410dc8adc1a8ad4
ndroid/gallery3d/filtershow/filters/BaseFiltersManager.java
ndroid/gallery3d/filtershow/filters/FiltersManagerInterface.java
ndroid/gallery3d/filtershow/filters/ImageFilter.java
ndroid/gallery3d/filtershow/filters/ImageFilterRS.java
|
| e87f2a79cda41bf75069206c6f453ce97912dddb |
10-May-2013 |
George Mount <mount@google.com> |
am ac94740c: Remove GL dependency on unused stencil buffers.
* commit 'ac94740cd673a016542d803c8600633c99b7427e':
Remove GL dependency on unused stencil buffers.
|
| caa77af0d12fa40418a342385bc47b8db6267e6c |
09-May-2013 |
George Mount <mount@google.com> |
Remove GL dependency on unused stencil buffers.
Bug 8884435
Change-Id: I8e7f0563a4a901953e3e2b14e35457b4fefe2e34
ndroid/gallery3d/glrenderer/GLCanvas.java
ndroid/gallery3d/glrenderer/GLES11Canvas.java
ndroid/gallery3d/glrenderer/GLES20Canvas.java
ndroid/gallery3d/ui/GLRootView.java
ndroid/gallery3d/ui/GalleryEGLConfigChooser.java
|
| e579e4f752af8005680a4b80780ba65a7fdfa9e8 |
09-May-2013 |
ztenghui <ztenghui@google.com> |
resolved conflicts for merge of 9a4fb2dc to gb-ub-photos-carlsbad
Change-Id: I90ffd8732cf34bb3dea7a849fc37fb1f3d82df39
|
| b5530eae0732be37a7685e646c5dd9726dc73caf |
09-May-2013 |
ztenghui <ztenghui@google.com> |
Merge "Fix the verbose log" into gb-ub-photos-bryce
|
| bf1dc5019c3040e2380a1695f4a5ac8ac6aafd26 |
09-May-2013 |
George Mount <mount@google.com> |
Merge "Fix bitmap buffer size." into gb-ub-photos-carlsbad
|
| 6a9a4979e60d54f010c2a43da7af62a5c3f9746c |
09-May-2013 |
Bart Sears <bsears@google.com> |
am b298ab63: Merge "Close menu in onPause" into gb-ub-photos-bryce
* commit 'b298ab636fec3894b9e702eaa0a6028ba03f49b1':
Close menu in onPause
|
| 3d585e9429acc637fa4f6e9ad9fdc82a428c7152 |
09-May-2013 |
Bart Sears <bsears@google.com> |
Merge "Close menu in onPause" into gb-ub-photos-bryce
|
| 6120af1f6b886191f92a6780957ced8b500e467d |
09-May-2013 |
Sascha Haeberling <haeberling@google.com> |
Make sure canceling a filter does not undo previous filter.
Bug: 8770921
Change-Id: I2b8e5fac980f562eaf97b231ad15612004608164
ndroid/gallery3d/filtershow/HistoryAdapter.java
|
| 667ef1217b802787d0d4557d5df1482d5f5b0c49 |
09-May-2013 |
Michael Kolb <kolby@google.com> |
am e324a388: Merge "Add drop shadow to preview thumb" into gb-ub-photos-bryce
* commit 'e324a388ead1f291fe27eb6b4ce5f25b55a29a49':
Add drop shadow to preview thumb
|
| c3b2c78480dc6bacf0b5d279cb7b07ee82a61dc8 |
09-May-2013 |
Michael Kolb <kolby@google.com> |
Merge "Add drop shadow to preview thumb" into gb-ub-photos-bryce
|
| d06573076a50d10038aea574529e02a190e93150 |
08-May-2013 |
ztenghui <ztenghui@google.com> |
Fix the verbose log
Now use adb shell log.tag.BasicRepresentation VERBOSE to turn on the logging.
bug:8771541
Change-Id: Ib9e1e44dbbd4e46798226d8ab5dc7365e8a90e27
ndroid/gallery3d/filtershow/filters/FilterBasicRepresentation.java
|
| 4615c5c727b4e447b702f1e11213898da28d2f97 |
08-May-2013 |
Michael Kolb <kolby@google.com> |
Add drop shadow to preview thumb
Bug: 8826241
Also, remove animateSlide blocker, it caused frozen review
Change-Id: Ic8eb129ec236726550a26bc387967fe0c00473e9
ndroid/camera/ActivityBase.java
ndroid/camera/CameraScreenNail.java
ndroid/camera/CaptureAnimManager.java
|
| b16bae90dbb99892c6b3209c13c53c44cb69deb4 |
09-May-2013 |
Michael Kolb <kolby@google.com> |
Close menu in onPause
Bug: 8722672
Change-Id: Ia3fac3ccc5db6cc1bb2a1dd32960ec6295735cfc
ndroid/camera/PhotoUI.java
|
| edc63acbef5d639e5c0afa25f23b589559e3dc0f |
09-May-2013 |
George Mount <mount@google.com> |
Fix bitmap buffer size.
The buffer size wasn't sufficient for some images.
Change-Id: Iba008c5bd4801183450f6076d73d19db531d5f3b
ndroid/photos/data/BitmapDecoder.java
|
| 0834d5e006a209b6ed22458abc8117f92f9e2fdb |
09-May-2013 |
Doris Liu <tianliu@google.com> |
Merge "Remove new camera activity to avoid build breakage" into gb-ub-photos-carlsbad
|
| f43dee9f40bb4f21df23ae3876213a5b2f9afcfc |
09-May-2013 |
Doris Liu <tianliu@google.com> |
Remove new camera activity to avoid build breakage
Change-Id: I56f0586ae196f57a0f55b8d835e6bc8fd27bdcfe
ndroid/camera/NewCameraActivity.java
ndroid/camera/NewCameraModule.java
ndroid/camera/NewPhotoMenu.java
ndroid/camera/NewPhotoModule.java
ndroid/camera/NewPhotoUI.java
ndroid/camera/NewPreviewGestures.java
ndroid/camera/NewVideoMenu.java
ndroid/camera/NewVideoModule.java
ndroid/camera/NewVideoUI.java
ndroid/camera/data/CameraDataAdapter.java
ndroid/camera/ui/FaceView.java
ndroid/camera/ui/FilmStripGestureRecognizer.java
ndroid/camera/ui/FilmStripView.java
ndroid/camera/ui/NewCameraRootView.java
|
| 955549f3e24e458dc6f3b84e8a510385a88f973c |
09-May-2013 |
Sascha Haeberling <haeberling@google.com> |
am 58f32428: Merge "Reduce max size of bitmap returned by crop dialog." into gb-ub-photos-bryce
* commit '58f32428768ff67520e0363de7a8c1929a4eac1f':
Reduce max size of bitmap returned by crop dialog.
|
| ca1717423fadab46d9c9d2f967a1a1d7eb2473ab |
09-May-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Reduce max size of bitmap returned by crop dialog." into gb-ub-photos-bryce
|
| 751aad308cb146dc03e018e19a756b3f99e8e06a |
08-May-2013 |
Michael Kolb <kolby@google.com> |
am c3fde4b4: Merge "Fix second level menu" into gb-ub-photos-bryce
* commit 'c3fde4b4032591fc34ce118860e53fe92c0b3706':
Fix second level menu
|
| 83bd9d3e7bb5402c335bad1370cef7f2351352ab |
08-May-2013 |
Michael Kolb <kolby@google.com> |
Merge "Fix second level menu" into gb-ub-photos-bryce
|
| 7048972374474dfca142856583833d8168d3b1b6 |
08-May-2013 |
Michael Kolb <kolby@google.com> |
Fix second level menu
Bug: 8857098
Added Countdown timer and picture size items
Change-Id: I73f3a5b22ab708e216729ed77fbd60041d40147d
ndroid/camera/CountDownTimerPreference.java
ndroid/camera/PhotoMenu.java
ndroid/camera/PhotoUI.java
ndroid/camera/ui/CountdownTimerPopup.java
ndroid/camera/ui/TimerSettingPopup.java
|
| ffaf11cbaeedc02812300fd1221ad154e37f857d |
08-May-2013 |
Sascha Haeberling <haeberling@google.com> |
Reduce max size of bitmap returned by crop dialog.
Bug: 8851336
Change-Id: Id69c46c44b22ce753900c52e34944428a38d02c6
ndroid/gallery3d/filtershow/crop/CropActivity.java
|
| 563643da89eba5d22239a0c87f81fb274c52ed17 |
08-May-2013 |
Bobby Georgescu <georgescu@google.com> |
am 9fcabfb5: Merge "Fix memory leak in SparseArrayBitmapPool" into gb-ub-photos-bryce
* commit '9fcabfb535f9e094f77cbdba5305d04209adc0b3':
Fix memory leak in SparseArrayBitmapPool
|
| bb70a7a3392a798e3af39479cf05f5bd1748ba89 |
08-May-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Fix memory leak in SparseArrayBitmapPool" into gb-ub-photos-bryce
|
| d731825ea5faa5d928f85d45d130efd74ad0645e |
08-May-2013 |
Michael Kolb <kolby@google.com> |
Fix build
Add required method to NewVideoModule
Change-Id: Ia04b07b8064f6fc1af73b1550bee88b14fe79b6b
ndroid/camera/NewVideoModule.java
|
| 48237fc2609f587b8cf2c262972ce7c437afb9d3 |
08-May-2013 |
Bobby Georgescu <georgescu@google.com> |
Fix memory leak in SparseArrayBitmapPool
Bug: 8857493
Change-Id: Ie5fae457aea91973caa07f8955b1364df573821b
ndroid/photos/data/SparseArrayBitmapPool.java
|
| e43208a013106e01e96ff09eab1a8b0ec7c78dde |
08-May-2013 |
Michael Kolb <kolby@google.com> |
Merge "Fix build" into gb-ub-photos-carlsbad
|
| b522f68987755ebdc515ff55466ff6ac094283fd |
08-May-2013 |
Michael Kolb <kolby@google.com> |
Fix build
Temporarily remove the old indicator code until
we update to the new UI
Change-Id: I4c706c5f147dffe085bd2ab1da30cc9a469ef2ce
ndroid/camera/NewPhotoUI.java
|
| c5def80161aa8dc2831d0509436452f966f18144 |
08-May-2013 |
Doris Liu <tianliu@google.com> |
am b281a646: Merge "Fix video capture intent overlapping buttons" into gb-ub-photos-bryce
* commit 'b281a6463f22c75c5b4a7a7079bdb55e484c2d07':
Fix video capture intent overlapping buttons
|
| 0815098550dd4158386d059b04de7f13fb415620 |
08-May-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix video capture intent overlapping buttons" into gb-ub-photos-bryce
|
| 26cde5188893b71699b51ef5e426e08e9b8bfe6a |
08-May-2013 |
Michael Kolb <kolby@google.com> |
am 0a830ce4: Merge "Add animation to slice selection" into gb-ub-photos-bryce
* commit '0a830ce4b5424ff9919b9156eb0635e671a67a81':
Add animation to slice selection
|
| e94d00bb84955b4928616af297b61b97f36f3345 |
08-May-2013 |
Michael Kolb <kolby@google.com> |
Merge "Add animation to slice selection" into gb-ub-photos-bryce
|
| 69ef5ea6ed838cf6fba834811f01122d349a61cf |
07-May-2013 |
Doris Liu <tianliu@google.com> |
Fix video capture intent overlapping buttons
Bug: 8839010
Change-Id: I8ee9bd8117a4a5e4dafe71775bb5563cef2ccdf0
ndroid/camera/VideoController.java
ndroid/camera/VideoModule.java
ndroid/camera/VideoUI.java
ndroid/camera/ui/CameraControls.java
|
| 77a66b210f6a272ccb3c4c494516de08df6afb76 |
08-May-2013 |
Sascha Haeberling <haeberling@google.com> |
am 6febbfc6: Merge "Avoid rounding errors from cropping uncropped images." into gb-ub-photos-bryce
* commit '6febbfc6c9c2d645f22fb200574fe14fa1201046':
Avoid rounding errors from cropping uncropped images.
|
| 59733de14afde5e9c1b34dd72f40837e486e43b4 |
08-May-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Avoid rounding errors from cropping uncropped images." into gb-ub-photos-bryce
|
| ad2a745d44fdf5acdd98d3bd8212ca51f45c29e7 |
07-May-2013 |
Michael Kolb <kolby@google.com> |
Add animation to slice selection
Bug: 8826233
Change-Id: Ibe41c38e048546b66ea9aa56a664ba80de2fbd4c
ndroid/camera/ui/PieRenderer.java
|
| a133a41f9773d2197a675312b8e6d13fedeabdeb |
07-May-2013 |
Michael Kolb <kolby@google.com> |
am 48ce39b8: Fix review button placement
* commit '48ce39b881f60fde8c9a1536199980c31d38188c':
Fix review button placement
|
| c9a1195c43d7d9953b3060503188c1f28cd948b8 |
07-May-2013 |
Michael Kolb <kolby@google.com> |
Fix review button placement
Bug: 8833788
Change-Id: I7fc8912ea4ffcd36a08e4cbb2705eec79c014da1
ndroid/camera/ui/CameraControls.java
|
| 559970b1af0333ead040b68cbcc632072f2e7a76 |
07-May-2013 |
Sascha Haeberling <haeberling@google.com> |
Avoid rounding errors from cropping uncropped images.
Bug: 8736111
Also don't treat "none" as a non-modifying filter.
Change-Id: I6478c557dbb68d7eecabb29f062285b83de05cda
ndroid/gallery3d/filtershow/imageshow/GeometryMetadata.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
|
| dabf1823a99ac2dc855f87acde6a0c62dff7cf18 |
07-May-2013 |
Doris Liu <tianliu@google.com> |
am ed1224f1: Resize children to avoid laying out outside parent
* commit 'ed1224f1b98a1a534f5a3b18739465ed6114529a':
Resize children to avoid laying out outside parent
|
| bcd73db9b9a5580167f1f54e78b798cbf9165940 |
07-May-2013 |
Doris Liu <tianliu@google.com> |
Resize children to avoid laying out outside parent
Bug: 8838983
Change-Id: Idc8ec7b96dd13e9c99dbc8b4710aa9d768ef198e
ndroid/camera/ui/CameraRootView.java
|
| 4546a3a1c97d959ab4f50a0727fbdbaef7347f7e |
06-May-2013 |
Doris Liu <tianliu@google.com> |
am 3a50eb36: Merge "Restrict checking for device flip" into gb-ub-photos-bryce
* commit '3a50eb36cf760ddb2a11c72b247f96611f3bf112':
Restrict checking for device flip
|
| 93240535cafe2b1a7630f8350963a3d84cbb9937 |
06-May-2013 |
Doris Liu <tianliu@google.com> |
Merge "Restrict checking for device flip" into gb-ub-photos-bryce
|
| 983be6e26337b3788a01eeebc2bdd45a58df12ba |
06-May-2013 |
Michael Kolb <kolby@google.com> |
am 1e3bc7d4: Set correct label text in tap mode
* commit '1e3bc7d4873dbc0778d5e12333c73c00bcd6512f':
Set correct label text in tap mode
|
| 712cc2f5add2fb78fbb723ecbca5f576a91fb54f |
06-May-2013 |
Michael Kolb <kolby@google.com> |
Set correct label text in tap mode
Bug: 8826229
Change-Id: I10b06ac04314beaf52fc8b29c9b10693eb11311b
ndroid/camera/ui/PieRenderer.java
|
| fa1c3a528de2ec357b8f43aa133feae444899668 |
03-May-2013 |
Doris Liu <tianliu@google.com> |
Restrict checking for device flip
Bug: 8714114
Change-Id: Ic12627fe5b7512c8d5739ed801130d52f33407cc
ndroid/camera/ui/CameraControls.java
ndroid/camera/ui/RotatableLayout.java
|
| 9f1027822eddb983c2fa812396598233fa31509f |
03-May-2013 |
Doris Liu <tianliu@google.com> |
am cd0fb7af: Fix NPE caused by insets never being set
* commit 'cd0fb7af20f855e1190122467c5650e46bfe820c':
Fix NPE caused by insets never being set
|
| d45258375a9356475377f6bdc7a504cd9acb937a |
03-May-2013 |
Doris Liu <tianliu@google.com> |
Fix NPE caused by insets never being set
Bug: 8804054
Change-Id: Ie0f2dec9681977621ba95650aa714b0733a30858
ndroid/camera/ui/CameraRootView.java
|
| ab27d0f7c2682645b8180935a736f118fa23f023 |
03-May-2013 |
Doris Liu <tianliu@google.com> |
am 4b9dea3a: Merge "Anchor camera controls when flipping device" into gb-ub-photos-bryce
* commit '4b9dea3a1496271b73a7b5a4f62ad3bb3b5cdadc':
Anchor camera controls when flipping device
|
| cbefed61cf0a7f28afb1221e95ee80c14d190243 |
03-May-2013 |
Doris Liu <tianliu@google.com> |
Merge "Anchor camera controls when flipping device" into gb-ub-photos-bryce
|
| a3d107564fe9e1001a1acd06b463404952bdc287 |
03-May-2013 |
Angus Kong <shkong@google.com> |
am b0a1e9fe: Don\'t show settings when popup is shown.
* commit 'b0a1e9fe925be1745bfb224867ee53562e027145':
Don't show settings when popup is shown.
|
| acfe99e268f157bfd524c825f388e6d37261e135 |
03-May-2013 |
Doris Liu <tianliu@google.com> |
Anchor camera controls when flipping device
Also adjusted margins for camera root view to avoid covering undo bar
Bug: 8758513
Bug: 8714114
Change-Id: If27f55a40f95402923d59d162db0c7cc29eabba4
ndroid/camera/ui/CameraControls.java
ndroid/camera/ui/CameraRootView.java
|
| d675bceed1a817e5f5a330ea27ac1b30b7be3330 |
03-May-2013 |
Angus Kong <shkong@google.com> |
Don't show settings when popup is shown.
bug:8771618
Change-Id: Idec1cbacec1ae958c7295facadc6653b840dbe50
ndroid/camera/PhotoUI.java
|
| b384243e414d22243e84c298f8cf3cef5f6c7bb4 |
02-May-2013 |
George Mount <mount@google.com> |
am 6d7a2d3e: Merge changes Ia9b2ced0,I7cccfffc into gb-ub-photos-bryce
* commit '6d7a2d3e32a27de28336176f856a7439b36252bd':
Class to simplify use of GalleryBitmapPool for decoding Bitmaps.
Allow prefetch for cache, reducing priority for prefetched images.
|
| 7b96023121ebeac1d7b48e573a24acfd8964e2d1 |
02-May-2013 |
George Mount <mount@google.com> |
Merge changes Ia9b2ced0,I7cccfffc into gb-ub-photos-bryce
* changes:
Class to simplify use of GalleryBitmapPool for decoding Bitmaps.
Allow prefetch for cache, reducing priority for prefetched images.
|
| 7b4502110166210cf7bbb0740544a0daf1c4d258 |
30-Apr-2013 |
George Mount <mount@google.com> |
Class to simplify use of GalleryBitmapPool for decoding Bitmaps.
Bug 8446191
Required for I86cfa59f448daa4e7b9fd7ea9ada2d69357e1f63
Change-Id: Ia9b2ced0bfd9c9c1b969c77bc89eaa0fa87687bb
ndroid/photos/data/BitmapDecoder.java
|
| e4600fca519144d8d9b82a82fdfaabcc77182f40 |
02-May-2013 |
George Mount <mount@google.com> |
Allow prefetch for cache, reducing priority for prefetched images.
Bug 8446191
Required for I86cfa59f448daa4e7b9fd7ea9ada2d69357e1f63
Change-Id: I7cccfffc539988d26fc751e16726b05fb2ba21bd
ndroid/photos/data/MediaCache.java
|
| 51d8cd77fd65f260c44cdb735a16322285aab342 |
02-May-2013 |
nicolasroard <nicolasroard@google.com> |
am f469a168: Fix flashing (remove clipping)
* commit 'f469a1689a9563f3c5bb68f46a5d9cd152d67053':
Fix flashing (remove clipping)
|
| f6c71858b1a6d39eab259bc593e3b4dd096daeef |
02-May-2013 |
nicolasroard <nicolasroard@google.com> |
Fix flashing (remove clipping)
bug:8747333
Change-Id: Ie1e7f1a58bf195b1f427b75ee9a1390e29b3ba2a
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
|
| 4c0d9138fda2ef04b2abd52ec93ed8715f00bb52 |
02-May-2013 |
nicolasroard <nicolasroard@google.com> |
am 00259461: Fix UI
* commit '00259461be82e601b58d3e970afbf0c012c5f3e7':
Fix UI
|
| 2ee98c8dc8bfba5e9820c14f348ee077c4a4236d |
01-May-2013 |
nicolasroard <nicolasroard@google.com> |
Fix UI
bug:8664728
Change-Id: I90b903e8935b2b6c0dbd6590cff36865644c49b4
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/category/Action.java
ndroid/gallery3d/filtershow/category/CategoryView.java
ndroid/gallery3d/filtershow/editors/ParametricEditor.java
ndroid/gallery3d/filtershow/filters/FilterRepresentation.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
ndroid/gallery3d/filtershow/state/State.java
ndroid/gallery3d/filtershow/state/StateAdapter.java
ndroid/gallery3d/filtershow/state/StatePanelTrack.java
ndroid/gallery3d/filtershow/state/StateView.java
|
| 6cfe7ce6fe6d3486d996288d6c7c700a5c645808 |
02-May-2013 |
Bobby Georgescu <georgescu@google.com> |
am 5a352be0: Increase selection limit
* commit '5a352be0df79b03c942eb67a799ddb3aaa1a26a2':
Increase selection limit
|
| e6a85fb5dc3148d8ef4d6cda30183a9ee33f7314 |
02-May-2013 |
Bobby Georgescu <georgescu@google.com> |
Increase selection limit
Bug: 8606565
Bug: 8721237
Bug: 8752803
Change-Id: I578536389146fb4d8735c8171ec346ebe49de729
ndroid/gallery3d/ui/ActionModeHandler.java
|
| cfd33dc25bf7589dc846c90e85f69a41794d5ca9 |
02-May-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "G+ activity xform stack and pipeline cleanup." into gb-ub-photos-carlsbad
|
| 513e369b84ec93175d63b922d4ed5e54a3393534 |
02-May-2013 |
John Hoford <hoford@google.com> |
fix crash due to no ImageFilterDraw
Change-Id: I0c8bfaa7d162f5c1a49f05d853f4700322fe5901
ndroid/gallery3d/filtershow/filters/BaseFiltersManager.java
|
| e65a7a3af35c3c79e8b7da1ed7edaf3a778c489c |
01-May-2013 |
Michael Kolb <kolby@google.com> |
am fb936141: Merge "Fix layout and preview for tablets" into gb-ub-photos-bryce
* commit 'fb9361419abfac7f893674bb6f4d1b1f8ab1f677':
Fix layout and preview for tablets
|
| b0da79fe069d740566663120818f9ed13a706890 |
01-May-2013 |
Michael Kolb <kolby@google.com> |
Fix layout and preview for tablets
Bug: 8253060
Make controls full screen, and layout according to required size
Change-Id: I725547041264457d85d73d470d25caa5cb2cf783
ndroid/camera/ui/CameraControls.java
|
| c35d94591c9ead2f79990c30dbe77ec302f9e2e6 |
01-May-2013 |
Michael Kolb <kolby@google.com> |
Fix new activity menus
Change-Id: If8ace52a46284b41169532b69bdf77305b9610d9
ndroid/camera/NewPhotoMenu.java
ndroid/camera/NewVideoMenu.java
|
| e70e39d53b3ff6bae964625fb29991667f276027 |
01-May-2013 |
Michael Kolb <kolby@google.com> |
am c43e5b6b: Update capture animation
* commit 'c43e5b6bd84f5a7635766f70677097f6958f4058':
Update capture animation
|
| 3466f1d66f5a70f17016114d034550840ae0b347 |
01-May-2013 |
Michael Kolb <kolby@google.com> |
am 9ea4147f: Update location indicator correctly
* commit '9ea4147f6220e3a9fb6f9ae3fef46036919641b4':
Update location indicator correctly
|
| 6aee5e63a9774812566cb4062348a9e8f9863487 |
01-May-2013 |
Michael Kolb <kolby@google.com> |
am 64c9c183: Adjust switcher animation
* commit '64c9c183384b9df6dafe0142f10c4f7b802d54bf':
Adjust switcher animation
|
| 7ffae50747da84448a06323dad2176605f8881d3 |
01-May-2013 |
Michael Kolb <kolby@google.com> |
am b048226f: Merge "Align review controls" into gb-ub-photos-bryce
* commit 'b048226feed739f122ffb39fca51fedaec791e67':
Align review controls
|
| 7523e30fb1bbe737296cf2d53bef2b640657ce97 |
01-May-2013 |
Mangesh Ghiware <mghiware@google.com> |
am fe804d11: Handle onDowngrade in PhotoDatabase
* commit 'fe804d11f398b3c03b4a6ccffcfdac56e1728de4':
Handle onDowngrade in PhotoDatabase
|
| b4ac724674dcbcd92f94b4fed203323233d20fa8 |
01-May-2013 |
Michael Kolb <kolby@google.com> |
am ce8f6d1b: Remove empty slots from menu
* commit 'ce8f6d1bb9dc52da7d168a94cb4c6f24d631d304':
Remove empty slots from menu
|
| f63b8fc49ecc6f980187a351a4e00213324dde5f |
01-May-2013 |
Michael Kolb <kolby@google.com> |
am 9c525edf: Merge "Remove timer indicator" into gb-ub-photos-bryce
* commit '9c525edf6440b6daf10885f4f7a0da479b7f2707':
Remove timer indicator
|
| d16de2ee0d4abc6dc46b949f693b1a865344dfa3 |
01-May-2013 |
John Hoford <hoford@google.com> |
resolved conflicts for merge of d6edcee3 to gb-ub-photos-carlsbad
Change-Id: I24057e85ca5b0409e9bcb92c85577fb9a763fbe4
|
| 78a5b224eca3c702f4ecf8abd072779e32e26641 |
01-May-2013 |
Michael Kolb <kolby@google.com> |
Update capture animation
Bug: 8253060
Update preview thumb margins and size
Add touch target for thumbnail
Change-Id: I2b298de330834c42a55b4cb082148d971727f530
ndroid/camera/CaptureAnimManager.java
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
ndroid/camera/ui/CameraControls.java
|
| 4f32062f39c6afc53bdce722cd3299b0840436ad |
01-May-2013 |
Ruben Brunk <rubenbrunk@google.com> |
G+ activity xform stack and pipeline cleanup.
Change-Id: I3277dd4e709146ca2c06b56a1db200d3130dd5e3
ndroid/gallery3d/filtershow/filters/ImageFilterRS.java
|
| 8788079a51a90255dce330e56afcb6674deccbf7 |
01-May-2013 |
Michael Kolb <kolby@google.com> |
Update location indicator correctly
Bug: 8768592
Change-Id: I8f94b4fb62174c4c27e6dbdc68ba272b0d3ae371
ndroid/camera/PhotoUI.java
ndroid/camera/VideoModule.java
ndroid/camera/VideoUI.java
|
| 997dfc3211ac036448d18d0c0076fef9623885c0 |
30-Apr-2013 |
Michael Kolb <kolby@google.com> |
Adjust switcher animation
Bug: 8754841
Change-Id: I7a25527297eddd11f9c9a025986ff857f97c07be
ndroid/camera/ui/CameraSwitcher.java
|
| 553f31aca13fbcb661af0122b132314576d84c27 |
30-Apr-2013 |
Michael Kolb <kolby@google.com> |
Merge "Align review controls" into gb-ub-photos-bryce
|
| d548f9af4524773a3dc7903f33eb05fcf9a1bfb8 |
30-Apr-2013 |
Michael Kolb <kolby@google.com> |
Align review controls
Bug: 8753607
Change-Id: Iea2cef5bf56c82c2ddbd7191be6345a58fa126c9
ndroid/camera/ui/CameraControls.java
|
| 7d54a706167031ff4043536c7cfa529ac46e6411 |
30-Apr-2013 |
Mangesh Ghiware <mghiware@google.com> |
Handle onDowngrade in PhotoDatabase
Bug: 8683352
Change-Id: Iefaa425a753c8242dc345efd96354bbb7b5bb999
ndroid/photos/data/PhotoDatabase.java
|
| b7c49994231f31f5cf4de4a66eec7a85a3bd9551 |
30-Apr-2013 |
Michael Kolb <kolby@google.com> |
Remove empty slots from menu
Bug: 8640131
When a specific camera doesn't support one of the menu options,
the option is removed from the menu, no empty spot anymore.
Change-Id: I002d6347c35cb0bfd5f71d880294f04f45ffb38f
ndroid/camera/PhotoMenu.java
ndroid/camera/PieController.java
ndroid/camera/VideoMenu.java
ndroid/camera/ui/PieItem.java
ndroid/camera/ui/PieRenderer.java
|
| 6cf36371a5888be8e137af1ede183bd592bb07b2 |
30-Apr-2013 |
Michael Kolb <kolby@google.com> |
Merge "Remove timer indicator" into gb-ub-photos-bryce
|
| b15919a1bccfcecd24c35001837626c73b0a4bdb |
30-Apr-2013 |
John Hoford <hoford@google.com> |
Merge "small ui changes based on UX/PM feedback" into gb-ub-photos-bryce
|
| 4f7fe16804568f9bcb189ab7916e403f8b1e2f90 |
30-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Modifications for simple edit" into gb-ub-photos-carlsbad
|
| ae1dbae668753a2765fccdd28a9b7359dc7ecb3f |
26-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Modifications for simple edit
Change-Id: Ic200a4f1e843deb119d68f627d5b8adb201f0f7f
ndroid/gallery3d/filtershow/cache/CachingPipeline.java
ndroid/gallery3d/filtershow/filters/BaseFiltersManager.java
ndroid/gallery3d/filtershow/filters/FilterRepresentation.java
ndroid/gallery3d/filtershow/filters/FiltersManagerInterface.java
ndroid/gallery3d/filtershow/filters/ImageFilter.java
ndroid/gallery3d/filtershow/filters/ImageFilterDraw.java
ndroid/gallery3d/filtershow/filters/ImageFilterRS.java
ndroid/gallery3d/filtershow/filters/ImageFilterSharpen.java
ndroid/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
ndroid/gallery3d/filtershow/filters/ImageFilterVignette.java
ndroid/gallery3d/filtershow/presets/FilterEnvironment.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
ndroid/gallery3d/filtershow/presets/PipelineInterface.java
|
| db56a16f02e06207e527d9b135fcedddb2643515 |
30-Apr-2013 |
Michael Kolb <kolby@google.com> |
Remove timer indicator
Bug: 8754833
Change-Id: I1750ac4ad7300605c3e65015ac9a94d012d26db2
ndroid/camera/PhotoUI.java
|
| bee436f8095e352549f4c1cbe275eb6009cea791 |
30-Apr-2013 |
Michael Kolb <kolby@google.com> |
am ef878669: Fix indicator layout
* commit 'ef87866904722e6d381445a98b61a948e004970e':
Fix indicator layout
|
| b644e34fa8e6a94eec12e12046a4098b8734c70d |
29-Apr-2013 |
Michael Kolb <kolby@google.com> |
Fix indicator layout
Bug: 8754592
Use the correct anchor for layout
Change-Id: Idc408da48dd3066a8dabdd8f4f2c553b54d0dffd
ndroid/camera/ui/CameraControls.java
|
| 027c2681e8075dda5c83088532ac1f55d20130fd |
29-Apr-2013 |
John Hoford <hoford@google.com> |
small ui changes based on UX/PM feedback
bug:8664728
Change-Id: I4e0651c011b9a6c4742d86c898a0821187f43043
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/controller/TitledSlider.java
ndroid/gallery3d/filtershow/editors/BasicEditor.java
ndroid/gallery3d/filtershow/editors/Editor.java
ndroid/gallery3d/filtershow/editors/EditorStraighten.java
ndroid/gallery3d/filtershow/editors/ParametricEditor.java
ndroid/gallery3d/filtershow/filters/BaseFiltersManager.java
ndroid/gallery3d/filtershow/filters/FilterBasicRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java
ndroid/gallery3d/filtershow/imageshow/EclipseControl.java
|
| 1307043784aca5f1014f93898d58e1a7d14608bf |
29-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 9e5b0799: Merge "Cleanup crop activity UI." into gb-ub-photos-bryce
* commit '9e5b079934538f2c90d0ac995330fb006b738cc7':
Cleanup crop activity UI.
|
| 31eef2d6d3e4c72bf168b931c5123ed739401b99 |
29-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Cleanup crop activity UI." into gb-ub-photos-bryce
|
| 5f73062b8e589547c9acba80678a9ebf9cfb0197 |
29-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am 384971f7: Instrument importer for usage statistics
* commit '384971f7ce93c98249825d0498ad4bcbd4104895':
Instrument importer for usage statistics
|
| 00c80bbed8cf59e374c6698c82a5d7fa830e2917 |
28-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Instrument importer for usage statistics
Bug: 8744068
Change-Id: I416463ba15713d363ac0ce68109532b770fb02b3
ndroid/gallery3d/ingest/ImportTask.java
ndroid/gallery3d/ingest/IngestActivity.java
ndroid/gallery3d/ingest/IngestService.java
|
| 8ee62644f72cc6a494517c398ef4847f64af8594 |
27-Apr-2013 |
Angus Kong <shkong@google.com> |
am a042bfaa: Merge "Delegate the texture copy to DrawClient." into gb-ub-photos-bryce
* commit 'a042bfaa31e514ea0979936d39cde8696fc0ece0':
Delegate the texture copy to DrawClient.
|
| beefbf5ad2ef69683f4c2f6c3d354b20c457a11c |
27-Apr-2013 |
Angus Kong <shkong@google.com> |
Merge "Delegate the texture copy to DrawClient." into gb-ub-photos-bryce
|
| 4aef1995e486d16a6273baa59f4a53dbf4111a98 |
27-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am 45377ce9: Merge "Log name of borders and filters of saved images" into gb-ub-photos-bryce
* commit '45377ce902eb0dce6fb6b1e58925654822e25a19':
Log name of borders and filters of saved images
|
| ba9862f353476fcb7ab77d5b7e601adca8a6d136 |
27-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Log name of borders and filters of saved images" into gb-ub-photos-bryce
|
| a15131d94864644ec9c65ce5e2521a936f75bc4a |
27-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 8021e39d: Merge "Add new indicators" into gb-ub-photos-bryce
* commit '8021e39d649be4603e66d5f82cef607ada87d56b':
Add new indicators
|
| 1efdb8f8cbb5e23209b933efa6e71876dabb8220 |
27-Apr-2013 |
Michael Kolb <kolby@google.com> |
Merge "Add new indicators" into gb-ub-photos-bryce
|
| eb8adc1754fc668435ee57d1be2235b80fc8c009 |
26-Apr-2013 |
Michael Kolb <kolby@google.com> |
Add new indicators
Bug: 8640131
Change-Id: I9e567ddafa130e84af4d56a69ba7e389e64e3456
ndroid/camera/ListPreference.java
ndroid/camera/OnScreenIndicators.java
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
ndroid/camera/VideoUI.java
|
| c64c13708cb3336a5982c35e1295af44fb2dd44b |
27-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am 568a8cf9: Dismiss MTP notification on device disconnect
* commit '568a8cf9ec253a635a36866efc0e3acebbba2a2e':
Dismiss MTP notification on device disconnect
|
| 5201d6da9f5c6d08a80cab1dab4bf7f1913455c4 |
27-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Log name of borders and filters of saved images
Bug: 8712946
Change-Id: Id7b32ceb00b131299c6d8630bca181141dc204fd
ndroid/gallery3d/filtershow/presets/ImagePreset.java
|
| 11dc9b8fdb77c5e569a284ea2dedf59ba1b889ac |
27-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Dismiss MTP notification on device disconnect
Bug: 8158516
Change-Id: I7d7fd78b5fb9dc199e9ecdd78440e0f8147fe58d
ndroid/gallery3d/ingest/IngestService.java
|
| 8f4ca941f3b79fa1836037405191049a95cba40c |
26-Apr-2013 |
Angus Kong <shkong@google.com> |
Delegate the texture copy to DrawClient.
bug:8109314
Change-Id: Ib70b9d4fa4edbf094bc0d4644b3994a5e8303013
ndroid/camera/CameraScreenNail.java
|
| c479e47518b5ec96985390c12bdaa3da00992884 |
26-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Cleanup crop activity UI.
Bug: 8734193
Bug: 8723843
Change-Id: I09f0e8fcb0d919c573ad9a6f7b9f060f667d1d0d
ndroid/gallery3d/filtershow/crop/CropActivity.java
ndroid/gallery3d/filtershow/crop/CropDrawingUtils.java
ndroid/gallery3d/filtershow/crop/CropMath.java
ndroid/gallery3d/filtershow/crop/CropView.java
|
| 28ab674adc018f88ea8666b87674dec248822169 |
26-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am ec6d1d85: Merge "Show notification to relaunch MTP importer" into gb-ub-photos-bryce
* commit 'ec6d1d852e7970da5c64dd9e37f58f741b713fa2':
Show notification to relaunch MTP importer
|
| 729fdb6c279e458849f0ae62c2467cc516ed0e02 |
26-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Show notification to relaunch MTP importer" into gb-ub-photos-bryce
|
| e550dce9b12b5608e87b294fbf1ea7803f73a46d |
26-Apr-2013 |
Michael Kolb <kolby@google.com> |
am d04ba19a: Merge "Center Video menu" into gb-ub-photos-bryce
* commit 'd04ba19a49bc26e34c7b5c7832c46058100e986d':
Center Video menu
|
| 22c308a444a4b746090cbc670169d41947691dfb |
26-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 132eb666: Merge "Don\'t render label on focus ring" into gb-ub-photos-bryce
* commit '132eb666756115e578dada36624b977ac4d10e38':
Don't render label on focus ring
|
| abd5efe72de6b571aada1b69633a4d02aced5616 |
26-Apr-2013 |
Michael Kolb <kolby@google.com> |
Merge "Center Video menu" into gb-ub-photos-bryce
|
| ba57946072e4f9f4c78259ae288c6d0667180e56 |
26-Apr-2013 |
Michael Kolb <kolby@google.com> |
Merge "Don't render label on focus ring" into gb-ub-photos-bryce
|
| bc33156713500e4de7224c1945b57bbc003e81e9 |
26-Apr-2013 |
Doris Liu <tianliu@google.com> |
Merge "Remove new camera activity code from Bryce" into gb-ub-photos-bryce
|
| 0d588fe96a654e46d3bb31c6a5de4110fcc3374c |
26-Apr-2013 |
Doris Liu <tianliu@google.com> |
am 37177f96: Merge "Make sure the initial rotation is set" into gb-ub-photos-bryce
* commit '37177f96a852fd7aa4b8c06d34fd3fb445541994':
Make sure the initial rotation is set
|
| 2b26ee170c6bc846530bcec2a768891843a0ab9d |
26-Apr-2013 |
Doris Liu <tianliu@google.com> |
Merge "Make sure the initial rotation is set" into gb-ub-photos-bryce
|
| c835849b179c481b92a308157d518bb3ad73f069 |
26-Apr-2013 |
Michael Kolb <kolby@google.com> |
Center Video menu
Bug: 8660834
Change-Id: I17bec35506fee5d590436811eb7411f4277b7b6c
ndroid/camera/VideoMenu.java
|
| 9e012f853e3eb5c9d36c84351961f588eef4788f |
26-Apr-2013 |
Michael Kolb <kolby@google.com> |
Don't render label on focus ring
Bug: 8719036
Change-Id: If783b96aaa8c56fceb98cb52fceb9a8afda0d59a
ndroid/camera/ui/PieRenderer.java
|
| 3a71f7338ce18545229e910930d14b1f3aaf0939 |
26-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am d5060931: Merge "Remove UI param for straighten." into gb-ub-photos-bryce
* commit 'd50609310e425df36e340120c794f08691d55808':
Remove UI param for straighten.
|
| e40c5c943001b61acdf5eba5390a764bc2cc8b67 |
26-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Show notification to relaunch MTP importer
Bug: 8158516
Change-Id: I98a57f9ac6e6935595b44e1277ddffa378065068
ndroid/gallery3d/ingest/IngestService.java
|
| 1beb91fbf4b43322c353146fea922b6ab3bc30b3 |
26-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Remove UI param for straighten." into gb-ub-photos-bryce
|
| ee62d817e50baf404339510105f04cbc6d984210 |
26-Apr-2013 |
Doris Liu <tianliu@google.com> |
Make sure the initial rotation is set
Bug: 8718884
Change-Id: I4d1890f5dc9a4838b84872b1de395440757a7b4b
ndroid/camera/ui/RotatableLayout.java
|
| 685b8e30b5c031e3d10b78143cc160eb204ca891 |
25-Apr-2013 |
Doris Liu <tianliu@google.com> |
Remove new camera activity code from Bryce
Bug: 8722017
Change-Id: Ife3f45511f6724c61fb01c4753078df14571fc4a
ndroid/camera/NewCameraActivity.java
ndroid/camera/NewCameraModule.java
ndroid/camera/NewPhotoMenu.java
ndroid/camera/NewPhotoModule.java
ndroid/camera/NewPhotoUI.java
ndroid/camera/NewPreviewGestures.java
ndroid/camera/NewVideoMenu.java
ndroid/camera/NewVideoModule.java
ndroid/camera/NewVideoUI.java
ndroid/camera/data/CameraDataAdapter.java
ndroid/camera/ui/FaceView.java
ndroid/camera/ui/FilmStripGestureRecognizer.java
ndroid/camera/ui/FilmStripView.java
ndroid/camera/ui/NewCameraRootView.java
|
| 9628b5f71cd423d20155742f2cf1ccac5160dad0 |
25-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 69f5d8cb: Fixes EDIT intents.
* commit '69f5d8cbf51422454257a00d7959b2e8d50cb0ca':
Fixes EDIT intents.
|
| d7eedcd228a27536f31b4a80141fde831ebc6d86 |
25-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fixes EDIT intents.
Bug: 8712238
Change-Id: I63bb07dc304b2745a29e3bf7510e8b38ccb59c48
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/cache/CachingPipeline.java
ndroid/gallery3d/filtershow/imageshow/MasterImage.java
|
| 74658059e396190169c17802e2937806bc296d80 |
25-Apr-2013 |
Doris Liu <tianliu@google.com> |
am 2e7f1704: Merge "Avoid rendering underneath nav bar" into gb-ub-photos-bryce
* commit '2e7f1704c6a30f0d6febfa6ac29d5b3f665c656c':
Avoid rendering underneath nav bar
|
| a63fa601615a1b5ca465fcd0ee327ceaa8e05570 |
25-Apr-2013 |
Doris Liu <tianliu@google.com> |
Merge "Avoid rendering underneath nav bar" into gb-ub-photos-bryce
|
| d2a62e72a38a5a569f357d75c62b1348ed9bc5cc |
25-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
resolved conflicts for merge of 6cc7a476 to gb-ub-photos-carlsbad
Change-Id: Ide133370403bbcc6a509aa9f064ee8da38abac25
|
| 948687589af6cb7cb21122352ab1e828b2c16a5c |
25-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "UI changes" into gb-ub-photos-bryce
|
| 61ef319ade6d32f35e2f61a20c6208e6fbac8076 |
20-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
UI changes
bug:8664728
Change-Id: I133328543af534c745526d0d58aa7a61f5748a9d
ndroid/gallery3d/filtershow/EditorPlaceHolder.java
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/ImageStateAdapter.java
ndroid/gallery3d/filtershow/MovableLinearLayout.java
ndroid/gallery3d/filtershow/PanelController.java
ndroid/gallery3d/filtershow/category/Action.java
ndroid/gallery3d/filtershow/category/CategoryAdapter.java
ndroid/gallery3d/filtershow/category/CategoryPanel.java
ndroid/gallery3d/filtershow/category/CategoryTrack.java
ndroid/gallery3d/filtershow/category/CategoryView.java
ndroid/gallery3d/filtershow/category/MainPanel.java
ndroid/gallery3d/filtershow/editors/BasicEditor.java
ndroid/gallery3d/filtershow/editors/Editor.java
ndroid/gallery3d/filtershow/editors/EditorPanel.java
ndroid/gallery3d/filtershow/editors/ParametricEditor.java
ndroid/gallery3d/filtershow/filters/ImageFilterVignette.java
ndroid/gallery3d/filtershow/imageshow/ImageGeometry.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
ndroid/gallery3d/filtershow/imageshow/ImageStraighten.java
ndroid/gallery3d/filtershow/imageshow/MasterImage.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
ndroid/gallery3d/filtershow/state/StateAdapter.java
ndroid/gallery3d/filtershow/state/StatePanel.java
ndroid/gallery3d/filtershow/state/StatePanelTrack.java
ndroid/gallery3d/filtershow/state/StateView.java
ndroid/gallery3d/filtershow/ui/FilterIconButton.java
ndroid/gallery3d/filtershow/ui/ImageCurves.java
|
| 7d5eb0bd117c7223393165c2ee93536258f53385 |
25-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Remove UI param for straighten.
Bug: 8322933
Change-Id: I718fc15fb551572ab2452097ac850fd395e59302
ndroid/gallery3d/filtershow/editors/EditorStraighten.java
|
| cb62cff674473133bedc32d06c2c0d6c02cbec90 |
25-Apr-2013 |
Doris Liu <tianliu@google.com> |
Avoid rendering underneath nav bar
Bug: 8647833
Change-Id: I84591c723bf289d8c57b8cb8920342566b64c528
ndroid/camera/ui/CameraRootView.java
|
| 933b49e59267d69c97fc7c81e3aba33ba1541042 |
25-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 474c2273: Merge "New capture animation" into gb-ub-photos-bryce
* commit '474c2273f02b2333e0bed22fa40918a0939b5a69':
New capture animation
|
| c646fb4b7400210c54e8b535a290d10d4c0ca49d |
25-Apr-2013 |
Michael Kolb <kolby@google.com> |
Merge "New capture animation" into gb-ub-photos-bryce
|
| 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
ndroid/camera/ActivityBase.java
ndroid/camera/CameraActivity.java
ndroid/camera/CameraScreenNail.java
ndroid/camera/CaptureAnimManager.java
ndroid/camera/ShutterButton.java
ndroid/camera/ui/CameraControls.java
|
| bcf97fdb5516111ee3e3b422c7936f2af85f412f |
25-Apr-2013 |
Doris Liu <tianliu@google.com> |
am 2e85f988: Merge "Fix for popuping being hard to dismiss" into gb-ub-photos-bryce
* commit '2e85f98891ffdccb1b7da1945f80af2de5c9a414':
Fix for popuping being hard to dismiss
|
| ce019e94d92f0097d73a6fc986d0a1e593b74b4d |
25-Apr-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix for popuping being hard to dismiss" into gb-ub-photos-bryce
|
| 59159dec120ac6739ab42392b0160f99fbf6905a |
24-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 31a50d72: Merge "Reset ongoing animation when opening menu" into gb-ub-photos-bryce
* commit '31a50d72488ec057d78dedfce290eab9264baed5':
Reset ongoing animation when opening menu
|
| 6d73e4574907809bf328f1535cd88d7ec564804b |
24-Apr-2013 |
Michael Kolb <kolby@google.com> |
Merge "Reset ongoing animation when opening menu" into gb-ub-photos-bryce
|
| 0233bade51dfcce5fa1f49b5c2e200a719feab22 |
24-Apr-2013 |
Michael Kolb <kolby@google.com> |
Reset ongoing animation when opening menu
Bug: 8687199
The XFade animation was not reset and yielded a transparent alpha
Change-Id: Ie2e43eccb2b4351ebf7d00075c567950ca6b2967
ndroid/camera/ui/PieRenderer.java
|
| 9355f2e9a01b023dea26b296f379039251082b13 |
24-Apr-2013 |
John Hoford <hoford@google.com> |
am cc7bcd07: Merge "Fix Curves" into gb-ub-photos-bryce
* commit 'cc7bcd0721735723c683b2f27267a52a76ff4244':
Fix Curves
|
| b341bb5ddda66c8df047cb5a7ad7a2f6bb9b2991 |
24-Apr-2013 |
John Hoford <hoford@google.com> |
Merge "Fix Curves" into gb-ub-photos-bryce
|
| 78bbe3f54603aac103784201fdbff96772ba1933 |
24-Apr-2013 |
Mangesh Ghiware <mghiware@google.com> |
am ef95774e: Merge "Fix for blank Gallery widgets on a DB upgrade" into gb-ub-photos-bryce
* commit 'ef95774e2463a3d3537d1ddd9b0dfca21c6d56df':
Fix for blank Gallery widgets on a DB upgrade
|
| 7ff114927c5e02e296485df58966c0fb116376a0 |
24-Apr-2013 |
Mangesh Ghiware <mghiware@google.com> |
Merge "Fix for blank Gallery widgets on a DB upgrade" into gb-ub-photos-bryce
|
| 707be905bf998c98ac948bfc8e3b2c2abea8adff |
24-Apr-2013 |
John Hoford <hoford@google.com> |
Fix Curves
bug:8710572
Change-Id: I49a8ea124be59de6d246ae0f9fb16f04fe447af7
ndroid/gallery3d/filtershow/filters/FilterCurvesRepresentation.java
ndroid/gallery3d/filtershow/ui/ImageCurves.java
ndroid/gallery3d/filtershow/ui/Spline.java
|
| 065199dcbb180442dc1c0e3b4878158a14100681 |
24-Apr-2013 |
Mangesh Ghiware <mghiware@google.com> |
Fix for blank Gallery widgets on a DB upgrade
Bug: 8660303
Change-Id: I06910ab0811d5f71ba6849d53ddc03c008fc77ad
ndroid/gallery3d/gadget/MediaSetSource.java
ndroid/gallery3d/gadget/WidgetService.java
|
| 3fe31386413590bcaf89f7a8f66e7b4d272000dd |
24-Apr-2013 |
Sascha Haeberling <haeberling@google.com> |
am 2b247c58: Merge "Store location for SRI panoramas." into gb-ub-photos-bryce
* commit '2b247c58611779c69aa2f0f243acf0b6d0a65333':
Store location for SRI panoramas.
|
| a98155693b15506d369fc6978b47202f72d040f8 |
24-Apr-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Store location for SRI panoramas." into gb-ub-photos-bryce
|
| b83e36df79a9bc3fadc9baa152dfa1608c214bdd |
24-Apr-2013 |
John Hoford <hoford@google.com> |
am dc464a12: Merge "Fix local adjust" into gb-ub-photos-bryce
* commit 'dc464a129bad2a2918531fc8a4415c41b60605e6':
Fix local adjust
|
| b3aa8b64087ecf64254134208b0fa0be7bd43800 |
24-Apr-2013 |
Sascha Haeberling <haeberling@google.com> |
Store location for SRI panoramas.
Bug: 8692005
Change-Id: I1499de0103e518ee321ebb0c566b9fb4a7a853d3
ndroid/camera/PanoramaModule.java
|
| dcd31fe8f7bc219b4e8f7608a6d5ad016da0f885 |
20-Apr-2013 |
John Hoford <hoford@google.com> |
Fix local adjust
bug:8655977
Change-Id: I0aa4ac30de077663f52418528757a842372e0fc2
ndroid/gallery3d/filtershow/controller/ActionSlider.java
ndroid/gallery3d/filtershow/controller/BasicParameterStyle.java
ndroid/gallery3d/filtershow/controller/ParameterActionAndInt.java
ndroid/gallery3d/filtershow/editors/Editor.java
ndroid/gallery3d/filtershow/editors/ParametricEditor.java
|
| 0630dcde223db78f0b474bca451e27e1791adf29 |
24-Apr-2013 |
John Hoford <hoford@google.com> |
am 0c71308c: Merge "interruptible renderer" into gb-ub-photos-bryce
* commit '0c71308c9d2a72d4a3faf00242707de773d5beba':
interruptible renderer
|
| f9ff7ffe2004ed2077f38a91dafb213495e5bf70 |
24-Apr-2013 |
John Hoford <hoford@google.com> |
Merge "interruptible renderer" into gb-ub-photos-bryce
|
| b75bc8e2573e1e7602ee70b6c548800cce5afa28 |
24-Apr-2013 |
Angus Kong <shkong@google.com> |
am 7d62e546: Use FULL_SENSOR for unlocked orientation.
* commit '7d62e546b3b9eedc1f5c9d8f3ee644025f554fe3':
Use FULL_SENSOR for unlocked orientation.
|
| 44ed61abd2dfd0e0a07887131a617e0518f28221 |
24-Apr-2013 |
Angus Kong <shkong@google.com> |
Use FULL_SENSOR for unlocked orientation.
bug:8689453
Change-Id: Ia81d970772f091fbd9bec142acfd5e9f84e0a0fb
ndroid/gallery3d/app/OrientationManager.java
|
| c4109628aec151e2ba70c4be729a869960e1b960 |
24-Apr-2013 |
John Hoford <hoford@google.com> |
interruptible renderer
bug:8632908
Change-Id: I4df59fb0c82370491d953292fd1cd17443054ab3
ndroid/gallery3d/filtershow/cache/CachingPipeline.java
ndroid/gallery3d/filtershow/cache/FilteringPipeline.java
ndroid/gallery3d/filtershow/presets/FilterEnvironment.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
|
| fd2e619a2fb263315816b3579a9c6751c398132d |
23-Apr-2013 |
Doris Liu <tianliu@google.com> |
Fix for popuping being hard to dismiss
Bug: 8688503
Change-Id: I86f1451867d7606060e5f81fdd3b8b0af1e0a6d3
ndroid/camera/PhotoUI.java
ndroid/camera/PreviewGestures.java
ndroid/camera/VideoUI.java
|
| 9823871527bdbe9a268c39fb83cb7a80004dd0af |
23-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 8600c562: Fix to check if crop activity got bad bitmap.
* commit '8600c562b8ed0f636bc966a8aac83dc90326f0fb':
Fix to check if crop activity got bad bitmap.
|
| dc84a61759d87e17e191d9a7a5f3c008d3f62abc |
23-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fix to check if crop activity got bad bitmap.
Bug: 8692297
Change-Id: I1900c45c71b3d1c6203e4d25a7ad5354f409fcf2
ndroid/gallery3d/filtershow/crop/CropActivity.java
|
| 7c530ecf8fcd2ed575226904ef21c943af91598f |
23-Apr-2013 |
Sascha Haeberling <haeberling@google.com> |
am ae52b3e3: Fixes video mode indicators by resetting them on init.
* commit 'ae52b3e3f0f356e1b91e883729d0d82cb40d7a42':
Fixes video mode indicators by resetting them on init.
|
| 140c263ebb2504fe1a0212a835f0098ce7973a22 |
23-Apr-2013 |
Sascha Haeberling <haeberling@google.com> |
Fixes video mode indicators by resetting them on init.
Bug: 8696004
Change-Id: I2bfc235ac87d836c29a53425e623121304a4c08a
ndroid/camera/OnScreenIndicators.java
ndroid/camera/VideoUI.java
|
| a815b0266cb5215726382503e14ec680eca3ee26 |
23-Apr-2013 |
Sascha Haeberling <haeberling@google.com> |
am d313bb0a: Merge "Make sure we don\'t add the pano sharing menu in the secure lock screen." into gb-ub-photos-bryce
* commit 'd313bb0acf2bc8b1114180fa9a7f50d6393168a2':
Make sure we don't add the pano sharing menu in the secure lock screen.
|
| 95040c43501306cca22c997f3d961e32b200b134 |
23-Apr-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Make sure we don't add the pano sharing menu in the secure lock screen." into gb-ub-photos-bryce
|
| c49f82ea893d6520bed3543a0cd749979bb7030b |
23-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 98698ea0: Merge "Fix wallpaper crop UI." into gb-ub-photos-bryce
* commit '98698ea0dd09f0cdc4ecdc92ae4718ea60164fd2':
Fix wallpaper crop UI.
|
| a8168bb5e39aa524c96569d5089d8949870a1cd0 |
23-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fix wallpaper crop UI." into gb-ub-photos-bryce
|
| 3f6b05195519445ab274b684c9eec6fd16ef7057 |
23-Apr-2013 |
Sascha Haeberling <haeberling@google.com> |
Make sure we don't add the pano sharing menu in the secure lock screen.
Bug: 8473022
Change-Id: Ie2221b6a660b7c9dc39cef89a509da4b2659adb3
ndroid/gallery3d/app/PhotoPage.java
|
| 47e9331457d4d2532a2b4ed1da56d962e1ddba08 |
23-Apr-2013 |
Sascha Haeberling <haeberling@google.com> |
am 7706d294: Merge "Refactor the methods for changing the on-screen indicators." into gb-ub-photos-bryce
* commit '7706d29493dc3c45cc8e4a276232177954cfe1b6':
Refactor the methods for changing the on-screen indicators.
|
| 0aaddefd03cd48a9254e6a996493a3d29f9e3647 |
23-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fix wallpaper crop UI.
Bug: 8687759
Change-Id: Ice32fdabdae585fc39e78ce1f3e7e1796c5d99b3
ndroid/gallery3d/filtershow/crop/CropActivity.java
ndroid/gallery3d/filtershow/crop/CropDrawingUtils.java
ndroid/gallery3d/filtershow/crop/CropView.java
|
| c7965e2bc8f69006de09b4be6fad61c4d2313e07 |
22-Apr-2013 |
Sascha Haeberling <haeberling@google.com> |
Refactor the methods for changing the on-screen indicators.
Bug: 8609355
This will be used in PanoramaModule to set the indicators to their
default values when the module is initialized.
Change-Id: I02f230fb222cbbc184b9265aac75f4a3f17b4cd6
ndroid/camera/OnScreenIndicators.java
ndroid/camera/PhotoUI.java
|
| c86502577f40121dc1b5d5e56a4c1d97ee7abfe1 |
22-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 9c48a6c3: Fixes build. Removes dead code.
* commit '9c48a6c30b2d663d382a8a4bc1c61ea75dfe46a1':
Fixes build. Removes dead code.
|
| 0f51d8b8085c56b048aebd485d01de97a4414f9a |
22-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 1365eec6: Merge "Fix orientation changes for wallpaper setter." into gb-ub-photos-bryce
* commit '1365eec634694796c1e3432abff54dd658bd4641':
Fix orientation changes for wallpaper setter.
|
| f47c8b2dd79739e12dcf8ced120ee3842ddae339 |
22-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 4a6dc2b1: Merge "Reenables crop aspect ratio menu." into gb-ub-photos-bryce
* commit '4a6dc2b147af34ab4545f6f647b4038c64fc80d0':
Reenables crop aspect ratio menu.
|
| b1c6f02f5041cad04b7ec89a130493e70b5a9879 |
22-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 608f7c98: Merge "More menu fixes" into gb-ub-photos-bryce
* commit '608f7c9843f48aeccc1678622dc3327958150c31':
More menu fixes
|
| 88ac4e7bdb3f367ec55c2f41f80f69648919cf33 |
22-Apr-2013 |
Doris Liu <tianliu@google.com> |
am d6e6533a: Merge "Fix for camera switcher hard to hit" into gb-ub-photos-bryce
* commit 'd6e6533a054ea526021c3331a18f93a618442f13':
Fix for camera switcher hard to hit
|
| e6f866b0cbdaf1d51444bcc30600313c511a6c57 |
22-Apr-2013 |
Doris Liu <tianliu@google.com> |
am ed689873: Merge "Fix camera buttons showing up at wrong position" into gb-ub-photos-bryce
* commit 'ed689873c9da338859dc8858c08afa4fa31578f2':
Fix camera buttons showing up at wrong position
|
| 50ec4c264fb010a413b32f65b4db094ab8e13758 |
22-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am ca6f04e2: Remove dead code
* commit 'ca6f04e27bbcab953bd3f9dcf50476a1c4b70aac':
Remove dead code
|
| 9d1563064200b3268112df5e5be4ecc5afa144f5 |
22-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am f53eea80: Merge "Ensure consistent image thumbnail handling." into gb-ub-photos-bryce
* commit 'f53eea80c773a1686631f9e2ec6edab23c8944b5':
Ensure consistent image thumbnail handling.
|
| e462c52ea24a4458244f031ef143561f6767016b |
22-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am afc46d5a: Merge "Fix saved video timestamps." into gb-ub-photos-bryce
* commit 'afc46d5a608ccfc1f370cc705e0c27eb0b678ded':
Fix saved video timestamps.
|
| f61e5fdd4c946f671b391e3022c1d5be51eabc79 |
22-Apr-2013 |
John Hoford <hoford@google.com> |
am 91d26f6c: tiny planet fix
* commit '91d26f6c3b183862eeffc1856e2d758e800d13f4':
tiny planet fix
|
| ebda34f3d637fe87fa2aa01353fed9277ce86fc0 |
22-Apr-2013 |
Angus Kong <shkong@google.com> |
am 935d4c80: Merge "Make MediaSaveService destroyed after unbound." into gb-ub-photos-bryce
* commit '935d4c8037d7b5f56e4dea1c96bd8f4b68cb6236':
Make MediaSaveService destroyed after unbound.
|
| 5387b8f1ec2ba18946811149c3bc23a6ef58ce1d |
22-Apr-2013 |
Angus Kong <shkong@google.com> |
am ca3875b2: Merge "Save video using MediaSaveService." into gb-ub-photos-bryce
* commit 'ca3875b21375defd0d42c57c05994cd67f0d59cd':
Save video using MediaSaveService.
|
| 2b8c1c3300fa4c152a0702e0d5ff51517d5ed054 |
22-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am faf2f040: Fix multi selection issue
* commit 'faf2f040f38532213fa237cf45c9794cf1a85859':
Fix multi selection issue
|
| ba6b16d99b0faf438ae557a8fdc478101ac75643 |
22-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 32049103: Merge "Lock camera orientation using FW API" into gb-ub-photos-bryce
* commit '32049103305c99e8be1f7af3e46933277e02a7c3':
Lock camera orientation using FW API
|
| c04b516ed7c9a90973bd50d62e00f70318e00a5e |
22-Apr-2013 |
Angus Kong <shkong@google.com> |
am 45826e18: Merge "Pass the camera to recorders after all is set." into gb-ub-photos-bryce
* commit '45826e188598cd6171fc0ec3112e2fbf52fbc952':
Pass the camera to recorders after all is set.
|
| d59c1784bb3715bed55eb5386e6ec535b0499ebc |
22-Apr-2013 |
Doris Liu <tianliu@google.com> |
am b1051814: Merge "Fix memory leak in pie controller" into gb-ub-photos-bryce
* commit 'b10518142bb84abe2ffe1bd3aa10ff4ee7982370':
Fix memory leak in pie controller
|
| 98a72bbed3a052782e6f7f01ab5ee560b92ef49c |
22-Apr-2013 |
Doris Liu <tianliu@google.com> |
am 14fe2887: Merge "Allow swiping to filmstrip from blocker bar" into gb-ub-photos-bryce
* commit '14fe288784c574c84edbf84306329dc8b70d8b4d':
Allow swiping to filmstrip from blocker bar
|
| 00d843b89f8d90b19f99bc8af9add53f15886811 |
22-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 316af8dd: Merge "Fix crop activity aspect ratio and orientation handling." into gb-ub-photos-bryce
* commit '316af8dd675d777f4bd9512b8af5391c7c89363f':
Fix crop activity aspect ratio and orientation handling.
|
| cd2114728c5c9ea938aece6648ee3369fccccfcc |
22-Apr-2013 |
repo sync <hoford@google.com> |
resolved conflicts for merge of a1939d22 to gb-ub-photos-carlsbad
Change-Id: Ic6759448c932823720021e85e1232736ff2085f8
|
| 37c006fc72a6a3f849545587ad85c82466862bc4 |
22-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fixes build. Removes dead code.
Change-Id: Ieef56407304254235295d81e09e55f1cd69b87cb
ndroid/gallery3d/filtershow/imageshow/ImageCrop.java
|
| 6b16364b3590740b22a32af4cc0fc93f4a8f860e |
22-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fix orientation changes for wallpaper setter." into gb-ub-photos-bryce
|
| 5737ed9f333fdff0a99150a21c70c9abea4f1f97 |
22-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Reenables crop aspect ratio menu." into gb-ub-photos-bryce
|
| 2825e69fca018b7831bbd91cd43c642a4450681e |
22-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fix orientation changes for wallpaper setter.
Bug: 8670036
Change-Id: I44932bcc8cd8b89686186e42fa1eb2644af87b47
ndroid/gallery3d/filtershow/crop/CropActivity.java
|
| 53fc9e17ce4b1e64f8fa53f6921cef304a39e1da |
22-Apr-2013 |
Michael Kolb <kolby@google.com> |
Merge "More menu fixes" into gb-ub-photos-bryce
|
| f465110e4b8ed787589e052e5ac746c588c5ac8f |
20-Apr-2013 |
Michael Kolb <kolby@google.com> |
More menu fixes
Bug: 8660834
Add label dropshadow, reposition fixed menu
Adjust dead zone and angle
Change-Id: I7d62c03bcdcdec6268ef805f56114327f471b6d7
ndroid/camera/drawable/TextDrawable.java
ndroid/camera/ui/PieRenderer.java
|
| 9523e9148356c875044512ad3a321490b665fbda |
22-Apr-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix for camera switcher hard to hit" into gb-ub-photos-bryce
|
| d4883e406ad43df815ede45e9aff23c6a4aa4457 |
22-Apr-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix camera buttons showing up at wrong position" into gb-ub-photos-bryce
|
| 8afd3b1f1ec70ea110bf99e3948cc2d7343680ea |
20-Apr-2013 |
Doris Liu <tianliu@google.com> |
Fix for camera switcher hard to hit
Bug: 8667079
Change-Id: I9d40617f4e3bcfcd810223d818b212d335c80707
ndroid/camera/PreviewGestures.java
|
| 3b148d0e719a6ae42c0147bdf63fe0c14cff2fd8 |
20-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Reenables crop aspect ratio menu.
Bug: 8471812
Change-Id: I50044f4c787ba326e24f67c5370e1f8a220eb005
ndroid/gallery3d/filtershow/editors/EditorCrop.java
ndroid/gallery3d/filtershow/imageshow/ImageCrop.java
|
| bec9cf0afe17d4fc26b4d8b6b5c7d95549bb35fe |
20-Apr-2013 |
Doris Liu <tianliu@google.com> |
Fix camera buttons showing up at wrong position
Bug: 8607034
Change-Id: Ia796a9f5e56fd0566e2f4853ec48b9371e8134e2
ndroid/camera/ui/RotatableLayout.java
|
| 79c3d920a138728fe5e64cfb90037df8c1af9949 |
20-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Remove dead code
Bug: 8672542
Change-Id: Ia6046b17f8ae77ffe6b8090b5fbd1dda2bc0327e
ndroid/gallery3d/app/AbstractGalleryActivity.java
|
| 2429727fc3e751edec61042846ae268ec70ea2e6 |
20-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Ensure consistent image thumbnail handling." into gb-ub-photos-bryce
|
| a7738962015e19cc7d5c43629ed679990628b016 |
20-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fix saved video timestamps." into gb-ub-photos-bryce
|
| 3ed2bf8291df2606d84dc5b6a1735d1c2bd5364e |
20-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Ensure consistent image thumbnail handling.
Bug: 7192433
Change-Id: Ie86ade06b7234681a0d955a87cacfb337bc39145
ndroid/gallery3d/filtershow/tools/SaveCopyTask.java
|
| 1600796a43cf584b3db49c5f21ec103529d7368d |
20-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fix saved video timestamps.
Bug: 8002939
Change-Id: I771b2b4082acd19bbf9b52c65f51da9489827c18
ndroid/camera/VideoModule.java
|
| 55afc2dcadf2f88774fbbe2eb7b11a5639b9fa29 |
19-Apr-2013 |
John Hoford <hoford@google.com> |
tiny planet fix
bug:8323524
Change-Id: I39283face7079574dbe25e797323a84141930f9a
ndroid/gallery3d/filtershow/EditorPlaceHolder.java
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/cache/CachingPipeline.java
ndroid/gallery3d/filtershow/cache/TripleBufferBitmap.java
ndroid/gallery3d/filtershow/editors/Editor.java
ndroid/gallery3d/filtershow/editors/EditorTinyPlanet.java
ndroid/gallery3d/filtershow/editors/ParametricEditor.java
ndroid/gallery3d/filtershow/filters/FilterTinyPlanetRepresentation.java
ndroid/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
ndroid/gallery3d/filtershow/imageshow/ImageTinyPlanet.java
ndroid/gallery3d/filtershow/presets/FilterEnvironment.java
|
| 8d732159c1093e7ce970cb34bc6d36a14f26e3fa |
19-Apr-2013 |
Angus Kong <shkong@google.com> |
Merge "Make MediaSaveService destroyed after unbound." into gb-ub-photos-bryce
|
| 736765766c6869c8add352641464dc5b099bc0f5 |
19-Apr-2013 |
Angus Kong <shkong@google.com> |
Merge "Save video using MediaSaveService." into gb-ub-photos-bryce
|
| 83a99ae51a11af28553dfb77ef0ec91148671c9b |
18-Apr-2013 |
Angus Kong <shkong@google.com> |
Save video using MediaSaveService.
bug:8511719
Change-Id: I3fc5054bf7661953181b27e66cc70ba95082d36c
ndroid/camera/MediaSaveService.java
ndroid/camera/VideoModule.java
|
| b13f87be0defbea052e317302f37e9d260244c9a |
19-Apr-2013 |
Angus Kong <shkong@google.com> |
Make MediaSaveService destroyed after unbound.
bug:8528779
Change-Id: I1e6b78d5603b10cde3399969cd7a8cc19655051b
ndroid/camera/CameraActivity.java
|
| aca7b2ef1a81d5e4973d1d181df6b983ea6a358c |
19-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Fix multi selection issue
Bug: 8663155
Change-Id: Ic6aa98c04b5134df9deb1b14736e614bf1618f03
ndroid/gallery3d/ui/SelectionManager.java
|
| 47c842458bfd94f9cc695459e64ebcc4c352c79e |
19-Apr-2013 |
ztenghui <ztenghui@google.com> |
Merge "Update the duration information when saving new video" into gb-ub-photos-carlsbad
|
| 4327fbf44250e568adb6f7f0b647e24ead54f035 |
19-Apr-2013 |
Michael Kolb <kolby@google.com> |
Merge "Lock camera orientation using FW API" into gb-ub-photos-bryce
|
| 32cae72fda76329e181c20aa2f0b74e0f391fa8f |
19-Apr-2013 |
Angus Kong <shkong@google.com> |
Merge "Pass the camera to recorders after all is set." into gb-ub-photos-bryce
|
| 7e2796f51a96a57ca91b42ec2976f72c13f71d11 |
19-Apr-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix memory leak in pie controller" into gb-ub-photos-bryce
|
| 29f5085a0b27ca62744974df67394f2c4b1df136 |
19-Apr-2013 |
Doris Liu <tianliu@google.com> |
Merge "Allow swiping to filmstrip from blocker bar" into gb-ub-photos-bryce
|
| d3f4b9350cfa2caf6fb175731b36626cf00e9dd9 |
19-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fix crop activity aspect ratio and orientation handling." into gb-ub-photos-bryce
|
| d81bba2275dc393278239aa1d5617d3d6a7bfe2a |
19-Apr-2013 |
John Hoford <hoford@google.com> |
Merge "fixed borders issues" into gb-ub-photos-bryce
|
| 1ce28c910dca3de9a832079acc77cb807b25d178 |
19-Apr-2013 |
Doris Liu <tianliu@google.com> |
Fix memory leak in pie controller
Bug: 7622218
Change-Id: Iaab96008a4f4b506bb0be98f489af9120d607251
ndroid/camera/PieController.java
|
| 8cb7055c0ea13b7b219e2cdc46cbfbf62e97c96e |
19-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fix crop activity aspect ratio and orientation handling.
Bug: 8659064
Bug: 8647628
Change-Id: I3e4293cc3bba7d55334acb396e20a23cc92f8f82
ndroid/gallery3d/filtershow/crop/CropActivity.java
ndroid/gallery3d/filtershow/crop/CropLoader.java
ndroid/gallery3d/filtershow/crop/CropObject.java
ndroid/gallery3d/filtershow/crop/CropView.java
|
| f603fabaa712c19f60604efee90d7a79e11fd50f |
19-Apr-2013 |
ztenghui <ztenghui@google.com> |
Update the duration information when saving new video
Change-Id: I9c3fd33dba7f04d9d905429c6bb17cf9a10b7628
ndroid/gallery3d/util/SaveVideoFileUtils.java
|
| 5327af1220eaf5b35cca6229466ccdc51970ee8b |
19-Apr-2013 |
Angus Kong <shkong@google.com> |
Pass the camera to recorders after all is set.
bug:8049369
Change-Id: I5cd658e78905a7b41f97ee0cce820f0c8bc99dd5
ndroid/camera/VideoModule.java
|
| b4ddad4bf71572a11e9b5864547fe539c712e483 |
19-Apr-2013 |
Flavio Lerda <flerda@google.com> |
am ed2f1790: Merge "Remove unused imports." into gb-ub-photos-bryce
* commit 'ed2f17903bbbca08ac98af4aa6c1dd9d22504a1d':
Remove unused imports.
|
| 0c65f5f024b62c67293073afff3543d72a84a5d0 |
19-Apr-2013 |
Flavio Lerda <flerda@google.com> |
Merge "Remove unused imports." into gb-ub-photos-bryce
|
| 1426ba71ae1c9238893dd98f93a689a2475a437c |
18-Apr-2013 |
Flavio Lerda <flerda@google.com> |
Remove unused imports.
This is follow-up on the previous fix for b/8433834, addressing reviewer
comments.
Bug: 8433834
Change-Id: I06f466704175a62d8febc5be471a2ca1f50e898d
ndroid/gallery3d/app/PhotoPage.java
|
| b73f50d6d4d8815d29a76f99d5b4e04906d870ae |
19-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 5b083f89: Add more menu options/icons
* commit '5b083f89c9c87f8e19e0942d1d7c2de623e527be':
Add more menu options/icons
|
| 25c0ec4c1252a8d0f9de74ba7ade74bc7af3f5b2 |
18-Apr-2013 |
Michael Kolb <kolby@google.com> |
Add more menu options/icons
Bug: 8640131
Added location and scene mode to secondary menu
Updated HDR icons
Change-Id: I5bed39a2ec037aecf67702d88f738befe61846d4
ndroid/camera/PhotoMenu.java
ndroid/camera/PieController.java
|
| 094fe6c2c6ac18f9293f6f2492808f2f1d28bea0 |
18-Apr-2013 |
George Mount <mount@google.com> |
am b726c83a: Merge "Change labels so that it doesn\'t clash with PanoUiLib." into gb-ub-photos-bryce
* commit 'b726c83ab60b0ec8e93cad9724857999b3bb8ec5':
Change labels so that it doesn't clash with PanoUiLib.
|
| 9d39c070458686fa31c3173c72332eee60c4dd14 |
18-Apr-2013 |
George Mount <mount@google.com> |
Merge "Change labels so that it doesn't clash with PanoUiLib." into gb-ub-photos-bryce
|
| 9cdfe00cf57f05f81e6d02ca050e6afd8cc4a25f |
16-Apr-2013 |
Doris Liu <tianliu@google.com> |
Allow swiping to filmstrip from blocker bar
Bug: 8607910
Change-Id: I69bfcf8d95d6071be7d65fbf433916740cbb655c
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
ndroid/camera/PreviewGestures.java
ndroid/camera/VideoUI.java
|
| 1ffe73e1e757b3c658f24c151358bfb4163460ba |
18-Apr-2013 |
John Hoford <hoford@google.com> |
fixed borders issues
bug:8315216
Change-Id: I04d62984c70e7e514b8625e6a4b5ed9395137471
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/PanelController.java
ndroid/gallery3d/filtershow/cache/FilteringPipeline.java
ndroid/gallery3d/filtershow/editors/ImageOnlyEditor.java
ndroid/gallery3d/filtershow/filters/BaseFiltersManager.java
|
| 3ec040be52b27e45155787aad80f2add71aead0b |
18-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am c3178ca4: Gallery crop uses new activity. Fixed image quality.
* commit 'c3178ca4daf7ed570f3432f3433959c208ecc105':
Gallery crop uses new activity. Fixed image quality.
|
| b0e82433a948ab7625d5c0343a4207ea9a45bbf7 |
17-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Gallery crop uses new activity. Fixed image quality.
Bug: 8639287
Bug: 8617799
Bug: 8600483
Bug: 8586301
Bug: 8526929
Bug: 8181859
Bug: 7561681
Change-Id: Ib275b970931dd324e93d1629be75e5309c9dcb4e
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/filtershow/crop/CropActivity.java
ndroid/gallery3d/filtershow/crop/CropDrawingUtils.java
ndroid/gallery3d/filtershow/crop/CropLoader.java
ndroid/gallery3d/filtershow/crop/CropMath.java
ndroid/gallery3d/filtershow/crop/CropView.java
|
| 1e259a86f780b2857793b8fba82d98c871989639 |
18-Apr-2013 |
George Mount <mount@google.com> |
Change labels so that it doesn't clash with PanoUiLib.
Bug 8401273
PanoUiLib is required for all Gallery Wolfie UI.
Change-Id: Icd58c5f4c03945c29f6bf3be286d2321abf2f63a
ndroid/camera/ListPreference.java
|
| d5cbd8fc0b689d9141f8b74480f9e6a7ae4e9516 |
18-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Add extra perf logging
Change-Id: Iebbb4491e69d356c0c73cd314c295857a2d6e357
ndroid/gallery3d/filtershow/filters/ImageFilterRS.java
|
| 91fdefe0260cbb2773c3b1769e38c4c84e4577f0 |
18-Apr-2013 |
Flavio Lerda <flerda@google.com> |
am 47f28614: Merge "Usage statistics for sharing." into gb-ub-photos-bryce
* commit '47f28614605a19726d2ab81b90333ba718223b72':
Usage statistics for sharing.
|
| c70983629903524194ad20b829894feb4ea140d5 |
18-Apr-2013 |
Flavio Lerda <flerda@google.com> |
Merge "Usage statistics for sharing." into gb-ub-photos-bryce
|
| f740cfd287e1a83e9f247e54cf2862587c889294 |
18-Apr-2013 |
John Hoford <hoford@google.com> |
Merge "Support for save state in images" into gb-ub-photos-carlsbad
|
| f6419b8b40d0dfcec04c750f8dd71851afa3046e |
18-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 61f3f111: Remove call to superclass onTouch in curves.
* commit '61f3f1113a5b4f8583fd9fcae4d24734617cae21':
Remove call to superclass onTouch in curves.
|
| e9011168ade9199b2ffebee23fdee49d4be0ab8e |
18-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Remove call to superclass onTouch in curves.
Bug: 8523301
Change-Id: I0102a228c2d1b3199412c9897a9f1abdb4bcb41f
ndroid/gallery3d/filtershow/ui/ImageCurves.java
|
| 22218d866879a07e4e1079b5d675be7bb77aeb5d |
18-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Revert "Remove redeye filter."
Bug: 8609003
Change-Id: Iac397cf2db7fd991b278f70de63fa18f1b620312
ndroid/gallery3d/filtershow/filters/BaseFiltersManager.java
|
| 86545917a2f35e359952824593e11ac59cc17c93 |
18-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 869cb048: Merge "Remove redeye filter." into gb-ub-photos-bryce
* commit '869cb0484c1c9e77d089abe198817709d3e89eb9':
Remove redeye filter.
|
| 310cd55c778978e9a98bedf11b5bd329262972af |
18-Apr-2013 |
Sascha Haeberling <haeberling@google.com> |
am 49ee213f: Merge "Add method for returning SoundPool audio type." into gb-ub-photos-bryce
* commit '49ee213fbb0f3434002693889bdae3e7c0d5b378':
Add method for returning SoundPool audio type.
|
| f74df5b2ddf6edc3a519d63c1924fd5b12291fa7 |
18-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Remove redeye filter." into gb-ub-photos-bryce
|
| 491c6915aefe4fdcd23176c78ec1199ef74ef50f |
18-Apr-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Add method for returning SoundPool audio type." into gb-ub-photos-bryce
|
| d659b589fbb7506390c2602576e3a87c5a86d0e8 |
18-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Remove redeye filter.
Bug: 8609003
Change-Id: I7f10e928fa775e5186146f06877dda34b3df699a
ndroid/gallery3d/filtershow/filters/BaseFiltersManager.java
|
| 13d7999e033ad12ad63d343f00a55062f1915afa |
18-Apr-2013 |
John Hoford <hoford@google.com> |
am 12cd0222: Merge "improve pinch to zoom behavior" into gb-ub-photos-bryce
* commit '12cd022273f14a64d9cdf79aa6a27feb099b9107':
improve pinch to zoom behavior
|
| 446224243616dbb95c3101c4b311ac6453517bc4 |
18-Apr-2013 |
John Hoford <hoford@google.com> |
Merge "improve pinch to zoom behavior" into gb-ub-photos-bryce
|
| 34b332f8db3e91b0c49f2d1d3b5be9b52f39d651 |
18-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 1c7d2bc2: First part of asset drop
* commit '1c7d2bc293a1ff824db768756d0309dfbc7f08d8':
First part of asset drop
|
| 172d37e178a33fd1138d7e3a9b08f8c541959cc3 |
18-Apr-2013 |
Michael Kolb <kolby@google.com> |
First part of asset drop
Bug: 8640131
Added new assets, updated front/back menu entry.
Change-Id: I9b007cde14eeb9f44706d99ea485e03ce1de9d53
ndroid/camera/PhotoMenu.java
ndroid/camera/VideoMenu.java
|
| 2967dc0912bf511d7cd97ff502c672565a548a00 |
17-Apr-2013 |
John Hoford <hoford@google.com> |
improve pinch to zoom behavior
bug:8630925
Change-Id: Ica4c4ab83e726901a8e729056529aa8379cb52ae
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
|
| 02cc9b9fbd42edfe6edd6db872f7eec84a274849 |
17-Apr-2013 |
Sascha Haeberling <haeberling@google.com> |
Add method for returning SoundPool audio type.
Bug: 7402245
Change-Id: Ib45ef78265a66d59f0b27473d9dfcdfa4624c8fa
ndroid/camera/SoundClips.java
|
| 3b254c2012f4862994bbd2c2e8d012a8e28b9931 |
17-Apr-2013 |
ztenghui <ztenghui@google.com> |
Merge "When video not seekable, don't show the scrubber" into gb-ub-photos-carlsbad
|
| b5a40b231ecc4105c8a80d9d1e8bb52b5efb9e56 |
17-Apr-2013 |
ztenghui <ztenghui@google.com> |
When video not seekable, don't show the scrubber
bug:7117365
Change-Id: I133ea68eaebf1d875a27336ac524d785efe71cc2
ndroid/gallery3d/app/CommonControllerOverlay.java
ndroid/gallery3d/app/MoviePlayer.java
ndroid/gallery3d/app/TimeBar.java
|
| 1b4d875d0434b226182dd37c4756ac468a660b94 |
16-Apr-2013 |
ztenghui <ztenghui@google.com> |
Add accessibility to video player controller.
bug:5714277
cherry pick the Carlsbad CL:
https://googleplex-android-review.git.corp.google.com/#/c/297944/
Change-Id: If0de1ec250a211890e1914d89e8b61780542a675
ndroid/gallery3d/app/CommonControllerOverlay.java
|
| f8f28abe5efd4c3db7cf6ae8522107c44392b7c0 |
16-Apr-2013 |
John Hoford <hoford@google.com> |
Support for save state in images
bug:8626775
Change-Id: I2a34a6027b23dab9c1802f672bfbf399cac0c4f7
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/controller/BasicParameterStyle.java
ndroid/gallery3d/filtershow/controller/BasicSlider.java
ndroid/gallery3d/filtershow/filters/BaseFiltersManager.java
ndroid/gallery3d/filtershow/filters/FilterBasicRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterCurvesRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterDrawRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterFxRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterTinyPlanetRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterVignetteRepresentation.java
ndroid/gallery3d/filtershow/filters/ImageFilterBwFilter.java
ndroid/gallery3d/filtershow/filters/ImageFilterContrast.java
ndroid/gallery3d/filtershow/filters/ImageFilterDownsample.java
ndroid/gallery3d/filtershow/filters/ImageFilterEdge.java
ndroid/gallery3d/filtershow/filters/ImageFilterExposure.java
ndroid/gallery3d/filtershow/filters/ImageFilterFx.java
ndroid/gallery3d/filtershow/filters/ImageFilterHighlights.java
ndroid/gallery3d/filtershow/filters/ImageFilterHue.java
ndroid/gallery3d/filtershow/filters/ImageFilterKMeans.java
ndroid/gallery3d/filtershow/filters/ImageFilterNegative.java
ndroid/gallery3d/filtershow/filters/ImageFilterSaturated.java
ndroid/gallery3d/filtershow/filters/ImageFilterShadows.java
ndroid/gallery3d/filtershow/filters/ImageFilterSharpen.java
ndroid/gallery3d/filtershow/filters/ImageFilterVibrance.java
ndroid/gallery3d/filtershow/filters/ImageFilterWBalance.java
ndroid/gallery3d/filtershow/imageshow/GeometryMetadata.java
ndroid/gallery3d/filtershow/imageshow/MasterImage.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
ndroid/gallery3d/filtershow/tools/SaveCopyTask.java
ndroid/gallery3d/filtershow/tools/XmpPresets.java
|
| e7abc9ca7565ba123032784e9b14d2d6d1590393 |
17-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Fix border apply if no filter applied
Change-Id: Ic5b319625b42adb298094c4ad202d6c161538644
ndroid/gallery3d/filtershow/cache/CachingPipeline.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
|
| db559f02b471e2a53ea7a3dba950967ac69217b1 |
16-Apr-2013 |
Flavio Lerda <flerda@google.com> |
Usage statistics for sharing.
Bug: 8433834
Change-Id: Iaec6150443258daa213395b6fb1e8d8d3e6123b3
ndroid/gallery3d/app/GalleryActionBar.java
ndroid/gallery3d/app/PhotoPage.java
|
| a40200389cc61d6164dcbce0299dbcb77b810c66 |
17-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Revert "Shows final set of filters in UI."" into gb-ub-photos-carlsbad
|
| 766c7421f39f5f1aca13b83cca2d1be0c53b54fd |
17-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 83bd8d34: Remove History panel
* commit '83bd8d346d295e4fe06212da957feb77ee23c04d':
Remove History panel
|
| bff393cee9eb2fc5d3a89fbcebb2fea988ab4cb2 |
17-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Remove History panel
Now that we have the state, history
is not that useful. For clarity's sake
we are removing it.
bug:8620913
bug:8503386
bug:8324322
bug:8324023
Change-Id: Ife86f3ab67c05d5781234496c7518866b506631b
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
ndroid/gallery3d/filtershow/imageshow/MasterImage.java
|
| b25104efc5de8c72f5ec19a5aa231b7206525ef7 |
17-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Revert "Shows final set of filters in UI."
Bug: 8609003
Change-Id: I24c343f62aa5e5c9a903cdd746abf2dc2b992418
ndroid/gallery3d/filtershow/FilterShowActivity.java
|
| 6fbc56c69961a2a527f114881df8476baff6ecde |
17-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 113e0fbd: Merge "Shows final set of filters in UI." into gb-ub-photos-bryce
* commit '113e0fbd251966629719f390e43b320b84751304':
Shows final set of filters in UI.
|
| 3aa15ee3823ccbf3426bf3bf78a21afa86808144 |
17-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Re-enable Simple Editor menu item
Change-Id: I080dfffeb6394b78a1dc2bd10b52ff15b1e55ac9
ndroid/gallery3d/ui/MenuExecutor.java
|
| 7f6c95557c9b510bbb434a0714be49363975ddb5 |
17-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Shows final set of filters in UI." into gb-ub-photos-bryce
|
| 095eefb3cc0cea8279ec9175ab0a9542af236eea |
17-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Shows final set of filters in UI.
Bug: 8609003
Change-Id: Id7530da3e11fb88a964b881ba8f8fad70b40bc23
ndroid/gallery3d/filtershow/FilterShowActivity.java
|
| 39a20595777bfb40aa84c6fd4d04fee5b5c6835e |
17-Apr-2013 |
Doris Liu <tianliu@google.com> |
am 953f109b: Merge "Fix face unlock failure" into gb-ub-photos-bryce
* commit '953f109b688477b086281fe09074d3886ef87fba':
Fix face unlock failure
|
| cc41601e7344f948452013b4751b8b541c6f7432 |
17-Apr-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix face unlock failure" into gb-ub-photos-bryce
|
| 2eb339731638b67b0be4a180fd1eb7d6c81fde5e |
17-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Make convertBitmap() protected so that Frames can use it.
bug:8633011
Change-Id: Ic731a1d906a6a388a22568f396111f8ca3b4475e
ndroid/gallery3d/filtershow/filters/ImageFilterRS.java
|
| 80c042e197bc710424add30d75c35c58a16b1e8f |
17-Apr-2013 |
Doris Liu <tianliu@google.com> |
Fix face unlock failure
Bug: 7494156
Change-Id: I6c909e498305ff3e66efdeeb9fb5581ea8f51715
ndroid/gallery3d/app/SlideshowPage.java
|
| 235f32be550c9e7de2383b3dd699a13dd264b640 |
17-Apr-2013 |
ztenghui <ztenghui@google.com> |
Merge "Add accessibility to video player controller." into gb-ub-photos-carlsbad
|
| 6a6eb29944dd52140f3c458d5584780fa872a49b |
17-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am f3f0aae4: Merge "Remove the Simple Edit menu item in Gallery" into gb-ub-photos-bryce
* commit 'f3f0aae490911245ad6a5602b77b72f0546b93cc':
Remove the Simple Edit menu item in Gallery
|
| 70108789ff49596e4f3034c64ccb94c1e126e3ab |
17-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Remove the Simple Edit menu item in Gallery" into gb-ub-photos-bryce
|
| 0b227127bbaa279bb02046e75e4b53d4a68866c8 |
16-Apr-2013 |
ztenghui <ztenghui@google.com> |
Add accessibility to video player controller.
bug:5714277
Change-Id: If0de1ec250a211890e1914d89e8b61780542a675
ndroid/gallery3d/app/CommonControllerOverlay.java
|
| 04da08ac700c94f6ade3fec704ac0ba6b0c201d8 |
16-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Remove the Simple Edit menu item in Gallery
bug:8609003
Change-Id: Ida6bfec65bf4b78c7c1b64f759c750ef9255bb6c
ndroid/gallery3d/ui/MenuExecutor.java
|
| a4efa8c41c75f6267138df5bd62ed5166fcee96f |
16-Apr-2013 |
Angus Kong <shkong@google.com> |
am bc02d7dc: Don\'t wait for Mosaic Renderer ready in UI thread.
* commit 'bc02d7dcb2e9716a1f1e297fef435c8b0275aafe':
Don't wait for Mosaic Renderer ready in UI thread.
|
| 0808c38f4ac300f7df047bf7884a607e0f069553 |
16-Apr-2013 |
Angus Kong <shkong@google.com> |
Don't wait for Mosaic Renderer ready in UI thread.
bug:8292711
Change-Id: Ic318c353fc420c0f7e573c74814757b79c798c5d
ndroid/camera/PanoramaModule.java
|
| 7d0b28be5231411d86c9cdfca11bb43a37535156 |
16-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am fb6a8e16: New state panel
* commit 'fb6a8e166f0a46d2a994a408b1679e3a67fdcb52':
New state panel
|
| abf8734fbf9afee227c4949b7302e4882c24bb25 |
16-Apr-2013 |
Christian Wichner <cwichner@google.com> |
convertBitmap is needed by ImageFilterFixedFrame.
Change-Id: I2094c54745f94dab2283e2a466371d15d5a57b0a
ndroid/gallery3d/filtershow/filters/ImageFilterRS.java
|
| 191da1ab42e2a70989ad5527513a4d51af577d79 |
15-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
New state panel
bug:8620913
bug:8503386
Change-Id: I35c95103e3b5097df93fa3f48e5562a479915f06
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/PanelController.java
ndroid/gallery3d/filtershow/imageshow/MasterImage.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
ndroid/gallery3d/filtershow/state/DragListener.java
ndroid/gallery3d/filtershow/state/PanelTrack.java
ndroid/gallery3d/filtershow/state/State.java
ndroid/gallery3d/filtershow/state/StateAdapter.java
ndroid/gallery3d/filtershow/state/StatePanel.java
ndroid/gallery3d/filtershow/state/StatePanelTrack.java
ndroid/gallery3d/filtershow/state/StateView.java
|
| 01d03e0b21ac5e25f42de64d4e239e8fdf147839 |
16-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Add local database for filters.
Bug: 8621039
Change-Id: I7b13ff0167483f148b354204cb01262fe40da2ba
ndroid/gallery3d/filtershow/data/FilterStackDBHelper.java
ndroid/gallery3d/filtershow/data/FilterStackSource.java
|
| 598ed6a7e13ee0294b0ef96708cfa6e3e52702c0 |
16-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 0786c387: Merge "Angle menu at edge of screen" into gb-ub-photos-bryce
* commit '0786c387413d434438257697475cf743661df296':
Angle menu at edge of screen
|
| 6e8057ea04160a4aeb83dfe3b4f1d4d9520f5c8b |
16-Apr-2013 |
Michael Kolb <kolby@google.com> |
Merge "Angle menu at edge of screen" into gb-ub-photos-bryce
|
| 0f4a5ae4fae89cc7cde711f6aad8d7f571132ca9 |
10-Apr-2013 |
Michael Kolb <kolby@google.com> |
Angle menu at edge of screen
Bug: 8618699
Adjust touch slices; adjust label position
Change-Id: I5bbf16fc570eb9801198847991395699de89ffa3
ndroid/camera/ui/PieRenderer.java
|
| aec0b43e4157cdf39262cc8cfa9f2e4ce2e667a1 |
16-Apr-2013 |
Angus Kong <shkong@google.com> |
am f7771f98: Use extra copy of parameters for concurrent access
* commit 'f7771f98aed9f253048af7dd8b2a143b9258c139':
Use extra copy of parameters for concurrent access
|
| 36ed867759d089723fc40947d772bb21deba5096 |
15-Apr-2013 |
Angus Kong <shkong@google.com> |
Use extra copy of parameters for concurrent access
bug:8585306
Change-Id: I21b8915c53508e4820e46b49171149189cb6012e
ndroid/camera/CameraManager.java
ndroid/camera/NewPhotoModule.java
ndroid/camera/NewVideoModule.java
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.java
|
| b2c323e3538820dc1da537c7a207ca6c9bd6d92b |
15-Apr-2013 |
Michael Kolb <kolby@google.com> |
Lock camera orientation using FW API
Bug: 8617536
Change-Id: Id3a5ae777f6f87d24984cbca48202470651cd71c
ndroid/gallery3d/app/OrientationManager.java
|
| eae68c6a368947394f3e8900eaf4cc616226f67a |
15-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 78991864: Merge "Also, add labels to video menu" into gb-ub-photos-bryce
* commit '789918643e2b682e387435002b5b0c287f35b39b':
Also, add labels to video menu
|
| 0408c9aef21d1e4e9afb1862897afdc8e21906fd |
15-Apr-2013 |
Michael Kolb <kolby@google.com> |
Also, add labels to video menu
Bug: 8618169
Change-Id: Ia933db79eccf2564c785a12c8c6551fa8eb1007c
ndroid/camera/VideoMenu.java
|
| 8842886cfb1a57c1955ddd949cb3cc7f21d7e060 |
15-Apr-2013 |
Michael Kolb <kolby@google.com> |
am ad30f960: Merge "Add menu labels" into gb-ub-photos-bryce
* commit 'ad30f960879285c4dadb10d5b7531e05c345587f':
Add menu labels
|
| 5b9375cebbe4bc357b734a022837d8ab85eb71d6 |
15-Apr-2013 |
Michael Kolb <kolby@google.com> |
Merge "Add menu labels" into gb-ub-photos-bryce
|
| 3a8a520eb42154b4c68b215a50c3c7f591582915 |
15-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am 3dc6a630: Merge "Fix performance and other issues related to multi-selection" into gb-ub-photos-bryce
* commit '3dc6a630aff5be323c54b4616fd3a373cbad31f7':
Fix performance and other issues related to multi-selection
|
| e5cee4bf6cea89360dd5823d47eb8b836bc371de |
15-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Fix performance and other issues related to multi-selection" into gb-ub-photos-bryce
|
| ed94a102391ad27a9cf9cc6c0f012ac0eab799a7 |
15-Apr-2013 |
John Hoford <hoford@google.com> |
am d2f5fe60: support for simplified parameters in filter
* commit 'd2f5fe607ee6d7b5f79862b495495e2f6024cdab':
support for simplified parameters in filter
|
| 10f4ba0198904a3d7679771ce845c847d940226f |
10-Apr-2013 |
Michael Kolb <kolby@google.com> |
Add menu labels
Bug: 8618169
Change-Id: Iea1ac7256450afd2870c144099459f32868c699f
ndroid/camera/CameraSettings.java
ndroid/camera/ListPreference.java
ndroid/camera/PhotoMenu.java
ndroid/camera/PieController.java
ndroid/camera/drawable/TextDrawable.java
ndroid/camera/ui/PieItem.java
ndroid/camera/ui/PieRenderer.java
|
| cb482deecb95a140b63d4bd43e2560fb9033df86 |
10-Apr-2013 |
John Hoford <hoford@google.com> |
support for simplified parameters in filter
Change-Id: I623e6fb90e8175c7e5e2dfc146f927eecba29817
ndroid/gallery3d/filtershow/controller/BasicParameterInt.java
ndroid/gallery3d/filtershow/controller/BasicParameterStyle.java
ndroid/gallery3d/filtershow/controller/FilterView.java
ndroid/gallery3d/filtershow/controller/Parameter.java
ndroid/gallery3d/filtershow/controller/ParameterSet.java
ndroid/gallery3d/filtershow/editors/BasicEditor.java
ndroid/gallery3d/filtershow/filters/FilterBasicRepresentation.java
|
| 5ef0565929c7c9185776143eba01a536b470e097 |
13-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 4b6ea5bc: Add direct rendering for border
* commit '4b6ea5bce9b68eea16eb8a0980501f671e7fbf44':
Add direct rendering for border
|
| d02932454e58d6858ec80d64932247f73dd0b19b |
13-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Add direct rendering for border
bug:8603245
Change-Id: Ibc1bde9adb19f930b474e4076a0c2720fbe0bc8d
ndroid/gallery3d/filtershow/cache/CachingPipeline.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
|
| 3952c323a14e55ba176e63197f5c6aa6c9cbdb7e |
13-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Fix performance and other issues related to multi-selection
Bug: 8606565
Bug: 8607510
Change-Id: I5bd01745b6d1047571d562e1637a2999afddfec2
ndroid/gallery3d/ui/ActionModeHandler.java
ndroid/gallery3d/ui/SelectionManager.java
|
| 0a93cd70de75bbd1547fa58330d68ba953607115 |
13-Apr-2013 |
Angus Kong <shkong@google.com> |
Load video items in the new camera filmstrip.
Also fixes:
1. NPE when no data to load.
2. The last item is skipped.
3. date and id should be long instead of int.
Change-Id: I7cad06998d78e0d3f0a30be24e65eb0f777b9c0e
ndroid/camera/data/CameraDataAdapter.java
ndroid/camera/ui/FilmStripView.java
|
| a3211b06f224ea79db8dac02b5ed19ccdb9f9094 |
11-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Add a direct rendering mode
This takes input and output allocations.
Also added a utility method in ImageFilterRS
to scale textures at screen resolution.
bug:8603245
bug:8588853
Change-Id: Ic5e4dea2289f0edd7518fc07f04b523be5316e82
ndroid/gallery3d/filtershow/cache/CachingPipeline.java
ndroid/gallery3d/filtershow/filters/ImageFilter.java
ndroid/gallery3d/filtershow/filters/ImageFilterRS.java
ndroid/gallery3d/filtershow/presets/FilterEnvironment.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
|
| 743dfdcd88081ff19fa6100dbd7d9c84aabe71c0 |
12-Apr-2013 |
Michael Kolb <kolby@google.com> |
Merge "Add checks for NPE in video pie menu." into gb-ub-photos-bryce
|
| 6608b57af0fd3b561022b589d4dc7ece567cf759 |
12-Apr-2013 |
Michael Kolb <kolby@google.com> |
Merge "Fix NPE in PieRenderer" into gb-ub-photos-bryce
|
| 14b553530417960d51ac173f09c2fbabf590cd81 |
12-Apr-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix ICS recording aspect ratio" into gb-ub-photos-bryce
|
| dc7d1ac9c9fd4ba9f4c689e17a4a248a27463fbe |
12-Apr-2013 |
Michael Kolb <kolby@google.com> |
Fix NPE in PieRenderer
Bug: 8579025
Change-Id: I1faaa4fc8a48e6abedca303e80dbf48d7b5e7574
ndroid/camera/ui/PieRenderer.java
|
| 22596004f272da6b07b91d791540e9bb85ff5a17 |
12-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
G+ crop overlay shadows. Aspect ratios.
Bug: 8597538
Change-Id: I9a7225a125bef7e11d6bf420bf1fa55e7f22c909
ndroid/gallery3d/filtershow/crop/CropDrawingUtils.java
ndroid/gallery3d/filtershow/crop/CropMath.java
ndroid/gallery3d/filtershow/crop/CropObject.java
|
| 4205d50cbb7fcf822e992c955719d4f8872f37d5 |
12-Apr-2013 |
Jason Noguchi <jnoguchi@google.com> |
Add checks for NPE in video pie menu.
Bug: 8536361
Change-Id: Iabd818e4e9fadf1f36ffed894ca7248f9568e6c9
ndroid/camera/VideoMenu.java
|
| e11dffa6d4d34cd6754d58a245b867a13385945c |
10-Apr-2013 |
Doris Liu <tianliu@google.com> |
Fix ICS recording aspect ratio
Change-Id: I092a4303959b1b3cee870c891070e2605ab9e0b0
ndroid/camera/NewVideoUI.java
|
| 6c5f5f43f18b466e7a51b8ebcd133e81029dba67 |
12-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Show loading indicator in full-screen importer view" into gb-ub-photos-bryce
|
| 580a67c198e351f9dd1bbc8c361e81da8329d4de |
12-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Show loading indicator in full-screen importer view
Bug: 8599282
Change-Id: I568d5077e8e5450da49cd4d75df39973b84d081f
ndroid/gallery3d/ingest/ui/MtpImageView.java
|
| 1124dd507a7512303abd674aaff1dbbf797226ee |
12-Apr-2013 |
Angus Kong <shkong@google.com> |
Merge "Integrate FilmStripView." into gb-ub-photos-bryce
|
| d6d4cccf7d4393fc90d2b8504873894c714aec2d |
11-Apr-2013 |
George Mount <mount@google.com> |
Merge "Add _COUNT support for PhotoProvider to help performance of All Photos." into gb-ub-photos-bryce
|
| 966f219a6bd36c4ddb8d07259fa31097a441745e |
11-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Setup geometry xforms and propogation chain.
Bug: 8597538
Change-Id: I4a6b8ebcfadfd30850a73217742c740835761388
ndroid/gallery3d/filtershow/crop/BoundedRect.java
ndroid/gallery3d/filtershow/crop/CropObject.java
|
| 125efb44995fb3307572c2832b259307e8b7aadc |
10-Apr-2013 |
Angus Kong <shkong@google.com> |
Integrate FilmStripView.
Change-Id: Ib9f280a4c58a5c120775d5e9340ea04d56c0343d
ndroid/camera/NewCameraActivity.java
ndroid/camera/NewPhotoUI.java
ndroid/camera/data/CameraDataAdapter.java
ndroid/camera/ui/FilmStripView.java
ndroid/camera/ui/NewCameraRootView.java
|
| 6e19729992bb98f77a72d34ce330d2e2c0910c68 |
09-Apr-2013 |
George Mount <mount@google.com> |
Add _COUNT support for PhotoProvider to help performance of All Photos.
Bug 8594818
Change-Id: Iab14a945e33ffcbf539b1d7acc704538e4bf48b6
ndroid/photos/data/PhotoProvider.java
|
| 7c6140adb4ea219da3a45f5d69daae3f4340593a |
11-Apr-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix camera preview being squished" into gb-ub-photos-bryce
|
| f37454e2ec94f83bc52177b9c986935006619b75 |
11-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fix downsampling check in crop.
Bug: 8586301
Change-Id: I4c5441f779122adb984368609cfea39a60190848
ndroid/gallery3d/filtershow/crop/CropLoader.java
|
| 28dc7f348b70ee6735d208b48ca12a94e9cd222f |
11-Apr-2013 |
Doris Liu <tianliu@google.com> |
Fix camera preview being squished
Bug: 8585407
Change-Id: Ie9a3a44c58599f4cccfa0017d48749e9883af6cd
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
|
| 7f8e138c86f77e64df7d85ab5d51148418c56ca1 |
10-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Correctly scale images in MTP importer" into gb-ub-photos-bryce
|
| f7ed2bba1b549c4cced8b5b762aa12b5d52012ea |
10-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Correctly scale images in MTP importer
Bug: 8293048
Change-Id: Ib46a6ce13aeea6a59706790b69be29215be7ebc4
ndroid/gallery3d/ingest/ui/MtpImageView.java
|
| 97963eb474d44d7c0e059f5c0d1f0564c79d4f06 |
10-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Adding simple crop ui. Refactoring." into gb-ub-photos-bryce
|
| 94bd4b0e6bd1b41f16ea37cc94c80e064f1de14a |
10-Apr-2013 |
ztenghui <ztenghui@google.com> |
Merge "Use MediaMuxer for the video trim and mute." into gb-ub-photos-bryce
|
| dca875bd0bc713c809e319ddb0adc3bab2d080a6 |
08-Apr-2013 |
ztenghui <ztenghui@google.com> |
Use MediaMuxer for the video trim and mute.
bug:8548085
Change-Id: I55955285ee141ebab6437950a154280cc5fefcc0
ndroid/gallery3d/app/TrimVideo.java
ndroid/gallery3d/app/VideoUtils.java
|
| 3aebab17d67d7acbf8da17d69a0e51f9cd428c35 |
10-Apr-2013 |
Angus Kong <shkong@google.com> |
Merge "Refactor CameraDataAdapter for other data types." into gb-ub-photos-bryce
|
| 326cc9a7939046476d8fa44c9f31c6e0c388a233 |
10-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Small cleanup in setting resources
Change-Id: Icd275aaddcee59a578f916c57903012ce35469ad
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/cache/FilteringPipeline.java
ndroid/gallery3d/filtershow/filters/BaseFiltersManager.java
|
| b70dbfcdc6fc52bbff98e1f5fae765bbc500273a |
10-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Adding simple crop ui. Refactoring.
Change-Id: I904ce776ca31cf2f782b0aa8e6456ab54b15e540
ndroid/gallery3d/filtershow/crop/CropDrawingUtils.java
ndroid/gallery3d/filtershow/crop/CropLoader.java
ndroid/gallery3d/filtershow/crop/CropView.java
|
| 30ddbfb5277d3f538b12209877fffaffc9b66835 |
10-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Add a third pipeline reserved for the high res preview
Change-Id: I1f35f0a7195157e5fe742d7d7c5506b3f84ece1b
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/cache/FilteringPipeline.java
|
| 107009fa3120563f9bdcdcce9c1ba92e58761b7a |
09-Apr-2013 |
Angus Kong <shkong@google.com> |
Refactor CameraDataAdapter for other data types.
Change-Id: I4d925a4f2a9c2d6d14beda8781a1d4ca5cf3c1f4
ndroid/camera/data/CameraDataAdapter.java
ndroid/camera/ui/FilmStripView.java
|
| 0f095dbd21725f646fce60f14bd954e5aceead24 |
10-Apr-2013 |
John Hoford <hoford@google.com> |
Merge "support icon styles" into gb-ub-photos-bryce
|
| c79fcc2ee8741705fc00849c66d06561f2219fc7 |
10-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Detach old editor
Change-Id: I1b0a30aa334a83011d9f03ea629e1b0f36ea21d2
ndroid/gallery3d/filtershow/PanelController.java
ndroid/gallery3d/filtershow/editors/Editor.java
|
| 49a6d76f505148e1b3a4842bd358cc155c051c74 |
10-Apr-2013 |
John Hoford <hoford@google.com> |
support icon styles
Change-Id: I9a4af2826824fd519099363b3190fc417b67c022
ndroid/gallery3d/filtershow/cache/CachingPipeline.java
ndroid/gallery3d/filtershow/cache/RenderingRequest.java
ndroid/gallery3d/filtershow/controller/StyleChooser.java
ndroid/gallery3d/filtershow/filters/FilterRepresentation.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
|
| d6448052595a2bef9a69a93a01ef74e331288484 |
10-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Implements swipe in editor menu" into gb-ub-photos-bryce
|
| 81b3e97257261df7252e1b481ec97aa82987d423 |
10-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fix to imports in NewPhotoModule.
Change-Id: Ifdb6d09e458bae7bba8bba253b0a2e8202f318ef
ndroid/camera/NewPhotoModule.java
|
| 8b7ac108eed98fbee43a21d5fd9ce41b9deda5ca |
10-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Moving crop to a separate activity. Refactoring." into gb-ub-photos-bryce
|
| 1a664450bed2737660057def2d25b0c6b49b3ba8 |
05-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Moving crop to a separate activity. Refactoring.
Bug: 8526929
Change-Id: I8acf6d46de069dd84c31afea6b4a7ae8e1c2fcce
ndroid/camera/PhotoModule.java
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/Wallpaper.java
ndroid/gallery3d/filtershow/CropExtras.java
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/crop/BoundedRect.java
ndroid/gallery3d/filtershow/crop/CropActivity.java
ndroid/gallery3d/filtershow/crop/CropExtras.java
ndroid/gallery3d/filtershow/crop/CropLoader.java
ndroid/gallery3d/filtershow/crop/CropMath.java
ndroid/gallery3d/filtershow/crop/CropObject.java
ndroid/gallery3d/filtershow/crop/CropView.java
ndroid/gallery3d/filtershow/editors/EditorCrop.java
ndroid/gallery3d/filtershow/filters/ImageFilterGeometry.java
ndroid/gallery3d/filtershow/imageshow/BoundedRect.java
ndroid/gallery3d/filtershow/imageshow/CropMath.java
ndroid/gallery3d/filtershow/imageshow/GeometryMetadata.java
ndroid/gallery3d/filtershow/imageshow/ImageCrop.java
ndroid/gallery3d/gadget/WidgetConfigure.java
|
| 850d5b25cbec18006f39c93e425515b57be0f026 |
10-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Implements swipe in editor menu
Change-Id: I5871da89d2e911d5b6663cdee8dc660ab0777393
ndroid/gallery3d/filtershow/editors/Editor.java
ndroid/gallery3d/filtershow/editors/SwapButton.java
|
| d7bdf84448ecedf914b205e6270e81ad5027715b |
09-Apr-2013 |
Angus Kong <shkong@google.com> |
Merge "Add more gestures and animations in FilmStripView." into gb-ub-photos-bryce
|
| c37653459da7e36644d9b5070ae6377cdcd1b98e |
09-Apr-2013 |
Angus Kong <shkong@google.com> |
Merge "Refresh parameters during recording." into gb-ub-photos-bryce
|
| 104e0012f33dfac317a23511dd8b2e832da5af4d |
04-Apr-2013 |
Angus Kong <shkong@google.com> |
Refresh parameters during recording.
bug:8504803
Change-Id: I1a1838a8415ed4eccad8c76c37cd61d667d92d66
ndroid/camera/CameraManager.java
ndroid/camera/NewVideoModule.java
ndroid/camera/VideoModule.java
|
| 7c45514d585e92abb069a06fe5867bc5f01127c2 |
09-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Hide the category panel when editing" into gb-ub-photos-bryce
|
| 9d042ad5d685e2316f5906072ace30c365aa26e9 |
09-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Hide the category panel when editing
Change-Id: I181ab1aa3ee27bf38a88999caf31eedc263cfe96
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/PanelController.java
|
| 5101490b4a54a26620856f1154c31a01ed6cd062 |
09-Apr-2013 |
John Hoford <hoford@google.com> |
Merge "ui cleanup" into gb-ub-photos-bryce
|
| b990071d1a9b8464c29333a9fac8ae41563f4621 |
09-Apr-2013 |
John Hoford <hoford@google.com> |
ui cleanup
Change-Id: Ifb08af6bfad2f049b66932360901b2e52ff07f01
ndroid/gallery3d/filtershow/controller/StyleChooser.java
|
| 753bb8aa56fff425fe16b93be368b9b236e4751f |
15-Mar-2013 |
Doris Liu <tianliu@google.com> |
Work in progress - Put preview in TextureView
Fixed gesture recognizing and pie menu.
Fixed camera picker. Exposure setting got fixed with rebasing.
Rebased for new pie menu
Fixed camera mode switch listener
Ongoing: secure album, aspect ratio for video recording on ICS
Change-Id: Iedae80815faf81cb49c791885810c8427034a6d1
ndroid/camera/NewCameraActivity.java
ndroid/camera/NewCameraModule.java
ndroid/camera/NewPhotoMenu.java
ndroid/camera/NewPhotoModule.java
ndroid/camera/NewPhotoUI.java
ndroid/camera/NewPreviewGestures.java
ndroid/camera/NewVideoMenu.java
ndroid/camera/NewVideoModule.java
ndroid/camera/NewVideoUI.java
ndroid/camera/PhotoMenu.java
ndroid/camera/PieController.java
ndroid/camera/VideoMenu.java
ndroid/camera/VideoUI.java
ndroid/camera/ui/CameraSwitcher.java
ndroid/camera/ui/FaceView.java
ndroid/camera/ui/NewCameraRootView.java
|
| 15f4efb50b40fbdf108121e367bfd6f50d5b2c41 |
09-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Fix history original image
Change 1st and 2nd panel background color
Change-Id: Ib6a1033f99a4a1460c1a31be1e67ebd965e00add
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/HistoryAdapter.java
|
| 40190f6917a127e156af72f72bfac9814de61ba8 |
09-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Fix history panel first appearance
Change-Id: I49c3f91d1d65cc64b15080c64709f769fc8a8f22
ndroid/gallery3d/filtershow/FilterShowActivity.java
|
| 1d728cf75969807b607838c77d2c8418462a92d6 |
09-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Fix crash in curves
Change-Id: Ic5b61b3a4653f718bf2e4327f3920b5f39162a49
ndroid/gallery3d/filtershow/ui/ImageCurves.java
|
| a5e47821f783cc14ba0ec3d3910af79dab3a870c |
09-Apr-2013 |
John Hoford <hoford@google.com> |
make basic editor based on ParametricEditor
Change-Id: Ie0a799d7e85f4e21fdd86ffbdca9814a3cc40c61
ndroid/gallery3d/filtershow/controller/BasicSlider.java
ndroid/gallery3d/filtershow/controller/ParameterStyles.java
ndroid/gallery3d/filtershow/controller/StyleChooser.java
ndroid/gallery3d/filtershow/controller/TitledSlider.java
ndroid/gallery3d/filtershow/editors/BasicEditor.java
ndroid/gallery3d/filtershow/editors/ParametricEditor.java
|
| d54c1e3d699defd21a581686eda4cdc94baa1fec |
09-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Deactivate Vintage & BW Color FX
bug:8503451
Change-Id: I5415551698a3f3db4cd0739b7d90c3576d458587
ndroid/gallery3d/filtershow/FilterShowActivity.java
|
| 7b9eac6dd0f1262773cc0a3b1acab27576e765bf |
09-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Add menu item to start the simple editor
Change-Id: Iac3ca76838a5f91186527863b3d990cbcad3faf0
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/ui/MenuExecutor.java
|
| 39766b49b97ebbd5b4100075ce8bd6b23dbc473a |
08-Apr-2013 |
Tim Murray <timmurray@google.com> |
Allow use of texture.
Change-Id: Ibc75616484d2833d9212c7c68027f83ad40b16cf
ndroid/gallery3d/filtershow/filters/ImageFilterRS.java
|
| 1a28e2e4dab537a4efd7f11cdc2f038a9e37ea0a |
08-Apr-2013 |
Tim Murray <timmurray@google.com> |
Limit creation of greyscale converter RS script.
Change-Id: I2725ae6cb5ba829fec61dce114513762fce53067
ndroid/gallery3d/filtershow/filters/ImageFilterRS.java
|
| 3eb0acbe1fcdcd10e962abaab7d946c6013343b3 |
05-Apr-2013 |
Angus Kong <shkong@google.com> |
Add more gestures and animations in FilmStripView.
Now supports fullscreen mode and filmstrip mode.
Change-Id: I4c568e37f3306d970b3439f86ac6757b15c7cd4f
ndroid/camera/data/CameraDataAdapter.java
ndroid/camera/ui/FilmStripGestureRecognizer.java
ndroid/camera/ui/FilmStripView.java
|
| ca13834b449c4586292ca9cc1853fd8e65884edd |
05-Apr-2013 |
John Hoford <hoford@google.com> |
support for simplified computed icons
Change-Id: Id886a0a2151037420d3672f34d2838c5d9c69cbd
ndroid/gallery3d/filtershow/filters/IconUtilities.java
ndroid/gallery3d/filtershow/filters/ImageFilter.java
|
| b9107fdcf2c17bebc4eeb0e13c92ba5f301f52b6 |
05-Apr-2013 |
Michael Kolb <kolby@google.com> |
Merge "Don't add unsupported options to menu" into gb-ub-photos-bryce
|
| 5cf3c47333d558abacd8962d68ccb1ff3e285005 |
05-Apr-2013 |
Michael Kolb <kolby@google.com> |
Don't add unsupported options to menu
Bug: 8549712
Exposure compensation and whitebalance were not checked when added
to the menu.
Change-Id: I90e2baea25e0273ed96e3678b3ed4c99184475df
ndroid/camera/PhotoMenu.java
|
| 2f81a0fe104d8806308dc4c6056090206f13ba84 |
05-Apr-2013 |
ztenghui <ztenghui@google.com> |
Merge "Remove redudant setName" into gb-ub-photos-bryce
|
| 1a65e735e935b7627c75617c8546af9eef7aba1b |
04-Apr-2013 |
ztenghui <ztenghui@google.com> |
Remove redudant setName
Change-Id: Id9c5f2ee268b275ba4272f66a0f72c1aa4786f9c
ndroid/gallery3d/filtershow/imageshow/GeometryMetadata.java
|
| b26251860824f962dd2306778a1f3cf9764bd702 |
04-Apr-2013 |
John Hoford <hoford@google.com> |
Merge "fixed the value that quality was getting set to" into gb-ub-photos-bryce
|
| 8d37289db2fdf37e38411d06a3235f11534931aa |
04-Apr-2013 |
John Hoford <hoford@google.com> |
fixed the value that quality was getting set to
Change-Id: I493c37c065e180ed3a7a785df4132812bd53add4
ndroid/gallery3d/filtershow/cache/CachingPipeline.java
|
| 8a9bee75383fba5a612c5e7ef7c6488495961bec |
04-Apr-2013 |
Michael Kolb <kolby@google.com> |
Merge "Adjust camera menu further" into gb-ub-photos-bryce
|
| 5a7a5ce7a4ea9603649e8b9aff74e829ca8179c1 |
04-Apr-2013 |
Angus Kong <shkong@google.com> |
Merge "Don't access mParameters dirty bit in other thread" into gb-ub-photos-bryce
|
| 3daa3518c3bfa1a2c1da37c56e1a34e9a0cac259 |
03-Apr-2013 |
Michael Kolb <kolby@google.com> |
Adjust camera menu further
Change-Id: I7e062608a7ee8e16932209640bd50b1864336a40
ndroid/camera/PhotoMenu.java
ndroid/camera/PieController.java
ndroid/camera/VideoMenu.java
ndroid/camera/ui/PieItem.java
ndroid/camera/ui/PieRenderer.java
|
| bbee3bfe85ab29acda2e13c422459d3cb96b1917 |
03-Apr-2013 |
Doris Liu <tianliu@google.com> |
Improve black bar to keep camera controls in place
Bug: 8340996
Change-Id: Ibca4a9f1ed84bd59e29cc988df346f1567de2a5b
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoUI.java
ndroid/camera/ui/CameraControls.java
ndroid/camera/ui/CameraRootView.java
ndroid/camera/ui/RotatableLayout.java
ndroid/camera/ui/SwitcherBackgroundView.java
|
| 5a58fb2146ec75061cc2a9a038628a6b7f340b34 |
03-Apr-2013 |
John Hoford <hoford@google.com> |
fix touch action in draw
Change-Id: I8c1e040a795186c47c8319441ed1c371497a5f6d
ndroid/gallery3d/filtershow/imageshow/ImageDraw.java
|
| 2ebee8fc991443fed9f043045a5c8feb2ff9342c |
03-Apr-2013 |
Angus Kong <shkong@google.com> |
Don't access mParameters dirty bit in other thread
Change-Id: I067dd56975cc908f29ed7ba419572982c55b2063
ndroid/camera/CameraManager.java
|
| 67dd6e6af3b652893c5890f24c35b2b5acfd633d |
03-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Fix segfaults in RS filters
We did not recreate the filters in all
cases when the input size change.
bug:8530112
Change-Id: I4cb47498532618271b90e56c01ec63ad991db787
ndroid/gallery3d/filtershow/filters/ImageFilterRS.java
|
| 02ecf8478a64c466cb2b70cf3ccde09ff895c58c |
03-Apr-2013 |
John Hoford <hoford@google.com> |
Merge "fix calling Allocation.copyFrom without context" into gb-ub-photos-bryce
|
| 7a02a7916312cc25e03badd30a76b36c92a007bc |
03-Apr-2013 |
Angus Kong <shkong@google.com> |
Merge "Make stopPreview synchronous." into gb-ub-photos-bryce
|
| 33acee47cf7e6e107321fdbe4b78554ed2dd6728 |
03-Apr-2013 |
John Hoford <hoford@google.com> |
fix calling Allocation.copyFrom without context
bug:8526929
Change-Id: I407539fae153642ea9be46a2f4102ab827e24164
ndroid/gallery3d/filtershow/cache/CachingPipeline.java
|
| b71331b1c245e039901b89f20342749e95d9d7a8 |
02-Apr-2013 |
Angus Kong <shkong@google.com> |
Make stopPreview synchronous.
bug:8517092
Change-Id: I66d218e206dab8ad8c80f61ca480923a6be0b0b6
ndroid/camera/CameraManager.java
|
| 0235199a906f7cda3713a689018930912688b866 |
02-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Usage statistics for photo and video capture" into gb-ub-photos-bryce
|
| 301b64679cfbd452060ac5b9595d315135550120 |
02-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Usage statistics for photo and video capture
Bug: 8433834
Change-Id: Idb4343a9e8d6895adbf9707e8c7811d007acc984
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.java
|
| 187a09a330f9c62783741b85b86b12610b2f595d |
02-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Fix stickiness issues with UI
The renderGeometryIcon() function shouldn't
be synchronized -- it's independent of the rest
of the pipeline and is only used to apply a given geometry.
Change-Id: I91a5d2ec3f28f15c489066ed2c5a5009e29fa7b3
ndroid/gallery3d/filtershow/cache/CachingPipeline.java
|
| 2b28723e58966471cde60d9452cc90e860df1d20 |
02-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Don't try freeing resources on a different thread..
This call to freeResources happens on the main thread.
It's also not really useful. The geometry instance
shouldn't be shared either.
bug:8522497
Change-Id: I7b144713428ab803b3640b3d8226fd862db824f4
ndroid/gallery3d/filtershow/cache/CachingPipeline.java
|
| 475a821d2bd16590c0a4c61cf3fca9228636c534 |
02-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Changed editor back button behavior.
Bug: 8522150
Change-Id: I803054138df931c4c48ef03930afe79e272f0d4b
ndroid/gallery3d/filtershow/FilterShowActivity.java
|
| bc0df4d0c02d701c57e6dcd3d4ad1d1977efc0e3 |
02-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Change panels organization. Also fixes border updates handling." into gb-ub-photos-bryce
|
| b71ec3a67d425fb44621fe75086fec3bcc33eae7 |
02-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Change panels organization. Also fixes border updates handling.
Change-Id: If96754e821b1e80238d2a04e65f1b57ee9683efe
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/filters/BaseFiltersManager.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
|
| 461159a112fb3fa098962bd384ff1ca72e463045 |
02-Apr-2013 |
Michael Kolb <kolby@google.com> |
Merge "Pie design update" into gb-ub-photos-bryce
|
| 3bc96b2d1106fc5ebec6fda6aad3bca4d62e81c0 |
12-Mar-2013 |
Michael Kolb <kolby@google.com> |
Pie design update
Change-Id: Ifb0d50938332bdae50e45523850605d0aafed7fb
ndroid/camera/PhotoMenu.java
ndroid/camera/PhotoUI.java
ndroid/camera/PieController.java
ndroid/camera/PreviewGestures.java
ndroid/camera/VideoMenu.java
ndroid/camera/VideoUI.java
ndroid/camera/ui/PieItem.java
ndroid/camera/ui/PieRenderer.java
|
| 98827845a0761792ce57d8d6a48f8f9772d77202 |
02-Apr-2013 |
Angus Kong <shkong@google.com> |
Merge "Handle InterruptedException in waitDone" into gb-ub-photos-bryce
|
| 8985b7b890aa7e84effe44ac11989c6158767f0d |
02-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Added apply UI callbacks for rotate/mirror operations." into gb-ub-photos-bryce
|
| fd363b27e87ad4b9dc23bcd415d3d9fb5619cdfb |
02-Apr-2013 |
Angus Kong <shkong@google.com> |
Handle InterruptedException in waitDone
Dirty bit for mParameters should be set properly if getParameters is not
finished.
bug:8517092
Change-Id: I2259dc978465d23bff9c6852bec4a791f94137d0
ndroid/camera/CameraManager.java
|
| 87efd29660cfc53023667ff8c124364fcdbcc88c |
02-Apr-2013 |
Angus Kong <shkong@google.com> |
Merge "Don't use SynchronousQueue to pass results." into gb-ub-photos-bryce
|
| 73749f2d3c4a403b7b8455edcfd260c1d8633be8 |
01-Apr-2013 |
Angus Kong <shkong@google.com> |
Don't use SynchronousQueue to pass results.
bug:8517092
Change-Id: I0f2084bc1d52f37743559391cd2217275e3d485d
ndroid/camera/CameraManager.java
|
| 41666d79533a352e273892a9a9bf33e4b99305c2 |
01-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Usage statistics for camera settings" into gb-ub-photos-bryce
|
| ebe79e4f32a6d8871e49fc91c45a3ef2d61e7f9a |
01-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Added apply UI callbacks for rotate/mirror operations.
Change-Id: I30bfb439d742248c3241742bd11f64a1b4a22640
ndroid/gallery3d/filtershow/editors/EditorFlip.java
ndroid/gallery3d/filtershow/editors/EditorRotate.java
ndroid/gallery3d/filtershow/imageshow/ImageFlip.java
ndroid/gallery3d/filtershow/imageshow/ImageRotate.java
|
| 12545f7a4a5e66fd59d6d6b2fdf907800e2df051 |
01-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Enforce bmp type in pool, handle MTP image decode failure
- GalleryBitmapPool didn't reject bitmap types other than
ARGB_8888 which could lead to problems when a different type
is used for recycling.
- BitmapFactory throws an exception rather than returning null
when image decoding fails and an existing bitmap was supplied
for recycling, even if the failure was not caused by the use
of that bitmap. When decoding things from an MTP device, we
need to handle this since unsupported formats may be returned.
Change-Id: I8cc8aa46f5a741b360e806814991f74a131e9039
ndroid/gallery3d/ingest/data/MtpBitmapFetch.java
ndroid/photos/data/GalleryBitmapPool.java
|
| 806e78b99ae440423547aca436fe5361882bcc33 |
01-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Usage statistics for camera settings
Change-Id: I1e683fa8114ab9e15d9da6b81a3caca952d75647
ndroid/camera/ComboPreferences.java
|
| e5a79a5bd8ca3e25c14e4fe5df7c1ee1b544dc7e |
01-Apr-2013 |
Angus Kong <shkong@google.com> |
Merge "Fix NPE when reconnecting camera." into gb-ub-photos-bryce
|
| 46252663f34021bf93586234396ce1139ae5d02e |
01-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Preliminary Album grid header in new gallery" into gb-ub-photos-bryce
|
| 31d492996d3aa49318a185489bebf2fa1a144c2f |
29-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Preliminary Album grid header in new gallery
Change-Id: I90942de920795aedc5475f23cc3ede459949cc16
ndroid/photos/AlbumActivity.java
ndroid/photos/AlbumFragment.java
ndroid/photos/MultiSelectGridFragment.java
|
| 918f811c21eb5a325626bf523a390926d4e6cb77 |
01-Apr-2013 |
Angus Kong <shkong@google.com> |
Fix NPE when reconnecting camera.
bug:8513852
Change-Id: I45150e5519604f695d25c830262c8b6eb363b1d3
ndroid/camera/CameraManager.java
|
| 8034eec63a1d84450d1841844a9294a10d14ba6d |
01-Apr-2013 |
George Mount <mount@google.com> |
Merge "Remove ImageCache from PhotoProvider in favor of MediaCache." into gb-ub-photos-bryce
|
| 408fbfdd78ea6d90f4fd2bdfa234a161a436d1aa |
30-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix double-tap behaviour" into gb-ub-photos-bryce
|
| 05022e50a7d280d990c2dca74f69a7da55bdd3b8 |
30-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Fix double-tap behaviour
Change-Id: I17282bce5af9d65b704e3853181ef3cbfde4992e
ndroid/gallery3d/filtershow/cache/RenderingRequest.java
ndroid/gallery3d/filtershow/imageshow/MasterImage.java
|
| d4545febbff39febd1058e1aa60e0c8b7659204f |
30-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Fixes some state synchronization issues
Change-Id: Iea0f2b8d9c885795bddfb0d3001c8a351caed63c
ndroid/gallery3d/filtershow/cache/FilteringPipeline.java
ndroid/gallery3d/filtershow/filters/FilterRepresentation.java
|
| d94a961e445adbf2ebd6af702209020475c6cab3 |
30-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Implements progressive rendering" into gb-ub-photos-bryce
|
| 3134c5478897af10e0c712794df4336fe6e3f995 |
29-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Implements progressive rendering
Change-Id: I32bd2072126a4fad4342f7d9ffa1cff3b5da84cf
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/cache/CachingPipeline.java
ndroid/gallery3d/filtershow/cache/FilteringPipeline.java
ndroid/gallery3d/filtershow/cache/ImageLoader.java
ndroid/gallery3d/filtershow/cache/RenderingRequest.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
ndroid/gallery3d/filtershow/imageshow/MasterImage.java
|
| 373b137fd10a6db5daa605a2813b639b09dffe57 |
30-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Added "discard unsaved changes" behavior for exiting." into gb-ub-photos-bryce
|
| b658ef4f610fcbafff4fa5e584cabe253e76d879 |
28-Mar-2013 |
George Mount <mount@google.com> |
Remove ImageCache from PhotoProvider in favor of MediaCache.
Change-Id: I4e75a094d1dc033ac892c2b95bdc6b6a4a165304
ndroid/photos/data/MediaCache.java
ndroid/photos/data/MediaCacheDatabase.java
ndroid/photos/data/MediaCacheUtils.java
ndroid/photos/data/PhotoProvider.java
|
| 8e498a060dca7e0a1d2ceaa39b902d1cce7f7c4a |
30-Mar-2013 |
George Mount <mount@google.com> |
Merge "Add initial implementation of MediaCache." into gb-ub-photos-bryce
|
| 314de4034664ab668aea61e1ecd14946f1b4a978 |
18-Mar-2013 |
George Mount <mount@google.com> |
Add initial implementation of MediaCache.
Change-Id: I94d357bab0e57cc60b8be790d912ba036730298b
ndroid/gallery3d/app/GalleryAppImpl.java
ndroid/photos/data/FileRetriever.java
ndroid/photos/data/MediaCache.java
ndroid/photos/data/MediaCacheDatabase.java
ndroid/photos/data/MediaCacheUtils.java
ndroid/photos/data/MediaRetriever.java
|
| 3171c21d51cc6b3197b0d25167f09237cb05840d |
29-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Added "discard unsaved changes" behavior for exiting.
Bug: 7534778
Change-Id: I3136fa04585a42912bad6235a776937a4cb4dcac
ndroid/gallery3d/filtershow/FilterShowActivity.java
|
| 534386cf6264df921f633f4c90edcab169778d26 |
29-Mar-2013 |
John Hoford <hoford@google.com> |
Merge "add flexable ui for parameters" into gb-ub-photos-bryce
|
| 06016438139fba0511dcd1e12646b53287b3bb3f |
13-Mar-2013 |
John Hoford <hoford@google.com> |
add flexable ui for parameters
Change-Id: Ifa9862ceb7f9a12b1b9b985fdc737dc1bb679921
ndroid/gallery3d/filtershow/PanelController.java
ndroid/gallery3d/filtershow/controller/ActionSlider.java
ndroid/gallery3d/filtershow/controller/BasicSlider.java
ndroid/gallery3d/filtershow/controller/Control.java
ndroid/gallery3d/filtershow/controller/Parameter.java
ndroid/gallery3d/filtershow/controller/ParameterActionAndInt.java
ndroid/gallery3d/filtershow/controller/ParameterInteger.java
ndroid/gallery3d/filtershow/controller/TitledSlider.java
ndroid/gallery3d/filtershow/editors/Editor.java
ndroid/gallery3d/filtershow/editors/EditorVignette.java
ndroid/gallery3d/filtershow/editors/ParametricEditor.java
ndroid/gallery3d/filtershow/filters/FilterBasicRepresentation.java
ndroid/gallery3d/filtershow/imageshow/ImageVignette.java
|
| d6f3162a473066a24838c8dc6f2c6f96d4db0f0c |
29-Mar-2013 |
Michael Kolb <kolby@google.com> |
Merge "Make camera releasing synchronous." into gb-ub-photos-bryce
|
| 7857fc5931953ed5d63fbcbd1c810740f6e0eef6 |
29-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Re-enable caching step in RS filters" into gb-ub-photos-bryce
|
| b782f6d9e38c84124735044708246112e62ddc9a |
29-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Re-enable caching step in RS filters
Bug: 8478659
Bug: 8459181
Bug: 8450339
Bug: 8457323
With the compatibility library, different Scripts instances
actually points to the same thing. We thus need to explicitely
rebind all the variables to the correct script instance before
running RS filters...
Change-Id: Id6cd4e44b5a67a3d2588e158c616b2b44e214a5b
ndroid/gallery3d/filtershow/filters/ImageFilterRS.java
ndroid/gallery3d/filtershow/filters/ImageFilterSharpen.java
ndroid/gallery3d/filtershow/presets/FilterEnvironment.java
|
| 0925a4e9d7f62f57cf9d8ed40ce22d08af1583a3 |
29-Mar-2013 |
Angus Kong <shkong@google.com> |
Make camera releasing synchronous.
bug:8502943
Change-Id: I48d71c07894fefa909db1a78c0dbe9b8f72e5166
ndroid/camera/CameraManager.java
|
| 2e45fd060ca623a3f28858eabd17be891b4fba89 |
28-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Add HeaderGridView implementation
Change-Id: Id0e699be0e40310c4919a9d55503edb9b07d4b58
ndroid/photos/views/HeaderGridView.java
|
| 2a68debc4c7a285dff36c7639387fed1e8e02b45 |
28-Mar-2013 |
Doris Liu <tianliu@google.com> |
Merge "Disable preview gestures when shutter is pressed" into gb-ub-photos-bryce
|
| 83facdef714b729aeab4d51919206d95a7afb165 |
28-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Fix deadlock.
Move the RenderScript context and Resources to CachingPipeline.
bug:8491107
Change-Id: I912555c87b060e4515cc1a4c66c8a8c9c840532d
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/cache/CachingPipeline.java
ndroid/gallery3d/filtershow/filters/ImageFilterRS.java
|
| 6d2104b2dd31e39e8f3c178375d4d91055a24a54 |
28-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fixed renderscript crashes." into gb-ub-photos-bryce
|
| 61f2b082014fe4402dd208029e9378dd5cb1fd1d |
28-Mar-2013 |
Doris Liu <tianliu@google.com> |
Disable preview gestures when shutter is pressed
Bug:8333662
Change-Id: Ia204822c5651ab98cca6f67ee45058b6d9d81b31
ndroid/camera/VideoModule.java
ndroid/camera/VideoUI.java
|
| 2a23c46ca52e9af02aac7c454a89d2b9c4f2e539 |
27-Mar-2013 |
Angus Kong <shkong@google.com> |
Merge "Make camera calls asynchronous" into gb-ub-photos-bryce
|
| dcb0ef1d6eacdd7d18a6881ae75f67c9851a858c |
26-Mar-2013 |
Angus Kong <shkong@google.com> |
Make camera calls asynchronous
bug:8438047
Change-Id: I151d5ff85f0fb3646432a64b5841256a1448f101
ndroid/camera/CameraManager.java
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.java
|
| 2f7cb89c74f7d0c01d847bdfe7fbd8c31c2d0fb5 |
27-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fixed renderscript crashes.
Bug: 8478659
Bug: 8459181
Bug: 8450339
Bug: 8457323
createFilter() initializes a ton of parameters in the RenderScript
filters. Using stale parameters from a previous call to createFilter()
causes segfaults.
Change-Id: Id54b956b7fe83be5089b1d47c3bedcca66237ddf
ndroid/gallery3d/filtershow/filters/ImageFilterRS.java
|
| c6af786bdc2488c2c7a69846b81261f31ffdccb3 |
27-Mar-2013 |
Doris Liu <tianliu@google.com> |
Merge "Workaround for switcher popup being cut off on ICS" into gb-ub-photos-bryce
|
| 1f69b697746b62c76c8a4892c62e20380151be69 |
27-Mar-2013 |
Doris Liu <tianliu@google.com> |
Workaround for switcher popup being cut off on ICS
Bug: 8390375
Change-Id: Ie4a196824751ae6717849f210c3e8e17e4aa014d
ndroid/camera/ui/CameraSwitcher.java
|
| a148e5b2139e6dad6c77f79e3440abb671db70b2 |
27-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Moves ownership of the environment to the pipeline" into gb-ub-photos-bryce
|
| c07f1badee5eb2debeb55e7d15d894163e03f3e8 |
23-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Moves ownership of the environment to the pipeline
Change-Id: I256e679a6f47831ebf00fe57d38b9c0372be38ec
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/cache/CachingPipeline.java
ndroid/gallery3d/filtershow/cache/ImageLoader.java
ndroid/gallery3d/filtershow/cache/RenderingRequest.java
ndroid/gallery3d/filtershow/filters/BaseFiltersManager.java
ndroid/gallery3d/filtershow/imageshow/ImageZoom.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
|
| 81c9d5d383e366670cb88c3a16a457428cdc18dd |
27-Mar-2013 |
Angus Kong <shkong@google.com> |
Remove debug log.
Change-Id: I9df3172c2f082fd9bdbbbf8edc8135983c837c43
ndroid/camera/PhotoModule.java
|
| 0d00a8907096b9970ac64f52abbd2bfc1ed751b6 |
26-Mar-2013 |
Angus Kong <shkong@google.com> |
Add GPSDirection tag using ExifInterface.
bug:8115825
Change-Id: Iefcbbddbb7f9fed0c386214b428d4743f67d0dd9
ndroid/camera/Exif.java
ndroid/camera/MediaSaveService.java
ndroid/camera/PhotoModule.java
ndroid/camera/Storage.java
ndroid/camera/VideoModule.java
|
| 88efa27609d08a749cda7ba928cb825de71a7f2b |
26-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Hides popup indicator on some editors
Change-Id: I88f17b9352c582f26f09a74db9d91e1fb81dbeae
ndroid/gallery3d/filtershow/editors/Editor.java
ndroid/gallery3d/filtershow/editors/EditorFlip.java
ndroid/gallery3d/filtershow/editors/EditorRotate.java
ndroid/gallery3d/filtershow/editors/EditorStraighten.java
|
| 175fc2198c8ff313fa90f0c37d09d80fa0c604cb |
26-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Hides seekbar in some editors
Change-Id: Ifce385f9a6bf9b741f0873f49d826fbcf453d97c
ndroid/gallery3d/filtershow/editors/Editor.java
ndroid/gallery3d/filtershow/editors/EditorCrop.java
ndroid/gallery3d/filtershow/editors/EditorCurves.java
ndroid/gallery3d/filtershow/editors/EditorDraw.java
ndroid/gallery3d/filtershow/editors/EditorFlip.java
ndroid/gallery3d/filtershow/editors/EditorRedEye.java
ndroid/gallery3d/filtershow/editors/EditorRotate.java
ndroid/gallery3d/filtershow/editors/EditorStraighten.java
|
| 8737bd93a989cc5608065b13f0682f60a6e18e27 |
26-Mar-2013 |
Doris Liu <tianliu@google.com> |
Merge "Adding switcher background back in" into gb-ub-photos-bryce
|
| c0bbf7c9a11e8c4e02045672989a8545e4c1279d |
26-Mar-2013 |
Doris Liu <tianliu@google.com> |
Adding switcher background back in
Fixed switcher background's rotation issue.
Bug: 8436031
Change-Id: Icc6c3fa38c98587c1ff37fea7d53980679943938
ndroid/camera/ui/SwitcherBackgroundView.java
|
| e67807fc8cb22fcd6b210fe660501dbf102c12eb |
25-Mar-2013 |
Mangesh Ghiware <mghiware@google.com> |
Add album type to albums table.
Change-Id: Ib4dfb1de9d814d2ee41c5b855b69f09115912e57
ndroid/photos/data/PhotoDatabase.java
ndroid/photos/data/PhotoProvider.java
|
| e09b8f4e1d3b2d1fb99e79f07312d06db87f652d |
23-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Refactoring: removed unnecessary apply calls.
Change-Id: Ic592a00a8487f6a2499c34929b0ec8afad2a73b6
ndroid/gallery3d/filtershow/ImageStateAdapter.java
ndroid/gallery3d/filtershow/filters/ImageFilter.java
ndroid/gallery3d/filtershow/filters/ImageFilterBorder.java
ndroid/gallery3d/filtershow/filters/ImageFilterDownsample.java
ndroid/gallery3d/filtershow/filters/ImageFilterGeometry.java
ndroid/gallery3d/filtershow/filters/ImageFilterParametricBorder.java
ndroid/gallery3d/filtershow/filters/SimpleImageFilter.java
ndroid/gallery3d/filtershow/imageshow/MasterImage.java
ndroid/gallery3d/filtershow/ui/FilterIconButton.java
|
| 955e5c57ec592003abea8e6b8f0bc2bfb3e201bc |
22-Mar-2013 |
Michael Kolb <kolby@google.com> |
Fix NPE in Camera
Bug: 8409508
Change-Id: I962a7eccec9ca2e1c190eb1c2c252020cd0926e0
ndroid/camera/CameraActivity.java
|
| e3974bb4614d027e88ad915f70c4c05fb5ff76b1 |
22-Mar-2013 |
Michael Kolb <kolby@google.com> |
Add renderers only once
Change-Id: I819c0486d23e358d7d7b989a051da9087fa292a1
ndroid/camera/PhotoUI.java
|
| cbbaef3e674898c3045486ae4930966c3dff1147 |
22-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Fix problem applying the Fx filter
Also adds some debug info
bug:8442036
Change-Id: Ife7fd4be664ae011e41969e74c7745da0a7a52f5
ndroid/gallery3d/filtershow/cache/CachingPipeline.java
ndroid/gallery3d/filtershow/cache/FilteringPipeline.java
ndroid/gallery3d/filtershow/filters/ImageFilterFx.java
ndroid/gallery3d/filtershow/filters/ImageFilterRS.java
ndroid/gallery3d/filtershow/tools/SaveCopyTask.java
|
| dc19e2f107b02b62f887dc500e107ad8f4a9cb07 |
22-Mar-2013 |
John Reck <jreck@google.com> |
Merge "Revert "New loading model"" into gb-ub-photos-bryce
|
| 400f35866b8758118e35541aa834b93fcfc5d1be |
21-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Refactor grid fragments in new gallery" into gb-ub-photos-bryce
|
| 51177aac9078da153bcb191864fb368faf105681 |
21-Mar-2013 |
John Reck <jreck@google.com> |
Revert "New loading model"
Change-Id: I5d3d4c7a4ca0d11de01278529e1413fc62e6b4ed
ndroid/gallery3d/app/AlbumDataLoader.java
ndroid/gallery3d/app/AlbumSetDataLoader.java
ndroid/gallery3d/app/PhotoDataAdapter.java
ndroid/gallery3d/app/SlideshowPage.java
ndroid/gallery3d/data/ClusterAlbum.java
ndroid/gallery3d/data/ClusterAlbumSet.java
ndroid/gallery3d/data/ComboAlbum.java
ndroid/gallery3d/data/ComboAlbumSet.java
ndroid/gallery3d/data/FilterDeleteSet.java
ndroid/gallery3d/data/FilterEmptyPromptSet.java
ndroid/gallery3d/data/FilterTypeSet.java
ndroid/gallery3d/data/LocalAlbum.java
ndroid/gallery3d/data/LocalAlbumSet.java
ndroid/gallery3d/data/LocalMergeAlbum.java
ndroid/gallery3d/data/MediaSet.java
ndroid/gallery3d/data/MediaSetWrapper.java
ndroid/gallery3d/data/SecureAlbum.java
ndroid/gallery3d/data/SingleItemAlbum.java
ndroid/gallery3d/data/SnailAlbum.java
ndroid/gallery3d/gadget/MediaSetSource.java
ndroid/photos/shims/MediaItemsLoader.java
ndroid/photos/shims/MediaSetLoader.java
|
| 03d6a96b088e6a3d8884cc4025c9d7cb9550c2f2 |
21-Mar-2013 |
John Reck <jreck@google.com> |
Merge "Changes for CanvasProvider" into gb-ub-photos-bryce
|
| 1b5a7a61f02b2a057c7eb64d9d90558b1b291ace |
21-Mar-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix for record button not responding" into gb-ub-photos-bryce
|
| 0ac3415c9b28f492614462641b87792c477de2f4 |
21-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Don't show the original image in the Curves editor
Change-Id: I884f6113c5b39d02b8b1f217ce8bec5fd19aaf4e
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
ndroid/gallery3d/filtershow/ui/ImageCurves.java
|
| fdc3d8bcea0cee2caa5a2662fb202e8876e18abb |
21-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix crashes with RS filters" into gb-ub-photos-bryce
|
| 7847f8d2fef696ac30d502a9875afeb0c727a5f1 |
20-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Fix crashes with RS filters
bug:8418537
Change-Id: I37f8ad8a77f04faed9f721122872f00f7aaaa365
ndroid/gallery3d/filtershow/cache/CachingPipeline.java
ndroid/gallery3d/filtershow/filters/ImageFilter.java
ndroid/gallery3d/filtershow/filters/ImageFilterRS.java
ndroid/gallery3d/filtershow/filters/ImageFilterSharpen.java
ndroid/gallery3d/filtershow/presets/FilterEnvironment.java
|
| c774ff93ae8026a76bddbf9b7a29f04de50721da |
21-Mar-2013 |
Doris Liu <tianliu@google.com> |
Fix for record button not responding
Bug: 8437944
Change-Id: I0393434d094b9288232c70b2f65cd5eb4d0719a4
ndroid/camera/VideoModule.java
|
| a9a61610044ec3a94628ca91f5a0c041d21431c3 |
21-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Added accessability description for filter buttons.
Change-Id: I20b780cf54a3fa4beed41845693c87e2369c33ae
ndroid/gallery3d/filtershow/ui/FilterIconButton.java
|
| add9a89e6f81adbaf19992d7e0ce8be4d221fdf1 |
20-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Refactor grid fragments in new gallery
Change-Id: I087cd68ddf8a0a23547d85082f146b6effd68f22
ndroid/photos/AlbumActivity.java
ndroid/photos/AlbumFragment.java
ndroid/photos/AlbumSetFragment.java
ndroid/photos/GalleryActivity.java
ndroid/photos/GalleryFragmentHost.java
ndroid/photos/MultiChoiceManager.java
ndroid/photos/MultiSelectGridFragment.java
ndroid/photos/PhotoSetFragment.java
ndroid/photos/SelectionManager.java
|
| a3b520678f0ad543847f81d23db580b89bc008ed |
19-Mar-2013 |
John Reck <jreck@google.com> |
Changes for CanvasProvider
Change-Id: I0f90f08f4413717933083d110d5020f494d9ed5f
ndroid/photos/data/SQLiteContentProvider.java
|
| a40965b95af786ed2aa13ff63e38b92881f3c315 |
20-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Refactor fragment/activity coupling in new Gallery
Change-Id: I7cc54b352197e1975cff286f4add7d0f42637841
ndroid/photos/AlbumActivity.java
ndroid/photos/AlbumFragment.java
ndroid/photos/AlbumSetFragment.java
ndroid/photos/GalleryActivity.java
ndroid/photos/GalleryFragmentHost.java
ndroid/photos/MultiChoiceManager.java
ndroid/photos/PhotoSetFragment.java
|
| 932aee29ce7ad3f77ee7c5e57082efb638b75d65 |
20-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Refactor the pipeline - add a CachingPipeline class - FilteringPipeline only deals with communication - fix large critical sections performance issues - improves stability" into gb-ub-photos-bryce
|
| 09ec2d5a01ccfce82b58c77959ec1464ec670855 |
20-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Refactor the pipeline
- add a CachingPipeline class
- FilteringPipeline only deals with communication
- fix large critical sections performance issues
- improves stability
bug:8418537
Change-Id: Id18edf71b2e2aec19a8b25fcce711c4acbb1a724
ndroid/gallery3d/filtershow/cache/CachingPipeline.java
ndroid/gallery3d/filtershow/cache/FilteringPipeline.java
ndroid/gallery3d/filtershow/imageshow/ImageVignette.java
|
| 2fc0f1143674f9896dfca2273b75d92772cb69de |
20-Mar-2013 |
Victor Doba <dobavictor@google.com> |
Method added to load scaled resource (with only alpha channel).
Change-Id: I1b9a58e0fd4c33c9748ad03f53d635c426a5102c
ndroid/gallery3d/filtershow/filters/ImageFilterRS.java
|
| 3bd74269f760dd35e8efcbe904284679202ff365 |
20-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Add accessor for filters to the source bitmap passed to apply()
Change-Id: I2900c5b799592c388daa9049093ef8c80fa4f5c6
ndroid/gallery3d/filtershow/filters/ImageFilterRS.java
|
| 09d311c58be3825ba5fb9d4d42d7952fc6c1bbac |
20-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fixed onDestroy ordering for RS context.
Bug: 8420637
Change-Id: Iddceaa3aefd3d905bbc7435350b768d10215b1d8
ndroid/gallery3d/filtershow/FilterShowActivity.java
|
| f024156f35ecfe1c8104eb871b27ae7ce3dca669 |
19-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Fix some startup issues, performance issues on ICS
Change-Id: Iccbcc5a78bf4feb5614e1c420022ef8440606baf
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/cache/FilteringPipeline.java
ndroid/gallery3d/filtershow/imageshow/GeometryMetadata.java
|
| f3c6bd763c84f5a99f57dffe38a345514583dfb1 |
19-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Add album viewing to new Gallery" into gb-ub-photos-bryce
|
| 2b18812c460e7cc721d4c4c25b3c6f1cf179554d |
18-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Add album viewing to new Gallery
Change-Id: I71230541db0b06d41e2d23d51e83f0b3b8e8caf4
ndroid/photos/AlbumActivity.java
ndroid/photos/AlbumFragment.java
ndroid/photos/AlbumSetFragment.java
|
| 3f26536bf18efcd9862d1553c4900d4100edd5a5 |
16-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Improves double-tap and comparison mechanism
Change-Id: I1fda50d7d179703db9e0e525550018c259233e89
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
ndroid/gallery3d/filtershow/imageshow/MasterImage.java
|
| 4dc98460359023d2a7d11752c09efa656fc17595 |
19-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
ImageFilterRS filters reset properly. FilterPipeline delay till after load.
Bug: 8293404
Bug: 8417804
Change-Id: I4e3fbbdb86bcb790d73455f21044e6dee9398a5d
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/cache/FilteringPipeline.java
ndroid/gallery3d/filtershow/cache/TripleBufferBitmap.java
ndroid/gallery3d/filtershow/filters/BaseFiltersManager.java
ndroid/gallery3d/filtershow/filters/ImageFilterFx.java
ndroid/gallery3d/filtershow/filters/ImageFilterRS.java
ndroid/gallery3d/filtershow/filters/ImageFilterSharpen.java
ndroid/gallery3d/filtershow/ui/FilterIconButton.java
|
| 35afd8f09183ae9b92e9b1b722cfa806032f189c |
19-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Fix disappearing panels and animations on ICS
bug:8405402
Change-Id: I9c0da8fbf20c424cc64ae5cc1be42414cb2f0964
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/PanelController.java
|
| 9a5c1beb3b8f5586a91b465fb013d6c4cea6b87c |
18-Mar-2013 |
John Reck <jreck@google.com> |
Merge "Fix notifyChange" into gb-ub-photos-bryce
|
| 246781394544be41ce315293b6f67302b3504c87 |
18-Mar-2013 |
John Reck <jreck@google.com> |
Fix notifyChange
Change-Id: I48d6c756a5272465b6cfaa632c879683aa51083d
ndroid/photos/data/PhotoProvider.java
|
| 96be5d9e7c66b64f9dd24a29eb0fb69ebd920106 |
18-Mar-2013 |
George Mount <mount@google.com> |
Merge "Change delete cascade" into gb-ub-photos-bryce
|
| 5b743de44cec814b6dab6241aee9b7ab733b4c08 |
15-Mar-2013 |
George Mount <mount@google.com> |
Change delete cascade
Change-Id: Ib40b0989ed437c923ff82b379e539b1141225529
ndroid/photos/data/PhotoProvider.java
|
| 575489b66b1e9c8397d4f497cb262c19e4c1aa8b |
18-Mar-2013 |
George Mount <mount@google.com> |
Merge "Fix "drop table" problem." into gb-ub-photos-bryce
|
| a331a12a4b1da7cb17f5a078cf21a03896e37496 |
18-Mar-2013 |
Angus Kong <shkong@google.com> |
Merge "Add shared preference key of LightCycle." into gb-ub-photos-bryce
|
| a248e314296419fb96e48a900e742226240357ab |
18-Mar-2013 |
George Mount <mount@google.com> |
Fix "drop table" problem.
Bug 8404285
Should drop table if exists when upgrading, not just drop a table.
Change-Id: Ic75fa0efc6ab44be073b2b78a8520e2289cd3148
ndroid/photos/data/PhotoDatabase.java
|
| 4230534827415a30840e122347354ea0be95a701 |
16-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Fix xmp crash
Change-Id: I256062b19e540fa77ff982552e62977789caf29b
ndroid/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
|
| 1580df6aed1e5569ede61af0949279819ec03119 |
16-Mar-2013 |
Angus Kong <shkong@google.com> |
Add shared preference key of LightCycle.
Change-Id: Ifd3171502cfde321769e3bc2b554ec14bf7bdd21
ndroid/camera/CameraSettings.java
ndroid/camera/ComboPreferences.java
|
| ef976a7a48bf3c626c558d8bdcf68e2743d83a6f |
16-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Refactoring iconbutton." into gb-ub-photos-bryce
|
| f88f1d99563ddcfe15fed8fe98a293c0a5de0d82 |
15-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Refactoring iconbutton.
Change-Id: Ie1538d978605ae28bb4fa6779eb2802794a35312
ndroid/gallery3d/filtershow/cache/ImageLoader.java
ndroid/gallery3d/filtershow/tools/IconFactory.java
ndroid/gallery3d/filtershow/ui/FilterIconButton.java
ndroid/gallery3d/filtershow/ui/IconButton.java
|
| 372368a941a38d74ea4671a64e3042a1e5698b83 |
15-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Improve AlbumSet UI in new gallery" into gb-ub-photos-bryce
|
| 6dc2f6ba41d6a7065ced232cfee5d1013171be34 |
15-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Improve AlbumSet UI in new gallery
Change-Id: I31cbf7cf8c0c7b5f5f3413a59ad94142b13870d2
ndroid/photos/adapters/AlbumSetCursorAdapter.java
|
| 0fe391a43d0c549fa0effddd21ece4eb4ba86194 |
15-Mar-2013 |
John Reck <jreck@google.com> |
Prepare to switch to panolibs
Change-Id: Ie29c0014fcb08105cab1ee6043f66b58e5ac85f8
ndroid/photos/canvas/CanvasActivity.java
ndroid/photos/canvas/CanvasProvider.java
ndroid/photos/canvas/CanvasProviderBase.java
ndroid/photos/canvas/EnableSyncActivity.java
oogle/android/pano/data/Cluster.java
oogle/android/pano/data/util/UriUtils.java
oogle/android/pano/provider/PanoContract.java
|
| 4fc93d01548b8b67cb4cdd4a9e540ea0e004df49 |
15-Mar-2013 |
George Mount <mount@google.com> |
Delete and recreate database on upgrade.
Change-Id: I0125697dd673568ddfee7be8d7d0d693018b61d5
ndroid/photos/data/PhotoDatabase.java
|
| b7cc5e99563bc695ec871f897914eb2cb797ad53 |
15-Mar-2013 |
George Mount <mount@google.com> |
Use cancellationSignal only on API Level 16 and above.
Bug 8390238
Change-Id: If2dacb1eb74e531d004b6f281d32a81f7cd59139
ndroid/photos/data/PhotoProvider.java
|
| 2e73dca71ba700f285b23fcab0c8f32b9b3ce5a4 |
15-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Fix layout issue on rotation
Change-Id: I93956687c5c4332c3ceae6f1e3c7041fb322b041
ndroid/gallery3d/filtershow/FilterShowActivity.java
|
| dadfbb888c13b67acbf302f6dfad022683ace001 |
15-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fixed more threading bugs in the ImageFilterRS and the FiltersManager." into gb-ub-photos-bryce
|
| c16e2afe3b7bb764f3de53cc34cd70afa413660e |
15-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fixed more threading bugs in the ImageFilterRS and the FiltersManager.
Bug: 8392832
Change-Id: I87b3af9ddb62524f02858a82eac2cc3bd2209418
ndroid/gallery3d/filtershow/filters/ImageFilterRS.java
ndroid/gallery3d/filtershow/filters/ImageFilterSharpen.java
|
| e06880d55d8c98491b95d6f8c0cdb1653d90c557 |
15-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Enable touch panning by default
Change-Id: I7d0ced296fe84c2cfff820fbcb99f5731f9ade44
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
|
| 61872e727127150b5a2bd5e7da30f92f8737b6b7 |
15-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Add many contextual actions to new gallery" into gb-ub-photos-bryce
|
| 55be3667e6807261a8b60185aff63f9669c26f84 |
15-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Requested RS method rename." into gb-ub-photos-bryce
|
| 48e9a7730db170c4dfd36156323cd54ddafe7117 |
14-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Add many contextual actions to new gallery
Change-Id: Ied57636c7bf0804ad015ddc664e177633c549e08
ndroid/gallery3d/app/MuteVideo.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/photos/AlbumSetFragment.java
ndroid/photos/MultiChoiceManager.java
ndroid/photos/PhotoSetFragment.java
ndroid/photos/SelectionManager.java
|
| 9591c24b04ef85f971f89ed8cf8b4b28f9d2eb9e |
14-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Requested RS method rename.
Change-Id: I2f158cb6cfb6ab23907e49c89f93681692e56dfb
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/filters/ImageFilterRS.java
|
| ae42bc21941565920db450ea68a7c5de3433196d |
14-Mar-2013 |
Michael Kolb <kolby@google.com> |
Merge "Fix exposure compensation" into gb-ub-photos-bryce
|
| 7e0ee8bbc790e2eef67f4bbe0cd1c5550d055ea9 |
14-Mar-2013 |
Michael Kolb <kolby@google.com> |
Fix exposure compensation
Bug: 8391082
Change-Id: I346b57dd0c1ed240ab4daa61147c2dd8f8892b44
ndroid/camera/CameraSettings.java
|
| b0c811a0a56de7cee718ce17ff8273c845d5007d |
14-Mar-2013 |
Justin Koh <justinkoh@google.com> |
Merge "Update Gallery Pano Provider." into gb-ub-photos-bryce
|
| 1c227156b0771f96ade6496d15326ecf416d8118 |
14-Mar-2013 |
Justin Koh <justinkoh@google.com> |
Update Gallery Pano Provider.
Update Gallery Pano Provider. Use DIP instead of PX.
Change-Id: I8871502aa215012a8647401f7ee1e7906e110fe4
ndroid/photos/canvas/CanvasProvider.java
|
| 8aa93945e2bc377261f39ac19e6968bc08a0b23b |
14-Mar-2013 |
Tim Murray <timmurray@google.com> |
Merge "Change element type to A_8 to support sampling." into gb-ub-photos-bryce
|
| 9a5247eeb3e0f606ed6fe02666b9edfc4a6b3f5f |
14-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fix image icons on Razr M." into gb-ub-photos-bryce
|
| 7a09fa86ed2b9bd00c8fbf9ec2dc861641b54a6f |
14-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fix image icons on Razr M.
Change-Id: I9f47dd043055fb5dc25dda643a3e9c81356bd0d5
ndroid/gallery3d/filtershow/ui/FilterIconButton.java
ndroid/gallery3d/filtershow/ui/IconButton.java
|
| 2a7d821f5c6c3532f9bdf9bdd83b8853fa6666bc |
14-Mar-2013 |
Tim Murray <timmurray@google.com> |
Change element type to A_8 to support sampling.
Change-Id: Ib91c924c9c2966bf431e24519af8ade7e360cf88
ndroid/gallery3d/filtershow/filters/ImageFilterRS.java
|
| 11d7e8d1eaad1f0a16e3deaa45e89a6452815e9d |
14-Mar-2013 |
Mangesh Ghiware <mghiware@google.com> |
Use plurals for table names for consistency.
Change-Id: I663c0085ed467f3f61f6060147374d9128967e2d
ndroid/photos/data/PhotoProvider.java
|
| 278fb4714d77bc0f9fe64a774b3a59561d51ad68 |
14-Mar-2013 |
Nicolas Roard <nicolasroard@google.com> |
Merge "Fix photo editor RS allocation on orientation change." into gb-ub-photos-bryce
|
| eb8ffe4b5f1c69ec037b5c2aecd97cb9bd20afbb |
14-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fix photo editor RS allocation on orientation change.
Bug: 8383050
Change-Id: Ic549d1f3fae22238dda08260cd7410c6054ce7b1
ndroid/gallery3d/filtershow/FilterShowActivity.java
|
| cd5c7040e91e0bdb3b966642d91b6de290fd1035 |
14-Mar-2013 |
Doris Liu <tianliu@google.com> |
Merge "Use Model-View-Controller pattern on video module" into gb-ub-photos-bryce
|
| 29fd4aa661f7e626a1d11558f09e8f7c011efcc2 |
12-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Exif parser modifications.
Bug: 8018327
Change-Id: I66a2ec309f9807ac255bbf29d8f5f26de60e89b8
ndroid/camera/Exif.java
ndroid/camera/PanoramaModule.java
ndroid/gallery3d/data/Exif.java
ndroid/gallery3d/data/LocalImage.java
ndroid/gallery3d/data/MediaDetails.java
ndroid/gallery3d/filtershow/cache/ImageLoader.java
ndroid/gallery3d/filtershow/tools/SaveCopyTask.java
|
| 6827ce281bd3a83ca2ffa552cd090e2b427c5f83 |
13-Mar-2013 |
Doris Liu <tianliu@google.com> |
Use Model-View-Controller pattern on video module
Change-Id: Id673efd1da9f53d4f74aab880504850152d1edfa
ndroid/camera/VideoController.java
ndroid/camera/VideoMenu.java
ndroid/camera/VideoModule.java
ndroid/camera/VideoUI.java
|
| acca4ee0fefe6442b853510b6b360f6cb7ad1bc5 |
13-Mar-2013 |
Angus Kong <shkong@google.com> |
Merge "Horizontal scrollable filmstrip view." into gb-ub-photos-bryce
|
| 7e57c641c1a53ce20b2194e2375e63412d6d14d0 |
13-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Sharing support for albums, bulk operations infrastructure" into gb-ub-photos-bryce
|
| 6616551e7d9bf78a6b630893602e63379e81ef2b |
22-Feb-2013 |
Angus Kong <shkong@google.com> |
Horizontal scrollable filmstrip view.
Change-Id: I076a07cd9a949ecdc8e4499b171b64e7becdbef2
ndroid/camera/data/CameraDataAdapter.java
ndroid/camera/ui/FilmStripView.java
|
| e0ebb91d3b5a740f04ec0d1339bd21a769e1a5c6 |
13-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Add coarse grained events for camera mode, filmstrip stats" into gb-ub-photos-bryce
|
| e2bc54a09412790da5ac7d19c52b964e49e14c25 |
09-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Sharing support for albums, bulk operations infrastructure
Change-Id: I590f60ab85ffbd9cf9d7cd9982627604fa1b427f
ndroid/photos/AlbumSetFragment.java
ndroid/photos/GalleryActivity.java
ndroid/photos/MultiChoiceManager.java
ndroid/photos/PhotoSetFragment.java
ndroid/photos/SelectionManager.java
ndroid/photos/adapters/AlbumSetCursorAdapter.java
ndroid/photos/data/AlbumSetLoader.java
ndroid/photos/data/PhotoSetLoader.java
ndroid/photos/shims/LoaderCompatShim.java
ndroid/photos/shims/MediaItemsLoader.java
ndroid/photos/shims/MediaSetLoader.java
|
| a27f45a5c142ec752f68ba752542972476dae8eb |
13-Mar-2013 |
Michael Kolb <kolby@google.com> |
Merge "Fix bug in exposure setting" into gb-ub-photos-bryce
|
| a335561b5d8e7237c725b3611742a8b11da7b897 |
13-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Added locking for FilteringPipeline and ImageFilterRS. Gets rid of leaked threads." into gb-ub-photos-bryce
|
| 963fffa259a557f3de917809ada0b6d54ee78066 |
13-Mar-2013 |
Michael Kolb <kolby@google.com> |
Fix bug in exposure setting
Bug: 8314498
Limit exposure compensation to -3 to 3;
some devices offer -4 to 4, and we don't have icons
covering that range
Change-Id: I2b334733c7630d57682b905d41dfe2ceb5641133
ndroid/camera/CameraSettings.java
|
| 2d0c9a59d3d742b9b42a133b29a6cfb9e3936ff7 |
13-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Added locking for FilteringPipeline and ImageFilterRS. Gets rid of leaked threads.
Bug: 8373600
Bug: 8363001
Bug: 8344345
Bug: 8264659
This CL fixes several things:
- FilteringPipeline no longer leaks a handler thread every time photoeditor is reopened.
- ImageFilterRS no longer leaks an RS context and thread every time photoeditor is reopened.
- ImageFilterRS now uses locking.
- ImageFilterRS no longer leaks Bitmap references or static renderscript allocations.
Change-Id: I79ebde1a8ba8ad689791c2af8db0c3c907e06399
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/cache/FilteringPipeline.java
ndroid/gallery3d/filtershow/filters/BaseFiltersManager.java
ndroid/gallery3d/filtershow/filters/ImageFilterRS.java
|
| 9bdae6d02381d1efeea91401be1d08d01ac30d7d |
13-Mar-2013 |
Michael Kolb <kolby@google.com> |
Merge "Fix Monkey NPE" into gb-ub-photos-bryce
|
| 2441ada50f4bfa3a6c59472ebd3b6339778b8b6b |
13-Mar-2013 |
Michael Kolb <kolby@google.com> |
Fix Monkey NPE
Bug: 8377895
Change-Id: Iaa89330e8c69961d700e0aab91d7855d579874f0
ndroid/camera/PhotoUI.java
|
| 03fc4e9aa172e091134d9dec8f51087cb6581c0d |
13-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Add coarse grained events for camera mode, filmstrip stats
Change-Id: I9c48f1646e9dff44efd27180065a6435110c5d16
ndroid/camera/ui/CameraSwitcher.java
ndroid/gallery3d/app/PhotoPage.java
|
| 0a7dd573732a06879b35cdd07a8c0ee08b62a32e |
13-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Usage statistics collection for camera module, filmstrip
Change-Id: Ib3e7dfb8948e99541f6d492c7d7bd4bfbad1e53d
ndroid/camera/PanoramaModule.java
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.java
ndroid/camera/ui/CameraSwitcher.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/app/StateManager.java
ndroid/gallery3d/ui/PhotoView.java
|
| b2edf4808b52024ca6f84bfa63e9d167407dc68d |
13-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix preview synchronization" into gb-ub-photos-bryce
|
| 79a8733231a81dcd79e10f50ec142005b537269c |
13-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Fix preview synchronization
Change-Id: Id6b5e5a140a3c366f2f5d4c29809e83ac1530d04
ndroid/gallery3d/filtershow/ImageStateAdapter.java
ndroid/gallery3d/filtershow/cache/FilteringPipeline.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
|
| 793207329f14517f2fd8998046acc2dfa52dc705 |
13-Mar-2013 |
John Reck <jreck@google.com> |
fix build
Change-Id: I41898041ad2e6d59973af30680288c436f3c6357
ndroid/photos/GalleryActivity.java
|
| e1bb3b1bcf1db22e82d9c44d55d168ea948cb309 |
13-Mar-2013 |
John Reck <jreck@google.com> |
basic activated support
Change-Id: If1c1faf42311ddbc76b617bff5f3c6bdafdef5d1
ndroid/photos/adapters/PhotoThumbnailAdapter.java
|
| fff0fbecb9f27e21c6e66a35861bcd8aa019db21 |
12-Mar-2013 |
John Reck <jreck@google.com> |
Use viewpager
Change-Id: Icd320799ce1e13815e34b2a0e45a9f6a47736de3
ndroid/photos/GalleryActivity.java
|
| b2fc6a4fb6519fd998d9691e244cdbab3587b54c |
12-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Add loading resources helper functions to ImageFilterRS" into gb-ub-photos-bryce
|
| 3243862413deeda922d2a1f087b89ceb789882b5 |
12-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Add loading resources helper functions to ImageFilterRS
Change-Id: I79b4996b5da0fa05536f2f53f770d01e9735b96c
ndroid/gallery3d/filtershow/filters/ImageFilterRS.java
|
| 9a8bf36157644e4f52c9bb3561575e6bdfcdb36a |
12-Mar-2013 |
George Mount <mount@google.com> |
Merge "Add delete cascade for Accounts." into gb-ub-photos-bryce
|
| 9bd3f529ee0dc79c9c9c5c9aa89309336e232a49 |
12-Mar-2013 |
George Mount <mount@google.com> |
Add delete cascade for Accounts.
Change-Id: I962c7cb657643c3eddbbeb6a691b26de5553d4df
ndroid/photos/data/PhotoProvider.java
|
| 2594ea2c0c650c6f0d03ce5575315dfd0787d189 |
12-Mar-2013 |
John Reck <jreck@google.com> |
Fix ICS compatibility issues
Change-Id: I43f3236b9da0424fde66d3ad4d46403223fde8bf
ndroid/photos/SelectionManager.java
ndroid/photos/adapters/PhotoThumbnailAdapter.java
ndroid/photos/views/SquareImageView.java
|
| 05a480847362eb9dbf57f73c83092e6a67f919f4 |
12-Mar-2013 |
George Mount <mount@google.com> |
Merge "Add support for local storage of uploaded pictures." into gb-ub-photos-bryce
|
| d42263b6cbd7ef47d6fa9d2f03ee9b88bc2a01c3 |
12-Mar-2013 |
Michael Kolb <kolby@google.com> |
Merge "Open camera only once in Video module" into gb-ub-photos-bryce
|
| b7e9fe88792cb2329bedb8af770236799177d44b |
12-Mar-2013 |
Michael Kolb <kolby@google.com> |
Open camera only once in Video module
Bug: 8272736
Change-Id: Id28fde5da62083651627dc8c734e818afe22a6e0
ndroid/camera/VideoModule.java
|
| b22a84a9baa7e64b5f9c77244c1586385e38a241 |
12-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Fix potential problem with default rsc number
Change-Id: I8205dbb2488232084f984a10963bb9286ff19e0e
ndroid/gallery3d/filtershow/filters/ImageFilterFx.java
|
| 1d3429626b5b6e46783169058285ee5fe8154da8 |
11-Mar-2013 |
George Mount <mount@google.com> |
Add support for local storage of uploaded pictures.
Change-Id: I23c86e6a95871effcb76a54b16b9ab7720a63383
ndroid/photos/data/PhotoProvider.java
|
| f39d8a0ce4081403cdc113f6d0f351a0b4756c45 |
12-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Fix layout on phones
Change-Id: I147b00f1abf032877c7461138ec78149bfd8b519
ndroid/gallery3d/filtershow/FilterShowActivity.java
|
| 57d885d112544f36d81c49033c470ae0dc619278 |
12-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Various bugfixes/improvements for Fx Filters:
- fix bug in history with Fx filters
- don't load Fx bitmaps at startup
- free bitmaps when unneeded
- fix history preview bitmaps
Change-Id: I5631a5bcec12c121871b3575066c201486896a14
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/HistoryAdapter.java
ndroid/gallery3d/filtershow/PanelController.java
ndroid/gallery3d/filtershow/filters/FilterFxRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterRepresentation.java
ndroid/gallery3d/filtershow/filters/ImageFilterFx.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
|
| aafbc72fb5aa2d67964c85b6c7c77dd00ae2c965 |
11-Mar-2013 |
John Hoford <hoford@google.com> |
fix menus for all editors
Change-Id: I93e7eef3176b38480d55df176166646709a875fe
ndroid/gallery3d/filtershow/editors/Editor.java
ndroid/gallery3d/filtershow/editors/EditorDraw.java
|
| 5cdaca858571b568c40ea0f1139e477a51859ef3 |
11-Mar-2013 |
Mangesh Ghiware <mghiware@google.com> |
Enable operations on accounts table.
Change-Id: Ida0e379cad422dbeffb3b4ea89232db7f45a36e4
ndroid/photos/data/PhotoProvider.java
|
| d3ebbcf13190110baddf3d60bc65400d2ff73099 |
11-Mar-2013 |
Michael Kolb <kolby@google.com> |
Merge "Spring cleaning" into gb-ub-photos-bryce
|
| f0765f183c87fc5ab47f5a05193a06f8fc95757e |
11-Mar-2013 |
John Hoford <hoford@google.com> |
split filter show into multiple files
Change-Id: I3d6b61ed893befa24a8c8306981d74096db91535
ndroid/gallery3d/filtershow/FilterShowActivity.java
|
| d6954f337e20365fc24ecffdd6f30e17c6b31eff |
09-Mar-2013 |
Michael Kolb <kolby@google.com> |
Spring cleaning
Change-Id: I00d7176301501784a6a400bc9ea2cb23ff9ec90a
ndroid/camera/CameraModule.java
ndroid/camera/FocusOverlayManager.java
ndroid/camera/MediaSaveService.java
ndroid/camera/PanoramaModule.java
ndroid/camera/PhotoController.java
ndroid/camera/PhotoMenu.java
ndroid/camera/PhotoModule.java
ndroid/camera/PhotoUI.java
ndroid/camera/PreviewGestures.java
ndroid/camera/VideoController.java
ndroid/camera/VideoMenu.java
ndroid/camera/VideoModule.java
|
| 887bde65742747aea7ab6dcf7c300ca8ec1f1ebf |
11-Mar-2013 |
John Hoford <hoford@google.com> |
refactoring to make Editor classes do more
Change-Id: Id0885929cf3a9410bd0e5d3bf96eb99e8c7e1cf9
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/PanelController.java
ndroid/gallery3d/filtershow/editors/BasicEditor.java
ndroid/gallery3d/filtershow/editors/Editor.java
ndroid/gallery3d/filtershow/editors/EditorCurves.java
ndroid/gallery3d/filtershow/editors/EditorStraighten.java
ndroid/gallery3d/filtershow/editors/EditorTinyPlanet.java
ndroid/gallery3d/filtershow/imageshow/GeometryMetadata.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
ndroid/gallery3d/filtershow/ui/ImageCurves.java
|
| b1aeb3963fb67b1ea251cb5f7790b2d2f8261a0c |
11-Mar-2013 |
Michael Kolb <kolby@google.com> |
Don't record video before preview is started
Bug: 8358998
Change-Id: I5d2380020b3e999f904b8a715324db13b25ebb5a
ndroid/camera/VideoModule.java
|
| 4ef1d738b796d9b6af448d9bfc46e262a97eafcd |
11-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Clear Gallery's bitmap pool before starting photoeditor.
Change-Id: Iaa1f559db12ba22e53673b2e9fe2c3fbabf33514
ndroid/gallery3d/filtershow/FilterShowActivity.java
|
| e0654dad632fa12959335dc68d6ae27b0d846376 |
11-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Revert "Clear Gallery's bitmap pool on photo editor start. Minor refactoring."" into gb-ub-photos-bryce
|
| 91cd1c2654ed9d7540be06569b548569aa9ecd28 |
11-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Revert "Clear Gallery's bitmap pool on photo editor start. Minor refactoring."
This reverts commit 65948b17607d6fab9a2561749a90e16889fd1eea
Change-Id: Iea682767fced173fe56dd6e91244f0ef70d1f74b
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/cache/ImageLoader.java
ndroid/gallery3d/filtershow/tools/BitmapTask.java
|
| 7b5e88bf8ce55d9b5bd757eada579422cee2a246 |
11-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Clear Gallery's bitmap pool on photo editor start. Minor refactoring." into gb-ub-photos-bryce
|
| 6320d90fb41fe1276a02b17fa27a660e76f21ba8 |
11-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Clear Gallery's bitmap pool on photo editor start. Minor refactoring.
Change-Id: I02e29bf6cfd85a9cecd3850f8828cccae91badd2
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/cache/ImageLoader.java
ndroid/gallery3d/filtershow/tools/BitmapTask.java
|
| 28bf7ac129344ca6306d83fc114759c9cf923806 |
09-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Add tiled background
Change-Id: I52292f6cae4f1121795829663dc4738cb38a953b
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/HistoryAdapter.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
|
| 976e017fa90c7134ef62cd69f61bbc08315b6042 |
09-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Clear border resources to save memory
Change-Id: I1bd9668eb3c7b2815bdc0123445185c8f9d21ad2
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java
ndroid/gallery3d/filtershow/filters/ImageFilterBorder.java
|
| 375705a63eea9dd2eb329d5ff42aeb9f9f73465c |
09-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Memory usage improvements, speed improvement - free filters resources agressively - implements multiple rendering pipelines - some cleanup" into gb-ub-photos-bryce
|
| 8f87def525800a584ea38bff209ceb1e80e95078 |
08-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Memory usage improvements, speed improvement
- free filters resources agressively
- implements multiple rendering pipelines
- some cleanup
Change-Id: Ib9ed268b0b2662d0bf5c049adcf046b556954c37
ndroid/gallery3d/filtershow/cache/BitmapCache.java
ndroid/gallery3d/filtershow/cache/Cache.java
ndroid/gallery3d/filtershow/cache/FilteringPipeline.java
ndroid/gallery3d/filtershow/cache/ImageLoader.java
ndroid/gallery3d/filtershow/cache/RenderingRequest.java
ndroid/gallery3d/filtershow/filters/BaseFiltersManager.java
ndroid/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java
ndroid/gallery3d/filtershow/filters/ImageFilter.java
ndroid/gallery3d/filtershow/filters/ImageFilterRS.java
ndroid/gallery3d/filtershow/filters/ImageFilterSharpen.java
ndroid/gallery3d/filtershow/imageshow/MasterImage.java
ndroid/gallery3d/filtershow/presets/FilterEnvironment.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
ndroid/gallery3d/filtershow/tools/SaveCopyTask.java
|
| 6333cb430ad3b354e0073266b58f8807b0b905ab |
09-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Add sharing support" into gb-ub-photos-bryce
|
| 755e327f63197c2798394bc805df8d98c2f6b6d3 |
07-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Add sharing support
Change-Id: I2c7f18b0d6dd057c1fba96c1133d563f32abf55c
ndroid/photos/GalleryActivity.java
ndroid/photos/PhotoSetFragment.java
ndroid/photos/SelectionManager.java
ndroid/photos/adapters/PhotoThumbnailAdapter.java
ndroid/photos/data/PhotoSetLoader.java
ndroid/photos/shims/BitmapJobDrawable.java
ndroid/photos/shims/MediaItemsLoader.java
|
| b04ff63a0c3b6dab780ead467586d3a52363a6d2 |
09-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Implements double-tap to zoom" into gb-ub-photos-bryce
|
| 0d84f476ed24922864f39d54e09274f6feac085e |
08-Mar-2013 |
John Reck <jreck@google.com> |
Support clicking on photos to view them
Change-Id: I511af0cbe46c833d81cbbd563b9c2b4feec2bffe
ndroid/photos/AlbumSetFragment.java
ndroid/photos/PhotoSetFragment.java
ndroid/photos/data/PhotoSetLoader.java
ndroid/photos/drawables/DrawableFactory.java
ndroid/photos/shims/LoaderCompatShim.java
ndroid/photos/shims/MediaItemsLoader.java
ndroid/photos/shims/MediaSetLoader.java
|
| 75f1d6c7f6d9cb32187ff7d1bc443916c496e38a |
08-Mar-2013 |
John Reck <jreck@google.com> |
Support rotation
Change-Id: Ic93bed50851f788803124ea2453128fd0497a746
ndroid/photos/shims/BitmapJobDrawable.java
|
| 7924bfe301b05c3c38b9b4c1ec9af541688facff |
08-Mar-2013 |
John Reck <jreck@google.com> |
Merge "Fix stuff" into gb-ub-photos-bryce
|
| 6a8ded56f04fdac34bad34bc22f34df69228b9e6 |
08-Mar-2013 |
John Reck <jreck@google.com> |
Fix stuff
Change-Id: Ib263a00a13f169388e6ee796359255fda2a26b37
ndroid/photos/AlbumSetFragment.java
ndroid/photos/PhotoSetFragment.java
ndroid/photos/shims/BitmapJobDrawable.java
ndroid/photos/shims/MediaItemsLoader.java
ndroid/photos/shims/MediaSetLoader.java
|
| 84931eeed7067c2607786fd3cd61b87d893d79f5 |
08-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Add possibility for UX improvement measurements" into gb-ub-photos-bryce
|
| e0a55d0735fd6f2fc48b1d960b6d353c2d8e72e9 |
07-Mar-2013 |
Tim Murray <timmurray@google.com> |
Merge "Add convertRGBAtoA." into gb-ub-photos-bryce
|
| 37dae82890a04fd4912d3a704066cb800712686f |
07-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Album set shim" into gb-ub-photos-bryce
|
| cc3d6dcfdf3070f78fbef2b458349db71d32844b |
07-Mar-2013 |
Tim Murray <timmurray@google.com> |
Add convertRGBAtoA.
Change-Id: I358bc0517480883c470df51189f46fb238fde101
ndroid/gallery3d/filtershow/filters/ImageFilterRS.java
ndroid/gallery3d/filtershow/filters/grey.rs
|
| e988eba768db85bb81b335c0c1db5aad6988480d |
07-Mar-2013 |
George Mount <mount@google.com> |
Merge "Add batch operations to PhotoProvider" into gb-ub-photos-bryce
|
| 07d00fa7535566d401ad4cf5002af626f907a514 |
07-Mar-2013 |
George Mount <mount@google.com> |
Add batch operations to PhotoProvider
Change-Id: I36b2f0305e2ef7502df7b896c8baedc86519ac52
ndroid/photos/data/NotificationWatcher.java
ndroid/photos/data/PhotoProvider.java
ndroid/photos/data/SQLiteContentProvider.java
|
| ef620effddf212694b61ccb26c36c968f1e7d626 |
07-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Album set shim
Change-Id: I12257ea09b7b5bc4b1d5ef638e685c66df86538a
ndroid/photos/AlbumSetFragment.java
ndroid/photos/data/AlbumSetLoader.java
ndroid/photos/shims/MediaSetLoader.java
|
| 9603a0c884208a0dc9ef906043387a1758a97656 |
07-Mar-2013 |
John Reck <jreck@google.com> |
recycle bitmaps
Change-Id: I3afda4f009fda07b4e2858cb65dee4444f8484e5
ndroid/photos/shims/BitmapJobDrawable.java
|
| 5e46468ff8bce4c2912b9f5fb64df68f24f281cc |
07-Mar-2013 |
Mangesh Ghiware <mghiware@google.com> |
Remove redundant Album NAME (replaced by TITLE)
Change-Id: I0482f8b4bd85e07aefe4af02b1e8dab4702eb9f6
ndroid/photos/data/PhotoDatabase.java
ndroid/photos/data/PhotoProvider.java
|
| 2678d9626f3efc6b0728de52c193598ecef02a8a |
07-Mar-2013 |
George Mount <mount@google.com> |
Merge "Add inserts to PhotoProvider." into gb-ub-photos-bryce
|
| 74fe1bc1bcbcef4a49eb68b4ef985d80912f7da9 |
07-Mar-2013 |
George Mount <mount@google.com> |
Merge "Add album cover art downloading." into gb-ub-photos-bryce
|
| 3360e27e1d0e37f803c10f27257a81b2600b209c |
07-Mar-2013 |
George Mount <mount@google.com> |
Add inserts to PhotoProvider.
Change-Id: Ie91df59975d185948c7c2fd96432d311847c3e00
ndroid/photos/data/PhotoProvider.java
|
| b07453fb2522b82a2f2e5f8c98279dfb9b56ec4d |
07-Mar-2013 |
George Mount <mount@google.com> |
Add album cover art downloading.
Change-Id: I660761c3bf59b1b314be9674fc3f1e43f307c686
ndroid/photos/data/PhotoProvider.java
|
| 4154324ca8480c13d9c4e22d8303d425a4e5d7d3 |
07-Mar-2013 |
John Reck <jreck@google.com> |
Merge "Data provider shim" into gb-ub-photos-bryce
|
| dc0bb6232a45a646799db8a79e9d678c494fc956 |
07-Mar-2013 |
John Reck <jreck@google.com> |
Data provider shim
Bolt the new UI framework on top of the old data model temporarily
to unblock UI work
Change-Id: I2f61f70647faca1f6a95b1f02f719ec4277fa5fb
ndroid/photos/PhotoSetFragment.java
ndroid/photos/data/MediaSetLoader.java
ndroid/photos/data/PhotoSetLoader.java
ndroid/photos/drawables/DrawableFactory.java
ndroid/photos/shims/BitmapJobDrawable.java
ndroid/photos/shims/MediaItemsLoader.java
ndroid/photos/shims/MediaSetLoader.java
|
| 0625b81efa0b98f54f45827316d03b03dda0e2ed |
07-Mar-2013 |
George Mount <mount@google.com> |
Merge "Add required fields to PhotoProvider." into gb-ub-photos-bryce
|
| f73f725d0b5d771b77041349fbad6e9f02023f87 |
06-Mar-2013 |
George Mount <mount@google.com> |
Add required fields to PhotoProvider.
Change-Id: I1e830702412d4431ba3b01fe4945a4818385b6cd
ndroid/photos/data/PhotoDatabase.java
ndroid/photos/data/PhotoProvider.java
|
| 124225a1dbea6ea2c66879804f259d74e31ab4fc |
07-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Preliminary AlbumSet UI" into gb-ub-photos-bryce
|
| 556713fa25b492b6cba9ed8bf4ea6e2f56298fb5 |
06-Mar-2013 |
Doris Liu <tianliu@google.com> |
Fix camera switcher mode picker
Bug: 8330008
Change-Id: I08ccd38a6898e88d28214cceb22cee6688ce0b3f
ndroid/camera/ui/CameraSwitcher.java
|
| 8cfb75ad0f0c60e5115b1c0feb3d717ab4e4bfee |
06-Mar-2013 |
John Hoford <hoford@google.com> |
Merge "fix undo bug" into gb-ub-photos-bryce
|
| 8c500a4700889c62d5e9e1d457d73e3ea9ac3f59 |
06-Mar-2013 |
John Hoford <hoford@google.com> |
fix undo bug
bug:8319433
Change-Id: If6bea005677b63267130d446e7b0298d21bbb3be
ndroid/gallery3d/filtershow/FilterShowActivity.java
|
| 5b45e26674bcbb91bdc195bed15a897ba3b96b0e |
06-Mar-2013 |
Doris Liu <tianliu@google.com> |
Fix NPE in switcher popup
Bug: 8327966
Change-Id: I4181a59871c065435756c100b3e8b43930781ee5
ndroid/camera/ui/CameraSwitcher.java
|
| 3aff80f9b0e4507b0f0775b581b4518a01e34da0 |
06-Mar-2013 |
Doris Liu <tianliu@google.com> |
Merge "Add a black bar symmetric to nav bar" into gb-ub-photos-bryce
|
| e07aedb584f9604e0b18929647fd31fe5dcc1b9f |
06-Mar-2013 |
Doris Liu <tianliu@google.com> |
Merge "Keep camera controls on the same physical side" into gb-ub-photos-bryce
|
| 09106a41ee6acc6b20553662cb9b730702a8f08a |
05-Mar-2013 |
Doris Liu <tianliu@google.com> |
Add a black bar symmetric to nav bar
Also fix bug: 8323926
Change-Id: I4886b285dee8ad71ad72a55e96bf699b7c18c9f4
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoModule.java
|
| 8485a62af07a376e6741ff7c6b8c7c6b6d9ebc61 |
04-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Preliminary AlbumSet UI
Change-Id: Ie99bd2939bfcb47c80605cbb22b84b1064098e91
ndroid/photos/AlbumSetFragment.java
ndroid/photos/data/AlbumSetLoader.java
ndroid/photos/drawables/AutoThumbnailDrawable.java
|
| e287f5b9af06ffbf7fcddd97342d140df921f75a |
06-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Implements double-tap to zoom
Change-Id: I716d847d6320504c963b197f11b0deea1fc338cb
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
ndroid/gallery3d/filtershow/imageshow/MasterImage.java
|
| 542c3832c24909c6f43b9b91fed4931a850b2fef |
05-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Improves visual history
Change-Id: Ie43e99777d590a504b068d81f327119cca03b9d9
ndroid/gallery3d/filtershow/FilterShowActivity.java
|
| 48239f4dd39040a9ab2ffc977586035a8784fd78 |
05-Mar-2013 |
Doris Liu <tianliu@google.com> |
Keep camera controls on the same physical side
Change-Id: I09c50650c77a89fadfeb376564ef43e750994f8a
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoModule.java
ndroid/camera/ShutterButton.java
ndroid/camera/ui/CameraSwitcher.java
ndroid/camera/ui/RotatableLayout.java
|
| 6aa73e7615a165c185778c238a7d6c73b6b56eff |
05-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Visual History
Change-Id: I3397c44b8c47985c97de5b82456c03469b2fb8db
ndroid/gallery3d/filtershow/HistoryAdapter.java
ndroid/gallery3d/filtershow/cache/RenderingRequest.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
ndroid/gallery3d/filtershow/imageshow/MasterImage.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
|
| 72db7ea0c18e5cc2f465252b53d9b6d2a8dcc6a0 |
05-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Simplify and speed up thumbnail creation" into gb-ub-photos-bryce
|
| b692dff92bc6caa24b546df1aa8a0b4c39e57112 |
05-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Simplify and speed up thumbnail creation
Change-Id: I1423573c600a807081f81d3cb3036b690e426f9e
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/imageshow/MasterImage.java
ndroid/gallery3d/filtershow/ui/FilterIconButton.java
|
| 377b9710723e1a316be0574fcbc4bb78dd9b11c9 |
05-Mar-2013 |
John Hoford <hoford@google.com> |
fixed vignetnette refresh during pan/zoom
Change-Id: I6bcc13cdd5232a15f199d8f64258c450f045c1cf
ndroid/gallery3d/filtershow/imageshow/ImageVignette.java
|
| 27ebe00df84917c6aeee22350ddf62129611c4f8 |
05-Mar-2013 |
John Hoford <hoford@google.com> |
fix tiny planet shown after rotation
Change-Id: Ia27f424c7936b8f3c7fb69d3b80966d4f364f116
ndroid/gallery3d/filtershow/FilterShowActivity.java
|
| 6e998555df98738bfc0f5a4290791c83aa6cee09 |
05-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Improves state/history panel behaviour
Change-Id: Icfd071aa5de11f1fe8cbba34f2837d5a850f9a68
ndroid/gallery3d/filtershow/FilterShowActivity.java
|
| 1bf3f3238727cc73a156e3eb61a2d2343ac3bdc0 |
05-Mar-2013 |
George Mount <mount@google.com> |
Merge "Fix build break." into gb-ub-photos-bryce
|
| 65fe4bb42ce4e517e6c51aa357a5a40747d462a7 |
05-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "UI cleanup" into gb-ub-photos-bryce
|
| 00c8b427b4371748b339be9660f61e3d1f6ece41 |
05-Mar-2013 |
George Mount <mount@google.com> |
Fix build break.
Change-Id: If19356395fe005a98036888cd9a688c4d36720ea
ndroid/photos/data/PhotoProvider.java
|
| b69f9cb14c4d47ab681f50379bfbada4b1bd00d0 |
05-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
UI cleanup
Change-Id: Iaf138455651511e610b640a716820bd846284948
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/filters/BaseFiltersManager.java
ndroid/gallery3d/filtershow/filters/FilterDrawRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java
|
| 50f73c1ffef9cc470936cf85103eaa895bcfd1f8 |
05-Mar-2013 |
George Mount <mount@google.com> |
Merge "Update PhotoProvider and tests to allow tests to run against GalleryGoogle.apk" into gb-ub-photos-bryce
|
| c0a5c3b8cd7d9724b0f9b692008283abc750f0d0 |
28-Feb-2013 |
George Mount <mount@google.com> |
Update PhotoProvider and tests to allow tests to run against GalleryGoogle.apk
Change-Id: I6630e7a5ba0883b887915f63094885a2dc9f025c
ndroid/photos/data/NotificationWatcher.java
ndroid/photos/data/PhotoDatabase.java
ndroid/photos/data/PhotoProvider.java
|
| e9f4e8c565de133a6cc16e562050d304e02e4cb6 |
04-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Clean up comments" into gb-ub-photos-bryce
|
| 011dd556c4058a7832a584298f68c637a0eee0cd |
04-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Clean up comments
Change-Id: I29e6d7ffef6b6b319262982709794aadd7919d8c
ndroid/photos/drawables/AutoThumbnailDrawable.java
|
| ee4db343e856800b141dcf4d69fe96b1270339e4 |
04-Mar-2013 |
Doris Liu <tianliu@google.com> |
Merge "Flatten view hierarchy and rotate views" into gb-ub-photos-bryce
|
| 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
ndroid/camera/CameraActivity.java
ndroid/camera/CameraModule.java
ndroid/camera/PanoramaModule.java
ndroid/camera/PhotoModule.java
ndroid/camera/PreviewFrameLayout.java
ndroid/camera/ShutterButton.java
ndroid/camera/VideoModule.java
ndroid/camera/ui/CameraSwitcher.java
ndroid/camera/ui/RotatableLayout.java
|
| 22fc7aac58ceceea9aaa391023cab8a02a8eb004 |
02-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Refactor AutoThumbnailDrawable, fix race conditions" into gb-ub-photos-bryce
|
| 232aa1369beb0a26a35b7792b8a927e09023961f |
01-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Refactor AutoThumbnailDrawable, fix race conditions
Change-Id: I80243ee177387e0d9b309acb5a7c1d364cc73530
ndroid/photos/PhotoSetFragment.java
ndroid/photos/drawables/AutoThumbnailDrawable.java
ndroid/photos/drawables/DataUriThumbnailDrawable.java
ndroid/photos/drawables/MtpThumbnailDrawable.java
|
| 56c35f8f9c173e618df34f94df6b4a0269bd7da5 |
01-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Fix preview rendering speed...
Change-Id: I6a6ba3c14a91d60446f28f5dce52fd3c4bc49f79
ndroid/gallery3d/filtershow/imageshow/GeometryMetadata.java
ndroid/gallery3d/filtershow/imageshow/MasterImage.java
|
| 2e1f31c7cd69892886e608a103cb05d338fe43b2 |
01-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Fix disappearing border thumbnails
Change-Id: I9ed43646a353658a590354f13e51dc96fa760442
ndroid/gallery3d/filtershow/FilterShowActivity.java
|
| d167e2fccc895a59a31afe47233bb1766809ddfb |
28-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Improves State panel and Refactor FilterShowActivity
- handles multiple xml layout
- add a portrait layout
- improves the state panel (delete, etc.)
Change-Id: I29762c99cdd467db8705174c660304c8ed673ce2
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/ImageStateAdapter.java
ndroid/gallery3d/filtershow/MovableLinearLayout.java
ndroid/gallery3d/filtershow/PanelController.java
ndroid/gallery3d/filtershow/imageshow/MasterImage.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
ndroid/gallery3d/filtershow/ui/FilterIconButton.java
|
| 5bb3cf43dd8470fc692f9b634967b2dc89dc1ee9 |
01-Mar-2013 |
John Hoford <hoford@google.com> |
fix imports
Change-Id: I07ac06ae4890bfcae48ea404cf7e67c2b0c084d7
ndroid/gallery3d/filtershow/EditorPlaceHolder.java
ndroid/gallery3d/filtershow/HistoryAdapter.java
ndroid/gallery3d/filtershow/ImageStateAdapter.java
ndroid/gallery3d/filtershow/cache/ImageLoader.java
ndroid/gallery3d/filtershow/cache/TripleBufferBitmap.java
ndroid/gallery3d/filtershow/colorpicker/ColorGridDialog.java
ndroid/gallery3d/filtershow/editors/BasicEditor.java
ndroid/gallery3d/filtershow/editors/EditorRedEye.java
ndroid/gallery3d/filtershow/editors/EditorTinyPlanet.java
ndroid/gallery3d/filtershow/editors/EditorVignette.java
ndroid/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterRepresentation.java
ndroid/gallery3d/filtershow/filters/ImageFilter.java
ndroid/gallery3d/filtershow/filters/ImageFilterBorder.java
ndroid/gallery3d/filtershow/filters/ImageFilterCurves.java
ndroid/gallery3d/filtershow/filters/ImageFilterDraw.java
ndroid/gallery3d/filtershow/filters/ImageFilterFx.java
ndroid/gallery3d/filtershow/filters/ImageFilterHighlights.java
ndroid/gallery3d/filtershow/filters/ImageFilterKMeans.java
ndroid/gallery3d/filtershow/filters/ImageFilterParametricBorder.java
ndroid/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
ndroid/gallery3d/filtershow/filters/ImageFilterVignette.java
ndroid/gallery3d/filtershow/imageshow/ImageCrop.java
ndroid/gallery3d/filtershow/imageshow/ImageDraw.java
ndroid/gallery3d/filtershow/imageshow/ImageGeometry.java
ndroid/gallery3d/filtershow/imageshow/ImagePoint.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
ndroid/gallery3d/filtershow/imageshow/ImageStraighten.java
ndroid/gallery3d/filtershow/imageshow/ImageTinyPlanet.java
ndroid/gallery3d/filtershow/ui/FilterIconButton.java
ndroid/gallery3d/filtershow/ui/IconButton.java
|
| 4b3084078c1c503e0d7ba17dfadc244ab246da06 |
01-Mar-2013 |
John Reck <jreck@google.com> |
Merge "Fix crash if a tile ends up with a width or height of 0" into gb-ub-photos-bryce
|
| 86d9386787c95ac8c98b661e69c458aa8de0e02a |
01-Mar-2013 |
John Hoford <hoford@google.com> |
Merge "fixed hiding of tiny planet" into gb-ub-photos-bryce
|
| 82148a5664f7d14712c6e9d5d7bb9d2a6374304e |
01-Mar-2013 |
John Hoford <hoford@google.com> |
fixed hiding of tiny planet
Change-Id: I0d23a640cf4aee5ae03e6552637ba3663db85bde
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/PanelController.java
ndroid/gallery3d/filtershow/imageshow/EclipseControl.java
|
| 9d999905fdd75a2f6fce89ef7e73815d206d54f5 |
01-Mar-2013 |
John Reck <jreck@google.com> |
Fix crash if a tile ends up with a width or height of 0
Bug: 8242279
Change-Id: Id8f9d85b46f07fb5aea8063a081524b9a3d992ae
ndroid/gallery3d/glrenderer/BasicTexture.java
|
| 6af159148657ac1c10652a29ae415b14d5a41930 |
01-Mar-2013 |
John Reck <jreck@google.com> |
Merge "Add full screen image view" into gb-ub-photos-bryce
|
| 053580e9890d528f8adb9e20e7e84618f89e823b |
28-Feb-2013 |
John Reck <jreck@google.com> |
Add full screen image view
Change-Id: I5b3db9ce4c86788b640a48bafa87cd9e952739d4
ndroid/photos/BitmapRegionTileSource.java
ndroid/photos/FullscreenViewer.java
ndroid/photos/PhotoSetFragment.java
ndroid/photos/views/BlockingGLTextureView.java
ndroid/photos/views/TiledImageRenderer.java
ndroid/photos/views/TiledImageView.java
|
| d6feb46dacd76ae0a4cc97f24e1c0a07515e6055 |
01-Mar-2013 |
John Reck <jreck@google.com> |
Fix race condition
Change-Id: I6cf9207d067d4c0c3c4271d6ce6f44b213d7296b
ndroid/photos/data/GalleryBitmapPool.java
|
| facd6eec5e6e5ff63725d00a791662c462c111c4 |
01-Mar-2013 |
John Reck <jreck@google.com> |
Clarify threading, cleanup locking
Bug: 8285317
Change-Id: I8b1b0eda74a41f388e97fee6bcd4ce948bb6e15a
ndroid/photos/drawables/AutoThumbnailDrawable.java
|
| 20b5ca5bfa5e07db5f909c0869d1c758c586d7d9 |
28-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix for applied ratios
Change-Id: Idbb7366522751c4b330cc99b88129df5808048e9
ndroid/gallery3d/filtershow/editors/EditorCrop.java
ndroid/gallery3d/filtershow/editors/EditorFlip.java
ndroid/gallery3d/filtershow/editors/EditorRotate.java
ndroid/gallery3d/filtershow/editors/EditorStraighten.java
|
| 67e00e042fab5f5234bfa7c33148724d9119b817 |
28-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix crop ratio
bug:8291961
Change-Id: Ia279c35115fbfc0774505bf3318b7fac7d84d2eb
ndroid/gallery3d/filtershow/imageshow/ImageCrop.java
|
| 1a07da3cd8060d49afabd11df33044ff9d05b48e |
28-Feb-2013 |
Nicolas Roard <nicolasroard@google.com> |
Revert "Cleanup ImagePreset"
This reverts commit 0f0765676e5be73c7187a44ee88e500ab691bf01
Change-Id: Id5a7eec61cdac3d57c8c4c790d24adf258410545
ndroid/gallery3d/filtershow/imageshow/GeometryMetadata.java
ndroid/gallery3d/filtershow/imageshow/MasterImage.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
ndroid/gallery3d/filtershow/ui/FilterIconButton.java
|
| ec5da88505d9b3c1562b13ce8448bc1a6b02ed27 |
28-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Cleanup ImagePreset
Change-Id: I89e180293a290adb76d4fc8a9a8965fa1445440e
ndroid/gallery3d/filtershow/imageshow/GeometryMetadata.java
ndroid/gallery3d/filtershow/imageshow/MasterImage.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
ndroid/gallery3d/filtershow/ui/FilterIconButton.java
|
| 0483c7cc6d321fd6e07dc602f6bac69bc365a401 |
28-Feb-2013 |
John Hoford <hoford@google.com> |
crop fix
Change-Id: Ie2e79992bf45fffb0ae00c4a4fd879546fa1450f
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/cache/ImageLoader.java
ndroid/gallery3d/filtershow/editors/EditorCrop.java
ndroid/gallery3d/filtershow/imageshow/MasterImage.java
|
| a510868d10c0977acb232a9e0eba3284b3bd4250 |
28-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix full res preview
Change-Id: Ia727d06b9ff9866dfbb883968a23c0ed105e57fa
ndroid/gallery3d/filtershow/cache/FilteringPipeline.java
|
| 7313e0cd0eb903e91b6bc166ad74145b294dd814 |
28-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix scale and full res preview
Change-Id: Ie432c2d1d631c37f54bd144c22d62cd59d7a665d
ndroid/gallery3d/filtershow/cache/ImageLoader.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
|
| 1e3384b2f7b01c104e76d5dd538fcb8967017b68 |
28-Feb-2013 |
John Hoford <hoford@google.com> |
Merge "refactor the geometry code" into gb-ub-photos-bryce
|
| 63cc04c3b51d544598c8af5c8c16a29b1e902a26 |
27-Feb-2013 |
John Hoford <hoford@google.com> |
refactor the geometry code
Change-Id: I5b0381ec5e127aabf37924af64fbeb490755bc9a
ndroid/gallery3d/filtershow/EditorPlaceHolder.java
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/PanelController.java
ndroid/gallery3d/filtershow/cache/ImageLoader.java
ndroid/gallery3d/filtershow/editors/EditorCrop.java
ndroid/gallery3d/filtershow/editors/EditorFlip.java
ndroid/gallery3d/filtershow/editors/EditorInfo.java
ndroid/gallery3d/filtershow/editors/EditorRotate.java
ndroid/gallery3d/filtershow/editors/EditorStraighten.java
ndroid/gallery3d/filtershow/filters/BaseFiltersManager.java
ndroid/gallery3d/filtershow/filters/FilterRepresentation.java
ndroid/gallery3d/filtershow/filters/ImageFilterGeometry.java
ndroid/gallery3d/filtershow/imageshow/GeometryMetadata.java
ndroid/gallery3d/filtershow/imageshow/ImageCrop.java
ndroid/gallery3d/filtershow/imageshow/ImageFlip.java
ndroid/gallery3d/filtershow/imageshow/ImageGeometry.java
ndroid/gallery3d/filtershow/imageshow/ImageRotate.java
ndroid/gallery3d/filtershow/imageshow/ImageStraighten.java
ndroid/gallery3d/filtershow/imageshow/MasterImage.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
ndroid/gallery3d/filtershow/ui/FilterIconButton.java
|
| dc6bc364aa2de2ffb2dde33efd661311fa4f1c95 |
28-Feb-2013 |
Justin Koh <justinkoh@google.com> |
Merge "Updated Gallery2 with Pano." into gb-ub-photos-bryce
|
| d878376c09d6cf65b0af051dd4241deab66bbf3d |
28-Feb-2013 |
Justin Koh <justinkoh@google.com> |
Updated Gallery2 with Pano.
Updated Gallery2 with Pano.
Bug: 8263808
Change-Id: Iedaba9dc478fb20480f3b37e9708bc8d67cf6003
ndroid/photos/canvas/CanvasActivity.java
ndroid/photos/canvas/CanvasProvider.java
ndroid/photos/canvas/CanvasProviderBase.java
oogle/android/canvas/data/Cluster.java
oogle/android/canvas/data/util/UriUtils.java
oogle/android/canvas/provider/CanvasContract.java
oogle/android/pano/data/Cluster.java
oogle/android/pano/data/util/UriUtils.java
oogle/android/pano/provider/PanoContract.java
|
| 089b1490d0ead0512e734e6f23b70e7bbdf885e0 |
27-Feb-2013 |
Michael Kolb <kolby@google.com> |
Merge "Highlight menu selection better" into gb-ub-photos-bryce
|
| ebcf6fed531d00cfb6900a1fb5d83c60aa7f9693 |
27-Feb-2013 |
Michael Kolb <kolby@google.com> |
Highlight menu selection better
Keep the selected slice highlighted longer before fading out
Timing might need further adjusting
Change-Id: I9c3febf4ad2b73f2c80d47259fa9cd7578445dd4
ndroid/camera/ui/PieRenderer.java
|
| 7c3ff29f5d187a9f8c660f8571a43f5a91b46836 |
27-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix vignette startup draw
Change-Id: Ifaab3167e44db05be6c788e10d234975b1f51b56
ndroid/gallery3d/filtershow/imageshow/ImageVignette.java
|
| 076446478f0034de3b563b28f12c18cf62395d7a |
27-Feb-2013 |
John Reck <jreck@google.com> |
Merge "Thumbnails for PhotoSetPage" into gb-ub-photos-bryce
|
| 5c9eeb4916824dcce3a2271d5677a9a925a35938 |
27-Feb-2013 |
John Reck <jreck@google.com> |
Thumbnails for PhotoSetPage
Change-Id: I8d62b4ca0d0902ca2a18b087a344d35d17a97fa7
ndroid/photos/PhotoSetFragment.java
ndroid/photos/drawables/AutoThumbnailDrawable.java
ndroid/photos/views/GalleryThumbnailView.java
|
| ee556ffc31da361596ca13021bbdd11ba9b30c2b |
26-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
FilterShowActivity cleanup
Change-Id: Iac674c6ca981b7dafb76af3602c75b925d4cbbed
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/PanelController.java
|
| a79f94b38f82ce20cff5b4bbb45a110c96ddb9ab |
26-Feb-2013 |
John Hoford <hoford@google.com> |
Merge "add upoint" into gb-ub-photos-bryce
|
| 178b04f4cea6dcbe0f84f0f189e9280d4c0d1442 |
21-Feb-2013 |
George Mount <mount@google.com> |
Add initial implementation of PhotosProvider.
Change-Id: I98694cf54bd0fb549703a7184e1816e9590a05ff
ndroid/photos/data/PhotoDatabase.java
ndroid/photos/data/PhotoProvider.java
|
| bdfaf6b49802ad9073adac89237076a1268bbdb1 |
26-Feb-2013 |
John Hoford <hoford@google.com> |
add upoint
Change-Id: I484d2c6658e4ea06e22fa037ef2262c17b9e8d79
ndroid/gallery3d/filtershow/PanelController.java
ndroid/gallery3d/filtershow/imageshow/EclipseControl.java
|
| aae069d8a006e4664414df56750b86844825b39c |
26-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Disable full res when dealing with jpeg orientation
Change-Id: Ie29f25addcb66a6c8a2effa2bfbf89155ce6465a
ndroid/gallery3d/filtershow/presets/ImagePreset.java
|
| a59102e397360b94ba921e3b574f8eb52acd474d |
26-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix compare swipe
bug:8266511
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
|
| fb68b59d4a6677c9d41b621133c93551d6a93d49 |
26-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix crash on applying borders" into gb-ub-photos-bryce
|
| 5a8f86ddfe3030af349bce1c4a3b48835f0156e1 |
26-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix crash on applying borders
bug:8265497
Change-Id: I7e6b22cb7666fd3876119051552e34e91df894a2
ndroid/gallery3d/filtershow/cache/FilteringPipeline.java
ndroid/gallery3d/filtershow/cache/ImageLoader.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
|
| b47db2e6d04a8bb2aa8f62f6149526593d0def52 |
26-Feb-2013 |
Michael Kolb <kolby@google.com> |
Merge "Use cross fade rotation animation" into gb-ub-photos-bryce
|
| 08650187c1f1a2d1ef7f754be0f479a29958daaa |
26-Feb-2013 |
Michael Kolb <kolby@google.com> |
Use cross fade rotation animation
Bug: 8257846
Change-Id: I891eda12f3de2ec0cd0f7672b991a19e6464873c
ndroid/camera/CameraActivity.java
|
| f26b3580d1f2f9a3736fb77aebf0ebb9d5a33001 |
26-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fixed more of filtershows large bitmap reference leaks.
Bug: 8253109
Change-Id: Iaff381e759d02baae701a01d6c081c49f4b3c772
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/cache/FilteringPipeline.java
ndroid/gallery3d/filtershow/filters/BaseFiltersManager.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
ndroid/gallery3d/filtershow/ui/ImageCurves.java
|
| a84dd7a82442ed41e7671b84c9d2c5ab744b25a7 |
14-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
Add possibility for UX improvement measurements
Bug: 4293199
Change-Id: I45f8a63c676c8d7700c422a0a18f799fb6d02d2e
ndroid/gallery3d/app/AbstractGalleryActivity.java
ndroid/gallery3d/app/GalleryAppImpl.java
ndroid/gallery3d/app/StateManager.java
|
| 02ef5ba117462eda524820b6004f84d26b28f647 |
23-Feb-2013 |
Doris Liu <tianliu@google.com> |
Merge "Release surface texture to fix gray camera preview" into gb-ub-photos-bryce
|
| b8cf250c6351cd96f069fd16087db5e7b0f6b1d6 |
22-Feb-2013 |
Doris Liu <tianliu@google.com> |
Release surface texture to fix gray camera preview
Bug: 8133672
Change-Id: Ie71c8fd1ea07a19eccf5bbd773054e095426fe80
ndroid/camera/PhotoModule.java
|
| 608ef5cf3a15f235aa7b6d80924edbdb0fda365b |
15-Feb-2013 |
John Reck <jreck@google.com> |
Start of photos
Change-Id: Id53dd96d8873e0fe6c2685e07cd7bdc0cde7ea75
ndroid/gallery3d/data/DataManager.java
ndroid/photos/AlbumSetFragment.java
ndroid/photos/GalleryActivity.java
ndroid/photos/PhotoFragment.java
ndroid/photos/PhotoSetFragment.java
ndroid/photos/data/MediaSetLoader.java
ndroid/photos/data/PhotoSetLoader.java
|
| f3e14d196191672129e2897e25627cc41f5f6534 |
22-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Stopgap fixes for more of the photo editor's memory issues." into gb-ub-photos-bryce
|
| 5ebc5b3bc483b6c16aab9138995bb83f81ffc0c1 |
22-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Stopgap fixes for more of the photo editor's memory issues.
Bug: 8253109
Bug: 8233895
Change-Id: Idd55618807ff0a0c5ac0cbb8c71db167fa32e70b
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/cache/FilteringPipeline.java
ndroid/gallery3d/filtershow/cache/ImageLoader.java
ndroid/gallery3d/filtershow/filters/ImageFilter.java
ndroid/gallery3d/filtershow/filters/ImageFilterRS.java
|
| ab893207b973361784ee1b57533134765a897627 |
22-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Revert "Stopgap fixes for more of the photo editor's memory issues."" into gb-ub-photos-bryce
|
| 9110226b1852334dd98c548dbd927600684684d5 |
22-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Revert "Stopgap fixes for more of the photo editor's memory issues."
This reverts commit 4c91156f9a2e48ebaec86e3a46ea9b7855392cfd
Change-Id: If94d87fd4d84bd518b7cc113c3cd422b59fdd3ed
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/cache/FilteringPipeline.java
ndroid/gallery3d/filtershow/cache/ImageLoader.java
ndroid/gallery3d/filtershow/filters/ImageFilter.java
ndroid/gallery3d/filtershow/filters/ImageFilterRS.java
|
| 9022b7185a5fe80d761f88fe362469b65923b1e8 |
22-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Stopgap fixes for more of the photo editor's memory issues." into gb-ub-photos-bryce
|
| 74bb3319af75a0022da94ec0159aead33612ae29 |
22-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Stopgap fixes for more of the photo editor's memory issues.
Bug: 8253109
Bug: 8233895
Change-Id: I676b6749f3b273a431323609add01e82b88db456
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/cache/FilteringPipeline.java
ndroid/gallery3d/filtershow/cache/ImageLoader.java
ndroid/gallery3d/filtershow/filters/ImageFilter.java
ndroid/gallery3d/filtershow/filters/ImageFilterRS.java
|
| e1c1c9b36ef36679ff2cd87ee7771c4d54be024d |
22-Feb-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Replace various BitmapPools with a smarter unified pool" into gb-ub-photos-bryce
|
| 11cfeeddedd61d3c4aa40945fef0bc2d87c7559d |
20-Feb-2013 |
Bobby Georgescu <georgescu@google.com> |
Replace various BitmapPools with a smarter unified pool
Make all of gallery use a single shared pool, and pave the
way for making the pool more adaptive based on the current
workload.
Change-Id: Ia32561ad50b1b9716ebe2fd32a7bf02737685dac
ndroid/gallery3d/app/AbstractGalleryActivity.java
ndroid/gallery3d/app/PhotoDataAdapter.java
ndroid/gallery3d/data/BitmapPool.java
ndroid/gallery3d/data/DecodeUtils.java
ndroid/gallery3d/data/ImageCacheRequest.java
ndroid/gallery3d/data/MediaItem.java
ndroid/gallery3d/ingest/IngestService.java
ndroid/gallery3d/ingest/data/MtpBitmapFetch.java
ndroid/gallery3d/ui/AlbumLabelMaker.java
ndroid/gallery3d/ui/AlbumSetSlidingWindow.java
ndroid/gallery3d/ui/AlbumSlidingWindow.java
ndroid/gallery3d/ui/BitmapLoader.java
ndroid/gallery3d/ui/BitmapTileProvider.java
ndroid/gallery3d/ui/TileImageView.java
ndroid/gallery3d/ui/TileImageViewAdapter.java
ndroid/gallery3d/ui/TiledScreenNail.java
ndroid/photos/data/GalleryBitmapPool.java
ndroid/photos/data/SparseArrayBitmapPool.java
|
| bd940c98109d8cf605d81281add83ffe787c4842 |
22-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Don't apply the filters twice in partial rendering...
Change-Id: I5ddcb74e2a6cf09852eec0049bee47581b402f28
ndroid/gallery3d/filtershow/cache/ImageLoader.java
|
| 8d363f83371b18bef02ad7aeeacc5060f3097c96 |
22-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Move setting wallpaper to a background thread." into gb-ub-photos-bryce
|
| 3a34e9e173535888edd154fe76f74ffd82a3d93b |
22-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Move setting wallpaper to a background thread.
Bug: 8088767
Change-Id: I168032418a15f766ac09e18cd12707c7270b07f3
ndroid/gallery3d/filtershow/FilterShowActivity.java
|
| a5fadcfd9faca04fed5c41669fe3895d1ac9c283 |
22-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Pinch to zoom refine
Change-Id: I538defa55a4ed898dd7c936ec813f052ac1b9e0a
ndroid/gallery3d/filtershow/PanelController.java
ndroid/gallery3d/filtershow/cache/FilteringPipeline.java
ndroid/gallery3d/filtershow/cache/ImageLoader.java
ndroid/gallery3d/filtershow/cache/RenderingRequest.java
ndroid/gallery3d/filtershow/filters/FilterCurvesRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterFxRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterRepresentation.java
ndroid/gallery3d/filtershow/filters/ImageFilterBwFilter.java
ndroid/gallery3d/filtershow/filters/ImageFilterContrast.java
ndroid/gallery3d/filtershow/filters/ImageFilterEdge.java
ndroid/gallery3d/filtershow/filters/ImageFilterExposure.java
ndroid/gallery3d/filtershow/filters/ImageFilterHighlights.java
ndroid/gallery3d/filtershow/filters/ImageFilterHue.java
ndroid/gallery3d/filtershow/filters/ImageFilterKMeans.java
ndroid/gallery3d/filtershow/filters/ImageFilterNegative.java
ndroid/gallery3d/filtershow/filters/ImageFilterSaturated.java
ndroid/gallery3d/filtershow/filters/ImageFilterShadows.java
ndroid/gallery3d/filtershow/filters/ImageFilterSharpen.java
ndroid/gallery3d/filtershow/filters/ImageFilterVibrance.java
ndroid/gallery3d/filtershow/filters/ImageFilterWBalance.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
ndroid/gallery3d/filtershow/imageshow/ImageZoom.java
ndroid/gallery3d/filtershow/imageshow/MasterImage.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
|
| c619b9510f048f5aab7ae3b2a1482e695dc6cfd7 |
22-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fix for null check with RS allocations.
Bug: 8243554
Change-Id: I49da16f530a7283a801b3739ee7ba06bc7e4dad7
ndroid/gallery3d/filtershow/filters/ImageFilterRS.java
|
| c67da3cdf3cc655a384d9d591fee051fdafb4630 |
22-Feb-2013 |
John Hoford <hoford@google.com> |
fix draw and ellipse to handle pinch to zoom
Change-Id: I8af9b37dcd98425959742a4142756963363d1cec
ndroid/gallery3d/filtershow/filters/FilterDrawRepresentation.java
ndroid/gallery3d/filtershow/imageshow/ImageDraw.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
ndroid/gallery3d/filtershow/imageshow/ImageVignette.java
|
| 8ae11144fc1fc15062297d03fb86d6bfb443953a |
21-Feb-2013 |
Michael Kolb <kolby@google.com> |
Adjust capture animation timing
Change-Id: I77c44baeafa58d2a28aa9f4ce85008e14a7f61eb
ndroid/camera/CaptureAnimManager.java
|
| d08258a1322a9a7f02f7cb30e91d5325cb49fd72 |
21-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Temporary handling when running out of heap in filtershow." into gb-ub-photos-bryce
|
| 2d5b41f229ee8d19a9a092ba15e925a22bc97190 |
21-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Temporary handling when running out of heap in filtershow.
Bug: 8233895
Change-Id: Id078d2a4b387127c0d230bc5d9de4590f0e9f72b
ndroid/gallery3d/filtershow/cache/ImageLoader.java
ndroid/gallery3d/filtershow/tools/SaveCopyTask.java
|
| bfca10950268205b8af207e0a21f86dbda8d9b7f |
21-Feb-2013 |
John Hoford <hoford@google.com> |
add highlight filter
Change-Id: I2e59e09fbc80172b9dfe27b3ce8ff2f1e24c5872
ndroid/gallery3d/filtershow/filters/BaseFiltersManager.java
ndroid/gallery3d/filtershow/filters/ImageFilterHighlights.java
ndroid/gallery3d/filtershow/filters/SplineMath.java
|
| 4472d1fad46b194b6114a8039910bd7a605485d4 |
21-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Remove SliderController class
Change-Id: I59ed20a63a59e4c48c0a44ff52d82852ea159331
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
ndroid/gallery3d/filtershow/ui/SliderController.java
ndroid/gallery3d/filtershow/ui/SliderListener.java
|
| 275ca8be28783b3e87410533766cb1c2ec61e068 |
21-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Remove slider in ImageShow, cleanup code" into gb-ub-photos-bryce
|
| f11861ff210d0eace106fa4a4385489e8b0b7a32 |
21-Feb-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix NPE for when camera is disabled" into gb-ub-photos-bryce
|
| 02103c6b2298a8f7e52164c33aacf1e0e1d1678c |
21-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Remove slider in ImageShow, cleanup code
Change-Id: I005d4ecd33a5b6fcd23af6a6ba46419e7c9fc683
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/PanelController.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
ndroid/gallery3d/filtershow/imageshow/ImageZoom.java
|
| d1d32ad29360992e9fad3615e2dda4ab47112aba |
21-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix typo
Change-Id: I6c41782a033d5ad1bb5780b22d99658223b23a0b
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
|
| edc48484bc67bd14a7e5fc4036de9d59f542c4fc |
15-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Add pinch to zoom
Change-Id: I5d90a7ce5d890f613fa957244c6ac5291496cf1a
ndroid/gallery3d/filtershow/imageshow/ImageDraw.java
ndroid/gallery3d/filtershow/imageshow/ImageRedEye.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
ndroid/gallery3d/filtershow/imageshow/ImageZoom.java
ndroid/gallery3d/filtershow/imageshow/MasterImage.java
ndroid/gallery3d/filtershow/ui/ImageCurves.java
|
| 537718ca08c3b65e529f5cf70b3ae65a3263bcc4 |
21-Feb-2013 |
Doris Liu <tianliu@google.com> |
Fix NPE for when camera is disabled
Bug: 7950211
Change-Id: I3983209211bc4afdff3a8878f458a9bf275c5639
ndroid/camera/VideoModule.java
|
| 8e08b01ed79efa2c026559fb2d9814e80d3eb05b |
20-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Removed unsupported GL operations.
Bug: 8223749
Change-Id: I722220def36aa4a9e53666540471100df6609d74
ndroid/gallery3d/filtershow/imageshow/ImageStraighten.java
|
| 9564406066e257580e68d26b67b93b6952fedfc4 |
20-Feb-2013 |
Victor Doba <dobavictor@google.com> |
Merge "Show the Utility Panel by default." into gb-ub-photos-bryce
|
| 0342a57fb113f26a6aed567a7f1434efd59a78fe |
20-Feb-2013 |
John Hoford <hoford@google.com> |
fix vignette startup issues
Change-Id: I3a8461edf3239044565611ed35b41cb87e5a529f
ndroid/gallery3d/filtershow/imageshow/EclipseControl.java
ndroid/gallery3d/filtershow/imageshow/ImageVignette.java
|
| ffe5a12da3a9f61607c8ee5d81e21dfce763b7d9 |
16-Feb-2013 |
John Hoford <hoford@google.com> |
add movable vignette
Change-Id: I54f2fccd0d748ca4c908d5b0f3c3ef7349cd686d
ndroid/gallery3d/filtershow/editors/EditorVignette.java
ndroid/gallery3d/filtershow/filters/FilterVignetteRepresentation.java
ndroid/gallery3d/filtershow/filters/ImageFilterVignette.java
ndroid/gallery3d/filtershow/imageshow/EclipseControl.java
ndroid/gallery3d/filtershow/imageshow/ImagePoint.java
ndroid/gallery3d/filtershow/imageshow/ImageRedEye.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
ndroid/gallery3d/filtershow/imageshow/ImageTinyPlanet.java
ndroid/gallery3d/filtershow/imageshow/ImageVignette.java
ndroid/gallery3d/filtershow/imageshow/Oval.java
|
| 0718d480a144ba0a44c07c48f90e85cf4ec669c6 |
16-Feb-2013 |
Michael Kolb <kolby@google.com> |
Fix auto-focus areas
Use a specific focus area in continuous AF
Use a smaller AF area for tap to focus
Change-Id: Ia633dec7c1830c7c03f56434614e9bce3f5697e6
ndroid/camera/FocusOverlayManager.java
|
| e3de7223ee3fe56e097d68f50c5a59ae61370d65 |
19-Feb-2013 |
Michael Kolb <kolby@google.com> |
Fix AF animation
Bug: 8219462
Change-Id: I9c39c70aad8f1ca6763acfc2d2a5ff5c918c71a5
ndroid/camera/FocusOverlayManager.java
ndroid/camera/ui/PieRenderer.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
ndroid/camera/CameraActivity.java
ndroid/camera/PhotoModule.java
|
| ad16c6799d559d304bb8688e37a02d2d9bc53a42 |
16-Feb-2013 |
John Reck <jreck@google.com> |
Merge "Remove com.android.camera.R" into gb-ub-photos-bryce
|
| 54987e8d3af88214ce4f3aed0b5c4e9ded5b1392 |
16-Feb-2013 |
John Reck <jreck@google.com> |
Remove com.android.camera.R
Change-Id: I0bb03da1423401f872c3bf13caffb9c87d850449
ndroid/camera/ActivityBase.java
ndroid/camera/CameraActivity.java
ndroid/camera/CameraPreference.java
ndroid/camera/CameraSettings.java
ndroid/camera/CountDownTimerPreference.java
ndroid/camera/EffectsRecorder.java
ndroid/camera/IconListPreference.java
ndroid/camera/ListPreference.java
ndroid/camera/OnScreenHint.java
ndroid/camera/PanoramaModule.java
ndroid/camera/PhotoController.java
ndroid/camera/PhotoModule.java
ndroid/camera/PreviewFrameLayout.java
ndroid/camera/PreviewGestures.java
ndroid/camera/RotateDialogController.java
ndroid/camera/SoundClips.java
ndroid/camera/Util.java
ndroid/camera/VideoController.java
ndroid/camera/VideoModule.java
ndroid/camera/ui/AbstractSettingPopup.java
ndroid/camera/ui/CameraSwitcher.java
ndroid/camera/ui/CountDownView.java
ndroid/camera/ui/EffectSettingPopup.java
ndroid/camera/ui/FaceView.java
ndroid/camera/ui/InLineSettingCheckBox.java
ndroid/camera/ui/InLineSettingItem.java
ndroid/camera/ui/InLineSettingMenu.java
ndroid/camera/ui/ListPrefSettingPopup.java
ndroid/camera/ui/MoreSettingPopup.java
ndroid/camera/ui/PieRenderer.java
ndroid/camera/ui/RotateTextToast.java
ndroid/camera/ui/Switch.java
ndroid/camera/ui/TimeIntervalPopup.java
ndroid/camera/ui/TimerSettingPopup.java
ndroid/camera/ui/ZoomRenderer.java
|
| 04026a407aca122132ce746a675ac20782f3ab08 |
15-Feb-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Don't use AsyncTasks to fetch images via MTP" into gb-ub-photos-bryce
|
| 4d88243c1e0c8d0ac5390b79ef0cf3418adcf02a |
15-Feb-2013 |
Michael Kolb <kolby@google.com> |
Merge "New capture animation" into gb-ub-photos-bryce
|
| dd3c37de2180cf9e1fe985bfe3f463c3243a9f6d |
15-Feb-2013 |
Victor Doba <dobavictor@google.com> |
Show the Utility Panel by default.
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
|
| 61d3ab7bdff78b5a3b79de5b4902fc92fe63c587 |
14-Feb-2013 |
Bobby Georgescu <georgescu@google.com> |
Don't use AsyncTasks to fetch images via MTP
Bug: 8192491
Avoids allocations when scrolling through the importer
grid by not using AsyncTasks anymore (which meant one
object creation per change of the source image). Also
fix an NPE if a device is unplugged during scrolling.
Change-Id: I4e7022ca5d4573402e60b16fbd82ea65bc6627e0
ndroid/gallery3d/ingest/data/MtpBitmapFetch.java
ndroid/gallery3d/ingest/ui/MtpImageView.java
|
| 098f37afd29e0d61ae32a23ae65e1e0d2cd533ec |
15-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fixed crop display for setting contacts/wallpapers." into gb-ub-photos-bryce
|
| 6a2dbeb43aa74dd16b290bacd52632452aea35ec |
15-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fixed crop display for setting contacts/wallpapers.
Bug: 8187056
Bug: 8196779
Bug: 8140241
Change-Id: Iaf3d113d9e53d365b73985fdc3350b627f8bda4c
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/cache/ImageLoader.java
|
| c551fcd76cbbf0611f365bbe2b86c87c6226b348 |
15-Feb-2013 |
John Hoford <hoford@google.com> |
Merge "refactor to support many filter based on RedEye" into gb-ub-photos-bryce
|
| 7847563eaa8e039cd196a695485c322d81b1967e |
15-Feb-2013 |
John Hoford <hoford@google.com> |
refactor to support many filter based on RedEye
Change-Id: I92ff19d8f750f5bf4c188129580e22990874501e
ndroid/gallery3d/filtershow/filters/FilterPoint.java
ndroid/gallery3d/filtershow/filters/FilterPointRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java
ndroid/gallery3d/filtershow/filters/ImageFilter.java
ndroid/gallery3d/filtershow/filters/ImageFilterDraw.java
ndroid/gallery3d/filtershow/filters/ImageFilterRedEye.java
ndroid/gallery3d/filtershow/filters/RedEyeCandidate.java
ndroid/gallery3d/filtershow/imageshow/ImagePoint.java
ndroid/gallery3d/filtershow/imageshow/ImageRedEye.java
|
| d036a2fb3069224eeb5c2102f10c71d2005bde63 |
14-Feb-2013 |
Michael Kolb <kolby@google.com> |
New capture animation
Change-Id: I45dd4989fcebd5fc69cfff55d69827574a438ec4
ndroid/camera/CaptureAnimManager.java
|
| ec2cebe4912bbb1a040b0bd52b250528671ef73d |
14-Feb-2013 |
Michael Kolb <kolby@google.com> |
Merge "Fix inexplicable monkey NPE" into gb-ub-photos-bryce
|
| 4a40e126df5a77eaf44a52c73011cbfa91879b54 |
14-Feb-2013 |
Michael Kolb <kolby@google.com> |
Fix inexplicable monkey NPE
Bug: 8049510
Change-Id: Idbd624a309bc026a1805030982cb0cb7ace698ee
ndroid/camera/FocusOverlayManager.java
|
| 3c2fca3fe03888a3db308eea5e69b38479433706 |
14-Feb-2013 |
Doris Liu <tianliu@google.com> |
Fix video disappearing when rotated
Bug: 7459723
Change-Id: I0f42e476cfda6c0c757ca1fda3dd8072bec25a37
ndroid/camera/VideoModule.java
|
| 9147ab1b489170a3f6454e2b3f425d60505ea208 |
14-Feb-2013 |
Angus Kong <shkong@google.com> |
Make ShutterButton visible after initialization.
bug:8186870
Change-Id: I45e33532e82cc128c25e61e3bf57843aef24edc2
ndroid/camera/VideoModule.java
|
| 498d78073c24f25055a2dc4943cdd0a42f85702c |
14-Feb-2013 |
John Hoford <hoford@google.com> |
get redeye working again
ndroid/gallery3d/filtershow/editors/EditorRedEye.java
ndroid/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java
ndroid/gallery3d/filtershow/filters/ImageFilter.java
ndroid/gallery3d/filtershow/filters/ImageFilterGeometry.java
ndroid/gallery3d/filtershow/filters/ImageFilterNegative.java
ndroid/gallery3d/filtershow/filters/ImageFilterRS.java
ndroid/gallery3d/filtershow/filters/ImageFilterRedEye.java
ndroid/gallery3d/filtershow/filters/ImageFilterStraighten.java
ndroid/gallery3d/filtershow/filters/ImageFilterWBalance.java
ndroid/gallery3d/filtershow/imageshow/ImageRedEye.java
|
| 147af26e86b7fa8f2d195651e3786c0102346702 |
14-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix sync representations
Change-Id: I8b1b159a2350f7ee8bcdc7e71faf82ab5df2755b
ndroid/gallery3d/filtershow/PanelController.java
ndroid/gallery3d/filtershow/filters/FilterRepresentation.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
|
| da7b84da52579cc967816e11f10acd9d9b3c714b |
13-Feb-2013 |
John Hoford <hoford@google.com> |
fix draw to support rotation/crop
Change-Id: Iea1db9e42f1fa2b86a452bf1d40b1663b69d03e2
ndroid/gallery3d/filtershow/cache/RenderingRequest.java
ndroid/gallery3d/filtershow/filters/ImageFilterDraw.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
|
| c81c9a87075e89acb940ff6cb1293b48ac7b1cb0 |
13-Feb-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Importer: Full-screen viewing, UI refinement, refactoring" into gb-ub-photos-bryce
|
| bfa696afec98657e7fa321522d60fcc514ff2637 |
13-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Pass the ImagePreset to ImageFilter
Change-Id: I4c195a5eb6055c3bb43fed60e76751ed133ab725
ndroid/gallery3d/filtershow/filters/FilterRepresentation.java
ndroid/gallery3d/filtershow/filters/ImageFilter.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
|
| 94327736e3e16d5d7c8dae084c09b8e41496dd03 |
13-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix curves slowness
Change-Id: If25f3ce1c3da02daa90405987075b87ce676c84e
ndroid/gallery3d/filtershow/ui/ImageCurves.java
|
| c97dddfe187be8ecfde9f8914e8018102ec6209a |
01-Feb-2013 |
Bobby Georgescu <georgescu@google.com> |
Importer: Full-screen viewing, UI refinement, refactoring
Bug: 7990333
Bug: 8151814
Bug: 8037411
This CL adds or changes the following things:
- Full-screen image viewing and UI for switching modes
- Moved general functionality from MtpThumbnailTileView
to MtpImageView to allow for reuse in full-screen image
use-case
- MtpBitmapCache moved from ui to data package
- Orientation now respected when set in image metadata
- Miscellaneous UI consistency issues fixed
- Miscellaneous instability issues fixed
Change-Id: I5f188b763617b693e32fedc03273d711d604922a
ndroid/gallery3d/ingest/IngestActivity.java
ndroid/gallery3d/ingest/IngestService.java
ndroid/gallery3d/ingest/MtpDeviceIndex.java
ndroid/gallery3d/ingest/adapter/CheckBroker.java
ndroid/gallery3d/ingest/adapter/MtpAdapter.java
ndroid/gallery3d/ingest/adapter/MtpPagerAdapter.java
ndroid/gallery3d/ingest/data/BitmapWithMetadata.java
ndroid/gallery3d/ingest/data/MtpBitmapFetch.java
ndroid/gallery3d/ingest/ui/IngestGridView.java
ndroid/gallery3d/ingest/ui/MtpBitmapCache.java
ndroid/gallery3d/ingest/ui/MtpFullscreenView.java
ndroid/gallery3d/ingest/ui/MtpImageView.java
ndroid/gallery3d/ingest/ui/MtpThumbnailTileView.java
|
| 7caa8cc9073e5cdf195c73f1eb0fe06df1efe569 |
13-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Clean up red eye correction
Change-Id: I19a8006ed31767ae8e33388cc5b11b5c68d5ae2d
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/PanelController.java
ndroid/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java
ndroid/gallery3d/filtershow/filters/ImageFilterRedEye.java
|
| 1335f1395bdc518cbb6dd13f2faabdd4631a0253 |
13-Feb-2013 |
John Hoford <hoford@google.com> |
fix ranges for various filters
Change-Id: I6790b06c5c4094c442ce19cb2ed7ddb6a4152f3a
ndroid/gallery3d/filtershow/editors/BasicEditor.java
ndroid/gallery3d/filtershow/filters/ImageFilterContrast.java
ndroid/gallery3d/filtershow/filters/ImageFilterExposure.java
ndroid/gallery3d/filtershow/filters/ImageFilterHue.java
ndroid/gallery3d/filtershow/filters/ImageFilterNegative.java
ndroid/gallery3d/filtershow/filters/ImageFilterRedEye.java
ndroid/gallery3d/filtershow/filters/ImageFilterSaturated.java
ndroid/gallery3d/filtershow/filters/ImageFilterShadows.java
ndroid/gallery3d/filtershow/filters/ImageFilterVibrance.java
ndroid/gallery3d/filtershow/filters/ImageFilterVignette.java
ndroid/gallery3d/filtershow/filters/ImageFilterWBalance.java
|
| ec0610102caf5353c07c8b271763d2509db474ee |
13-Feb-2013 |
Angus Kong <shkong@google.com> |
Merge "Wait for the previous MosaicPreviewRenderer to end" into gb-ub-photos-bryce
|
| a52d6674e576a15d1c3f71f951fa3843957bfa8b |
13-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Turn back on the state panel" into gb-ub-photos-bryce
|
| dff54430a7f6a11dc8ef45496f2836a853bd6d42 |
13-Feb-2013 |
John Hoford <hoford@google.com> |
Merge "fix the draw clear bug" into gb-ub-photos-bryce
|
| 66b293e3d57988899a7fd5f1883e15f9d74b4a93 |
13-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Turn back on the state panel
Change-Id: I22706078d4026ce4e24917c484a30a56de431983
ndroid/gallery3d/filtershow/ImageStateAdapter.java
ndroid/gallery3d/filtershow/filters/FilterBasicRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterRepresentation.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
|
| e5349356383416c813db70544624cf2f3d72a65c |
12-Feb-2013 |
Tenghui Zhu <ztenghui@google.com> |
Merge "DO NOT MERGE: Don't call requestLayout from onLayout" into gb-ub-photos-bryce
|
| fc7f760667061a64e5acf09d80e08472fe148260 |
07-Feb-2013 |
Marco Nelissen <marcone@google.com> |
DO NOT MERGE: Don't call requestLayout from onLayout
Doing a layout within a layout can lead to various problems, so it should
be avoided. There's some logging that warns of this, which got triggered
by CommonControllerOverlay.
I don't know what problem this code was originally trying to solve, but it
doesn't seem to be necessary anymore. The line in question was originally
introduced in change 209a9163d4e8cee0bfe162ae598ef40e6051479c, in Oct 2011.
Note: This has been checked into master, this is just cherry picking into
Bryce branch.
Change-Id: I7651304491a90e8d130f4a0a3b3de8e29c4d0116
ndroid/gallery3d/app/CommonControllerOverlay.java
|
| bd4c46989171b5171797e0dbf4b33a1914ffba49 |
12-Feb-2013 |
John Hoford <hoford@google.com> |
fix the draw clear bug
Change-Id: I1050c3e1ad1280480f35a03c9d29dc1cd44b515f
ndroid/gallery3d/filtershow/editors/EditorDraw.java
ndroid/gallery3d/filtershow/filters/FilterDrawRepresentation.java
ndroid/gallery3d/filtershow/filters/ImageFilterDraw.java
|
| 0e1fd65c1b797dbed03570bf5e4f868600d680c3 |
12-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Add null check on the source URI
bug:8181133
Change-Id: I1a7226db3ceb42a759f24c9b70f140a63a4294f0
ndroid/gallery3d/filtershow/cache/ImageLoader.java
ndroid/gallery3d/filtershow/tools/SaveCopyTask.java
|
| 1c00e97c214dc8c0a73f02b9faec53ce02d81b54 |
12-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Limit preview size
Change-Id: I4b9b43abcb509407f9244a776d31cc96876a26cd
ndroid/gallery3d/filtershow/cache/ImageLoader.java
|
| 3c3f2336bfc8f6d5fc6d94a807d40df327481df7 |
12-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Refactor FiltersManager
Change-Id: I4c42ddb90e65e90af873eb8dbe065f4fa3de69ef
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/cache/FilteringPipeline.java
ndroid/gallery3d/filtershow/filters/BaseFiltersManager.java
ndroid/gallery3d/filtershow/filters/FilterDrawRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterFxRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterTinyPlanetRepresentation.java
ndroid/gallery3d/filtershow/filters/ImageFilterWBalance.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
ndroid/gallery3d/filtershow/ui/FilterIconButton.java
ndroid/gallery3d/filtershow/ui/ImageCurves.java
|
| c04f50dd1ed5523c21e587bc899e7d3610e68b25 |
12-Feb-2013 |
John Hoford <hoford@google.com> |
refactor quality to be int
Change-Id: I0470abdbe75cf48c5228e80b9dc060ae6f3d8bbd
ndroid/gallery3d/filtershow/cache/FilteringPipeline.java
ndroid/gallery3d/filtershow/cache/ImageLoader.java
ndroid/gallery3d/filtershow/editors/EditorDraw.java
ndroid/gallery3d/filtershow/filters/FilterDrawRepresentation.java
ndroid/gallery3d/filtershow/filters/ImageFilter.java
ndroid/gallery3d/filtershow/filters/ImageFilterBorder.java
ndroid/gallery3d/filtershow/filters/ImageFilterBwFilter.java
ndroid/gallery3d/filtershow/filters/ImageFilterContrast.java
ndroid/gallery3d/filtershow/filters/ImageFilterCurves.java
ndroid/gallery3d/filtershow/filters/ImageFilterDownsample.java
ndroid/gallery3d/filtershow/filters/ImageFilterDraw.java
ndroid/gallery3d/filtershow/filters/ImageFilterEdge.java
ndroid/gallery3d/filtershow/filters/ImageFilterExposure.java
ndroid/gallery3d/filtershow/filters/ImageFilterFx.java
ndroid/gallery3d/filtershow/filters/ImageFilterGeometry.java
ndroid/gallery3d/filtershow/filters/ImageFilterHue.java
ndroid/gallery3d/filtershow/filters/ImageFilterKMeans.java
ndroid/gallery3d/filtershow/filters/ImageFilterNegative.java
ndroid/gallery3d/filtershow/filters/ImageFilterParametricBorder.java
ndroid/gallery3d/filtershow/filters/ImageFilterRS.java
ndroid/gallery3d/filtershow/filters/ImageFilterRedEye.java
ndroid/gallery3d/filtershow/filters/ImageFilterSaturated.java
ndroid/gallery3d/filtershow/filters/ImageFilterShadows.java
ndroid/gallery3d/filtershow/filters/ImageFilterSharpen.java
ndroid/gallery3d/filtershow/filters/ImageFilterStraighten.java
ndroid/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
ndroid/gallery3d/filtershow/filters/ImageFilterVibrance.java
ndroid/gallery3d/filtershow/filters/ImageFilterVignette.java
ndroid/gallery3d/filtershow/filters/ImageFilterWBalance.java
ndroid/gallery3d/filtershow/filters/SimpleImageFilter.java
ndroid/gallery3d/filtershow/imageshow/GeometryMetadata.java
ndroid/gallery3d/filtershow/imageshow/ImageDraw.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
|
| 3d3a66695f3d022a71e8b9c77326eb68cd15b31d |
12-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Add reset bitmap for RS filters
Change-Id: I34e28ca72d13f9b5f8054d8a2c07cfffca4e85c6
ndroid/gallery3d/filtershow/cache/FilteringPipeline.java
ndroid/gallery3d/filtershow/filters/ImageFilterRS.java
|
| c4816efb49d3e90e37835d9359a6fa8447df97df |
12-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Update thumbnails when the geometry changes
Change-Id: I44d70839efb7e00edfb1e6c1f73296beab09783c
ndroid/gallery3d/filtershow/imageshow/GeometryListener.java
ndroid/gallery3d/filtershow/imageshow/MasterImage.java
ndroid/gallery3d/filtershow/ui/FilterIconButton.java
|
| 31019e09eaaa460e68b3f90a881ea3278fbd6108 |
12-Feb-2013 |
Angus Kong <shkong@google.com> |
Wait for the previous MosaicPreviewRenderer to end
When changing orientations very fast, there might be 2 MosaicPreviewRenderer
instances accessing the SRI native library at the same time. The library is not
designed so.
bug:8151753
Change-Id: Ie7a381349feeb95b40bae3c093cfcb66acba9069
ndroid/camera/MosaicFrameProcessor.java
ndroid/camera/MosaicPreviewRenderer.java
|
| 0c5bacd7e45c4f08796ce047fbc356e696c4da65 |
12-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Generate thumbnails asynchronously" into gb-ub-photos-bryce
|
| b4bab5ddbbb6aa15ae8646686b30021083718a3d |
12-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Generate thumbnails asynchronously
Change-Id: I6a2520fc869280a2a7be9c9b5673e17038964a02
ndroid/gallery3d/filtershow/cache/FilteringPipeline.java
ndroid/gallery3d/filtershow/cache/RenderingRequest.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
ndroid/gallery3d/filtershow/imageshow/MasterImage.java
ndroid/gallery3d/filtershow/ui/FilterIconButton.java
ndroid/gallery3d/filtershow/ui/IconButton.java
|
| e7f63075622f37d40bbbc8b17eb1b4be1cb2cf82 |
12-Feb-2013 |
John Hoford <hoford@google.com> |
remove animations if before Jelly Bean
Change-Id: Ifb60390f513f60af2875cbc2218fdc185752e9b2
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/PanelController.java
|
| 2d445b63f5d4d3204374a1955a4a679023362c96 |
12-Feb-2013 |
John Hoford <hoford@google.com> |
fixes the draw and clean up the UI
Change-Id: Ia52dfc3ec407c307612dcfc91fb61a1fb89e32ec
ndroid/gallery3d/filtershow/editors/EditorDraw.java
ndroid/gallery3d/filtershow/filters/ImageFilterDraw.java
ndroid/gallery3d/filtershow/imageshow/ImageDraw.java
|
| 1d160fd11e594a7ae77ae09d9f561b02cc9030a0 |
12-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Adding support for ICS" into gb-ub-photos-bryce
|
| d3b009b2c15c607c0b4bcc72412c45d231e26ca2 |
12-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Adding support for ICS
Change-Id: I550d461b08a4cc5ceb3cdefd82301d5986325184
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/PanelController.java
ndroid/gallery3d/filtershow/filters/ImageFilterBorder.java
|
| 3e926284099152f14a78910c744d462d13a044e5 |
09-Feb-2013 |
John Hoford <hoford@google.com> |
fix red eye to use the new system
Change-Id: If79106dc3144cce374afd410f5f859692e564b83
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/editors/EditorRedEye.java
ndroid/gallery3d/filtershow/editors/EditorTinyPlanet.java
ndroid/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java
ndroid/gallery3d/filtershow/filters/ImageFilterRedEye.java
ndroid/gallery3d/filtershow/imageshow/ImageRedEye.java
ndroid/gallery3d/filtershow/imageshow/ImageRedEyes.java
|
| 83eeb942e8eda7da94303eb1c105164c253cdbba |
12-Feb-2013 |
Tim Murray <timmurray@google.com> |
Merge "Only create one RS context." into gb-ub-photos-bryce
|
| da1c8d757aad7f7f0077ff99283b3db98e2ea395 |
12-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Move useFilterRepresentation to PanelController
Change-Id: I8abd9b2bd1b808df6a84e334b6eaa36b1c16750d
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/PanelController.java
ndroid/gallery3d/filtershow/ui/FilterIconButton.java
|
| 3adce2f354258282f9c0e19667786ea79481feeb |
12-Feb-2013 |
Tim Murray <timmurray@google.com> |
Only create one RS context.
Change-Id: I527da839142cd2e48fb81e8cb02b43f6f87147d6
ndroid/gallery3d/filtershow/filters/ImageFilterRS.java
|
| c4447bec1e57d301739f37be3258ecc896edc595 |
11-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Cleaning filters" into gb-ub-photos-bryce
|
| 9c37635183f7908746982a191005d53f8efb71d6 |
11-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Cleaning filters
Change-Id: I413b935f90cebdab37d3db73d7fcb0fe77a64579
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/PanelController.java
ndroid/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterCurvesRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterDrawRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterFxRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterTinyPlanetRepresentation.java
ndroid/gallery3d/filtershow/filters/ImageFilter.java
ndroid/gallery3d/filtershow/filters/ImageFilterBorder.java
ndroid/gallery3d/filtershow/filters/ImageFilterBwFilter.java
ndroid/gallery3d/filtershow/filters/ImageFilterContrast.java
ndroid/gallery3d/filtershow/filters/ImageFilterCurves.java
ndroid/gallery3d/filtershow/filters/ImageFilterDownsample.java
ndroid/gallery3d/filtershow/filters/ImageFilterDraw.java
ndroid/gallery3d/filtershow/filters/ImageFilterEdge.java
ndroid/gallery3d/filtershow/filters/ImageFilterExposure.java
ndroid/gallery3d/filtershow/filters/ImageFilterFx.java
ndroid/gallery3d/filtershow/filters/ImageFilterGradient.java
ndroid/gallery3d/filtershow/filters/ImageFilterHue.java
ndroid/gallery3d/filtershow/filters/ImageFilterKMeans.java
ndroid/gallery3d/filtershow/filters/ImageFilterNegative.java
ndroid/gallery3d/filtershow/filters/ImageFilterParametricBorder.java
ndroid/gallery3d/filtershow/filters/ImageFilterRedEye.java
ndroid/gallery3d/filtershow/filters/ImageFilterSaturated.java
ndroid/gallery3d/filtershow/filters/ImageFilterShadows.java
ndroid/gallery3d/filtershow/filters/ImageFilterSharpen.java
ndroid/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
ndroid/gallery3d/filtershow/filters/ImageFilterVibrance.java
ndroid/gallery3d/filtershow/filters/ImageFilterVignette.java
ndroid/gallery3d/filtershow/filters/ImageFilterWBalance.java
ndroid/gallery3d/filtershow/filters/SimpleImageFilter.java
ndroid/gallery3d/filtershow/ui/FilterIconButton.java
|
| cef56e96ff49a90d032699ed06b9991fc8486d2a |
11-Feb-2013 |
Doris Liu <tianliu@google.com> |
Merge "Lock focus during countdown" into gb-ub-photos-bryce
|
| 3f1665337123cbc5a21f7b424c224dc39c0f0d37 |
11-Feb-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix camera setting icons appearing in wrong place" into gb-ub-photos-bryce
|
| 2b74cb3e2fbdde0a818eca06645b4a55553e371e |
09-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Move filter type to representations
Change-Id: I2d49447c57f4ff49001d27cdfa6482ca320c7a8b
ndroid/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterFxRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterRepresentation.java
ndroid/gallery3d/filtershow/filters/ImageFilter.java
ndroid/gallery3d/filtershow/filters/ImageFilterDraw.java
ndroid/gallery3d/filtershow/filters/ImageFilterFx.java
ndroid/gallery3d/filtershow/filters/ImageFilterParametricBorder.java
ndroid/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
ndroid/gallery3d/filtershow/filters/ImageFilterVignette.java
ndroid/gallery3d/filtershow/filters/ImageFilterWBalance.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
|
| c21332d00abceb1959fc43be2986a6c3d27a6707 |
09-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix crash when reset
Change-Id: Ibab01c4e218e30f3f4a67665d99dbc14bdc7d8ea
ndroid/gallery3d/filtershow/PanelController.java
|
| b00a8188613462320491e5edad5feb6e7c01f788 |
09-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix loading screen" into gb-ub-photos-bryce
|
| 40ac3829119a316ee11cbcc26d278b04ac581877 |
09-Feb-2013 |
Doris Liu <tianliu@google.com> |
Fix camera setting icons appearing in wrong place
Bug: 7956904
Change-Id: I1b2d3fef8d82a3efeb0caa5130ce3dbb6808af70
ndroid/camera/ui/PieMenuButton.java
|
| e5d7ee43c55da14f6de1b392ea928db25499293b |
09-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix loading screen
Change-Id: Id41c4c93782bea7f11d75f0ddcdd4529f4fc9758
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/PanelController.java
ndroid/gallery3d/filtershow/imageshow/ImageGeometry.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
ndroid/gallery3d/filtershow/imageshow/MasterImage.java
|
| 1bc931c09606f8a00fd8b41706e918a766389b20 |
08-Feb-2013 |
John Hoford <hoford@google.com> |
Fix tiny planet to work with the new framework
Change-Id: I57e87ade6f2cfdfee1b237cdfdf5914244ee98aa
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/editors/EditorTinyPlanet.java
ndroid/gallery3d/filtershow/filters/FilterTinyPlanetRepresentation.java
ndroid/gallery3d/filtershow/filters/ImageFilterDraw.java
ndroid/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
ndroid/gallery3d/filtershow/imageshow/ImageTinyPlanet.java
|
| b4e6733731e751afe7dcf2a3b9803d2f720cb253 |
08-Feb-2013 |
John Hoford <hoford@google.com> |
remove slider from FX and Border UI
Change-Id: Ic1c38734c4351ab0150b90d5d4fc575cce9db9e9
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/editors/ImageOnlyEditor.java
ndroid/gallery3d/filtershow/filters/ImageFilterBorder.java
ndroid/gallery3d/filtershow/filters/ImageFilterFx.java
|
| 0606108a8126b357772db415ad4517395fce8875 |
08-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix leaks / init" into gb-ub-photos-bryce
|
| deeddb19c78a4299cc0e4075ed0265820eeb20f0 |
08-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix leaks / init
Change-Id: I5befdc24cc89cdcfb73ee4d13f076b1c4a585cf6
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java
ndroid/gallery3d/filtershow/filters/ImageFilterBorder.java
ndroid/gallery3d/filtershow/filters/ImageFilterRS.java
ndroid/gallery3d/filtershow/imageshow/MasterImage.java
|
| f46b5fd7f700252d303ca41bfb3fda0de04d0d4f |
08-Feb-2013 |
Bobby Georgescu <georgescu@google.com> |
Change transition from Gallery to Filtershow
Bug: 8163894
Change-Id: Iaed600df39a88b176cb8ed3316d187c26c6b7961
ndroid/gallery3d/app/PhotoPage.java
|
| b7e69915ebc7fa89398649ec03e9aa619e9d9991 |
08-Feb-2013 |
Bobby Georgescu <georgescu@google.com> |
Replace background getDrawable calls to avoid ANR
Bug: 8148243
Change-Id: I0b94c647bd39b2aabd9cd5316a82b3ef3573b710
ndroid/gallery3d/filtershow/FilterShowActivity.java
|
| e11aa659de39512c42f3c482a6485788bd32a34c |
08-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Cleanup
Change-Id: I30ccd935876a8cbf580d06c037b4bc7f86dafa42
ndroid/gallery3d/filtershow/filters/FilterCurvesRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterDrawRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterFxRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterRepresentation.java
ndroid/gallery3d/filtershow/filters/ImageFilter.java
ndroid/gallery3d/filtershow/filters/ImageFilterBorder.java
ndroid/gallery3d/filtershow/filters/ImageFilterBwFilter.java
ndroid/gallery3d/filtershow/filters/ImageFilterCurves.java
ndroid/gallery3d/filtershow/filters/ImageFilterDraw.java
ndroid/gallery3d/filtershow/filters/ImageFilterFx.java
ndroid/gallery3d/filtershow/filters/ImageFilterGeometry.java
ndroid/gallery3d/filtershow/filters/ImageFilterGradient.java
ndroid/gallery3d/filtershow/filters/ImageFilterHue.java
ndroid/gallery3d/filtershow/filters/ImageFilterParametricBorder.java
ndroid/gallery3d/filtershow/filters/ImageFilterRedEye.java
ndroid/gallery3d/filtershow/filters/ImageFilterShadows.java
ndroid/gallery3d/filtershow/filters/ImageFilterStraighten.java
|
| 743600e90f1318f8ff506d8a7e568060636ccfe7 |
08-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix borders
Change-Id: Ia77660872f3baf10968e20b5656d97c4fbfc815e
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterFxRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterRepresentation.java
ndroid/gallery3d/filtershow/filters/ImageFilterBorder.java
ndroid/gallery3d/filtershow/filters/ImageFilterParametricBorder.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
|
| fbd39b13a41a96142da85956625530e28075992e |
08-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Add todo
Change-Id: I54fd72da364337833f80a0f1913beadf2af74277
ndroid/gallery3d/filtershow/filters/FilterFxRepresentation.java
|
| 7857b453e2aac07c0dbd5fdaa6d0df5e02ad2464 |
08-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix Fx filters" into gb-ub-photos-bryce
|
| 99256e380cb0369df7f407192f279d3e39d5d5d1 |
08-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix Fx filters
Change-Id: Id501ec3a7b4880e697e2b90c056a57fb3ec456ea
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/PanelController.java
ndroid/gallery3d/filtershow/filters/FilterBasicRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterFxRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterRepresentation.java
ndroid/gallery3d/filtershow/filters/ImageFilterFx.java
ndroid/gallery3d/filtershow/ui/FilterIconButton.java
|
| 260fc36e76a140687868e86d9cb244e3a2523f39 |
07-Feb-2013 |
John Hoford <hoford@google.com> |
Merge "fix draw and curves to use FilterRepresentation" into gb-ub-photos-bryce
|
| 394c12c26d03f0ae341b2251c4e5ad35c4463e9c |
05-Feb-2013 |
John Hoford <hoford@google.com> |
fix draw and curves to use FilterRepresentation
Change-Id: I500d9c04ea0e55cbc9b1927dee2f6a19a67d5349
ndroid/gallery3d/filtershow/cache/ImageLoader.java
ndroid/gallery3d/filtershow/editors/EditorCurves.java
ndroid/gallery3d/filtershow/editors/EditorDraw.java
ndroid/gallery3d/filtershow/filters/FilterCurvesRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterDrawRepresentation.java
ndroid/gallery3d/filtershow/filters/ImageFilterCurves.java
ndroid/gallery3d/filtershow/filters/ImageFilterDraw.java
ndroid/gallery3d/filtershow/imageshow/ImageDraw.java
ndroid/gallery3d/filtershow/imageshow/MasterImage.java
ndroid/gallery3d/filtershow/ui/ImageCurves.java
ndroid/gallery3d/filtershow/ui/Spline.java
|
| da50e05c6f01a8de71e6c3e7293058b4f6985316 |
07-Feb-2013 |
Doris Liu <tianliu@google.com> |
Lock focus during countdown
Change-Id: Ia8d4250daa488c35e276218e9fdb8efdf00836c2
ndroid/camera/PhotoModule.java
|
| 4d9133ad6d48bdf45e1ed87fa8a934013ddc584f |
07-Feb-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix memory leak in ComboPreferences" into gb-ub-photos-bryce
|
| 4e72c9098e96866fe9d7612c197a5b26f8f99d57 |
07-Feb-2013 |
Doris Liu <tianliu@google.com> |
Fix memory leak in ComboPreferences
Bug: 8028546
Change-Id: I05246ba6675c62f89b1eaeb90d594dcb9aaf7185
ndroid/camera/ComboPreferences.java
|
| 96bba43f8ea135208d9c2a33ae309326a7abfd69 |
07-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix flashing on geometry preview
Change-Id: I0f05d654c1c4373016d2d5766eb983a47fab2780
ndroid/gallery3d/filtershow/PanelController.java
|
| 895cb496eddf5db0abff55100bdb2730a2515cae |
07-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix filters only + geometry only rendering
Change-Id: Id8f0637ae53864488cb931def196ee50ae807f5c
ndroid/gallery3d/filtershow/cache/FilteringPipeline.java
ndroid/gallery3d/filtershow/cache/RenderingRequest.java
ndroid/gallery3d/filtershow/cache/RenderingRequestCaller.java
ndroid/gallery3d/filtershow/filters/ImageFilterRS.java
ndroid/gallery3d/filtershow/imageshow/ImageGeometry.java
ndroid/gallery3d/filtershow/imageshow/MasterImage.java
|
| 082803ec883c8182485872bbc34b63705b04d101 |
06-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Refactor to use direct manipulations of FilterRepresentations.
Change-Id: If5f92f137283cb126835be004d315942ff95021c
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/PanelController.java
ndroid/gallery3d/filtershow/cache/FilteringPipeline.java
ndroid/gallery3d/filtershow/cache/ImageLoader.java
ndroid/gallery3d/filtershow/cache/TripleBufferBitmap.java
ndroid/gallery3d/filtershow/editors/BasicEditor.java
ndroid/gallery3d/filtershow/editors/Editor.java
ndroid/gallery3d/filtershow/filters/ImageFilterRS.java
ndroid/gallery3d/filtershow/imageshow/MasterImage.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
|
| 083074c72999425c7e8a54ecafc965ae17dcbea8 |
05-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
fix editor visibility
Change-Id: I0c9c5273b49974884b8bdf365211b33de54c5598
ndroid/gallery3d/filtershow/EditorPlaceHolder.java
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/PanelController.java
|
| 76776d3d5ab2ea3c5d101f668a35680e11094fe6 |
05-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Refactor filters parameters - introduce FilterRepresentations - change filters lifecycle" into gb-ub-photos-bryce
|
| 009dbc7b5ff33e97ca8a99fb60f1275ad07f572d |
05-Feb-2013 |
John Reck <jreck@google.com> |
Cleanup
Move Canvas to com.android.photos.canvas
Remove workaround for b/8079561
Change-Id: I14b832d5935eb8704e96e5591c58f33a7cd4de31
ndroid/gallery3d/app/Gallery.java
ndroid/gallery3d/provider/CanvasProvider.java
ndroid/gallery3d/provider/CanvasProviderBase.java
ndroid/photos/canvas/CanvasActivity.java
ndroid/photos/canvas/CanvasProvider.java
ndroid/photos/canvas/CanvasProviderBase.java
ndroid/photos/canvas/EnableSyncActivity.java
oogle/android/canvas/provider/EnableSyncActivity.java
|
| da4de5aa86b49be455efe396455b77be44dec684 |
29-Jan-2013 |
nicolasroard <nicolasroard@google.com> |
Refactor filters parameters
- introduce FilterRepresentations
- change filters lifecycle
Change-Id: I9416fca47a334d532a347cd5577795738c870933
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/ImageStateAdapter.java
ndroid/gallery3d/filtershow/PanelController.java
ndroid/gallery3d/filtershow/cache/FilteringPipeline.java
ndroid/gallery3d/filtershow/editors/BasicEditor.java
ndroid/gallery3d/filtershow/editors/EditorDraw.java
ndroid/gallery3d/filtershow/filters/FilterBasicRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterDirectRepresentation.java
ndroid/gallery3d/filtershow/filters/FilterRepresentation.java
ndroid/gallery3d/filtershow/filters/ImageFilter.java
ndroid/gallery3d/filtershow/filters/ImageFilterBorder.java
ndroid/gallery3d/filtershow/filters/ImageFilterBwFilter.java
ndroid/gallery3d/filtershow/filters/ImageFilterContrast.java
ndroid/gallery3d/filtershow/filters/ImageFilterCurves.java
ndroid/gallery3d/filtershow/filters/ImageFilterDownsample.java
ndroid/gallery3d/filtershow/filters/ImageFilterDraw.java
ndroid/gallery3d/filtershow/filters/ImageFilterEdge.java
ndroid/gallery3d/filtershow/filters/ImageFilterExposure.java
ndroid/gallery3d/filtershow/filters/ImageFilterFx.java
ndroid/gallery3d/filtershow/filters/ImageFilterHue.java
ndroid/gallery3d/filtershow/filters/ImageFilterKMeans.java
ndroid/gallery3d/filtershow/filters/ImageFilterNegative.java
ndroid/gallery3d/filtershow/filters/ImageFilterParametricBorder.java
ndroid/gallery3d/filtershow/filters/ImageFilterRedEye.java
ndroid/gallery3d/filtershow/filters/ImageFilterSaturated.java
ndroid/gallery3d/filtershow/filters/ImageFilterShadows.java
ndroid/gallery3d/filtershow/filters/ImageFilterSharpen.java
ndroid/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
ndroid/gallery3d/filtershow/filters/ImageFilterVibrance.java
ndroid/gallery3d/filtershow/filters/ImageFilterVignette.java
ndroid/gallery3d/filtershow/filters/ImageFilterWBalance.java
ndroid/gallery3d/filtershow/filters/SimpleImageFilter.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
ndroid/gallery3d/filtershow/imageshow/MasterImage.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
ndroid/gallery3d/filtershow/ui/FilterIconButton.java
ndroid/gallery3d/filtershow/ui/ImageCurves.java
|
| 465e25bd3cb2c76732102d7be98bc0335962f715 |
05-Feb-2013 |
John Reck <jreck@google.com> |
Merge "Handle syncing better" into gb-ub-photos-bryce
|
| 6e99c176e9c8763a774dbad05bfcc5f2b0b788d5 |
05-Feb-2013 |
John Reck <jreck@google.com> |
Handle syncing better
Bug: 8104531
Limit to every 15 minutes
Avoid requesting a sync on a MediaSet that's already syncing
Change-Id: Iac4522cd305c64696317cc7088b0e851a2b81893
ndroid/gallery3d/provider/CanvasProvider.java
ndroid/gallery3d/provider/CanvasProviderBase.java
|
| 1ddbdc88f9b6e8ab26ba344c5bebb5b6fa220941 |
04-Feb-2013 |
Tim Murray <timmurray@google.com> |
Switch Gallery over to RS compatibility library.
Change-Id: If27809236534f3b196949bf455faed45c99f3da5
ndroid/gallery3d/filtershow/cache/FilteringPipeline.java
ndroid/gallery3d/filtershow/filters/ImageFilterRS.java
|
| 88e34ef6e25ec2ee63b0400accb9f500bf88dc96 |
02-Feb-2013 |
John Hoford <hoford@google.com> |
fix performance problem with large images in draw
Change-Id: I9fa5a90e58273c6dd6e80d7d0bf07c3371a6f10e
ndroid/gallery3d/filtershow/colorpicker/ColorOpacityView.java
ndroid/gallery3d/filtershow/filters/ImageFilterDraw.java
|
| efc561262664cbb9aaf2c4e39a74597329ae77de |
01-Feb-2013 |
John Hoford <hoford@google.com> |
Merge "fix sharpen to work under the new system" into gb-ub-photos-bryce
|
| f52b80ecac784c0d279cfde44f159e9d1aa74961 |
01-Feb-2013 |
John Hoford <hoford@google.com> |
fix sharpen to work under the new system
Change-Id: I25518a05511c8b2279ba171bc3902e8cb3181c19
ndroid/gallery3d/filtershow/editors/BasicEditor.java
ndroid/gallery3d/filtershow/editors/EditorZoom.java
ndroid/gallery3d/filtershow/filters/ImageFilterSharpen.java
|
| 48e3a417d2d2dbae25410b2219ca823539e38325 |
01-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix async loading of borders
bug:8099597
Change-Id: I62584c87eff03539ec50aafafda4238850b4f743
ndroid/gallery3d/filtershow/FilterShowActivity.java
|
| 141cc17189342efe78bbc2ab1c30e34bb980e200 |
01-Feb-2013 |
Angus Kong <shkong@google.com> |
Merge "Make video snapshot save images in the background." into gb-ub-photos-bryce
|
| 81795da6a519803efc46e46e3c2c4ba8a6e00e9b |
01-Feb-2013 |
John Hoford <hoford@google.com> |
Fix curves refresh bug
Change-Id: I5c85dcfa118345d24a5fef120541741e7d1cbdd6
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/filters/ImageFilterCurves.java
|
| 86d36313d88fe96354f2cdd4f378e5ff8397c458 |
01-Feb-2013 |
Angus Kong <shkong@google.com> |
Make video snapshot save images in the background.
bug:8114662
Change-Id: I4e96269bd7723dd9a82d2905a01f736c8982c4ed
ndroid/camera/CameraActivity.java
ndroid/camera/CameraModule.java
ndroid/camera/MediaSaveService.java
ndroid/camera/PanoramaModule.java
ndroid/camera/PhotoModule.java
ndroid/camera/VideoModule.java
|
| 8052651774e5a4f68f9ea3e79319e59eafd354cc |
01-Feb-2013 |
John Reck <jreck@google.com> |
Merge "Animate between photo modules" into gb-ub-photos-bryce
|
| e319aeabdc825f221df5af8a6ec080c6f5d41a94 |
07-Nov-2012 |
John Reck <jreck@google.com> |
Animate between photo modules
Change-Id: I20f0d470a14bb41757788897c1c5e7ea42a7426d
ndroid/camera/CameraActivity.java
ndroid/camera/CameraScreenNail.java
|
| 865c12a79c5ab045d689c26be621d53586ee2a05 |
31-Jan-2013 |
Angus Kong <shkong@google.com> |
Merge "Make background media saving a service" into gb-ub-photos-bryce
|
| ce5480e099fda944b9e96e4b750300944c3f4a4f |
30-Jan-2013 |
Angus Kong <shkong@google.com> |
Make background media saving a service
bug:8091328
Change-Id: If35c1832238e921b6582d8642fdbaa4378ea0c48
ndroid/camera/MediaSaveService.java
ndroid/camera/MediaSaver.java
ndroid/camera/PhotoModule.java
|
| 9beac537774310fc435bc513ba25a8230b14f0e4 |
25-Jan-2013 |
John Hoford <google.com> |
add color selection ui to draw
Change-Id: Ie2fa3522141e4f98e2b7f805c1ebe3385083bb02
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/colorpicker/ColorGridDialog.java
ndroid/gallery3d/filtershow/colorpicker/ColorListener.java
ndroid/gallery3d/filtershow/colorpicker/ColorOpacityView.java
ndroid/gallery3d/filtershow/colorpicker/ColorPickerDialog.java
ndroid/gallery3d/filtershow/colorpicker/ColorRectView.java
ndroid/gallery3d/filtershow/colorpicker/ColorValueView.java
ndroid/gallery3d/filtershow/colorpicker/RGBListener.java
ndroid/gallery3d/filtershow/editors/EditorDraw.java
ndroid/gallery3d/filtershow/filters/ImageFilterDraw.java
ndroid/gallery3d/filtershow/imageshow/ImageDraw.java
|
| d08e8639ce9a0088a34d6fb9630e4fb8b4f9e035 |
31-Jan-2013 |
John Reck <jreck@google.com> |
Merge "show enable sync option for canvas" into gb-ub-photos-bryce
|
| a44d376a92993839117f34743a17e27bf090b1a9 |
31-Jan-2013 |
John Reck <jreck@google.com> |
show enable sync option for canvas
Temporary change for testing
Change-Id: I46305cb3b182e0a48625bf4fcad3205334ade961
ndroid/gallery3d/provider/CanvasProvider.java
ndroid/gallery3d/provider/CanvasProviderBase.java
oogle/android/canvas/provider/EnableSyncActivity.java
|
| 80af9dc06a173d09778b843c5a3067b079ce0c34 |
31-Jan-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Clean up invalidate / redraw loop Move the recopy to the main thread" into gb-ub-photos-bryce
|
| 518d1193692fadaf91a2f5b174735d45bda2c4ab |
29-Jan-2013 |
nicolasroard <nicolasroard@google.com> |
Clean up invalidate / redraw loop
Move the recopy to the main thread
Change-Id: I8c94179e292f5679b7c817b6bd5000ee384b83ce
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/cache/FilteringPipeline.java
ndroid/gallery3d/filtershow/editors/BasicEditor.java
ndroid/gallery3d/filtershow/filters/ImageFilter.java
ndroid/gallery3d/filtershow/imageshow/MasterImage.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
|
| 501ced9324dd97e71435e08e431a7f97cf1b8bed |
29-Jan-2013 |
John Reck <jreck@google.com> |
Extract constants/boilerplate
Change-Id: I52ba51bab6ec12f2925384c1eedbba96e02bfa97
ndroid/gallery3d/provider/CanvasProvider.java
ndroid/gallery3d/provider/CanvasProviderBase.java
|
| 45e42d25b8fa11f9b9615244a8f0bc68de2e4a8c |
29-Jan-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix thumbnail generation" into gb-ub-photos-bryce
|
| a2577e066f195d6f3ec8d92c8941797976501ea2 |
29-Jan-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Importer: when view is reused for same image, don't reload" into gb-ub-photos-bryce
|
| 0bb3abc58f7c921451f2870d8679af2377ad7ce9 |
29-Jan-2013 |
nicolasroard <nicolasroard@google.com> |
Fix thumbnail generation
Change-Id: I03a290bf8eb80bd1687bfd37640dec29ef213cdb
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/ui/IconButton.java
|
| ddbff6fd78d2b3286a81fad125818443a6907ccf |
29-Jan-2013 |
Bobby Georgescu <georgescu@google.com> |
Importer: when view is reused for same image, don't reload
Bug: 7968780
Change-Id: I6786d140e516ff60562c5c0b1222fca0ea153216
ndroid/gallery3d/ingest/adapter/MtpAdapter.java
ndroid/gallery3d/ingest/ui/MtpThumbnailTileView.java
|
| b5317406b1f43f39e5c5847a04b21a1c38a1830e |
29-Jan-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix scaling + quality parameters" into gb-ub-photos-bryce
|
| 4fbd974264a91357de98115d7746ab370d7f3d94 |
29-Jan-2013 |
nicolasroard <nicolasroard@google.com> |
Fix scaling + quality parameters
Change-Id: I92e7759282e0f3cc7be8ff95a19a4acb890d214d
ndroid/gallery3d/filtershow/cache/FilteringPipeline.java
ndroid/gallery3d/filtershow/cache/ImageLoader.java
|
| 9a19022b495447029c81fdcd83dc1a1c86d98b25 |
29-Jan-2013 |
Michael Kolb <kolby@google.com> |
Merge "Move Camera Java/Native source into Gallery2" into gb-ub-photos-bryce
|
| 72d510612f505d4d8439dab144d5c253346aebc2 |
29-Jan-2013 |
Bobby Georgescu <georgescu@google.com> |
Add comment about MenuExecutor assumptions in BatchService
Bug: 7998915
Change-Id: Ibb73585bf2f81b4a1daadfeb814828ec7b55441d
ndroid/gallery3d/app/BatchService.java
|
| 8872c23e739de38d74f04a8c852ebb5199c905f6 |
29-Jan-2013 |
Michael Kolb <kolby@google.com> |
Move Camera Java/Native source into Gallery2
Change-Id: I968efe4d656e88a7760d3c0044f65b4adac2ddd1
ndroid/camera/ActivityBase.java
ndroid/camera/CameraActivity.java
ndroid/camera/CameraBackupAgent.java
ndroid/camera/CameraButtonIntentReceiver.java
ndroid/camera/CameraDisabledException.java
ndroid/camera/CameraErrorCallback.java
ndroid/camera/CameraHardwareException.java
ndroid/camera/CameraHolder.java
ndroid/camera/CameraManager.java
ndroid/camera/CameraModule.java
ndroid/camera/CameraPreference.java
ndroid/camera/CameraScreenNail.java
ndroid/camera/CameraSettings.java
ndroid/camera/CaptureAnimManager.java
ndroid/camera/ComboPreferences.java
ndroid/camera/CountDownTimerPreference.java
ndroid/camera/DisableCameraReceiver.java
ndroid/camera/EffectsRecorder.java
ndroid/camera/Exif.java
ndroid/camera/FocusOverlayManager.java
ndroid/camera/IconListPreference.java
ndroid/camera/IntArray.java
ndroid/camera/ListPreference.java
ndroid/camera/LocationManager.java
ndroid/camera/MediaSaver.java
ndroid/camera/Mosaic.java
ndroid/camera/MosaicFrameProcessor.java
ndroid/camera/MosaicPreviewRenderer.java
ndroid/camera/MosaicRenderer.java
ndroid/camera/OnClickAttr.java
ndroid/camera/OnScreenHint.java
ndroid/camera/PanoProgressBar.java
ndroid/camera/PanoUtil.java
ndroid/camera/PanoramaModule.java
ndroid/camera/PhotoController.java
ndroid/camera/PhotoModule.java
ndroid/camera/PieController.java
ndroid/camera/PreferenceGroup.java
ndroid/camera/PreferenceInflater.java
ndroid/camera/PreviewFrameLayout.java
ndroid/camera/PreviewGestures.java
ndroid/camera/ProxyLauncher.java
ndroid/camera/RecordLocationPreference.java
ndroid/camera/RotateDialogController.java
ndroid/camera/SecureCameraActivity.java
ndroid/camera/ShutterButton.java
ndroid/camera/SoundClips.java
ndroid/camera/StaticBitmapScreenNail.java
ndroid/camera/Storage.java
ndroid/camera/SwitchAnimManager.java
ndroid/camera/Thumbnail.java
ndroid/camera/Util.java
ndroid/camera/VideoController.java
ndroid/camera/VideoModule.java
ndroid/camera/drawable/TextDrawable.java
ndroid/camera/ui/AbstractSettingPopup.java
ndroid/camera/ui/CameraSwitcher.java
ndroid/camera/ui/CheckedLinearLayout.java
ndroid/camera/ui/CountDownView.java
ndroid/camera/ui/EffectSettingPopup.java
ndroid/camera/ui/ExpandedGridView.java
ndroid/camera/ui/FaceView.java
ndroid/camera/ui/FocusIndicator.java
ndroid/camera/ui/InLineSettingCheckBox.java
ndroid/camera/ui/InLineSettingItem.java
ndroid/camera/ui/InLineSettingMenu.java
ndroid/camera/ui/LayoutChangeHelper.java
ndroid/camera/ui/LayoutChangeNotifier.java
ndroid/camera/ui/LayoutNotifyView.java
ndroid/camera/ui/ListPrefSettingPopup.java
ndroid/camera/ui/MoreSettingPopup.java
ndroid/camera/ui/OnIndicatorEventListener.java
ndroid/camera/ui/OverlayRenderer.java
ndroid/camera/ui/PieItem.java
ndroid/camera/ui/PieRenderer.java
ndroid/camera/ui/PopupManager.java
ndroid/camera/ui/PreviewSurfaceView.java
ndroid/camera/ui/RenderOverlay.java
ndroid/camera/ui/Rotatable.java
ndroid/camera/ui/RotateImageView.java
ndroid/camera/ui/RotateLayout.java
ndroid/camera/ui/RotateTextToast.java
ndroid/camera/ui/Switch.java
ndroid/camera/ui/TimeIntervalPopup.java
ndroid/camera/ui/TimerSettingPopup.java
ndroid/camera/ui/TwoStateImageView.java
ndroid/camera/ui/ZoomRenderer.java
|
| c58d88b469fd345df9bdbff0c147d91caa9959b5 |
29-Jan-2013 |
John Reck <jreck@google.com> |
Merge "Launching gallery shows browse ui on canvas" into gb-ub-photos-bryce
|
| 407d60623860a53780a53edac81f39193da44126 |
29-Jan-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fixed BasicEditor NPE." into gb-ub-photos-bryce
|
| 5a1fcd84b353eda4c283c04cb656a51e6069bec7 |
29-Jan-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Fix ANRs due to waiting for IO on UI thread" into gb-ub-photos-bryce
|
| 18a4ceb563def1f20d2cefb7a87e2f1f9a061a82 |
29-Jan-2013 |
nicolasroard <nicolasroard@google.com> |
Fix apply geometry.
bug:8068166
Change-Id: I3cfa44dda1af1fbd5455db6027d793b5a44dd5d8
ndroid/gallery3d/filtershow/presets/ImagePreset.java
ndroid/gallery3d/filtershow/tools/SaveCopyTask.java
|
| 76778f6aa46928263df4a39bd717aada9a5cde1a |
29-Jan-2013 |
John Reck <jreck@google.com> |
Launching gallery shows browse ui on canvas
Change-Id: I3a5e63ce354ac8e3f3c60e4dc86cfa4432026622
ndroid/gallery3d/app/Gallery.java
ndroid/gallery3d/provider/CanvasProvider.java
|
| 4906a4d1f5167b4911627e692aef82e486eeea5a |
29-Jan-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fixed BasicEditor NPE.
Bug: 8068020
Change-Id: I81df163d9779ae3e246f4e337b64dfbc32ce7db5
ndroid/gallery3d/filtershow/editors/BasicEditor.java
|
| 248c7e912dbddaeeeec52e4602a319976d24dddb |
29-Jan-2013 |
Bobby Georgescu <georgescu@google.com> |
Fix ANRs due to waiting for IO on UI thread
Bug: 7998915
Change-Id: I938145a7072170f713099a04578f98951b35cbab
ndroid/gallery3d/app/AbstractGalleryActivity.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/ui/MenuExecutor.java
|
| 07e9353082b6b0d41c8ec33efa9aa6e8c2633202 |
28-Jan-2013 |
John Reck <jreck@google.com> |
Code drop
Change-Id: Ibee7c3a1aed61dbe9d3d62ad7f3d3653994c8ef8
ndroid/gallery3d/provider/CanvasProvider.java
oogle/android/canvas/data/Cluster.java
oogle/android/canvas/data/util/UriUtils.java
oogle/android/canvas/provider/CanvasContract.java
|
| c2caaf8053376dbe0253dcd3d85873decce7fab6 |
23-Jan-2013 |
Stephen Hines <srhines@google.com> |
Revert "Switch Gallery over to RS compatibility library."
This reverts commit 0746ce0977cde616d25ce35fee0d8d554235a21c
Change-Id: Ic0fb6c60e5f40b53ad032afeafe2f9ff70c26b50
ndroid/gallery3d/filtershow/cache/FilteringPipeline.java
ndroid/gallery3d/filtershow/filters/ImageFilterRS.java
|
| c1a6a49b4364b5b3bd54c8c2dca377b8791a8172 |
17-Jan-2013 |
Stephen Hines <srhines@google.com> |
Switch Gallery over to RS compatibility library.
Change-Id: If6eaea15a12a1448b402fb00dfd770b3749471ad
ndroid/gallery3d/filtershow/cache/FilteringPipeline.java
ndroid/gallery3d/filtershow/filters/ImageFilterRS.java
|
| 87463e150b1f52086ecf7d597636ba83e7f93b8f |
16-Jan-2013 |
nicolasroard <nicolasroard@google.com> |
Better caching for RS filters
Change-Id: I78eaa90e408059cf1c59fc06920f5aef82ae2c0d
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/PanelController.java
ndroid/gallery3d/filtershow/cache/DelayedPresetCache.java
ndroid/gallery3d/filtershow/cache/DirectPresetCache.java
ndroid/gallery3d/filtershow/cache/FilteringPipeline.java
ndroid/gallery3d/filtershow/cache/ImageLoader.java
ndroid/gallery3d/filtershow/cache/TripleBufferBitmap.java
ndroid/gallery3d/filtershow/filters/ImageFilter.java
ndroid/gallery3d/filtershow/filters/ImageFilterRS.java
ndroid/gallery3d/filtershow/imageshow/ImageGeometry.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
ndroid/gallery3d/filtershow/imageshow/ImageZoom.java
ndroid/gallery3d/filtershow/imageshow/MasterImage.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
|
| fd2c62cbf84fcdaa3280327fd02f4372b3118338 |
19-Jan-2013 |
John Reck <jreck@google.com> |
Merge "Tweaks for canvas" into gb-ub-photos-bryce
|
| 76595d7ee48d63ca5c1766239f822a0c6dbcdc6f |
19-Jan-2013 |
John Reck <jreck@google.com> |
Tweaks for canvas
Change-Id: I9aecf757047f93159212441e5317ef2b3b304a70
ndroid/gallery3d/app/Gallery.java
ndroid/gallery3d/app/MovieActivity.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/data/MediaSet.java
|
| c3c50454ce201ffc8fdbbcf383cb5caa1255dc37 |
19-Jan-2013 |
John Hoford <hoford@google.com> |
Merge "refactor the filter/editor relationship" into gb-ub-photos-bryce
|
| 0cd4c8706f242f7a5d625e5b88509fc646859807 |
18-Jan-2013 |
John Hoford <hoford@google.com> |
refactor the filter/editor relationship
Change-Id: I1f9a735166c28c65734fbb85201774fb6f664076
ndroid/gallery3d/filtershow/EditorPlaceHolder.java
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/PanelController.java
ndroid/gallery3d/filtershow/editors/BasicEditor.java
ndroid/gallery3d/filtershow/editors/Editor.java
ndroid/gallery3d/filtershow/editors/EditorCurves.java
ndroid/gallery3d/filtershow/editors/EditorZoom.java
ndroid/gallery3d/filtershow/filters/ImageFilter.java
ndroid/gallery3d/filtershow/filters/ImageFilterHue.java
ndroid/gallery3d/filtershow/imageshow/ImageDraw.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
ndroid/gallery3d/filtershow/imageshow/MasterImage.java
|
| 2f557640030af99c3aaf650dc7d7957f1a18c6e7 |
18-Jan-2013 |
Bobby Georgescu <georgescu@google.com> |
Fix importer crashes on unplug during scrolling
Bug: 8035040
Change-Id: If822b15f2210e2af42c8a38f6ac2acb25d535aa9
ndroid/gallery3d/ingest/ui/MtpBitmapCache.java
|
| 6c95a5c97615593181365d8f320e733eb2df54e0 |
17-Jan-2013 |
Bobby Georgescu <georgescu@google.com> |
Fix importer crashes when unplugging during indexing
Bug: 8027984
Slightly refactored the indexing step to encapsulate all
of the indexing work within the runnable that does it and
to correctly handle the cases where the device is unplugged
in the middle of the indexing.
Change-Id: I338657bbbedd6b82d012f65cd1ea28e0afd890c2
ndroid/gallery3d/ingest/MtpDeviceIndex.java
|
| 188a7505a3e864fe19684ccf174978b89f42ae65 |
17-Jan-2013 |
Bobby Georgescu <georgescu@google.com> |
Show status in importer for empty or no device
Bug: 8000251
Change-Id: Iefbbe6df59f432ffeb10ac9fa846a8908584ab58
ndroid/gallery3d/ingest/IngestActivity.java
ndroid/gallery3d/ingest/MtpDeviceIndex.java
ndroid/gallery3d/ingest/adapter/MtpAdapter.java
|
| cdbd61532909eb2168c74b6a9d0e0aa5b95c0274 |
17-Jan-2013 |
John Reck <jreck@google.com> |
Merge "New loading model" into gb-ub-photos-bryce
|
| 9686d9d07e344fae2f2310ca544e5401b5e11d30 |
16-Jan-2013 |
John Reck <jreck@google.com> |
New loading model
Rename reload() to loadIfDirty()
loadIfDirty is implemented by MediaSet and is final
loadIfDirty is now blocking instead of async
Subclasses must implement two protected methods, isDirtyLocked() and load()
The change from async reload() to sync loadIfDirty() should be fine since
all users of reload() were doing so from a background thread already, and the
longest load() is PicasaAlbumSet which is still a fairly brisk 40ms or so
Change-Id: If5cc596a1c13e52e5f4efff1a144bd086d37cfb7
ndroid/gallery3d/app/AlbumDataLoader.java
ndroid/gallery3d/app/AlbumSetDataLoader.java
ndroid/gallery3d/app/PhotoDataAdapter.java
ndroid/gallery3d/app/SlideshowPage.java
ndroid/gallery3d/data/ClusterAlbum.java
ndroid/gallery3d/data/ClusterAlbumSet.java
ndroid/gallery3d/data/ComboAlbum.java
ndroid/gallery3d/data/ComboAlbumSet.java
ndroid/gallery3d/data/FilterDeleteSet.java
ndroid/gallery3d/data/FilterEmptyPromptSet.java
ndroid/gallery3d/data/FilterTypeSet.java
ndroid/gallery3d/data/LocalAlbum.java
ndroid/gallery3d/data/LocalAlbumSet.java
ndroid/gallery3d/data/LocalMergeAlbum.java
ndroid/gallery3d/data/MediaSet.java
ndroid/gallery3d/data/MediaSetWrapper.java
ndroid/gallery3d/data/SecureAlbum.java
ndroid/gallery3d/data/SingleItemAlbum.java
ndroid/gallery3d/data/SnailAlbum.java
ndroid/gallery3d/gadget/MediaSetSource.java
|
| 01e4d3a4d112832d33409adf6f8e0c0ac09b7b1e |
16-Jan-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Always have determinate progress in import notification" into gb-ub-photos-bryce
|
| dd8784f2a9dc18f8ce2951ef1edaf2e6e63d93b0 |
16-Jan-2013 |
Bobby Georgescu <georgescu@google.com> |
Always have determinate progress in import notification
Bug: 7967520
Change-Id: Iaeb5f2e3d508d964856faaea63475cbc25e13c0d
ndroid/gallery3d/ingest/IngestService.java
|
| 9003bd581c00a31db4c8291c99a30d5e74fe2dde |
16-Jan-2013 |
John Reck <jreck@google.com> |
Merge "Add a blocking load to MediaSet" into gb-ub-photos-bryce
|
| 2c0396a28ebf8cad71d234a82add2afb763a68f4 |
16-Jan-2013 |
Bobby Georgescu <georgescu@google.com> |
Importer date tiles reflect language change
Bug: 8020035
Change-Id: I1ac2a27ca7be088e6ad6f9b8c624c36e04ff03b0
ndroid/gallery3d/ingest/IngestActivity.java
ndroid/gallery3d/ingest/ui/DateTileView.java
|
| 8af0426fff43fee962d3c23b8885d453ad6c2f3c |
16-Jan-2013 |
John Reck <jreck@google.com> |
Add a blocking load to MediaSet
Change-Id: I367975fd33f884fb7e576b7064c495bdb7a3ce7b
ndroid/gallery3d/data/ComboAlbumSet.java
ndroid/gallery3d/data/MediaSet.java
|
| 29aeb6bc6ca5e750fad9ff1da351b25969513030 |
16-Jan-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fix exif data saving for picasa images.
Bug: 7910836
Change-Id: I8ec1a1ab379c35b0602689a8f7850f5c861e0189
ndroid/gallery3d/filtershow/cache/ImageLoader.java
ndroid/gallery3d/filtershow/tools/SaveCopyTask.java
|
| de5d6c6a14c1250dc43c40f5b22cf6ff69362f17 |
14-Jan-2013 |
John Hoford <hoford@google.com> |
refactoring imageshow
Change-Id: I6d0872250b31a427ea6a3e46bd1c9ca5f3ba92ee
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/HistoryAdapter.java
ndroid/gallery3d/filtershow/PanelController.java
ndroid/gallery3d/filtershow/cache/DirectPresetCache.java
ndroid/gallery3d/filtershow/filters/ImageFilterRS.java
ndroid/gallery3d/filtershow/imageshow/ImageDraw.java
ndroid/gallery3d/filtershow/imageshow/ImageGeometry.java
ndroid/gallery3d/filtershow/imageshow/ImageRedEyes.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
ndroid/gallery3d/filtershow/imageshow/ImageSlave.java
ndroid/gallery3d/filtershow/imageshow/ImageTinyPlanet.java
ndroid/gallery3d/filtershow/imageshow/ImageZoom.java
ndroid/gallery3d/filtershow/imageshow/MasterImage.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
ndroid/gallery3d/filtershow/ui/FilterIconButton.java
ndroid/gallery3d/filtershow/ui/ImageCurves.java
|
| 3d49241cf309365373a1c3e98838c764f718cd3e |
14-Jan-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fixed ClassCastException on open crop aspect menu.
Bug: 7999315
Change-Id: I78bd4c12f5241215629f6eb06fdc7b101ed6ddb6
ndroid/gallery3d/filtershow/imageshow/ImageCrop.java
|
| a9de8750056fb8bacaafd9706e9e2320cbe0cbe1 |
13-Jan-2013 |
George Mount <mount@google.com> |
Merge "Fix LightCycle capture NullPointerException." into gb-ub-photos-bryce
|
| 5a4285d3ef0e05f817c45456217546f4f2f00d75 |
13-Jan-2013 |
George Mount <mount@google.com> |
Fix LightCycle capture NullPointerException.
Bug 7987002
During capture animation, allow LightCycle to write the
current frame to a texture, then use that texture for drawing
the background image.
Change-Id: I7891e5cac18ee21ff17910790397459f9d57e408
ndroid/gallery3d/glrenderer/BasicTexture.java
ndroid/gallery3d/glrenderer/GLES20Canvas.java
ndroid/gallery3d/glrenderer/RawTexture.java
|
| b146af084f43e6b87ad34ac9bf94b18aa36a46aa |
19-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Refactoring button class. Minor bug fixes.
Bug: 7875246
Bug: 7459118
Change-Id: Ic1099a7ae0feeeb16c8be3035f9726805149666e
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/PanelController.java
ndroid/gallery3d/filtershow/filters/ImageFilter.java
ndroid/gallery3d/filtershow/filters/ImageFilterBorder.java
ndroid/gallery3d/filtershow/filters/ImageFilterDownsample.java
ndroid/gallery3d/filtershow/filters/ImageFilterFx.java
ndroid/gallery3d/filtershow/filters/ImageFilterParametricBorder.java
ndroid/gallery3d/filtershow/imageshow/ImageBorder.java
ndroid/gallery3d/filtershow/imageshow/ImageSmallBorder.java
ndroid/gallery3d/filtershow/imageshow/ImageSmallFilter.java
ndroid/gallery3d/filtershow/ui/FilterIconButton.java
ndroid/gallery3d/filtershow/ui/IconButton.java
ndroid/gallery3d/filtershow/ui/ImageButtonTitle.java
|
| 6681d532e7f1fe9971e10ddeae52063bf4ba5e12 |
10-Jan-2013 |
George Mount <mount@google.com> |
Merge "Fix slide show animation so that cross fades work." into gb-ub-photos-bryce
|
| c8cab06ea9dbf4b1d46203603bfefa0160aa8f62 |
08-Jan-2013 |
George Mount <mount@google.com> |
Fix slide show animation so that cross fades work.
Bug 7961297
Removed the "Additive" blending, which didn't do anything, even in
OpenGL ES 1.1 implementation. Modified the texturing to
change the color of the pixels based on the supplied alpha
rather than modifying the alpha. This appears to match the
implementation in the OpenGL ES 1.1 pipeline.
Change-Id: I52491af1a8a2d727968e4e805bc4bc61647f5cf2
ndroid/gallery3d/glrenderer/GLCanvas.java
ndroid/gallery3d/glrenderer/GLES11Canvas.java
ndroid/gallery3d/glrenderer/GLES20Canvas.java
ndroid/gallery3d/ui/SlideshowView.java
|
| a6911dc4d39a1c31fd15e6db55ce0e270a7bc94d |
09-Jan-2013 |
nicolasroard <nicolasroard@google.com> |
Refactor filters management
Change-Id: I0e75ad534cf8cc74a132f97836eedd35baeebeae
ndroid/gallery3d/filtershow/FilterShowActivity.java
|
| e984fa69f93999b7c88e24fd9aeb1360f349377d |
29-Dec-2012 |
John Hoford <hoford@google.com> |
Add the Drama filter
Change-Id: I6f026f899b9d991bd6f9e74445f68114041fe781
ndroid/gallery3d/filtershow/FilterShowActivity.java
|
| 534fc631c98d51b186b823608a0d9e267b3c0ea8 |
08-Jan-2013 |
John Hoford <hoford@google.com> |
Merge "Add a Draw filter" into gb-ub-photos-bryce
|
| 7b9803262e5f1ebb9464d5cf857f9cbb38f888bf |
08-Jan-2013 |
John Hoford <hoford@google.com> |
Add a Draw filter
Change-Id: I67aecc9241b4534491fb838b84d0da1a6edbbb54
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/filters/ImageFilterDraw.java
ndroid/gallery3d/filtershow/imageshow/ImageDraw.java
|
| a91969297aac4fa4572ad7c69d4d5924ce4b8de2 |
08-Jan-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Refactoring UI editors" into gb-ub-photos-bryce
|
| 962f4d03e92a3aa38202950053b1557e12860624 |
08-Jan-2013 |
nicolasroard <nicolasroard@google.com> |
Refactoring UI editors
bug:7688780
Change-Id: I30f8691788332a01d591435474a84cc352b71138
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/PanelController.java
ndroid/gallery3d/filtershow/imageshow/ImageCrop.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
ndroid/gallery3d/filtershow/ui/FramedTextButton.java
ndroid/gallery3d/filtershow/ui/ImageCurves.java
|
| fd091d5c1cbb635f26823efa6295bf0563a2e2a4 |
08-Jan-2013 |
George Mount <mount@google.com> |
Merge "Instantiate GLCanvas rather than reinitialize current GLCanvas." into gb-ub-photos-bryce
|
| e4673b2650ffc642afa872458dbf51e1a24b00c8 |
07-Jan-2013 |
George Mount <mount@google.com> |
Instantiate GLCanvas rather than reinitialize current GLCanvas.
GLCanvas was being used as a singleton when it really should
allow separate instances for correctness.
Change-Id: I650884e843a4a78997b70826f6012ae19b8df549
ndroid/gallery3d/glrenderer/ExtTexture.java
ndroid/gallery3d/glrenderer/GLCanvas.java
ndroid/gallery3d/glrenderer/GLES11Canvas.java
ndroid/gallery3d/glrenderer/GLES11IdImpl.java
ndroid/gallery3d/glrenderer/GLES20Canvas.java
ndroid/gallery3d/glrenderer/GLES20IdImpl.java
ndroid/gallery3d/glrenderer/GLIdImpl.java
ndroid/gallery3d/glrenderer/RawTexture.java
ndroid/gallery3d/glrenderer/UploadedTexture.java
ndroid/gallery3d/ui/GLRootView.java
ndroid/gallery3d/ui/GalleryEGLConfigChooser.java
ndroid/gallery3d/ui/SurfaceTextureScreenNail.java
|
| a4205e4eab691b402e7a6dc1e913a611b7fdc45f |
26-Dec-2012 |
Bobby Georgescu <georgescu@google.com> |
Replace camera importer
Change-Id: Icfeb23301bc6c9f8c8b12824bcbb0d8b41852d07
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/AlbumSetPage.java
ndroid/gallery3d/app/NotificationIds.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/app/UsbDeviceActivity.java
ndroid/gallery3d/data/DataManager.java
ndroid/gallery3d/data/DataSourceType.java
ndroid/gallery3d/data/MediaObject.java
ndroid/gallery3d/data/MtpContext.java
ndroid/gallery3d/data/MtpDevice.java
ndroid/gallery3d/data/MtpDeviceSet.java
ndroid/gallery3d/data/MtpImage.java
ndroid/gallery3d/data/MtpSource.java
ndroid/gallery3d/ingest/ImportTask.java
ndroid/gallery3d/ingest/IngestActivity.java
ndroid/gallery3d/ingest/IngestService.java
ndroid/gallery3d/ingest/MtpDeviceIndex.java
ndroid/gallery3d/ingest/SimpleDate.java
ndroid/gallery3d/ingest/adapter/MtpAdapter.java
ndroid/gallery3d/ingest/ui/DateTileView.java
ndroid/gallery3d/ingest/ui/MtpBitmapCache.java
ndroid/gallery3d/ingest/ui/MtpThumbnailTileView.java
ndroid/gallery3d/provider/GalleryProvider.java
ndroid/gallery3d/ui/ActionModeHandler.java
ndroid/gallery3d/ui/AlbumLabelMaker.java
ndroid/gallery3d/ui/ImportCompleteListener.java
ndroid/gallery3d/ui/MenuExecutor.java
|
| bf7af1173998fe8ac9e0eb7059d2b64e75a1c417 |
07-Jan-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Fix camera->gallery relaunch loop on empty camera album" into gb-ub-photos-bryce
|
| db3771f25a819246badc3483ebe1a35919c670b2 |
07-Jan-2013 |
Bobby Georgescu <georgescu@google.com> |
Fix camera->gallery relaunch loop on empty camera album
Bug: 7952132
Change-Id: I27325abe32177195d07fe310b8c49aca81af9056
ndroid/gallery3d/app/PhotoPage.java
|
| 44333ecb8ebb4ea172a7847731837a88719cea3f |
28-Dec-2012 |
nicolasroard <nicolasroard@google.com> |
Fix crash when using red eyes correction
bug:7680079
Change-Id: Icc6728321f18d09de5676564a3640c4b414c6741
ndroid/gallery3d/filtershow/FilterShowActivity.java
|
| 3c081799a4fff041ee7485de1dd969dcc06d562e |
19-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Made downsampling filter preview accurate.
Bug: 7892268
Change-Id: I9ab3a7f5077b718ed54206666ef9ef289db8facc
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/filters/ImageFilterDownsample.java
|
| 6905fe1e9a08f8f18aa0919265d782c5ee83b2c6 |
06-Dec-2012 |
Earl Ou <shunhsingou@google.com> |
Use ExifOutputStream in SaveCopyTask
Change-Id: Ifa68d819249d3871c4a22f6e3dadc69542b9dc28
ndroid/gallery3d/filtershow/tools/SaveCopyTask.java
|
| f4491f1fee7adda5cf5e3ab71904d41cd3053cfc |
19-Dec-2012 |
Angus Kong <shkong@google.com> |
Merge "Apply ExifModifier for rotation" into gb-ub-photos-bryce
|
| b297f4e2f04cbf1a44c1fb76cc87a08ce96bcda5 |
06-Dec-2012 |
Earl Ou <shunhsingou@google.com> |
Apply ExifModifier for rotation
Change-Id: Ifa3cee7816ffeacab2415f479234856916acfecf
ndroid/gallery3d/data/LocalImage.java
ndroid/gallery3d/data/MediaDetails.java
|
| 2df5f8e5197ef6091877a2c13217ecd823738785 |
02-Nov-2012 |
Wu-cheng Li <wuchengli@google.com> |
Lock icon in secure album should redirect to gallery after unlock.
Use FLAG_DISMISS_KEYGUARD so lock screen will be brought up
when launching gallery.
bug:7462572
Change-Id: I345398cc6cfc09901e1ce8309ebdb65cf15088e0
The auto-merge of this CL from Arches to Bryce had a merge conflict,
so I canceled the auto-merge and then did this manual cherry-pick.
ndroid/gallery3d/app/Gallery.java
ndroid/gallery3d/app/PhotoPage.java
|
| 97cb71043e8dc15948c7dc663504966ff988c4d1 |
18-Dec-2012 |
Bart Sears <bsears@google.com> |
resolved conflicts for merge of 5b188c94 to gb-ub-photos-bryce
Change-Id: I0b39e54323c8f2ce67816ec223acf72cfacbd191
|
| 2b5021d525229c759f0b57b8a607520d081a3084 |
18-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Disabled further filters after Tiny Planet.
Bug: 7407176
Temporary fix. We need to handle filters changing the image
geometry properly.
Change-Id: I405b83acddec4e3b88a8a1d70dc534df15c37f1c
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/PanelController.java
|
| 04359d5ddb1c69da3671ca285553d51b846c4fe2 |
17-Dec-2012 |
George Mount <mount@google.com> |
Merge "Move LightCycle to render directly to GLRootView." into gb-ub-photos-bryce
|
| 86616448866336aa294b88cfd93b5603e4207f88 |
11-Dec-2012 |
George Mount <mount@google.com> |
Move LightCycle to render directly to GLRootView.
Change-Id: I298ef7127d86ca37067ffa953640aad1747961f9
ndroid/gallery3d/glrenderer/GLCanvas.java
ndroid/gallery3d/glrenderer/GLES11Canvas.java
ndroid/gallery3d/glrenderer/GLES20Canvas.java
|
| 7b2f1faec6055175884a5d2dbf317bea2c602b96 |
17-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Improved performance for Kmeans filter.
Bug: 7739334
Change-Id: I5ab1eb429d65f84449a61deca962a47f2b6dbc8b
ndroid/gallery3d/filtershow/filters/ImageFilterKMeans.java
|
| 3b0ed25fd416934fabb7003c1d2981b3a311186d |
13-Dec-2012 |
Doris Liu <tianliu@google.com> |
Add relativePath field into photo widget db
Bug: 7481248
The bug is caused by the change of external storage going from JB to JBMR1.
In light of this change, a new field has been added to the photo widget app
database to store the relative path for the local album. With the relative paths
stored, the widget app should be more resilient to future storage path changes.
Change-Id: Ia2497b882ae67178fa0632f23e07673b82d3a942
ndroid/gallery3d/data/LocalAlbum.java
ndroid/gallery3d/gadget/WidgetConfigure.java
ndroid/gallery3d/gadget/WidgetDatabaseHelper.java
ndroid/gallery3d/onetimeinitializer/GalleryWidgetMigrator.java
ndroid/gallery3d/util/BucketNames.java
ndroid/gallery3d/util/GalleryUtils.java
ndroid/gallery3d/util/MediaSetUtils.java
|
| b8378fae9f19191d2706e3579158aaf3c2ffe75e |
14-Dec-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Gallery in separate task for up button in Camera filmstrip" into gb-ub-photos-bryce
|
| f40318094c182bf2fb39e817d10bdb86782d93f0 |
14-Dec-2012 |
Bobby Georgescu <georgescu@google.com> |
Gallery in separate task for up button in Camera filmstrip
Bug: 7738398
Change-Id: I297c15f0a3e537d96d79b05e1dd8d376ff59bfca
ndroid/gallery3d/util/GalleryUtils.java
|
| 32d5c41dfbec0b929dbecfb0a8c9c3cda22a2d30 |
14-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Removed filtershow geometry editor preview interpolating. It looks bad.
Change-Id: I790ce00e85c835f73c076f79cde5e65236131f49
ndroid/gallery3d/filtershow/imageshow/ImageCrop.java
ndroid/gallery3d/filtershow/imageshow/ImageFlip.java
ndroid/gallery3d/filtershow/imageshow/ImageRotate.java
|
| 0ff6da23784a3bae03bcad6d97840815e70c977a |
14-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Remove preview dithering from Geometry editor in filtershow.
Bug: 7739904
Change-Id: I25c3cbe8907dd921aeb68f217fa9703e703d34a8
ndroid/gallery3d/filtershow/imageshow/ImageCrop.java
ndroid/gallery3d/filtershow/imageshow/ImageFlip.java
ndroid/gallery3d/filtershow/imageshow/ImageRotate.java
|
| a0e4fb160e5e8e66f4e749933824d127d725f0aa |
14-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Refactoring: removed unused presets." into gb-ub-photos-bryce
|
| dc5dddc441e8445f3ac22d084175942229c253cf |
14-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Added downsampling filter.
Bug: 7690079
Change-Id: I235524127da848b1cbcca159cec43d1e0dcb5bf2
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/filters/ImageFilterDownsample.java
|
| f4d3a216361375f1ad846bfb88fba66b014d2901 |
14-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Refactoring: removed unused presets.
Change-Id: I1390bf65048a6cbd4dee5ee9cd472dc440352860
ndroid/gallery3d/filtershow/presets/ImagePresetFX.java
ndroid/gallery3d/filtershow/presets/ImagePresetOld.java
ndroid/gallery3d/filtershow/presets/ImagePresetSaturated.java
ndroid/gallery3d/filtershow/presets/ImagePresetXProcessing.java
|
| 9fc2f6cacba8079392eeaa4917d5eed3613df2be |
14-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Refactoring: removed unused filters." into gb-ub-photos-bryce
|
| b2f247847838c4eeb971be06d0c241101093ae3d |
14-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Refactoring: removed old filtershow slider." into gb-ub-photos-bryce
|
| 1e9023d8689a1167dc8890dc7306778857bc485e |
14-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Refactoring: removed unused filters.
Change-Id: If6344fde16607ab9dddb25922d295b1df205df6b
ndroid/gallery3d/filtershow/filters/ImageFilterBW.java
ndroid/gallery3d/filtershow/filters/ImageFilterBWBlue.java
ndroid/gallery3d/filtershow/filters/ImageFilterBWGreen.java
ndroid/gallery3d/filtershow/filters/ImageFilterBWRed.java
ndroid/gallery3d/filtershow/presets/ImagePresetBW.java
ndroid/gallery3d/filtershow/presets/ImagePresetBWBlue.java
ndroid/gallery3d/filtershow/presets/ImagePresetBWGreen.java
ndroid/gallery3d/filtershow/presets/ImagePresetBWRed.java
|
| 19ce6823b6f7f3779f0695dd73b5733e5391c8be |
14-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Refactoring: removed old filtershow slider.
Change-Id: Iebd2f18c0f4819e7ff32be638e96b519f3ce905c
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
ndroid/gallery3d/filtershow/imageshow/ImageZoom.java
|
| e5465d339fd64f7c07d776ebb3ecaf46640b2df1 |
14-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Fix Seekbar infinite recursion.
Bug: 7739384
Change-Id: Ie76d6741be4d08f3f9919662f1ad558c809aa5bd
ndroid/gallery3d/filtershow/filters/ImageFilter.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
|
| 7f7f875515cbafa91ca935748e6f9e97fa0b6b76 |
13-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Added K-Means clustering filter.
Change-Id: If8961d4a21de953b754cf74aefc222b6bec902a3
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/filters/ImageFilterEdge.java
ndroid/gallery3d/filtershow/filters/ImageFilterKMeans.java
|
| 4bdd0372ca1bba02828e9343fa3cc775f8c6f6e9 |
11-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Added sobel filter for edge function.
Change-Id: I4d59a96585f4902cd01d26ff68c777b542041132
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/filters/ImageFilterEdge.java
|
| c6e04ab48c3cd06d93ec245b6e540d89684fba0b |
11-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Added photonegative filter.
Change-Id: I73594573b26873cb3fda49aca6d40761dec3707f
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/PanelController.java
ndroid/gallery3d/filtershow/filters/ImageFilter.java
ndroid/gallery3d/filtershow/filters/ImageFilterCurves.java
ndroid/gallery3d/filtershow/filters/ImageFilterNegative.java
|
| 2afbc152f1ac729db5f4c3d9d2f96f5fcf4129d5 |
12-Dec-2012 |
John Reck <jreck@google.com> |
Merge "remove actionbar sherlock" into gb-ub-photos-bryce
|
| ba512ca3bb2e2b51c4be0cc7336a6a5b0fa22106 |
12-Dec-2012 |
John Reck <jreck@google.com> |
remove actionbar sherlock
Change-Id: Idb9b63f625fd4f0b78d947421ec5b098d8e5dfd5
ndroid/gallery3d/app/AbstractGalleryActivity.java
ndroid/gallery3d/app/ActivityState.java
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/AlbumSetPage.java
ndroid/gallery3d/app/Gallery.java
ndroid/gallery3d/app/GalleryActionBar.java
ndroid/gallery3d/app/MovieActivity.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/app/PickerActivity.java
ndroid/gallery3d/app/SinglePhotoDataAdapter.java
ndroid/gallery3d/app/StateManager.java
ndroid/gallery3d/app/TrimVideo.java
ndroid/gallery3d/ui/ActionModeHandler.java
ndroid/gallery3d/ui/MenuExecutor.java
ndroid/gallery3d/ui/PopupList.java
ndroid/gallery3d/ui/PositionController.java
|
| 97d9a7cdf25c39b5a4cb92a99ec9fb21d7da1509 |
12-Dec-2012 |
Your Name <jreck@google.com> |
Merge "Remove LongSpareArray + some cleanups" into gb-ub-photos-bryce
|
| 8e8cc05541f6c8c34c6c37aa5622e146064a1793 |
12-Dec-2012 |
John Reck <jreck@google.com> |
Merge "GL packaging refactor" into gb-ub-photos-bryce
|
| 8cb165add72646ba57cf2f072d91351a8544fbc5 |
11-Dec-2012 |
John Reck <jreck@google.com> |
GL packaging refactor
Change-Id: I1d7a95c4f0b91a5ba59030d57cf6865c11b497aa
ndroid/gallery3d/anim/AlphaAnimation.java
ndroid/gallery3d/anim/CanvasAnimation.java
ndroid/gallery3d/anim/StateTransitionAnimation.java
ndroid/gallery3d/app/ActivityState.java
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/AlbumSetPage.java
ndroid/gallery3d/app/ManageCachePage.java
ndroid/gallery3d/app/PhotoDataAdapter.java
ndroid/gallery3d/app/SlideshowPage.java
ndroid/gallery3d/glrenderer/BasicTexture.java
ndroid/gallery3d/glrenderer/BitmapTexture.java
ndroid/gallery3d/glrenderer/CanvasTexture.java
ndroid/gallery3d/glrenderer/ColorTexture.java
ndroid/gallery3d/glrenderer/ExtTexture.java
ndroid/gallery3d/glrenderer/FadeInTexture.java
ndroid/gallery3d/glrenderer/FadeOutTexture.java
ndroid/gallery3d/glrenderer/FadeTexture.java
ndroid/gallery3d/glrenderer/GLCanvas.java
ndroid/gallery3d/glrenderer/GLES11Canvas.java
ndroid/gallery3d/glrenderer/GLES20Canvas.java
ndroid/gallery3d/glrenderer/GLId.java
ndroid/gallery3d/glrenderer/GLIdImpl.java
ndroid/gallery3d/glrenderer/GLPaint.java
ndroid/gallery3d/glrenderer/MultiLineTexture.java
ndroid/gallery3d/glrenderer/NinePatchChunk.java
ndroid/gallery3d/glrenderer/NinePatchTexture.java
ndroid/gallery3d/glrenderer/RawTexture.java
ndroid/gallery3d/glrenderer/ResourceTexture.java
ndroid/gallery3d/glrenderer/StringTexture.java
ndroid/gallery3d/glrenderer/Texture.java
ndroid/gallery3d/glrenderer/TextureUploader.java
ndroid/gallery3d/glrenderer/TiledTexture.java
ndroid/gallery3d/glrenderer/UploadedTexture.java
ndroid/gallery3d/ui/AbstractSlotRenderer.java
ndroid/gallery3d/ui/AlbumSetSlidingWindow.java
ndroid/gallery3d/ui/AlbumSetSlotRenderer.java
ndroid/gallery3d/ui/AlbumSlidingWindow.java
ndroid/gallery3d/ui/AlbumSlotRenderer.java
ndroid/gallery3d/ui/BasicTexture.java
ndroid/gallery3d/ui/BitmapScreenNail.java
ndroid/gallery3d/ui/BitmapTexture.java
ndroid/gallery3d/ui/CanvasTexture.java
ndroid/gallery3d/ui/ColorTexture.java
ndroid/gallery3d/ui/EdgeEffect.java
ndroid/gallery3d/ui/EdgeView.java
ndroid/gallery3d/ui/ExtTexture.java
ndroid/gallery3d/ui/FadeInTexture.java
ndroid/gallery3d/ui/FadeOutTexture.java
ndroid/gallery3d/ui/FadeTexture.java
ndroid/gallery3d/ui/GLCanvas.java
ndroid/gallery3d/ui/GLCanvasImpl.java
ndroid/gallery3d/ui/GLES20Canvas.java
ndroid/gallery3d/ui/GLId.java
ndroid/gallery3d/ui/GLIdImpl.java
ndroid/gallery3d/ui/GLPaint.java
ndroid/gallery3d/ui/GLRoot.java
ndroid/gallery3d/ui/GLRootView.java
ndroid/gallery3d/ui/GLView.java
ndroid/gallery3d/ui/GalleryEGLConfigChooser.java
ndroid/gallery3d/ui/Log.java
ndroid/gallery3d/ui/ManageCacheDrawer.java
ndroid/gallery3d/ui/MultiLineTexture.java
ndroid/gallery3d/ui/NinePatchChunk.java
ndroid/gallery3d/ui/NinePatchTexture.java
ndroid/gallery3d/ui/PhotoFallbackEffect.java
ndroid/gallery3d/ui/PhotoView.java
ndroid/gallery3d/ui/PreparePageFadeoutTexture.java
ndroid/gallery3d/ui/ProgressSpinner.java
ndroid/gallery3d/ui/RawTexture.java
ndroid/gallery3d/ui/ResourceTexture.java
ndroid/gallery3d/ui/ScreenNail.java
ndroid/gallery3d/ui/ScrollBarView.java
ndroid/gallery3d/ui/SlideshowView.java
ndroid/gallery3d/ui/SlotView.java
ndroid/gallery3d/ui/StringTexture.java
ndroid/gallery3d/ui/SurfaceTextureScreenNail.java
ndroid/gallery3d/ui/Texture.java
ndroid/gallery3d/ui/TextureUploader.java
ndroid/gallery3d/ui/TileImageView.java
ndroid/gallery3d/ui/TiledScreenNail.java
ndroid/gallery3d/ui/TiledTexture.java
ndroid/gallery3d/ui/UndoBarView.java
ndroid/gallery3d/ui/UploadedTexture.java
|
| 51623b2bb42e054bd4b7e45de474fe27c4379a0e |
11-Dec-2012 |
nicolasroard <nicolasroard@google.com> |
Cleanup filters creation in presets
bug:7688780
Change-Id: If330d02e3c0f43cffbce5327b26f0af44d2416c8
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/PanelController.java
ndroid/gallery3d/filtershow/filters/ImageFilter.java
|
| 6c6e2d4edeb0113376b66ac4491ce7ec023e3437 |
04-Dec-2012 |
Your Name <jreck@google.com> |
Remove LongSpareArray + some cleanups
Change-Id: If5bb44ebca70bd735e426aeb3d9aac2d4bac646e
ndroid/gallery3d/app/PhotoDataAdapter.java
ndroid/gallery3d/ui/BitmapTileProvider.java
ndroid/gallery3d/ui/PhotoView.java
ndroid/gallery3d/ui/TileImageView.java
ndroid/gallery3d/ui/TileImageViewAdapter.java
ndroid/gallery3d/util/GalleryUtils.java
|
| 203b6826f9958fbafd1a92b4a99d8d9e20e8b248 |
10-Dec-2012 |
John Reck <jreck@google.com> |
am 695e1aa0: Force a layout pass if the display rotation changes
* commit '695e1aa059cbc2cb2988f6beb0fee8ff7952b229':
Force a layout pass if the display rotation changes
|
| fdc55e32bb4643ca7a3637045b975d94b25f3714 |
10-Dec-2012 |
John Reck <jreck@google.com> |
Force a layout pass if the display rotation changes
Bug: 7687209
DisplayRotation is used to map camera orientation to the display and is
updated in layoutContentPane(). However, in the case of a 180 rotate
framework doesn't send an onConfigurationChanged nor does the layout
dimensions change, thus layoutContentPane doesn't fire and we don't
update mDisplayRotation, resulting in an upside-down preview. To handle
this, check each draw whether or not the display rotation has changed
and if it has force a layout pass.
Change-Id: I610ea235d1bf7de2743f4cdb8e42ba1ddcb41404
ndroid/gallery3d/ui/GLRootView.java
|
| f10a8fa2a4bd5d26d649842d9063ffe9092bff82 |
08-Dec-2012 |
nicolasroard <nicolasroard@google.com> |
More refactoring...
Simplify management of filters in PanelController
bug:7688780
Change-Id: I0d07711cb2be127f064d476c6e98f4363b69b06c
ndroid/gallery3d/filtershow/PanelController.java
ndroid/gallery3d/filtershow/filters/ImageFilter.java
ndroid/gallery3d/filtershow/filters/ImageFilterCurves.java
ndroid/gallery3d/filtershow/filters/ImageFilterRedEye.java
ndroid/gallery3d/filtershow/filters/ImageFilterSharpen.java
ndroid/gallery3d/filtershow/filters/ImageFilterWBalance.java
ndroid/gallery3d/filtershow/imageshow/ImageSmallFilter.java
|
| f7273315313afded5c91e37b9d8f0b5c30c93c71 |
07-Dec-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "More refactoring. Makes it easy to specify how the button should look like (overlay img or not)." into gb-ub-photos-bryce
|
| 4e2406e2e2ba5f4dd4b5d4e75f5b9b07a64ba77f |
07-Dec-2012 |
Doris Liu <tianliu@google.com> |
Decode screenshots when they show 0x0 dimensions
Bug: 7470758
Change-Id: If4012899e120ad68cdc8ca12bf6f8de8c5c96019
ndroid/gallery3d/ui/DetailsHelper.java
ndroid/gallery3d/ui/DialogDetailsView.java
|
| 85dff5a538042695a244ddd10db994c64e9e82d4 |
07-Dec-2012 |
nicolasroard <nicolasroard@google.com> |
More refactoring. Makes it easy to specify
how the button should look like (overlay img or not).
bug:7688780
Change-Id: If883c6886ade409dac7d72c87a514bd3fcd3ad7f
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/filters/ImageFilterCurves.java
ndroid/gallery3d/filtershow/filters/ImageFilterSharpen.java
ndroid/gallery3d/filtershow/imageshow/ImageSmallFilter.java
ndroid/gallery3d/filtershow/imageshow/ImageWithIcon.java
|
| e623dcde5ea8c572602fcbb470c439600e74b610 |
07-Dec-2012 |
nicolasroard <nicolasroard@google.com> |
Refactor filters to simplify their creation/addition
Bug:7688780
Change-Id: I9e1bb860dc9150bed4a255118654f2ca7f1ec3f0
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/PanelController.java
ndroid/gallery3d/filtershow/filters/ImageFilter.java
ndroid/gallery3d/filtershow/filters/ImageFilterBwFilter.java
ndroid/gallery3d/filtershow/filters/ImageFilterContrast.java
ndroid/gallery3d/filtershow/filters/ImageFilterExposure.java
ndroid/gallery3d/filtershow/filters/ImageFilterHue.java
ndroid/gallery3d/filtershow/filters/ImageFilterSaturated.java
ndroid/gallery3d/filtershow/filters/ImageFilterShadows.java
ndroid/gallery3d/filtershow/filters/ImageFilterSharpen.java
ndroid/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
ndroid/gallery3d/filtershow/filters/ImageFilterVibrance.java
ndroid/gallery3d/filtershow/filters/ImageFilterVignette.java
ndroid/gallery3d/filtershow/filters/ImageFilterWBalance.java
|
| 4450409cc98730e9418013a186d0a79864bdc350 |
06-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Fixed Autocolor not getting saved.
Bug: 7541348
Change-Id: Ie62aa8abec78441ae0e42cb4069ddbd7d2f3e199
ndroid/gallery3d/filtershow/filters/ImageFilterWBalance.java
|
| 2ef34aafcf6957ed8bd764a5fe0921c376c0b416 |
06-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Removed old crop.
Bug: 7441237
Change-Id: I29801f798a1d1ad3af81a82950edbb8a72ccae82
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/CropImage.java
ndroid/gallery3d/app/Wallpaper.java
ndroid/gallery3d/data/CropExtras.java
ndroid/gallery3d/filtershow/CropExtras.java
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/cache/ImageLoader.java
ndroid/gallery3d/filtershow/filters/ImageFilterGeometry.java
ndroid/gallery3d/filtershow/imageshow/GeometryMetadata.java
ndroid/gallery3d/filtershow/imageshow/ImageCrop.java
ndroid/gallery3d/gadget/WidgetConfigure.java
ndroid/gallery3d/ui/CropView.java
ndroid/gallery3d/ui/MenuExecutor.java
|
| 6425413690fccb004b52f64b23bc7e3c9cd33e7e |
28-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Added support for Crop extras. Wallpaper & Widget use editor crop.
Bug: 7561976
Bug: 7441237
Change-Id: I0d6644171177650568ed911fc63c0c7e104f8d8c
ndroid/gallery3d/app/Wallpaper.java
ndroid/gallery3d/data/CropExtras.java
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/PanelController.java
ndroid/gallery3d/filtershow/cache/ImageLoader.java
ndroid/gallery3d/filtershow/filters/ImageFilterGeometry.java
ndroid/gallery3d/filtershow/imageshow/GeometryMetadata.java
ndroid/gallery3d/filtershow/imageshow/ImageCrop.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
ndroid/gallery3d/filtershow/tools/BitmapTask.java
ndroid/gallery3d/filtershow/tools/SaveCopyTask.java
ndroid/gallery3d/gadget/WidgetConfigure.java
|
| b6794369702f20871241e6bff5e6069f27c8d537 |
24-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Implements Redeye fix
bug:7223838
Change-Id: I21d8d2c8f858fca2e86d18b927cbf6878eb64263
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/PanelController.java
ndroid/gallery3d/filtershow/cache/ImageLoader.java
ndroid/gallery3d/filtershow/filters/ImageFilterRedEye.java
ndroid/gallery3d/filtershow/filters/RedEyeCandidate.java
ndroid/gallery3d/filtershow/imageshow/ImageRedEyes.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
|
| eaafd032b2e7eb80591ee6913e1fa296b3d954bd |
05-Dec-2012 |
George Mount <mount@google.com> |
Merge "Add GLES20 canvas implementation." into gb-ub-photos-bryce
|
| 837007c09f723dd96cd8e99476de242c633759c2 |
17-Nov-2012 |
George Mount <mount@google.com> |
Add GLES20 canvas implementation.
Change-Id: I5680909f31dc097599d0e063aa1f6daba834d3e2
ndroid/gallery3d/ui/GLCanvas.java
ndroid/gallery3d/ui/GLCanvasImpl.java
ndroid/gallery3d/ui/GLES20Canvas.java
ndroid/gallery3d/ui/GLRootView.java
ndroid/gallery3d/ui/GalleryEGLConfigChooser.java
ndroid/gallery3d/ui/NinePatchTexture.java
ndroid/gallery3d/ui/RawTexture.java
ndroid/gallery3d/util/IntArray.java
|
| 518d4a5ae0a90fc53af74d7adc35d595b7e12362 |
05-Dec-2012 |
Bobby Georgescu <georgescu@google.com> |
am db99a10b: Fix NPE in PhotoPage
* commit 'db99a10b6ac9296d612db8ba51e37f141fee4170':
Fix NPE in PhotoPage
|
| 6004b5721a9e3d310be4d0f5fac92e14d54231d1 |
05-Dec-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix NPE in PhotoPage
Bug: 7673141
Change-Id: I264f28d127f47e5f4f8c6a7c2df1c021401d03f2
ndroid/gallery3d/app/PhotoPage.java
|
| e759a6839a2883603343a1f370790cad38d4bf27 |
05-Dec-2012 |
nicolasroard <nicolasroard@google.com> |
am 870e62ac: Handle the case where the orientation column is not here...
* commit '870e62ac801064f83bffc9095cbaee5fe46bdd80':
Handle the case where the orientation column is not here...
|
| e228f8a88f0dbaeb850cdc40410e98ac962c6a50 |
05-Dec-2012 |
nicolasroard <nicolasroard@google.com> |
Handle the case where the orientation column is not here...
bug:7537610
Change-Id: I4f64891a789358c20206aea3033fd17514199d62
ndroid/gallery3d/filtershow/cache/ImageLoader.java
|
| b3e4cc1a4c4bf27ba605cfa2175411e9bfc4603d |
05-Dec-2012 |
Michael Kolb <kolby@google.com> |
am 7a537732: Merge "Prevent Camera UI in Gallery" into gb-ub-photos-arches
* commit '7a5377322dcebdaad98df9a31cadc7ff0f464d8a':
Prevent Camera UI in Gallery
|
| 3e9860b5e0e9cb93b4af3ff59aa94ea7fb83201b |
04-Dec-2012 |
Michael Kolb <kolby@google.com> |
Prevent Camera UI in Gallery
Bug: 7668856
At startup, the PhotoView wouldn't execute the onFullScreenChanged
callback, so the Camera UI believed it was in Camera.
Change-Id: I6794c2a5a4eb06d39161a681b7a0afc27d5e4b3f
ndroid/gallery3d/ui/PhotoView.java
|
| 8ad54ea6105ca40b2f21301229469f1aa168206a |
04-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fix call to Toast outside UI thread." into gb-ub-photos-bryce
|
| 32f5fee98df0e2f4b30475bb2d04e5fafa969727 |
03-Dec-2012 |
Bobby Georgescu <georgescu@google.com> |
Move MenuExecutor operations into Service
Bug: 6680729
Change-Id: I538bb0a8783f7c1ff467ba8d8eb0deefdc0b6ea2
ndroid/gallery3d/app/AbstractGalleryActivity.java
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/AlbumSetPage.java
ndroid/gallery3d/app/BatchService.java
ndroid/gallery3d/ui/ActionModeHandler.java
ndroid/gallery3d/ui/MenuExecutor.java
|
| e05d11454e60ab15e530f2878e3db507b974b113 |
03-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Fix call to Toast outside UI thread.
Bug: 7412281
Change-Id: I976ccd28f696a65a1159b6a092b8aa2f2a2d0e08
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/cache/ImageLoader.java
|
| 8d26578f8db895dadb7e0e1d7a56c00fa18183ec |
01-Dec-2012 |
George Mount <mount@google.com> |
Merge "Separate GL calls into GLCanvas in preparation for adding GLES2." into gb-ub-photos-bryce
|
| 85ea4b74e2c18576e2d0191eef804c6e2d2e65a7 |
30-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
Improve fling to delete gesture handling
Bug: 7419862
Bug: 7301456
Allows flings to start anywhere within the width bounds
of the image, even if outside the height bounds, making
deletion of panoramas more feasible, and gestures are
filtered by length to be able to make flinging easier
while still avoiding accidental input.
Change-Id: Iac933bfee85865a718ed47eadfed76683eb771d2
ndroid/gallery3d/ui/GestureRecognizer.java
ndroid/gallery3d/ui/PhotoView.java
|
| 7f072c4c99331a331d2950c11baca5426fad6643 |
31-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Refactoring crop, made unconstrained.
Bug 7401363
Change-Id: I3ef10c43fd2a01216d6d6c8cc77b31ddef3fdd9b
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/imageshow/BoundedRect.java
ndroid/gallery3d/filtershow/imageshow/CropMath.java
ndroid/gallery3d/filtershow/imageshow/GeometryMath.java
ndroid/gallery3d/filtershow/imageshow/GeometryMetadata.java
ndroid/gallery3d/filtershow/imageshow/ImageCrop.java
ndroid/gallery3d/filtershow/imageshow/ImageGeometry.java
ndroid/gallery3d/filtershow/imageshow/ImageStraighten.java
|
| 4a97d9b5cb2f5156d2322cb95bd7531efb34354a |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 599393ec: (re-)add vertical/horizontal lines when moving Curves Align histogram with Curves grid.
* commit '599393ecad6803161d5e901ef625e34cfe088009':
(re-)add vertical/horizontal lines when moving Curves Align histogram with Curves grid.
|
| c5317f7dbd812f83ba086817d077f44ea4494f91 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
(re-)add vertical/horizontal lines when moving Curves
Align histogram with Curves grid.
bug:7361722
Change-Id: I327f3fb0ba844cc09f8b899e59f74d368478d30a
ndroid/gallery3d/filtershow/ui/ImageCurves.java
ndroid/gallery3d/filtershow/ui/Spline.java
|
| 8ca301c848acdb2b33c6a36ea83a54ac9d1837f1 |
29-Nov-2012 |
Nicolas Roard <nicolasroard@google.com> |
am 65025459: Merge "Added dashed diagonal for crop." into gb-ub-photos-arches
* commit '6502545991948769bc9ca725dafb9899c2635a01':
Added dashed diagonal for crop.
|
| 73487035ea64b59b62ee280cd73e8c1bfaf64f8f |
29-Nov-2012 |
Nicolas Roard <nicolasroard@google.com> |
Merge "Added dashed diagonal for crop." into gb-ub-photos-arches
|
| 11d586fb5564be39ebb985d5371e867fcbd8b12f |
29-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Added dashed diagonal for crop.
Bug: 7634466
Change-Id: I14c778766d4b00495b2f5f6fa5f87f4877f76381
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/PanelController.java
ndroid/gallery3d/filtershow/imageshow/ImageCrop.java
|
| 2c5d2004ab1ba730bc1e3e4907be05872144a375 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 0a624bb8: Fix potential crash (regression introduced with fix for 7406402)
* commit '0a624bb8db70f1e71ca511756b886c68f32fedbe':
Fix potential crash (regression introduced with fix for 7406402)
|
| 8d427b8a58fabb9164738b9ed0da2809ca3d60e0 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
Fix potential crash
(regression introduced with fix for 7406402)
bug:7406402
Change-Id: I7ba92b4cb4fe2976583eba54a5bd25a29eae9d5c
ndroid/gallery3d/filtershow/filters/ImageFilterBorder.java
ndroid/gallery3d/filtershow/filters/ImageFilterParametricBorder.java
|
| 601dd77295fcfdb873b537da5e54289c14e3df93 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 6d867ce0: Set crop ratio to unconstrained by default.
* commit '6d867ce03ea96495d531d7e3f35a21b5aab257ef':
Set crop ratio to unconstrained by default.
|
| 2aa25c488216f498b941245266d1eb3de97fe09b |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
Set crop ratio to unconstrained by default.
bug:7634466
Change-Id: I4b0e82ca77ab19527293334cc96e7b80f2d75535
ndroid/gallery3d/filtershow/PanelController.java
ndroid/gallery3d/filtershow/imageshow/ImageCrop.java
|
| 57bb5bf7333f585f4fb4a2cf28502c649608030e |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 6e9123a6: Merge "Fix flashing in geometry panel" into gb-ub-photos-arches
* commit '6e9123a658d4ed0dcb80dd376c676f043e2f4baa':
Fix flashing in geometry panel
|
| 85d62f7e70be8aa4b7c104388f050e7022d1f8cb |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix flashing in geometry panel" into gb-ub-photos-arches
|
| 17a4bad29490ec674474d08fb98838f11a2d27ab |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 3507b925: Merge "Add new borders assets" into gb-ub-photos-arches
* commit '3507b925ce1edb2563c076d2d9f01bfadf9f61e5':
Add new borders assets
|
| 0c9a1a741b4d794105755bc1554fc2b2169b8b68 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Add new borders assets" into gb-ub-photos-arches
|
| 62b88ea47a7b49e987e30ad39fdf82e0052a0a1b |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
Add new borders assets
bug:7386268
Change-Id: I026c36bdad32ae6a34ce1d5ec83abff319296d30
ndroid/gallery3d/filtershow/FilterShowActivity.java
|
| 9e4f72f53cedfba265eee3a7c3a7545cdbe71c4a |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am cd84d676: Fix history panel overlap
* commit 'cd84d67629075795d4c5c28d980f77ff8d75c593':
Fix history panel overlap
|
| f0327b5c9c9ec5ed173de0b94b9566a56540b229 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
Fix history panel overlap
bug:7545507
Change-Id: I06236f3025191896c851af1d84dc48a4dde18b1d
ndroid/gallery3d/filtershow/FilterShowActivity.java
|
| 2891e97b6b918f3525e026752673acdb7bf800cb |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
Fix flashing in geometry panel
bug:7406402
Change-Id: If2c6156349b90dfc57c56284ad6d821731e48e1a
ndroid/gallery3d/filtershow/filters/ImageFilter.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
|
| 2b14b2be7bbc5dbcb616ca4c8c34022c761bf841 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 987bc8aa: Fix wrong colors in Curves
* commit '987bc8aaafa55c45451937b27d94c1d602de4d68':
Fix wrong colors in Curves
|
| da9da43c19472280257e327e51d84b83bde834ae |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am d24fdf6a: Merge "Fix moving points in the Curves editor" into gb-ub-photos-arches
* commit 'd24fdf6ad148ffeb34a721d90e46d038f5a7b0da':
Fix moving points in the Curves editor
|
| 1bab51a0e46a70ff98cb9f761bebc148e393b5e6 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
Fix wrong colors in Curves
bug:7633765
Change-Id: Ie6d0c175af6a1ade8f225107408ad03e73a289d3
ndroid/gallery3d/filtershow/ui/Spline.java
|
| 91287749301c41b8ae8a827350b040384b9c0217 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix moving points in the Curves editor" into gb-ub-photos-arches
|
| f94d5c38e57d6ab563f801ea1de7ccea5cd4d94a |
29-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 7a36d427: Merge "Added locking to ImageLoader." into gb-ub-photos-arches
* commit '7a36d4275ea0375d4e6a940cc3307dbe716cf85c':
Added locking to ImageLoader.
|
| 9174643f1e0004e7240ed4d49877dc207c47acf3 |
29-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Added locking to ImageLoader." into gb-ub-photos-arches
|
| c604eacfeaea2845b3848ac341f47bc41af6d132 |
29-Nov-2012 |
John Hoford <hoford@google.com> |
am e5b979ed: Merge "reduce size of tiny planet if malloc fails" into gb-ub-photos-arches
* commit 'e5b979edb369877463e07680dddd9983bd2501cb':
reduce size of tiny planet if malloc fails
|
| 42d6865e0b4c674298c3bcb99c0d377c07732004 |
29-Nov-2012 |
John Hoford <hoford@google.com> |
Merge "reduce size of tiny planet if malloc fails" into gb-ub-photos-arches
|
| 800cb2eb683643df5816ef5000b9cedaa8a98b88 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
Fix moving points in the Curves editor
bug:7632994
Change-Id: Ibd0b22594ad9be52e32ea860976861e4619fb513
ndroid/gallery3d/filtershow/ui/ImageCurves.java
|
| 742e97aaa0fb92d475cf922cfacea74599959a83 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 5d2227a7: Merge "Add a triangle to the popup button view" into gb-ub-photos-arches
* commit '5d2227a793b51f44f664a739cc7e931c40ba4970':
Add a triangle to the popup button view
|
| 4f83ce2f10250e827033cdcfdb8d7f8d8697b7b3 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Add a triangle to the popup button view" into gb-ub-photos-arches
|
| 3edadae96e469686026bb729060f7619e56557ad |
16-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Added locking to ImageLoader.
Bug: 7471850
Change-Id: Ifbaf6e3547fad546a6faa94694bc7d3c7bb4711c
ndroid/gallery3d/filtershow/cache/ImageLoader.java
|
| 82b73d52e12b121b24ee685e71632483533246af |
29-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 6a94446d: Minor fix for some FP rounding errors in crop.
* commit '6a94446de01e8b6b034cc537ee3e65d507d47a47':
Minor fix for some FP rounding errors in crop.
|
| 0048915b4cea0196daa17dc69f7e10e9be9a4387 |
28-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "AlbumDataLoader.get returns correct value if not in cache" into gb-ub-photos-bryce
|
| d830f2a1b5becddfbae68e758fe29d6eda3777d8 |
28-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Minor fix for some FP rounding errors in crop.
Bug 7566505
Change-Id: Ic3b849b26e0435e0e51a3ddd80c25d8e6e9949aa
ndroid/gallery3d/filtershow/filters/ImageFilterGeometry.java
ndroid/gallery3d/filtershow/imageshow/GeometryMath.java
ndroid/gallery3d/filtershow/imageshow/GeometryMetadata.java
|
| 48ac0347df314fe845a425d7a8645ce04b8a979d |
28-Nov-2012 |
Your Name <jreck@google.com> |
resolved conflicts for merge of 3c6a0610 to gb-ub-photos-bryce
Change-Id: Iac3fcc4a4b8c0295ec53edf5658169fb5fab021e
|
| a314235e093032c2d6cdd1f1d3f6b5c10c3e75a7 |
27-Nov-2012 |
Your Name <jreck@google.com> |
Remove orientation compensation
Bug: 7446056
Change-Id: I6f00617c890961e4d56545406bac9682356c0b15
ndroid/gallery3d/app/OrientationManager.java
ndroid/gallery3d/app/PhotoPage.java
|
| 63360570aecd7dbdc7bf2a4d06a264c7eee66bb7 |
27-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
AlbumDataLoader.get returns correct value if not in cache
Bug: 7621656
Change-Id: I8b73837f41bf4ac8c753a5d84f251219fde8ae75
ndroid/gallery3d/app/AlbumDataLoader.java
|
| 0db6ec1a2d602a48437a48ae47fbca01299fdcea |
01-Nov-2012 |
George Mount <mount@google.com> |
Separate GL calls into GLCanvas in preparation for adding GLES2.
Change-Id: I2756c14294a36af7905766ee650fa08fb95e9477
ndroid/gallery3d/ui/BasicTexture.java
ndroid/gallery3d/ui/CropView.java
ndroid/gallery3d/ui/ExtTexture.java
ndroid/gallery3d/ui/GLCanvas.java
ndroid/gallery3d/ui/GLCanvasImpl.java
ndroid/gallery3d/ui/GLId.java
ndroid/gallery3d/ui/GLIdImpl.java
ndroid/gallery3d/ui/NinePatchTexture.java
ndroid/gallery3d/ui/RawTexture.java
ndroid/gallery3d/ui/SlideshowView.java
ndroid/gallery3d/ui/UploadedTexture.java
|
| 56f214d21ea696e8b5d721b64fa4958ab1bf6686 |
13-Nov-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Video: Fix crash in trimming/muting video in GB.
Basically switched to use sherlock actionbar and protect various new methods
with API level check.
bug:7546257
Change-Id: Ic16f75126c619578a9e9c2520fa264687d89a2e6
ndroid/gallery3d/app/MuteVideo.java
ndroid/gallery3d/app/TrimControllerOverlay.java
ndroid/gallery3d/app/TrimVideo.java
|
| 99996e3b7d581a25d12cad8c00740221f2e1d922 |
16-Nov-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Merge "Video: Add the mute functionality." into gb-ub-photos-bryce
|
| b6dda0c74eee0994b70608ce1737ed01d168ee52 |
16-Nov-2012 |
Angus Kong <shkong@google.com> |
am 18b38883: Guard tiles by synchronized block.
* commit '18b388839ed9858a3b35cec9a636e5cde58a528a':
Guard tiles by synchronized block.
|
| 46da45f76cae4b7cbcb9706cbd54b8b4b064f11d |
13-Nov-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Video: Add the mute functionality.
1. Enable the mute video functionality.
2. Consolidate the sharing code, especially for file handling.
bug:7543943
Change-Id: Ie7ec605996bc3242b1a50385f506e6a50ee2d2fc
ndroid/gallery3d/app/MuteVideo.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/app/TrimVideo.java
ndroid/gallery3d/app/TrimVideoUtils.java
ndroid/gallery3d/app/VideoUtils.java
ndroid/gallery3d/data/LocalVideo.java
ndroid/gallery3d/data/MediaObject.java
ndroid/gallery3d/ui/MenuExecutor.java
ndroid/gallery3d/util/SaveVideoFileInfo.java
ndroid/gallery3d/util/SaveVideoFileUtils.java
|
| 93b9c1e3b6fee10b3c61ed0dc57608fe32be3d64 |
14-Nov-2012 |
Earl Ou <shunhsingou@google.com> |
Remove import exiftags
Change-Id: Ifa9882a32ab788e02b1ce5f1751d8c976d67c013
ndroid/gallery3d/data/MediaDetails.java
|
| 370ec0d435e43763f3e7c4804420bf44d9a39a97 |
14-Nov-2012 |
Angus Kong <shkong@google.com> |
Guard tiles by synchronized block.
Tiles might be touched in different threads.
bug:7490351
Change-Id: Ie30d43db90cf63f7a6ec6438faabfcae8bca151a
ndroid/gallery3d/ui/TiledTexture.java
|
| b7b93211cc4171c8758de2ccc1d27b5e36c31033 |
14-Nov-2012 |
Earl Ou <shunhsingou@google.com> |
use ExifReader in MediaDetails
Change-Id: If8c7f32804ba55b4b0351c350e324dc1b6e508d7
ndroid/gallery3d/data/MediaDetails.java
|
| b232a2caff083191ab9d24f0a164b9a83afafc1c |
14-Nov-2012 |
Earl Ou <shunhsingou@google.com> |
use ExifParser in ImageLoader
Change-Id: Ibcee97c15b2cc7df3aaa6c6c65535ca00cef2ed6
ndroid/gallery3d/filtershow/cache/ImageLoader.java
|
| d6db57ca0d2b1c9ba554608fdfaabb9f2afb8ce0 |
14-Nov-2012 |
Earl Ou <shunhsingou@google.com> |
Use getValueAt() to read different data in ExifTag
Change-Id: I4d8a72523a6ad4ae34e173c4b845a462644e83c7
ndroid/gallery3d/data/Exif.java
|
| 0ce848fd66a1a55984aaf1616a0bd9da2c5bb0e7 |
13-Nov-2012 |
Doris Liu <tianliu@google.com> |
Fix UnsupportedOperationException in MediaObject
Bug: 6495745
Change-Id: I770833f0c3fec6f187e961f511a7d9d2591f5f97
ndroid/gallery3d/app/PhotoPage.java
|
| 3c38fb244c0ec4a538c5600af16a289bd652bbe4 |
08-Nov-2012 |
John Hoford <hoford@google.com> |
reduce size of tiny planet if malloc fails
bug:7477815
Change-Id: I03fec9246e368fb7f929769dc5e5e6266761dc34
ndroid/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
|
| 91833f3d909c5b01dc590289c1a8dab9e145318a |
07-Nov-2012 |
Earl Ou <shunhsingou@google.com> |
use ExifParser to parse the orientaion
Change-Id: I47171c028cbc1f94b7de5d067de0636a9e241fbb
ndroid/gallery3d/data/Exif.java
|
| 1be13e45ee7a6d24cf3f3ba6bb0884328e804e51 |
07-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am 9ec5de9d: Fix scenario where launching Gallery launches Camera
* commit '9ec5de9dbf46caecd2f0b38a72d31fa37ecb0466':
Fix scenario where launching Gallery launches Camera
|
| 6f02f74d88efc644d244e9611b56097bf2dcbaec |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix scenario where launching Gallery launches Camera
Bug: 7479102
Change-Id: Ib4676a7149c659897eee1dbbb92ab09861bd0ed4
ndroid/gallery3d/app/PhotoPage.java
|
| b0e3eba1c4d03192986b6cc240b04cd5c98f620b |
05-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
Split PhotoPage into FilmstripPage and SinglePhotoPage
Bug: 7479348
Change-Id: I98f668bd00e2e09bda9d5d9965fdbdaf1b832bfa
ndroid/gallery3d/app/ActivityState.java
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/AlbumSetPage.java
ndroid/gallery3d/app/FilmstripPage.java
ndroid/gallery3d/app/Gallery.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/app/SinglePhotoPage.java
|
| 43ab5e5519fc5a95f45c4f29553b657840989ba7 |
05-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
Load correct localized album names after language change
Bug: 7459805
Change-Id: I484ffea5b07488ffdda2e265c4efa32a3333ea03
ndroid/gallery3d/data/LocalAlbum.java
ndroid/gallery3d/data/LocalMergeAlbum.java
|
| 07c3ab57628b4b962b6369fdee9afe3c45a0c2ba |
05-Nov-2012 |
Doris Liu <tianliu@google.com> |
Adding AccessibilityUtils class
Bug: 7434841
All the functions in this class should be backward compatible to
gingerbread.
Change-Id: I280a64d195b2df123607a5cdad5886e3048dbb92
ndroid/gallery3d/util/AccessibilityUtils.java
|
| d270653e91ff15d552d6c94b143e32a70f9610f1 |
02-Nov-2012 |
Wu-cheng Li <wuchengli@google.com> |
Lock icon in secure album should redirect to gallery after unlock.
Use FLAG_DISMISS_KEYGUARD so lock screen will be brought up
when launching gallery.
bug:7462572
Change-Id: I345398cc6cfc09901e1ce8309ebdb65cf15088e0
ndroid/gallery3d/app/Gallery.java
ndroid/gallery3d/app/PhotoPage.java
|
| 310150da6405d21ebb6db64c2a3d9f7df925f17d |
01-Nov-2012 |
George Mount <mount@google.com> |
am 25fab805: Merge "Fix extra gray item in secure album." into gb-ub-photos-arches
* commit '25fab8057e0db4b1ff33b8da13b270d9af8ae217':
Fix extra gray item in secure album.
|
| 2e13c999e8f63296e643e9a921950f3b964b3eff |
01-Nov-2012 |
George Mount <mount@google.com> |
Merge "Fix extra gray item in secure album." into gb-ub-photos-arches
|
| ae448c720c14ded7a86e825ad5f8a3bb4194f2a6 |
01-Nov-2012 |
Bart Sears <bsears@google.com> |
am 40bb7158: Merge "Jump to lockscreen in secure album if tap on video" into gb-ub-photos-arches
* commit '40bb7158b8bda53433b36b94d6efed0e3937dcf2':
Jump to lockscreen in secure album if tap on video
|
| d21d2aea8015ea6234819e8e5c616421858077ca |
01-Nov-2012 |
Bart Sears <bsears@google.com> |
Merge "Jump to lockscreen in secure album if tap on video" into gb-ub-photos-arches
|
| e226d337ec69337fb35c664fda8c83ac7e54c36a |
01-Nov-2012 |
Sascha Haeberling <haeberling@google.com> |
am 769d38db: Fix tiny planet not using XMP metadata anymore
* commit '769d38db5736cd690ab7837c0824572739c39184':
Fix tiny planet not using XMP metadata anymore
|
| 91ee484aa3092135bf05b4d62e4fc025321ae62b |
01-Nov-2012 |
George Mount <mount@google.com> |
Fix extra gray item in secure album.
Bug 7454444
Change-Id: I83f40e7e74f658a7b9ada148932a231ef8c31f73
ndroid/gallery3d/data/SecureAlbum.java
|
| c57b37c608f13d35fe4000870421aebb68f10b03 |
01-Nov-2012 |
Angus Kong <shkong@google.com> |
Jump to lockscreen in secure album if tap on video
bug:7454356
Change-Id: I1e7e9ed886d414d5b41abdb1cc1d00c7736ae006
ndroid/gallery3d/app/PhotoPage.java
|
| 4f4c036e8537ab76301f7ad0faadf42a15538d7e |
01-Nov-2012 |
Sascha Haeberling <haeberling@google.com> |
Fix tiny planet not using XMP metadata anymore
Bug: 7452777
Background: Semantics of isPanoramaSafe has changed and should not be
called from within the TinyPlanet filter at all.
Change-Id: I6bada525d30d9ff21fdff99f52c6697c3f828c7e
ndroid/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
|
| 37dfa8109d0147a076bdc64bca696a494dce756e |
01-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
Use the system-standard long press vibration pattern
Bug: 7216819
Change-Id: I575868583777a7a953d767d0cdaa91a439d908ff
ndroid/gallery3d/app/ActivityState.java
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/AlbumSetPage.java
|
| 1d0d5cbf663a76f5cb2769621d39a83256943de9 |
01-Nov-2012 |
Doris Liu <tianliu@google.com> |
Disable operations when no item is selected
Bug: 7441208
Change-Id: I2f435ad8aa0b578ecfec426f7ad6287f0f210f48
ndroid/gallery3d/ui/ActionModeHandler.java
|
| e8cd59bd5446556bfbb53cea49330388d51e5e0d |
31-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Fix jank on videoplayer auto-exit" into gb-ub-photos-bryce
|
| ce6b27fde7c95477fd6d24ea427280a5d6431bcf |
31-Oct-2012 |
John Reck <jreck@google.com> |
Gingerbread support-ish
This reverts commit 1336062985c9824d7fd796b1cebd5eaa8e4163ca.
Change-Id: I718ec56315dc207a3e612abb4576bddab9afa2ee
ndroid/gallery3d/app/AbstractGalleryActivity.java
ndroid/gallery3d/app/ActivityState.java
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/AlbumSetPage.java
ndroid/gallery3d/app/CropImage.java
ndroid/gallery3d/app/Gallery.java
ndroid/gallery3d/app/GalleryActionBar.java
ndroid/gallery3d/app/MovieActivity.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/app/PickerActivity.java
ndroid/gallery3d/app/SinglePhotoDataAdapter.java
ndroid/gallery3d/app/StateManager.java
ndroid/gallery3d/ui/ActionModeHandler.java
ndroid/gallery3d/ui/MenuExecutor.java
ndroid/gallery3d/ui/PopupList.java
ndroid/gallery3d/ui/PositionController.java
|
| e47ca16b3941204721a6a06fa5c4ce5400b97640 |
31-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix jank on videoplayer auto-exit
Bug: 7344292
Change-Id: I3af95d3370769a6465644fa4aabe3f2ffa2980e7
ndroid/gallery3d/app/CommonControllerOverlay.java
|
| e0fab93dc32c3927bfdab1233c194e4c772e57d0 |
31-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Add a triangle to the popup button view
bug:7442434
Change-Id: I7b784f2a5662ef694daef6cd926f60694b3eee4f
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/ui/FramedTextButton.java
|
| a3c8cf04c31af4d53bb81d161241c13656847166 |
30-Oct-2012 |
Tenghui Zhu <ztenghui@google.com> |
Merge "DO NOT MERGE: Do not set the background to null for video." into gb-ub-photos-arches
|
| 6af05206f0b71f7a09ed7d9f8763535723796d75 |
04-Oct-2012 |
Romain Guy <romainguy@google.com> |
DO NOT MERGE: Do not set the background to null for video.
Bug #7275145
Bug 7405595
Removing the window background when it's not visible is a good idea
to save on performance. Removing *all* the backgrounds is just a silly
idea that leads to weird looking results that drive graphics engineers
mad for a day until they figure out that everything is working properly
and that the app is simply asking the system to draw whatever garbage
is left in the GPU's graphics buffers.
Cherry pick the Romain's change from jb-mr1-dev:
https://googleplex-android-review.googlesource.com/#/c/234571/
Change-Id: Ief88821319989add5fda57ae7b69cdb01f6ccdf4
ndroid/gallery3d/app/MoviePlayer.java
|
| 85ee46d76fb59f8550afdfe73486fff2b6bd5035 |
30-Oct-2012 |
Bart Sears <bsears@google.com> |
am c7536cfa: Merge "Show sync error toast only when both loading and syncing are done." into gb-ub-photos-arches
* commit 'c7536cfa819d10e0c556ecb30c53a58c048fa327':
Show sync error toast only when both loading and syncing are done.
|
| 556347cb20e871f25560ff37d7c51f66733888f7 |
30-Oct-2012 |
Bart Sears <bsears@google.com> |
Merge "Show sync error toast only when both loading and syncing are done." into gb-ub-photos-arches
|
| fffab335ac447da86e7f54211b6415b49d096f85 |
30-Oct-2012 |
George Mount <mount@google.com> |
am aa8228a4: Merge "Don\'t use an album for UriImages." into gb-ub-photos-arches
* commit 'aa8228a42b25b60f0663770beea9acdce536f699':
Don't use an album for UriImages.
|
| 9062c85907bb49a30dd7554506a607b7405c4a35 |
30-Oct-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Merge "Gallery: Do not set the background to null for video." into gb-ub-photos-bryce
|
| bbcb023e46e4cfc905182a753a74baa43e12b076 |
27-Oct-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Gallery: Do not set the background to null for video.
This will fix screen corruption when exit while video complete or rotate while
video playing.
bug:7405595
Change-Id: I8b559390a284e5c850bc02a76add86c4de600144
ndroid/gallery3d/app/MoviePlayer.java
|
| db0db2d3809d377577c601689c140276ac8cf323 |
30-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
Show sync error toast only when both loading and syncing are done.
Bug: 7427597
Change-Id: Ie1fe8510e2a2225424b3c2892b2c0a8b4021324c
ndroid/gallery3d/app/AlbumDataLoader.java
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/AlbumSetDataLoader.java
ndroid/gallery3d/app/AlbumSetPage.java
ndroid/gallery3d/app/LoadingListener.java
ndroid/gallery3d/app/PhotoDataAdapter.java
ndroid/gallery3d/app/PhotoPage.java
|
| 883295bc3643c5d3e0520fa317bec9919cc4ff7c |
29-Oct-2012 |
George Mount <mount@google.com> |
Don't use an album for UriImages.
Bug 7422455
Change-Id: Ic9b0ae762b56f6734a1bd452c6c877431b90c0a6
ndroid/gallery3d/data/UriSource.java
|
| 59e1fc0f37be14fa8290a5be734dc5819a7e6484 |
29-Oct-2012 |
Doris Liu <tianliu@google.com> |
Disable save button when there's no modification
Bug: 7353884
Change-Id: I1b88e8b8ab3a92aad1226c60062a17a2f4badfb9
ndroid/gallery3d/app/TrimVideo.java
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
|
| 373fe6a155425c6488ab610157184633637314b4 |
29-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Reset rotation flag
bug:7386221
Change-Id: I45a615a880a96d54bbde0a5ce648e02ff86db1de
ndroid/gallery3d/filtershow/cache/ImageLoader.java
|
| 17b9bd8f1baed2f788d179d90b775a9c16087b50 |
29-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix zooming position" into gb-ub-photos-arches
|
| 7fcf15ec7f1dc20d211c6211bb3a464d12449ffa |
29-Oct-2012 |
John Hoford <hoford@google.com> |
Do not copy XMP data if it has TinyPlanet filter
bug:7429072
Change-Id: I791db8ae8157741eb4cd74e9b6f749275b6b6cc3
ndroid/gallery3d/filtershow/presets/ImagePreset.java
|
| 180282b9c90e2b387e6c65f1b35bb637c170aacf |
26-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix zooming position
bug:7386221
Change-Id: I70215d3c3e12d08eee40a3cc848e3fc50f7dda75
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/cache/ImageLoader.java
ndroid/gallery3d/filtershow/imageshow/GeometryMetadata.java
ndroid/gallery3d/filtershow/imageshow/ImageZoom.java
|
| 6a96acff4169070a82be05d0eed3ec27bc02420d |
27-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix rounding issue affecting TinyPlanet
bug:7428061
Change-Id: Ieeb4c27d4c426d7052c49ca88ca61ff0785000a3
ndroid/gallery3d/filtershow/imageshow/GeometryMetadata.java
|
| 38f91275d6762029269c02bcd73f0cbd6a63cc6b |
27-Oct-2012 |
Nicolas Roard <nicolasroard@google.com> |
Merge "Changed rotated display parameter increments to 90." into gb-ub-photos-arches
|
| e3a16c0f6f6f24681a5b5d7fe4cd923ca0731463 |
27-Oct-2012 |
Nicolas Roard <nicolasroard@google.com> |
Merge "change thumbnail and reset behaviour" into gb-ub-photos-arches
|
| 3b74d96d94cc8d3c89cd0f61824bda63e8b0ac94 |
27-Oct-2012 |
Doris Liu <tianliu@google.com> |
Merge "Show panoViewer icon after "Back" from viewer" into gb-ub-photos-arches
|
| 4e11131e1e8408e5a8803d6289a2bc55a150b3c7 |
27-Oct-2012 |
Doris Liu <tianliu@google.com> |
Show panoViewer icon after "Back" from viewer
Bug: 7407942
Change-Id: I00da3c73a558e412e106f089034e83f2e75616e4
ndroid/gallery3d/app/PhotoPageBottomControls.java
|
| 4de422b670d1aa9e2878d89c9d84ef3b7294ff85 |
27-Oct-2012 |
John Hoford <hoford@google.com> |
change thumbnail and reset behaviour
bug:7386757
bug:7343047
Change-Id: I0b44309f047b790025fb806ce041e2265489f027
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/imageshow/ImageSmallFilter.java
|
| 3bf329fbf1d314f3e1f219cff60b098e7c81452f |
25-Oct-2012 |
George Mount <mount@google.com> |
Remove black borders in Manta LightCycle capture after orientation change.
Bug 7344906
Change-Id: I70017e4479962d49aedb06ea7b050f638e00fc06
ndroid/gallery3d/ui/SurfaceTextureScreenNail.java
|
| 3b6743cb518f090d7c3ac427122e54122ad85ce6 |
27-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Fix the black lines near edge of thumbnails" into gb-ub-photos-arches
|
| f69c65b415a420cb9658aa0dbf4bb5f0d04b2693 |
26-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Changed rotated display parameter increments to 90.
Bug: 7393432
Change-Id: Id94a28c88cc06a7d99aab0d01dae4fc59cefbab2
ndroid/gallery3d/filtershow/imageshow/ImageRotate.java
|
| 6e0655f27f5263f67caa6c48f15a36a63a6cce04 |
26-Oct-2012 |
John Reck <jreck@google.com> |
Merge "Add proxy launcher" into gb-ub-photos-arches
|
| f9f56e5d0e7d0662da26f15d609a601cef5d0fb2 |
26-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Hold WakeLock for batch delete operation" into gb-ub-photos-arches
|
| 4663598408ac2ca40c9d2009de1a74c5adbbe85f |
26-Oct-2012 |
Owen Lin <owenlin@google.com> |
Fix the black lines near edge of thumbnails
1. Correct the positions of right and bottom borders
2. Turn off blending by using PoterDuffMode.SRC
bug: 7414307
Change-Id: Icc6fd765c2b1e904308c53aa66b55600e0016471
ndroid/gallery3d/ui/TiledTexture.java
|
| a4f31025a49ef4a8e1ebf8ab6d1e7134f37556d5 |
26-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix colors in rotate and mirror
bug:7419025
Change-Id: Icf92de032f62f93a3ac57e042ea582c760d9f600
ndroid/gallery3d/filtershow/imageshow/ImageGeometry.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
|
| 8ff6b11f168ab131c87df6be56208f60dc5df15b |
26-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix crash when showing history" into gb-ub-photos-arches
|
| 32cd4fad9f8866d10f2bb68e1b1ded209b08d676 |
26-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix crash when showing history
bug:7418823
Change-Id: I0a84bb4d8fc8b42fc953f8301bb2b24cf64edce7
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
|
| 5b006bf51a130b7e7a2fa486e99615f33efcb956 |
26-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Fix tiling effect when open a photo." into gb-ub-photos-arches
|
| 6a03661ca41acfd5f4cc804338d930a024955e4e |
26-Oct-2012 |
Nicolas Roard <nicolasroard@google.com> |
Merge "Do not add crop into preset if in inital setup" into gb-ub-photos-arches
|
| f33af70636db6496747b905ccc81f6511894c039 |
25-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Hold WakeLock for batch delete operation
Bug: 6680729
Change-Id: I0bdd59edb60c746c8c9e3c3608be980247f0d91a
ndroid/gallery3d/ui/ActionModeHandler.java
ndroid/gallery3d/ui/ImportCompleteListener.java
ndroid/gallery3d/ui/WakeLockHoldingProgressListener.java
|
| 4684dda756ec425ab1d0058d6294581efeb35ffc |
26-Oct-2012 |
John Hoford <hoford@google.com> |
Do not add crop into preset if in inital setup
bug:7417545
Change-Id: I355936645e555e3d6b950923af301b437570dd93
ndroid/gallery3d/filtershow/imageshow/ImageGeometry.java
|
| 806ab25465c3bc874136d89db8d42f27270e76bf |
24-Oct-2012 |
John Reck <jreck@google.com> |
Add proxy launcher
Bug: 7394901
Change-Id: I667a6e6fbd11d4c02dc536067bb6f3813775db9c
ndroid/gallery3d/app/PhotoPage.java
|
| 73c4d73f5042087d6258ced03124957045567fd7 |
26-Oct-2012 |
John Reck <jreck@google.com> |
Merge "Add loading spinner" into gb-ub-photos-arches
|
| 95a0734d7996db52ecbc128223e17b69a6663684 |
26-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Merge "Handle 360 panorama specific MIME type." into gb-ub-photos-arches
|
| 24c6b09c392983efc772fce3e5973e68461db760 |
25-Oct-2012 |
John Reck <jreck@google.com> |
Add loading spinner
Bug: 7408575
Change-Id: Ia737b36abb88d75381f41c25474e3cc03448dbb9
ndroid/gallery3d/filtershow/FilterShowActivity.java
|
| 5dbcddd9298fc85be0ab178fbb71b97c0495b1bb |
11-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Handle 360 panorama specific MIME type.
Bug: 7407448
Change-Id: I939a061e2100c2cdc17279982de98f1d446d8aef
ndroid/gallery3d/app/Gallery.java
|
| 7993e1f8392e8c1c84fc4efc9c79996eb85a9122 |
26-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fix issue where aspect bounds don't get applied." into gb-ub-photos-arches
|
| 817e1edb66e0b0b75494f46d4a509e4f48730a7f |
26-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fixed crop intent." into gb-ub-photos-arches
|
| 21a7aa3a269dfb68a771e010c0554b68f88a1466 |
25-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Fix issue where aspect bounds don't get applied.
Bug: 7407937
Change-Id: Ie6484d6458657d6284e04de755a8cc1a912dfb6c
ndroid/gallery3d/filtershow/PanelController.java
ndroid/gallery3d/filtershow/imageshow/ImageGeometry.java
|
| eb3dd15fd820ee4242d0b0799e834fbeeb5f7005 |
26-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Fixed crop intent.
Bug: 7415140
Bug: 7403813
Change-Id: I545162544f845d210d21185cddaca09b219fb091
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/ui/MenuExecutor.java
|
| f6ac061eb455fff6e8d08410f70db2dffbaa9213 |
25-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Get rid of black lines near edge of thumbnails" into gb-ub-photos-arches
|
| bd0219cd5e45d98118993e355776f2bf20538e83 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix crash when starting filtereditor
bug:7415170
Change-Id: I9d54b1179f343aa089bfd9a065ecddaa8a4283b8
ndroid/gallery3d/filtershow/cache/DirectPresetCache.java
ndroid/gallery3d/filtershow/cache/ImageLoader.java
|
| b64131fc5443eeb208178dd5e1cadd93d36bbdfd |
25-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Get rid of black lines near edge of thumbnails
Bug: 7414307
Change-Id: If77e04945ff6df65301a6802dd40fabc8c329bfa
ndroid/gallery3d/ui/TiledTexture.java
|
| 30e7406db27fc4f0dbd3dd0ee3a0b04f40439231 |
25-Oct-2012 |
Angus Kong <shkong@google.com> |
Force renderring request for Camera Animation.
bug:7410862
Change-Id: I439186f2fea5ee0939ddcfcb9d77a49d0047727b
ndroid/gallery3d/ui/GLRoot.java
ndroid/gallery3d/ui/GLRootView.java
|
| 31c9a0ff9b2a732e76e03dd38c511b22b4e8c0f1 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix default for tiny planet
bug:7410938
Change-Id: If43317c2ad1e22ca1a3d3de1eef91ea2556252dd
ndroid/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
|
| 1aa5f5b7c8a44cd7f002fd7838b95a6297e4e46b |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix update view
bug:7410583
Change-Id: I8e773bc4ba550c2a362b46e5a6488ad7b3c29646
ndroid/gallery3d/filtershow/cache/ImageLoader.java
|
| 9ed5587681d216168ab000ae254da4bdbdcf7a34 |
24-Oct-2012 |
Owen Lin <owenlin@google.com> |
Fix tiling effect when open a photo.
1. Don't draw the tiles of full image before screen nail is ready.
2. Upload multiple tiles in each frame in order to show photo quickly.
bug: 7403409
Change-Id: Ic5a88a29fe302068e97ab81ab260d0cc572dd7ff
ndroid/gallery3d/ui/TiledScreenNail.java
ndroid/gallery3d/ui/TiledTexture.java
|
| 2189502d1ea176fa8aec207ad8fa57965dc6ae33 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Remove the old photo editor" into gb-ub-photos-arches
|
| 2696d692dcf04c36f92455bdd9dc662487689707 |
25-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
Merge "Fixes TinyPlanet crashed due to too excessive memory usage." into gb-ub-photos-arches
|
| 0817895a0de7f0295ed06fa7ac4cff624479797a |
25-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fixed blackscreen when launching crop from menu." into gb-ub-photos-arches
|
| 644aa2529f24d7750cff0b448765933675c3afdb |
25-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Fixed blackscreen when launching crop from menu.
Bug: 7410287
Change-Id: I60ae95cff82c789df37ce1b45fbaaaffa1aa552b
ndroid/gallery3d/filtershow/cache/ImageLoader.java
ndroid/gallery3d/filtershow/imageshow/ImageCrop.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
|
| 6ebc5501d1e577f243beb306c3493f77b25c4794 |
25-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
Fixes TinyPlanet crashed due to too excessive memory usage.
Bug: 7409664
Change-Id: If82882ce7186500f5a3af769d490275233a6191c
ndroid/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
|
| b9cded8b42f032e453ae016027cb2b8e7097f575 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Remove the old photo editor
bug:7407573
Change-Id: Ifac6d3d7cec02c9cb8ef8bbd390f0512e6cdb66c
(cherry picked from commit a96c8e9c9aac509ba074b340c66e31e20ec05823)
ndroid/gallery3d/app/GalleryAppImpl.java
ndroid/gallery3d/photoeditor/ActionBar.java
ndroid/gallery3d/photoeditor/BitmapUtils.java
ndroid/gallery3d/photoeditor/EffectsBar.java
ndroid/gallery3d/photoeditor/EffectsMenu.java
ndroid/gallery3d/photoeditor/FilterStack.java
ndroid/gallery3d/photoeditor/ImageActionButton.java
ndroid/gallery3d/photoeditor/LoadScreennailTask.java
ndroid/gallery3d/photoeditor/OnDoneBitmapCallback.java
ndroid/gallery3d/photoeditor/OnDoneCallback.java
ndroid/gallery3d/photoeditor/Photo.java
ndroid/gallery3d/photoeditor/PhotoEditor.java
ndroid/gallery3d/photoeditor/PhotoView.java
ndroid/gallery3d/photoeditor/RendererUtils.java
ndroid/gallery3d/photoeditor/RestorableView.java
ndroid/gallery3d/photoeditor/SaveCopyTask.java
ndroid/gallery3d/photoeditor/SpinnerProgressDialog.java
ndroid/gallery3d/photoeditor/Toolbar.java
ndroid/gallery3d/photoeditor/YesCancelDialogBuilder.java
ndroid/gallery3d/photoeditor/actions/AbstractSeekBar.java
ndroid/gallery3d/photoeditor/actions/AutoFixAction.java
ndroid/gallery3d/photoeditor/actions/ColorSeekBar.java
ndroid/gallery3d/photoeditor/actions/ColorTemperatureAction.java
ndroid/gallery3d/photoeditor/actions/CropAction.java
ndroid/gallery3d/photoeditor/actions/CropView.java
ndroid/gallery3d/photoeditor/actions/CrossProcessAction.java
ndroid/gallery3d/photoeditor/actions/DocumentaryAction.java
ndroid/gallery3d/photoeditor/actions/Doodle.java
ndroid/gallery3d/photoeditor/actions/DoodleAction.java
ndroid/gallery3d/photoeditor/actions/DoodleView.java
ndroid/gallery3d/photoeditor/actions/DuotoneAction.java
ndroid/gallery3d/photoeditor/actions/EffectAction.java
ndroid/gallery3d/photoeditor/actions/EffectToolKit.java
ndroid/gallery3d/photoeditor/actions/FaceTanAction.java
ndroid/gallery3d/photoeditor/actions/FaceliftAction.java
ndroid/gallery3d/photoeditor/actions/FillLightAction.java
ndroid/gallery3d/photoeditor/actions/FisheyeAction.java
ndroid/gallery3d/photoeditor/actions/FlipAction.java
ndroid/gallery3d/photoeditor/actions/FlipView.java
ndroid/gallery3d/photoeditor/actions/FullscreenToolView.java
ndroid/gallery3d/photoeditor/actions/GrainAction.java
ndroid/gallery3d/photoeditor/actions/GrayscaleAction.java
ndroid/gallery3d/photoeditor/actions/HighlightAction.java
ndroid/gallery3d/photoeditor/actions/LomoishAction.java
ndroid/gallery3d/photoeditor/actions/NegativeAction.java
ndroid/gallery3d/photoeditor/actions/PosterizeAction.java
ndroid/gallery3d/photoeditor/actions/RedEyeAction.java
ndroid/gallery3d/photoeditor/actions/RotateAction.java
ndroid/gallery3d/photoeditor/actions/RotateView.java
ndroid/gallery3d/photoeditor/actions/SaturationAction.java
ndroid/gallery3d/photoeditor/actions/ScaleSeekBar.java
ndroid/gallery3d/photoeditor/actions/SepiaAction.java
ndroid/gallery3d/photoeditor/actions/ShadowAction.java
ndroid/gallery3d/photoeditor/actions/SharpenAction.java
ndroid/gallery3d/photoeditor/actions/StraightenAction.java
ndroid/gallery3d/photoeditor/actions/TintAction.java
ndroid/gallery3d/photoeditor/actions/TouchView.java
ndroid/gallery3d/photoeditor/actions/VignetteAction.java
ndroid/gallery3d/photoeditor/filters/AbstractScaleFilter.java
ndroid/gallery3d/photoeditor/filters/AutoFixFilter.java
ndroid/gallery3d/photoeditor/filters/ColorTemperatureFilter.java
ndroid/gallery3d/photoeditor/filters/CropFilter.java
ndroid/gallery3d/photoeditor/filters/CrossProcessFilter.java
ndroid/gallery3d/photoeditor/filters/DocumentaryFilter.java
ndroid/gallery3d/photoeditor/filters/DoodleFilter.java
ndroid/gallery3d/photoeditor/filters/DuotoneFilter.java
ndroid/gallery3d/photoeditor/filters/FaceTanFilter.java
ndroid/gallery3d/photoeditor/filters/FaceliftFilter.java
ndroid/gallery3d/photoeditor/filters/FillLightFilter.java
ndroid/gallery3d/photoeditor/filters/Filter.java
ndroid/gallery3d/photoeditor/filters/FilterCreator.java
ndroid/gallery3d/photoeditor/filters/FisheyeFilter.java
ndroid/gallery3d/photoeditor/filters/FlipFilter.java
ndroid/gallery3d/photoeditor/filters/GrainFilter.java
ndroid/gallery3d/photoeditor/filters/GrayscaleFilter.java
ndroid/gallery3d/photoeditor/filters/HighlightFilter.java
ndroid/gallery3d/photoeditor/filters/LomoishFilter.java
ndroid/gallery3d/photoeditor/filters/NegativeFilter.java
ndroid/gallery3d/photoeditor/filters/PosterizeFilter.java
ndroid/gallery3d/photoeditor/filters/RedEyeFilter.java
ndroid/gallery3d/photoeditor/filters/RotateFilter.java
ndroid/gallery3d/photoeditor/filters/SaturationFilter.java
ndroid/gallery3d/photoeditor/filters/SepiaFilter.java
ndroid/gallery3d/photoeditor/filters/ShadowFilter.java
ndroid/gallery3d/photoeditor/filters/SharpenFilter.java
ndroid/gallery3d/photoeditor/filters/StraightenFilter.java
ndroid/gallery3d/photoeditor/filters/TintFilter.java
ndroid/gallery3d/photoeditor/filters/VignetteFilter.java
|
| e7647cf87c7303c4f9b7a2dd57d6c70563a63655 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Add rotation to tinyplanet view
bug:7389189
Change-Id: Ib072879190bcd96c552581bf9240876b10ca362d
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/PanelController.java
ndroid/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
ndroid/gallery3d/filtershow/imageshow/ImageTinyPlanet.java
|
| 028c39fdda797ea6cd5a507a1164c656f3c73b97 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fixes UI stuff
bug:7393871
bug:7387596
Change-Id: I833c6f713ab71c4dce896f66e191a2a1a42b3e2f
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/ui/FramedTextButton.java
|
| fbc5472790ad2f6e142a6814d812a52b0e4e3328 |
25-Oct-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Merge "Initialize the modified date correctly." into gb-ub-photos-arches
|
| 48541c58a9ee455e14bdc1a7dd4ed8e866055fd1 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Change background and panel colors
bug:7385980
Change-Id: I67edeeda0df311203e4cedc140d42a3d9d41a7b4
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/imageshow/ImageSmallFilter.java
|
| 19a8eac2eb19c02e62d0881b8b6fd9cface43b4d |
25-Oct-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Initialize the modified date correctly.
On top of that, the date_taken is in units of seconds, while others are in
units of milliseconds.
bug:7307090
Change-Id: I3f14a6354fa72a20d228d49a92d5c2007ca29df1
ndroid/gallery3d/app/TrimVideo.java
ndroid/gallery3d/data/LocalVideo.java
|
| 68a664431ea1ffdfca53411e8c70ced00bf8dcbc |
24-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Fix attempted uploading of recycled tiles" into gb-ub-photos-arches
|
| eab224a54a9b8d1a87ce23036402a234518c1109 |
24-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix attempted uploading of recycled tiles
Bug: 7405398
Change-Id: I17711f9c724af216aa22cee6a86d9feba84c1548
ndroid/gallery3d/ui/TiledTexture.java
|
| 80a35b17989ee57b706cd18cfe8c5d928f08eeda |
24-Oct-2012 |
John Reck <jreck@google.com> |
Move loadBitmap to async task
Bug: 7406705
Change-Id: I4e540e08d239d2e57f0ae6be5d70c8777cdbab2a
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/cache/ImageLoader.java
ndroid/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
|
| 474cf37aca1a88f909cc272ab5f7936726c011ab |
24-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Launch built-in camera app via filmstrip
Bug: 7407182
Change-Id: I25e0028dd5f3889f7837494e0bf25c54edbb4405
ndroid/gallery3d/app/PhotoPage.java
|
| 354998d14f170e278339c1a8c0639298c970440c |
24-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Took out aspect ratio switching.
Bug: 7406414
Change-Id: Iba6e59d728d6f1ce81ea62b01a86dfaa355383b9
ndroid/gallery3d/filtershow/PanelController.java
ndroid/gallery3d/filtershow/imageshow/ImageCrop.java
|
| c50ba9db0366810bbe10e36ab61206ef51536ece |
24-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Save the image when applying tiny planet" into gb-ub-photos-arches
|
| b1eeb6ca05d1b1e59e64680b14c8d5b341e22582 |
24-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Save the image when applying tiny planet
bug:7403622
Change-Id: Ic199b163d6418b6d45c2da10b915f2088dd52e16
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/PanelController.java
|
| d62540b5ce2017d7f8045a648a1f04f7017891db |
24-Oct-2012 |
John Hoford <hoford@google.com> |
Merge "limited the size of textures to 2048" into gb-ub-photos-arches
|
| e8410e06481f76a314724d010035aef729000b6a |
24-Oct-2012 |
John Hoford <hoford@google.com> |
limited the size of textures to 2048
bug:7404007
Change-Id: I77fac900e213ca16c2accfa8f59d0cd300559836
ndroid/gallery3d/filtershow/cache/ImageLoader.java
|
| 30cea9fd7d02cffe4a15c58a61fa823fee29db42 |
24-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Do not show bottom controls when undo bar is visible
Bug: 7403458
Change-Id: I1e789ebd7f08256a1ccbdb2ac9f2f9f97d0859c6
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/ui/PhotoView.java
|
| b89ad7cf365087de7ca11166bcfbfecbe4584b98 |
24-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Do not show Camera placeholder when not appropriate" into gb-ub-photos-arches
|
| 26e7a71df39c4b6923c0d36e32cc7ae0ebd72a05 |
22-Oct-2012 |
Owen Lin <owenlin@google.com> |
Use TiledTexture for thumbnails.
1. Use TiledTexture for thumbnails to prevent jank in uploading big
thumbnails. (e.g., 512 * 512)
2. Use larger thumbnails (DISPLAY_LONG_SIDE / 5).
bug: 7381302
Change-Id: I7661d648373e893b40b2a0304037171760091e00
ndroid/gallery3d/data/ImageCacheService.java
ndroid/gallery3d/ui/AlbumSetSlidingWindow.java
ndroid/gallery3d/ui/AlbumSetSlotRenderer.java
ndroid/gallery3d/ui/AlbumSlidingWindow.java
ndroid/gallery3d/ui/AlbumSlotRenderer.java
ndroid/gallery3d/ui/FadeInTexture.java
ndroid/gallery3d/ui/FadeOutTexture.java
ndroid/gallery3d/ui/FadeTexture.java
ndroid/gallery3d/ui/TiledTexture.java
ndroid/gallery3d/util/GalleryUtils.java
|
| bbd30e0aab09feba5d3e038433895561ab255640 |
24-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
Use XMP meta-data for correct tiny planets.
Bug: 7403766
Change-Id: Ie03d40d0396d352d6fe48c91b995a2f872c98a06
ndroid/gallery3d/filtershow/cache/ImageLoader.java
ndroid/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
|
| 026dabdcb13bd0095a970af8e1a05741f801db50 |
24-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Fixed scaling factor for ImageShow and rotations.
Bug: 7392240
Bug: 7386048
Change-Id: I156c52acbd041604df2f7ccacca3a80f1b9fdb3b
ndroid/gallery3d/filtershow/imageshow/GeometryMath.java
ndroid/gallery3d/filtershow/imageshow/GeometryMetadata.java
ndroid/gallery3d/filtershow/imageshow/ImageGeometry.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
|
| 5a3f6e371d4efc5ca4f2ec80f21d787bbb14efc9 |
24-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Do not show Camera placeholder when not appropriate
Bug: 7403454
Change-Id: I5cc0227f068da0ca596e6259314b9d2ade62de07
ndroid/gallery3d/app/PhotoPage.java
|
| 57cc382afb777db41002619da6f4762f4251bb59 |
24-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fix so mirror gets applied." into gb-ub-photos-arches
|
| 63bf92dd121514abdaca9f8cac106bcbcfeb010d |
24-Oct-2012 |
Nicolas Roard <nicolasroard@google.com> |
Merge "Support XMP data, fixed read file on another thread" into gb-ub-photos-arches
|
| fa4bb6de2db465a2ceb4deab0ebf60060f06ab36 |
24-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Fix so mirror gets applied.
Bug: 7402773
Change-Id: I531b795c2f43379e9eaf1ad3b9292e62c867ec3c
ndroid/gallery3d/filtershow/imageshow/GeometryMetadata.java
|
| 3e23efc9cd3db42561f6b241c79c6d80aae53507 |
24-Oct-2012 |
Doris Liu <tianliu@google.com> |
Merge "Stay in AlbumPage when dismissing a popup from AP" into gb-ub-photos-arches
|
| bc219f73dd60001c5ad035fab917cb5e2243093d |
24-Oct-2012 |
John Hoford <hoford@google.com> |
Support XMP data, fixed read file on another thread
bug:7293391
Change-Id: I634857dea3c4d0d204c3fb40f0eec9dc1a9af263
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/cache/ImageLoader.java
|
| ba18d1eceecddfe16e938c77878a56cf0dbadced |
23-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Increased touch tolerance in cropping.
Bug: 7342281
Change-Id: Ice2ba5f07074b1518e4064bbda489aae7ba17b22
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/imageshow/ImageCrop.java
|
| 76cb915b10a84732809ee634f723befe5e2604ac |
24-Oct-2012 |
Doris Liu <tianliu@google.com> |
Stay in AlbumPage when dismissing a popup from AP
Bug: 7384972
Change-Id: Ie2434ecc203a98610f1954b73a3d6916940eb812
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/StateManager.java
|
| 95a94afb783be6f01dac6c6c99ab3716cc456ca7 |
22-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Reworked crop/transform UI.
Bug: 7385644
Bug: 7378335
Bug: 7366075
Change-Id: Iee7e0a0741b69269b08726bad45e29d86834054e
ndroid/gallery3d/filtershow/PanelController.java
ndroid/gallery3d/filtershow/filters/ImageFilterGeometry.java
ndroid/gallery3d/filtershow/imageshow/GeometryMath.java
ndroid/gallery3d/filtershow/imageshow/GeometryMetadata.java
ndroid/gallery3d/filtershow/imageshow/ImageCrop.java
ndroid/gallery3d/filtershow/imageshow/ImageFlip.java
ndroid/gallery3d/filtershow/imageshow/ImageGeometry.java
ndroid/gallery3d/filtershow/imageshow/ImageRotate.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
ndroid/gallery3d/filtershow/imageshow/ImageStraighten.java
|
| 70d8bce63b966a00447f8dbd1736fe26a62b07ac |
24-Oct-2012 |
John Hoford <hoford@google.com> |
add support for black and white filters, add rotation API to tiny planet
bug:7386370
bug:7389189
Change-Id: I1720893000c39edf28a356fb7b56634f004ef120
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/PanelController.java
ndroid/gallery3d/filtershow/filters/ImageFilterBwFilter.java
ndroid/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
|
| 1e09027a2cc43960eca65404381d791e2d243cab |
24-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix jank when launching editor from Camera filmstrip
Bug: 7301182
Status bar visibility in FilterShow will now match
the one in Camera/Gallery so that there isn't weird
jank when launching.
Change-Id: I3e942633b351264d2cd38cc5b587de32e38521ed
ndroid/gallery3d/app/AbstractGalleryActivity.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/filtershow/FilterShowActivity.java
|
| 02ed57d123ba96cca284f78df8c6eba776e710ee |
24-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Express the borders size in percentages" into gb-ub-photos-arches
|
| 5894a6b55271727695d7a489dfc06d12fa49c788 |
24-Oct-2012 |
John Reck <jreck@google.com> |
Merge "Fix NPE" into gb-ub-photos-arches
|
| 52863a17f1e0aab3d47a6b98b72812187620ee84 |
24-Oct-2012 |
George Mount <mount@google.com> |
Merge "Fix NPE in detecting panoramas." into gb-ub-photos-arches
|
| 03e18995f4a2c71381048b2e264bcac11cd17950 |
23-Oct-2012 |
John Reck <jreck@google.com> |
Fix NPE
Bug: 7399438
Change-Id: Ida0bcc0689d5a797e3c60c3ee51542512fbadf1e
ndroid/gallery3d/ui/PhotoView.java
|
| 9a9c3b582a407f632aaaa8e704113262796757f4 |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Express the borders size in percentages
bug:7379459
Change-Id: I14c91dbee0480a3880a11b166fcce3673c2ff3eb
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/filters/ImageFilterParametricBorder.java
|
| 4588b65ebb1aacef2a991d5da6659d69f791e571 |
23-Oct-2012 |
George Mount <mount@google.com> |
Fix NPE in detecting panoramas.
Bug 7398022
Change-Id: Iae646c424ffbe552d014f563c8f4e5e4385b4724
ndroid/gallery3d/app/PanoramaMetadataSupport.java
|
| 1b5ec22976ca5182a16228bc5ca1b12130923856 |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Hide the history panel on rotation
bug:7386882
Change-Id: Id68fa1680318b85b4b5b5e54221377d504687d93
ndroid/gallery3d/filtershow/FilterShowActivity.java
|
| 5aad4e99baf4dc0c31468e51cbe4ce738ee7d49e |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix another potential crash in Curves
bug:7379140
Change-Id: I5f2f21b56595799c0e46e13bf5278b44803f4080
ndroid/gallery3d/filtershow/ui/ImageCurves.java
ndroid/gallery3d/filtershow/ui/Spline.java
|
| f2b827b5461160f96a0b6c497452d8bab73957cc |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix flickering in geometry panel" into gb-ub-photos-arches
|
| f2b2d94a8d2e8273563244c85a75656cd9e37b83 |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix flickering in geometry panel
bug:7344214
Change-Id: I34c980061c2d51e7b97ec95fc77e3331cffdf8d5
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
|
| b818cbe38468eb79f5d85f6738b8264451cf4356 |
23-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Show Panorama viewer button in filmstrip mode" into gb-ub-photos-arches
|
| 90fa4a1d0ec72dd412c0dd37eb7ec23cfa1d47c6 |
23-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Show Panorama viewer button in filmstrip mode
Bug: 7393346
Change-Id: I555ef6cfee0ac3992f0a84c69a1eafc19718ce4c
ndroid/gallery3d/app/PhotoPage.java
|
| 983f612476c394dffcd2b73869ed3c92f531e5e1 |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Add copyright notices
bug:7387634
Change-Id: Iaac0b55c9857f609312b78a613d074d323174ea1
ndroid/gallery3d/filtershow/CenteredLinearLayout.java
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/HistoryAdapter.java
ndroid/gallery3d/filtershow/ImageStateAdapter.java
ndroid/gallery3d/filtershow/PanelController.java
ndroid/gallery3d/filtershow/cache/BitmapCache.java
ndroid/gallery3d/filtershow/cache/Cache.java
ndroid/gallery3d/filtershow/cache/DelayedPresetCache.java
ndroid/gallery3d/filtershow/cache/DirectPresetCache.java
ndroid/gallery3d/filtershow/cache/ZoomCache.java
ndroid/gallery3d/filtershow/filters/ColorSpaceMatrix.java
ndroid/gallery3d/filtershow/filters/ImageFilter.java
ndroid/gallery3d/filtershow/filters/ImageFilterBW.java
ndroid/gallery3d/filtershow/filters/ImageFilterBWBlue.java
ndroid/gallery3d/filtershow/filters/ImageFilterBWGreen.java
ndroid/gallery3d/filtershow/filters/ImageFilterBWRed.java
ndroid/gallery3d/filtershow/filters/ImageFilterBorder.java
ndroid/gallery3d/filtershow/filters/ImageFilterContrast.java
ndroid/gallery3d/filtershow/filters/ImageFilterCurves.java
ndroid/gallery3d/filtershow/filters/ImageFilterExposure.java
ndroid/gallery3d/filtershow/filters/ImageFilterFx.java
ndroid/gallery3d/filtershow/filters/ImageFilterGradient.java
ndroid/gallery3d/filtershow/filters/ImageFilterHue.java
ndroid/gallery3d/filtershow/filters/ImageFilterParametricBorder.java
ndroid/gallery3d/filtershow/filters/ImageFilterRS.java
ndroid/gallery3d/filtershow/filters/ImageFilterRedEye.java
ndroid/gallery3d/filtershow/filters/ImageFilterSaturated.java
ndroid/gallery3d/filtershow/filters/ImageFilterShadows.java
ndroid/gallery3d/filtershow/filters/ImageFilterSharpen.java
ndroid/gallery3d/filtershow/filters/ImageFilterStraighten.java
ndroid/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
ndroid/gallery3d/filtershow/filters/ImageFilterVibrance.java
ndroid/gallery3d/filtershow/filters/ImageFilterVignette.java
ndroid/gallery3d/filtershow/filters/ImageFilterWBalance.java
ndroid/gallery3d/filtershow/imageshow/GeometryMath.java
ndroid/gallery3d/filtershow/imageshow/ImageBorder.java
ndroid/gallery3d/filtershow/imageshow/ImageSmallBorder.java
ndroid/gallery3d/filtershow/imageshow/ImageSmallFilter.java
ndroid/gallery3d/filtershow/imageshow/ImageWithIcon.java
ndroid/gallery3d/filtershow/imageshow/ImageZoom.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
ndroid/gallery3d/filtershow/presets/ImagePresetBW.java
ndroid/gallery3d/filtershow/presets/ImagePresetBWBlue.java
ndroid/gallery3d/filtershow/presets/ImagePresetBWGreen.java
ndroid/gallery3d/filtershow/presets/ImagePresetBWRed.java
ndroid/gallery3d/filtershow/presets/ImagePresetFX.java
ndroid/gallery3d/filtershow/presets/ImagePresetOld.java
ndroid/gallery3d/filtershow/presets/ImagePresetSaturated.java
ndroid/gallery3d/filtershow/presets/ImagePresetXProcessing.java
ndroid/gallery3d/filtershow/provider/SharedImageProvider.java
ndroid/gallery3d/filtershow/ui/ControlPoint.java
ndroid/gallery3d/filtershow/ui/FramedTextButton.java
ndroid/gallery3d/filtershow/ui/ImageButtonTitle.java
ndroid/gallery3d/filtershow/ui/ImageCurves.java
ndroid/gallery3d/filtershow/ui/SliderController.java
ndroid/gallery3d/filtershow/ui/SliderListener.java
ndroid/gallery3d/filtershow/ui/Spline.java
|
| 3a6614628f8d33f8ce881d85355cebf2b9523252 |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix slow / jerky tracking in Curves
bug:7394837
Change-Id: I70758b463601faa19d05da58d0163b31df7b4b91
ndroid/gallery3d/filtershow/ui/ImageCurves.java
ndroid/gallery3d/filtershow/ui/Spline.java
|
| cd0a788658ae61e215a677635779a3313e483d96 |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Shows filtered images in geometry modules and comparison." into gb-ub-photos-arches
|
| 0107c1ee0b0815bdc1cbf383e776d17365f67530 |
23-Oct-2012 |
George Mount <mount@google.com> |
Merge "Ensure photo sphere icon shows for panoramas." into gb-ub-photos-arches
|
| 8fa78323ff1b14c4eebb2cfa1e67f8259811b76c |
20-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Shows filtered images in geometry modules and comparison.
bug:7279469
bug:7379286
bug:7344214
bug:7379140
Also:
- cache multiple version (with/without geometry or filters applied)
- doesn't show the original image anymore when waiting for a filtered version (shows nothing instead for now)
- fix potential crash in Curves
Change-Id: I4eabd42c30f6d370571f177d5efe92550798aed8
ndroid/gallery3d/filtershow/cache/DirectPresetCache.java
ndroid/gallery3d/filtershow/cache/ImageLoader.java
ndroid/gallery3d/filtershow/imageshow/ImageGeometry.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
ndroid/gallery3d/filtershow/imageshow/ImageSlave.java
ndroid/gallery3d/filtershow/imageshow/ImageSmallBorder.java
ndroid/gallery3d/filtershow/imageshow/ImageSmallFilter.java
ndroid/gallery3d/filtershow/imageshow/ImageZoom.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
ndroid/gallery3d/filtershow/ui/ImageCurves.java
|
| 1d5fda98a8d6bb28ef3eafb1fc0f24152a91560e |
23-Oct-2012 |
George Mount <mount@google.com> |
Ensure photo sphere icon shows for panoramas.
Bug 7393844
Change-Id: Id3b0d15606ec6e5d41558cbfc5089c4b1b229c63
ndroid/gallery3d/app/PhotoPageBottomControls.java
|
| 072e41e2c00abdc8f7e780679b5a943d41c6f1e6 |
23-Oct-2012 |
John Hoford <hoford@google.com> |
on entry check if Tiny Planet if not remove UI
bug:7391885
Change-Id: Ic2bffa9f9fbaa2d437ce231a1478a1b63a0eed83
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/cache/ImageLoader.java
|
| a1988ea0257872c07900a125a056427bb27258fe |
23-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Minor transition tweaks" into gb-ub-photos-arches
|
| 57028113bd8ed41c136e5254d184e828ddd9ded1 |
23-Oct-2012 |
Doris Liu <tianliu@google.com> |
Merge "Show panorama thumbs in Gallery grid view" into gb-ub-photos-arches
|
| 3fefe69b92437c0ad9aa4eeae31f7b63cd9270e9 |
23-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Minor transition tweaks
Bug: 7376109
Change-Id: Id4a761c3d601e453ac1ad2edbbea986af14bb21c
ndroid/gallery3d/anim/StateTransitionAnimation.java
|
| 691c9edf71c4c886b0cb8a3adc29e27b8eb65531 |
20-Oct-2012 |
Doris Liu <tianliu@google.com> |
Show panorama thumbs in Gallery grid view
Bug: 7362229
Bug: 7378208
In addition to showing pano thumbs, this CL also removes the video play
icon on the top-level album view thumbnails.
Change-Id: I950bc66c38575036d5ad7464a2fd9a5dea9fae4b
ndroid/gallery3d/ui/AbstractSlotRenderer.java
ndroid/gallery3d/ui/AlbumSetSlidingWindow.java
ndroid/gallery3d/ui/AlbumSetSlotRenderer.java
ndroid/gallery3d/ui/AlbumSlidingWindow.java
ndroid/gallery3d/ui/AlbumSlotRenderer.java
|
| 4e791ba2c3992d948c0ac4c70c2dafd289386c21 |
23-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Move new exif lib to gallerycommon." into gb-ub-photos-arches
|
| d4f9359d64b447e78c5101d11e71b628fc82ef2c |
23-Oct-2012 |
John Reck <jreck@google.com> |
Merge "Drive GLRootView with Choreographer" into gb-ub-photos-arches
|
| ccd5750055f6b692f4d5bb9fd1a1a8428966cbed |
23-Oct-2012 |
John Reck <jreck@google.com> |
Drive GLRootView with Choreographer
Bug: 7332724
By routing requestRender through postOnAnimation we can drive
the GLRootView's rendering with the UI thread's coreographer, which
ensures that touch events are processed before drawing
Change-Id: Iac2b3229e9a09ee0319c64c5fc7cb906512a379c
ndroid/gallery3d/ui/GLRootView.java
|
| e49d4f91b60b33c8f2f59e217916ffe4507f1714 |
23-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Scroll to placeholder in gallery filmstrip launches camera" into gb-ub-photos-arches
|
| bc912f9e17b55ab815bd12081e1ceb71a2c9f424 |
23-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches
|
| 1426b538b0df7653b77b05243c422b2e155c5d14 |
22-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Scroll to placeholder in gallery filmstrip launches camera
Bug: 7368079
Change-Id: I50323b6b4d64672486cdca785b9f1e1ae2f02a97
ndroid/gallery3d/app/PhotoPage.java
|
| 3651c39f614e37cbf35896838bf56bacd6423266 |
22-Oct-2012 |
George Mount <mount@google.com> |
Merge "Add null-check for StitchingServiceProvider." into gb-ub-photos-arches
|
| e1c830b5b51ad4760d2730227d89b9326dfc48b6 |
19-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Fix geometry xforms & minor bug.
Bug: 7376048
Fixed geometry transform. Fixed minor bug where the foldername
for saved edited images was incorrect.
Change-Id: I901df11cf71cd987b354dd7821fef7a484b0cbd3
ndroid/gallery3d/filtershow/filters/ImageFilterGeometry.java
ndroid/gallery3d/filtershow/imageshow/GeometryMetadata.java
|
| 3d7829c71c27a14e671017b46228c5d684bd349e |
22-Oct-2012 |
George Mount <mount@google.com> |
Add null-check for StitchingServiceProvider.
Bug 7386827
Change-Id: Id1ec7399202c6e67bb215f1309697b2f718a3c03
ndroid/gallery3d/app/GalleryAppImpl.java
|
| 2f7d7b23ff41800d01edad9d30ddd9517b309e18 |
22-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Better transition between Gallery and editor" into gb-ub-photos-arches
|
| 7ccf0111d388bbaf963ace2ea9eeb37903bffb0a |
20-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Fix to ensure visible history adapter strings are from xml.
Bug: 7379327
Change-Id: I5fcb6fec1e9abe05689dd3b9f4e70e518a9e09d1
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/HistoryAdapter.java
ndroid/gallery3d/filtershow/PanelController.java
ndroid/gallery3d/filtershow/imageshow/ImageCrop.java
ndroid/gallery3d/filtershow/imageshow/ImageFlip.java
ndroid/gallery3d/filtershow/imageshow/ImageRotate.java
ndroid/gallery3d/filtershow/imageshow/ImageStraighten.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
|
| f5d3a0e494703f2ea749ff836c6b00a4fdb239bc |
22-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Better transition between Gallery and editor
Bug: 7346155
Change-Id: I5f6b0901df4aa37d1657c13917aeae7ad77ac9bf
ndroid/gallery3d/app/PhotoPage.java
|
| 82da3e8e16187b8c13c1382b487b4735b7f1d94a |
22-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix the undo/redo/reset menu item state" into gb-ub-photos-arches
|
| 6e8f37db441228ffb7c1165f36a1289e0cc48896 |
22-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Tweak transition animations" into gb-ub-photos-arches
|
| 331e2bffdbbbfe4f2d22fcc7a2464c0bb7491efe |
22-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Tweak transition animations
Bug: 7376109
Change-Id: I28cc8413bda31ff945e8e48dd75b86b2e9d071a8
ndroid/gallery3d/anim/StateTransitionAnimation.java
|
| 2c6c9f9d75d03174b446ff218ac66cf81bba5109 |
19-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
Move new exif lib to gallerycommon.
https://googleplex-android-review.googlesource.com/#/c/242047 depends on this.
Bug: 6667860
Change-Id: Iac937e2eea94f0f5ffde876235b1c2ee748e7570
ndroid/gallery3d/exif/CountedDataInputStream.java
ndroid/gallery3d/exif/ExifData.java
ndroid/gallery3d/exif/ExifInvalidFormatException.java
ndroid/gallery3d/exif/ExifOutputStream.java
ndroid/gallery3d/exif/ExifParser.java
ndroid/gallery3d/exif/ExifReader.java
ndroid/gallery3d/exif/ExifTag.java
ndroid/gallery3d/exif/IfdData.java
ndroid/gallery3d/exif/IfdId.java
ndroid/gallery3d/exif/JpegHeader.java
ndroid/gallery3d/exif/OrderedDataOutputStream.java
ndroid/gallery3d/exif/Rational.java
ndroid/gallery3d/exif/Util.java
|
| eaf93ae9970f34ed2d69fbd8b66beddaa82d37f6 |
22-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix the undo/redo/reset menu item state
bug:7357734
- enable/disable the undo/redo/reset menu item
depending on the history.
Change-Id: I633008bc9a99eef2e7289b290fc96120f09b3825
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/HistoryAdapter.java
|
| 08999d276db9b07c2fdd28d11ea6a20ca05aaa2e |
22-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Prevent unveil direction to change as long as no touch up
bug:7385925
Change-Id: I16f17e6de1624f7a40b16641122103edc0f5bb64
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
|
| 74bf1dc76f451e71b64ee8d7e61d56a5680e3ea1 |
22-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix crash in Curves module
bug:7379140
Change-Id: I26f30d24eb8cf2db9248f29549d8b435d941a325
ndroid/gallery3d/filtershow/ui/ImageCurves.java
|
| 589211113909726cd97e2dca7326ac1bb9e5a552 |
22-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix several issues with crop/straighten
bug:7386266
bug:7386270
bug:7385727
- use a transparent white for the bounds instead of green
- add "rule of third" lines to the crop tool
- improves preview image quality for geometric operations
Change-Id: I94c233e7ea89d67451e7808fb71537d03a1c183d
ndroid/gallery3d/filtershow/filters/ImageFilterGeometry.java
ndroid/gallery3d/filtershow/imageshow/ImageCrop.java
|
| 1cb4edc0153dec88b8f6150a64637eaad2c7694e |
21-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Only translate the main panel if we have to.
bug:7386882
Change-Id: Ib670eb4e513f0bbebd3ecca052fe27180dcf5fdc
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
ndroid/gallery3d/filtershow/imageshow/ImageSlave.java
|
| 74711ae65afa48c44f5da250bf4f4ef0291ab09c |
21-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Revert partially CL https://googleplex-android-review.googlesource.com/#/c/243614/
bug:7384984
Change-Id: Id10c7ac08cc7aab4d2f4b19c88b20d0f3369807a
ndroid/gallery3d/filtershow/filters/ImageFilterGeometry.java
|
| be536c2f7882c587a2ad7fcb566b04521fe8604b |
20-Oct-2012 |
Doris Liu <tianliu@google.com> |
Fix for active action bar in camera
Bug: 7377404
Bug: 7384972
Change-Id: Ic54a7501ed3e2a61fab272461dee474b693c8f3a
ndroid/gallery3d/app/AlbumPage.java
|
| ed9c2b629cc43e5c61c1d016a5bcf21e086720c9 |
20-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
Adds a tiny planet (stereographic projection) image filter.
Bug: 7293391
Also fixes an issue where the preview value was statically set to 100.
This adds a preview parameter value that can be set for this purpose.
Change-Id: I68c4ec04e86ab8a29ef7f561e5f21a298003677e
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/filters/ImageFilter.java
ndroid/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
|
| ea4609e63cc3721912bc0381eaaa6b1800062bd5 |
20-Oct-2012 |
John Hoford <hoford@google.com> |
Add the infrastructure to support Tiny Planet
bug:7293391
Change-Id: I25d95b78a832fa5f20b661e13c4028041517da19
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/cache/ImageLoader.java
ndroid/gallery3d/filtershow/filters/ImageFilter.java
ndroid/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
ndroid/gallery3d/filtershow/imageshow/ImageSmallFilter.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
|
| 7eeb00e767afa7761c28fc96007505043c69c7f5 |
20-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix delete and undo behavior on filmstrip
Bug: 7353749
Change-Id: Ib0abd3f71783c01b1df418dd76e674bf05e65ce7
ndroid/gallery3d/app/PhotoDataAdapter.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/ui/PhotoView.java
|
| 1d3823a2fde62fbc5e2763ace81ac003271f970f |
20-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Improves swipe gesture" into gb-ub-photos-arches
|
| eb45a40ee1e2c1f541dbfc9316a116c861a3bf7b |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Improves swipe gesture
bug:7379463
- better timings
- add original label
- remove the gesture detector from ImageZoom (use the parent's one)
Change-Id: Ib6879e471dfc21cb3a112aa36a61cd304516cf7f
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
ndroid/gallery3d/filtershow/imageshow/ImageZoom.java
|
| 63ec6cf86b5ff11bd4af50cf8422b64818ec9806 |
19-Oct-2012 |
George Mount <mount@google.com> |
Remove progress bar when switching to grid mode.
Bug 7377975
Change-Id: I388fdf6c6c9a5ffa64e10f864806a8131e53a009
ndroid/gallery3d/app/PhotoPage.java
|
| 7cad82f61c1d56865fa30ce5cf36b197badd87c6 |
19-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Re-enable crop for new panorama
Bug: 7326215
Change-Id: Ic7a87baceb8aff6247d40b91d4c60cd47c86c377
ndroid/gallery3d/ui/MenuExecutor.java
|
| a02be444d5bbaf71ee4629e6cd0443679e2385b4 |
19-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches
|
| bf77f1387ab6b5e9cf027b37a42357192149e233 |
19-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Saner behavior when deleting in filmstrip mode" into gb-ub-photos-arches
|
| 55146e261be8104860e484d5bcb93f635814b825 |
19-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Saner behavior when deleting in filmstrip mode
Bug: 7353749
Change-Id: Ic9854d205fe5ab76dd1cfe78fee314e93e1ace55
ndroid/gallery3d/ui/PhotoView.java
|
| 09d1602f2e14bf9d9f22739afb4a95ae3282a762 |
19-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Fix sharing state in Gallery ActionBar
Bug: 7340067
Change-Id: I4ff9577315fc743f6b9fef0d325b0743546f108e
ndroid/gallery3d/app/GalleryActionBar.java
|
| bc4f2ffb15b34dac8bb68112e25889dac90c8bc1 |
19-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Fix geometry xforms & minor bug.
Bug: 7376048
Fixed geometry transform. Fixed minor bug where the foldername
for saved edited images was incorrect.
Change-Id: Icb3156f02b7db7b50a455aaa31ee70832e3fdca8
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/filtershow/filters/ImageFilterGeometry.java
ndroid/gallery3d/filtershow/imageshow/GeometryMetadata.java
ndroid/gallery3d/filtershow/imageshow/ImageFlip.java
|
| b184f83254e8a930112c4db9364669a936f295d8 |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Improves Curves & Crop UI
bug:7361722
- Use new assets
- Add a margin
- Add a popup menu
- Add a new button showing the current channel
- Add popup menu, new assets, new button for Crop as well
Change-Id: I0e09098e3135d2213f7f4cd64cd75a3a518a07da
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/PanelController.java
ndroid/gallery3d/filtershow/imageshow/ImageCrop.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
ndroid/gallery3d/filtershow/ui/FramedTextButton.java
ndroid/gallery3d/filtershow/ui/ImageCurves.java
ndroid/gallery3d/filtershow/ui/Spline.java
|
| 3b50e7b4baceebfea3fb3ccc7aca2966a20d02b9 |
19-Oct-2012 |
Doris Liu <tianliu@google.com> |
Merge "Adding support for tiny planet in gallery" into gb-ub-photos-arches
|
| 5530e2979762541936a2087df57a5fbaab8cc53a |
19-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Fix Gallery crash" into gb-ub-photos-arches
|
| d672d083d1af3e42e0f87c5b0757d714270dcd9e |
19-Oct-2012 |
Doris Liu <tianliu@google.com> |
Adding support for tiny planet in gallery
Bug: 7344427
Change-Id: I6fad734b28022f45cc551d81212ee4d3a0c867b2
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/app/PhotoPageBottomControls.java
ndroid/gallery3d/filtershow/FilterShowActivity.java
|
| 3045c0c57f5d0850a181ced58df657725afa96fb |
19-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix Gallery crash
Bug: 7268985
Change-Id: I88c823d3270cb74d6e2bd7df5b6b6ed9e28f16a6
ndroid/gallery3d/app/AlbumPage.java
|
| 8c6181a363fad6f37bc780e3f4c109009a7646e5 |
18-Oct-2012 |
Scott Main <smain@google.com> |
DO NOT MERGE
cherrypick from Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8
remove old fashioned Dream, no longer supported
Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8
Conflicts:
AndroidManifest.xml
ndroid/gallery3d/app/SlideshowDream.java
|
| 99cb9cd2816c5fa8cfddb34e5ef84ec3d9b2a330 |
19-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Do not show "Filmstrip view" text when photo is fullscreen" into gb-ub-photos-arches
|
| f1135ad929aadaf873314cc14216c4a8b0ab5b7c |
18-Oct-2012 |
John Reck <jreck@google.com> |
Save XMP & Exif data on edited photos
Bug: 7293391
Bug: 7329199
Bug: 7376660
Change-Id: I23b1637a9a494c1dc43b1fc1359cdaf3e75bc23f
ndroid/gallery3d/filtershow/cache/ImageLoader.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
ndroid/gallery3d/filtershow/tools/ProcessedBitmap.java
ndroid/gallery3d/filtershow/tools/SaveCopyTask.java
|
| e1fb53368803126d6f128b16799f1875705d3562 |
18-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix undo/redo/back button behaviour with effects and enable history
bug:7332980
bug:7357734
bug:7325872
Change-Id: Ie952a410c218c91ac927095ddcf542209fe7b90c
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/HistoryAdapter.java
ndroid/gallery3d/filtershow/PanelController.java
ndroid/gallery3d/filtershow/filters/ImageFilterCurves.java
ndroid/gallery3d/filtershow/imageshow/ImageCrop.java
ndroid/gallery3d/filtershow/imageshow/ImageFlip.java
ndroid/gallery3d/filtershow/imageshow/ImageGeometry.java
ndroid/gallery3d/filtershow/imageshow/ImageRotate.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
ndroid/gallery3d/filtershow/imageshow/ImageSlave.java
ndroid/gallery3d/filtershow/imageshow/ImageStraighten.java
ndroid/gallery3d/filtershow/ui/ImageCurves.java
ndroid/gallery3d/filtershow/ui/Spline.java
|
| 816f5f93572c728a80e7d0d32199b72b91f3b37d |
19-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Do not show "Filmstrip view" text when photo is fullscreen
Bug: 243374
Change-Id: I2d0a1d56e6c2d833d9d75041b30afcb988635c49
ndroid/gallery3d/app/PhotoPage.java
|
| 10ed0fbdb5619d0972aa3cc6fd8c05201a992e39 |
19-Oct-2012 |
George Mount <mount@google.com> |
Merge "Remove panorama checks from supported operations." into gb-ub-photos-arches
|
| 16b3bfbbd2a6447684ac406554f862b29c873751 |
18-Oct-2012 |
George Mount <mount@google.com> |
Remove panorama checks from supported operations.
Bug 7351383
Bug 7349438
Move panorama support checks from getSupportedOperations so
that calls to getSupportedOperations are consistent. Panorama
checks are moved to only based on callbacks.
Change-Id: Id9ff138204df84c6fb0a4c971dcea59f1220aee2
ndroid/gallery3d/app/GalleryAppImpl.java
ndroid/gallery3d/app/PanoramaMetadataSupport.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/app/PhotoPageBottomControls.java
ndroid/gallery3d/data/DataManager.java
ndroid/gallery3d/data/LocalImage.java
ndroid/gallery3d/data/MediaObject.java
ndroid/gallery3d/data/PanoramaMetadataJob.java
ndroid/gallery3d/data/UriImage.java
ndroid/gallery3d/ui/ActionModeHandler.java
ndroid/gallery3d/ui/MenuExecutor.java
|
| 6fae731dfab7861a878a853358a06db71399b3e8 |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Handle screen rotation
bug:7328773
Change-Id: I3c03c233a5b5a883963c8fd124c760655fd12bc7
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
|
| 79b74e0fd52cd2ba92130c5131474d52170d6f7e |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix broken build" into gb-ub-photos-arches
|
| 484bf5d6018a8e5563d765cea5b0cb89cd147f97 |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix broken build
Change-Id: I088926bd7fad32017861027d7786a4c178aca122
ndroid/gallery3d/filtershow/PanelController.java
|
| 5353fe78ea6c70e855285574cf43e557f9753e1d |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Hide curve channel picker" into gb-ub-photos-arches
|
| 25fbd8e2660350684b2f8bae5fbcabdfd432e800 |
19-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Various transition tweaks/fixes in Gallery" into gb-ub-photos-arches
|
| 51c30125189936313604d1111becef8565e76120 |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Hide curve channel picker
bug:7375053
Change-Id: I7aa5f9db44dc657b0f4282a1bb2ea41bde322d36
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/PanelController.java
|
| 548038a155d94f674e7afc622f2a5b356a6f5328 |
18-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Various transition tweaks/fixes in Gallery
Bug: 7376109
-Add new animation preset for photos based on UX feedback
-Fix showing of highlight when tapping album grid photo
-Move StateTransition enum to StateTransitionAnimation.State
Change-Id: I2ce57580fa6c5f34d9545561515031899eb41eb2
ndroid/gallery3d/anim/StateTransitionAnimation.java
ndroid/gallery3d/app/ActivityState.java
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/StateManager.java
|
| 079ee7776fb81d1f38ea22bf553d2c7c9ba45103 |
18-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
First cut at a skeleton for the TinyPlanets filter.
Bug: 7344426
This is not hooking up the real algorithm yet, but unblocks Doris so she
can add the button while we rewrite the algorithm.
Change-Id: I685b6c189e8ac124670db53c37565c4f1ff1f606
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/PanelController.java
ndroid/gallery3d/filtershow/filters/ImageFilter.java
ndroid/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
|
| f6c31e476d940a8306a7e14ad47215a87540dbf0 |
18-Oct-2012 |
Doris Liu <tianliu@google.com> |
Merge "Fix for initial edited picture is gray" into gb-ub-photos-arches
|
| f81b8bdc1230d42d6850dc682451854abd007547 |
18-Oct-2012 |
Doris Liu <tianliu@google.com> |
Fix for initial edited picture is gray
Bug: 7373880
Change-Id: I0aa18ba850608437ae6327b3f3d676b218bcc75e
ndroid/gallery3d/filtershow/tools/SaveCopyTask.java
|
| 155195bb5fa12d4f16872af3c30fc26701785414 |
18-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Fixed initial aspect button text.
Bug: 7374910
Change-Id: I2c86b7c5b242f930692e2e6feda8a85533c509d8
ndroid/gallery3d/filtershow/PanelController.java
|
| da994b21184f6e3af94e1da66cd26532b172847a |
18-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Big refactor, additions to state transition animations" into gb-ub-photos-arches
|
| 9726d8bed6fa6b0403466be4aceb860dffa57b80 |
18-Oct-2012 |
Doris Liu <tianliu@google.com> |
Save edited picasa to "Edited Online Photos" album
Bug: 7346157
This CL includes the following changes:
1) Save the new image to a new folder named "Edited Online Photos"
2) After the picture is saved, the user will be in the "Edited Online Photos" folder
3) Change the toast during saving to "Saving to" + new folder name
Change-Id: Ic505925425419ba9e3c7dac31fd403bf73d6887d
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/data/LocalAlbum.java
ndroid/gallery3d/data/Path.java
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/tools/SaveCopyTask.java
ndroid/gallery3d/util/BucketNames.java
ndroid/gallery3d/util/MediaSetUtils.java
|
| 82a5fe8fb0d44c497dcb419b6693ef3d28de3e8e |
18-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Fixed disappearing aspect ratio button.
Bug: 7369518
Change-Id: I5342339fa5a6e42d38b1ec7a8e6398bbb6901526
ndroid/gallery3d/filtershow/PanelController.java
|
| 2ba8604e8f1a8faf0e692706c3103cc889142583 |
17-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Big refactor, additions to state transition animations
Bug: 7362944
Refactored a lot of the state transitions code, adding
support for definable transition animations and defining
distinct outgoing and incoming animations.
Change-Id: I31a69057ea1b72dd3185cec656e59b11fdb528c1
ndroid/gallery3d/anim/StateTransitionAnimation.java
ndroid/gallery3d/app/ActivityState.java
ndroid/gallery3d/app/StateManager.java
ndroid/gallery3d/ui/GLView.java
ndroid/gallery3d/ui/PositionController.java
ndroid/gallery3d/ui/PreparePageFadeoutTexture.java
|
| c4ddadd5171771e25deee9707fee802823addc1e |
18-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Added support for crop actions. Changed overflow menu to use new editor." into gb-ub-photos-arches
|
| caf46711c033bb2de4649080e723b5cca81549c9 |
17-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Added support for crop actions. Changed overflow menu to use new editor.
Bug: 7281479
Bug: 7337191
Change-Id: I91055c972666e4c2d605903646b55d8c67ae87f3
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/filtershow/FilterShowActivity.java
|
| 0a331aeb7386b73e693528b0b26beba693ed6c10 |
18-Oct-2012 |
John Hoford <hoford@google.com> |
fix crash from configurable slider ranges
bug:7293391
Change-Id: I17498a2066acdb5c53763610980fe2f6532f2f34
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
|
| 591ba8d027d574f1e9fedaf878d3b7b41ebe4861 |
17-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Moved many strings to xml. Changed UI filter order. Renamed things.
Bug: 7344749
Bug: 7322949
Change-Id: Ia9ebc45fb2c743a458af270be429f07198ea3c1b
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/PanelController.java
ndroid/gallery3d/filtershow/filters/ImageFilterFx.java
ndroid/gallery3d/filtershow/imageshow/ImageSmallFilter.java
ndroid/gallery3d/filtershow/ui/ImageButtonTitle.java
|
| 2aec35785f8265f7711e281dcbd56ccebcba9cf7 |
18-Oct-2012 |
John Hoford <hoford@google.com> |
Merge "fix rotating normal images" into gb-ub-photos-arches
|
| bb81280524bffa7511dc8a7af0aaaaa1cd4a2c1c |
18-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix back button behaviour" into gb-ub-photos-arches
|
| 24fc5f1dd7a3a99e04e1e7f0d54d9ec1e777145d |
18-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix back button behaviour
bug:7290000
bug:7256201
Change-Id: Ia6f5726b0602c45e98566bcb5e027686e7f2fe57
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/filters/ImageFilter.java
ndroid/gallery3d/filtershow/filters/ImageFilterBorder.java
ndroid/gallery3d/filtershow/filters/ImageFilterCurves.java
ndroid/gallery3d/filtershow/filters/ImageFilterFx.java
ndroid/gallery3d/filtershow/filters/ImageFilterParametricBorder.java
ndroid/gallery3d/filtershow/imageshow/GeometryMetadata.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
ndroid/gallery3d/filtershow/imageshow/ImageSmallBorder.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
|
| fb0051a8d4bdc027e3b5fdf895718199ca24e133 |
18-Oct-2012 |
John Reck <jreck@google.com> |
Only fade out if texture creation succeeded
Bug: 7366597
Change-Id: Id28970fe263d975dcd48e45fd716199bc40f64d3
ndroid/gallery3d/app/ActivityState.java
ndroid/gallery3d/ui/PreparePageFadeoutTexture.java
|
| 659432ae6323d21600dde816a831f63fd2210350 |
17-Oct-2012 |
John Hoford <hoford@google.com> |
fix rotating normal images
bug:7353416
Change-Id: I86875286ea81982bdb55e9df22e44827b521d257
ndroid/gallery3d/filtershow/cache/ImageLoader.java
|
| d4f457e0133bac5e3b172a1261a36ff62c39953c |
17-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Merge "Add read URI permission to intent returned for GET_CONTENT" into gb-ub-photos-arches
|
| 903c190fc10e7cf5c95bccc7cf0220375e25ea00 |
17-Oct-2012 |
John Reck <jreck@google.com> |
Change double tap scale from 1.5 to 1.0
Bug: 7287834
Change-Id: I43312825c1494e385a36a3783765de33d2b691e2
ndroid/gallery3d/ui/PhotoView.java
|
| 25b4822bdf644054ee8871b5f091065075351510 |
17-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix UI stuff
bug:7354368
bug:7362027
bug:7344915
Change-Id: I2efd5de0971e5dfbc989d60860348280c03b3db4
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
ndroid/gallery3d/filtershow/imageshow/ImageSmallBorder.java
ndroid/gallery3d/filtershow/imageshow/ImageSmallFilter.java
|
| 0c4d19852885760e7fcfafbc8305e3533af35316 |
17-Oct-2012 |
John Hoford <hoford@google.com> |
Merge "rotate images before saving" into gb-ub-photos-arches
|
| dfbb1f436b6020bbc5c14794ef0e8f571adc2167 |
17-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Add read URI permission to intent returned for GET_CONTENT
Bug: 7366308
Bug: 7202384
GalleryProvider now requires a permission to access content.
See CL ca181a6 for more details.
Change-Id: I4bdf61e19c9e2b6e2da0837a8f633a27c49441d7
ndroid/gallery3d/app/AlbumPage.java
|
| b3f4f83e6d997f70d4ec762fb0bbe3cacd15613e |
17-Oct-2012 |
John Hoford <hoford@google.com> |
rotate images before saving
bug:7353416
Change-Id: I113de1fa16725c9483a447a64ab1a41a3bbe679f
ndroid/gallery3d/filtershow/cache/ImageLoader.java
|
| c635f76f2155525b2bcca5cfdd1320d16a865876 |
16-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
Adds GMS Core PanoramaClient to Gallery
Bug: 7319099
Also updates the API call to LightCycleHelper.
This depends on http://go/ag/#/c/239523/
Change-Id: Ie951e44e3a474599d1da6fea52609fbb9f8dc9bc
ndroid/gallery3d/app/AbstractGalleryActivity.java
ndroid/gallery3d/app/PhotoPage.java
|
| 7fc37252be8d12de906a9c68224f553f80c8ef52 |
17-Oct-2012 |
John Hoford <hoford@google.com> |
add support for configurable slider ranges
bug:7293391
Change-Id: Ie4984ce85387bf4d7a0a38e318eb20f6802ffc96
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/filters/ImageFilter.java
ndroid/gallery3d/filtershow/filters/ImageFilterFx.java
ndroid/gallery3d/filtershow/filters/ImageFilterHue.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
|
| 482038206b6677816b7030c3dbbc2a61ad2c9a84 |
17-Oct-2012 |
Nicolas Roard <nicolasroard@google.com> |
Merge "Added fixed aspect ratio support for cropping." into gb-ub-photos-arches
|
| 924146128735eab43340c293fdd77d1af3efe436 |
17-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Fixed flip (mirror) orientation.
Bug: 7342859
Change-Id: Ic9508927738f64e82e1bd078461b6ee1e1892300
ndroid/gallery3d/filtershow/imageshow/ImageFlip.java
|
| f52c1e102bb6510399509e0df335fcc13a98b9ae |
17-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Add permission to GalleryProvider." into gb-ub-photos-arches
|
| 85ff828f443f176c3ae3d6677cd6433e8abf59e5 |
17-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Update empty placeholder asset" into gb-ub-photos-arches
|
| dfd18bf09fcc3b6a7d06a8752641244e1a26ac84 |
17-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Update empty placeholder asset
Bug: 7362100
Change-Id: I521c1c481a00959bb50d17fee3be6981be84a269
ndroid/gallery3d/data/EmptyAlbumImage.java
|
| ed3566c74cf67f45f4384e13e8973fe197ef3548 |
17-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Update Camera album overlay icon asset
Bug: 7332688
Change-Id: Id7ada222551187787c4e3b50f52dcdc5c6c70929
ndroid/gallery3d/ui/AlbumSetSlotRenderer.java
|
| f36e53f7c59380670327a600b2766b3b42edbc2c |
16-Oct-2012 |
Owen Lin <owenlin@google.com> |
Add permission to GalleryProvider.
bug: 7202384
Change-Id: I1a13ed7e480163c898cf376219953b321290d4d4
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/ui/ActionModeHandler.java
|
| 0225fcd8513803711a3d5647e4927e2d8a9cfe34 |
15-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Added fixed aspect ratio support for cropping.
Bug: 7350377
Change-Id: I8110ea999c764de675fe11f586ab9bc7af205f46
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/PanelController.java
ndroid/gallery3d/filtershow/imageshow/GeometryMath.java
ndroid/gallery3d/filtershow/imageshow/ImageCrop.java
ndroid/gallery3d/filtershow/imageshow/ImageGeometry.java
ndroid/gallery3d/filtershow/imageshow/ImageRotate.java
ndroid/gallery3d/filtershow/imageshow/ImageStraighten.java
ndroid/gallery3d/filtershow/ui/ImageButtonTitle.java
|
| 2ad7b55cb31487fbfdbd50d60eb3e929cad0b42f |
17-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Consistent animations & up button behavior in Gallery" into gb-ub-photos-arches
|
| 488ef8a9eb4d6ac7efd070956058d5ce6a1c3f89 |
17-Oct-2012 |
John Reck <jreck@google.com> |
Merge "Add hook to manipulate SurfaceTexture transform" into gb-ub-photos-arches
|
| 2a9a6b53fb4a07b27773ee31171f441bc8aa08b3 |
17-Oct-2012 |
John Reck <jreck@google.com> |
Add hook to manipulate SurfaceTexture transform
Bug: 7302956
Change-Id: I32bdeb22630dbeba9f028e1c68167d10a5288a28
ndroid/gallery3d/ui/SurfaceTextureScreenNail.java
|
| 641b838e49a445592b17e56b11374d92f99789f2 |
15-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Consistent animations & up button behavior in Gallery
Bug: 7302857
Bug: 7295464
This CL makes all of the transition animations throughout
the Gallery app consistent. The animation is the previous
view shrinking and fading out while the new view starts out
bigger than the view port and is coming in to the viewport
size as it fades in. Having consistent animations allows us
to not keep PhotoPage/AlbumPage instances around in certain
cases, making it possible to have consistent up button
behavior when switching between the grid and filmstrip.
Finally, this also makes the transitions in the camera app
filmstrip/grid switching consistent with those in the
gallery app.
Change-Id: I77bac6a0cde1e439738c78f9e16ab15ed5910cfb
ndroid/gallery3d/anim/StateTransitionAnimation.java
ndroid/gallery3d/app/ActivityState.java
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/AlbumSetPage.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/app/StateManager.java
ndroid/gallery3d/ui/GLView.java
ndroid/gallery3d/ui/PositionController.java
ndroid/gallery3d/ui/PreparePageFadeoutTexture.java
|
| c057d64b701fc2de9f0d5fec7dbd34779647a442 |
16-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix when we cannot load an image
bug:7321636
Change-Id: I82cd603d531a1b743737a7c5b65005d370f2cdb1
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/cache/ImageLoader.java
|
| 5a69dcc8de22788cf57425e317337d5017c3673c |
16-Oct-2012 |
John Hoford <hoford@google.com> |
prevent original now acts like any other FX filter
bug:7353358
Change-Id: Id4efa45ddb8a8a0ca6d201ffc0b45fdd2f3caabf
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/filters/ImageFilterFx.java
|
| 9c64bdafa7efaef9eaa7eb9fe7b6207be483bef7 |
16-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix curves tool" into gb-ub-photos-arches
|
| 52186ac38ef5f10babf0f933066294958a28ae26 |
16-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix curves tool
bug:7344301
bug:7328680
bug:7289525
bug:7234239
Change-Id: I78d09dc2b38b11ccb2aac38ceef3acd8041f245e
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/PanelController.java
ndroid/gallery3d/filtershow/filters/ImageFilterCurves.java
ndroid/gallery3d/filtershow/ui/ControlPoint.java
ndroid/gallery3d/filtershow/ui/ImageCurves.java
ndroid/gallery3d/filtershow/ui/Spline.java
|
| f142ca3c6beee3fa69007431a1fe87e665207377 |
16-Oct-2012 |
Doris Liu <tianliu@google.com> |
Make save button in video trimming consistent
Bug: 7353884
Updated save button icon and text
Save button in video trimming now acts like back button when no change
has been made.
Change-Id: Iec29315222d3f3ffac9b96a89cad2821d7f86c4f
ndroid/gallery3d/app/TrimVideo.java
|
| d113262a45813f1d77c8b17e61c79727b2d037bd |
16-Oct-2012 |
John Hoford <hoford@google.com> |
filters now support orientation
bug:7353416
Change-Id: Ie6f01f37428dc86d338c5cb5a80630aa3a879eaa
ndroid/gallery3d/filtershow/cache/ImageLoader.java
|
| 306d7745b13ed3e489556e1e0019130e434499b7 |
14-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
Remove old camera classes.
bug:7201108
Change-Id: I539d02c411c654238d7e5e0c34e9ec3e6e6d4d90
ndroid/gallery3d/data/DataManager.java
ndroid/gallery3d/data/LocalAlbum.java
ndroid/gallery3d/data/LocalImage.java
ndroid/gallery3d/data/LocalVideo.java
|
| d3cd5c499ce58f3ad69d58acafd4f251a149fdbb |
11-Oct-2012 |
Owen Lin <owenlin@google.com> |
Fixes bugs in TiledTexture.
1. Upload tiles in SinglePhotoDataAdapter
2. Rebuild the upload queue after the screen nails being recycled
bug: 6399444
Change-Id: I57e756f8d1d84742bf82dd34c83baf8df89ae4cc
ndroid/gallery3d/app/CropImage.java
ndroid/gallery3d/app/PhotoDataAdapter.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/app/SinglePhotoDataAdapter.java
ndroid/gallery3d/ui/BitmapScreenNail.java
ndroid/gallery3d/ui/PhotoView.java
ndroid/gallery3d/ui/TileImageView.java
ndroid/gallery3d/ui/TileImageViewAdapter.java
ndroid/gallery3d/ui/TiledScreenNail.java
ndroid/gallery3d/util/GalleryUtils.java
|
| a942400efc37c5dd05b3c615092ae8d0f2ca7e2c |
16-Oct-2012 |
Owen Lin <owenlin@google.com> |
Merge "Revert "Revert "Upload screennails in tiles to prevent jank""" into gb-ub-photos-arches
|
| 2ef2d71edf822f0462fb312342f89f80ff271564 |
16-Oct-2012 |
John Hoford <hoford@google.com> |
Merge "fix for the cache" into gb-ub-photos-arches
|
| 4035d297191bd43377714a2fd70c12f375d9a6b2 |
16-Oct-2012 |
John Hoford <hoford@google.com> |
fix for the cache
Change-Id: Ib5c82aa602df961d15064e732b3701c8d6cd66ff
bug:7345592
ndroid/gallery3d/filtershow/cache/DirectPresetCache.java
|
| 06c349afaff1957f7bc7550f30b8b27ad05730df |
16-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Merge "Cherry-pick of 092fd92 to fix bug 7344730 also." into gb-ub-photos-arches
|
| 6d3d603b15ec260b70223460fd92db31394e112e |
16-Oct-2012 |
John Reck <jreck@google.com> |
Fix SRI Pano orientation
Bug: 7345511
Change-Id: I9a06f03b67ba820b86520588415ff3ab16f05829
ndroid/gallery3d/ui/GLRoot.java
ndroid/gallery3d/ui/PhotoView.java
|
| 8a112b0473278959e84002bc03e25af542a77e84 |
12-Oct-2012 |
Chih-Chung Chang <chihchung@google.com> |
Cherry-pick of 092fd92 to fix bug 7344730 also.
Make getSupportedOperations() call getSupportedOperations(boolean) by default.
So things will work for MediaObject who doesn't override the new method.
Bug: 7336562
Change-Id: Ic9ed6211981bb91c56702eafa7b21e83ed071cef
ndroid/gallery3d/data/MediaObject.java
|
| bb9b933ce04eb50c85c0c592ebbc85d00dcbf47f |
15-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Add stitching panorama image to secure album." into gb-ub-photos-arches
|
| 03cf9e04d820aff33a776a3b4b8744598f0cc365 |
14-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix dimensions to use dips instead of pixels
bug:7343798
Change-Id: I3d576ae334e580ad9da5b56d4ae84f749004ec21
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
ndroid/gallery3d/filtershow/imageshow/ImageSmallFilter.java
ndroid/gallery3d/filtershow/ui/ImageButtonTitle.java
|
| 1c44be4899c454e359cdde0b62f7678c59e0a8fa |
14-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix cropping and saving issues
bug:7342359
Change-Id: Ia59eb3f423b8c4f420b7b6f120735856a84cd854
ndroid/gallery3d/filtershow/filters/ImageFilterGeometry.java
ndroid/gallery3d/filtershow/imageshow/GeometryMetadata.java
ndroid/gallery3d/filtershow/imageshow/ImageGeometry.java
|
| ef1a61cb5470decd3ddf3729217ff1549eaeed43 |
13-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
Add stitching panorama image to secure album.
bug:7285105
Change-Id: I9f609f30d817f10a6c9c94fc6eadb58bc1bdd580
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/data/SecureAlbum.java
|
| b3e8fc2def7b3995c3b558d8594eb573defedf82 |
13-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Hide Camera button on empty gallery when not available" into gb-ub-photos-arches
|
| 76c14acf3255303cc72308d938fa05bfa0d3dc3d |
13-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Hide Camera button on empty gallery when not available
Bug: 7342583
Change-Id: I545b6902f994f7ed0245ec486e78693aea197a4a
ndroid/gallery3d/app/AlbumSetPage.java
|
| 2061ddca51d6cc4816073c857836c9283f7853b5 |
12-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Improve performance of filmstrip" into gb-ub-photos-arches
|
| 99abd47222e829493b0757fe332bb83926c5d85d |
12-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Adding crop UI. Fixes a number of other UI bugs.
Bug:7337191
Change-Id: If63dbdac6722ad4fc6c30c165d6c2eeb7011c240
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/PanelController.java
ndroid/gallery3d/filtershow/filters/ImageFilterGeometry.java
ndroid/gallery3d/filtershow/imageshow/GeometryMetadata.java
ndroid/gallery3d/filtershow/imageshow/ImageCrop.java
ndroid/gallery3d/filtershow/imageshow/ImageGeometry.java
ndroid/gallery3d/filtershow/imageshow/ImageStraighten.java
|
| 834a5e0da57fc92aeb79fd9c3b8fc44662415c9e |
12-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Improve performance of filmstrip
Bug: 7336758
Change-Id: I22dbf2e75bc069341a9bbc2c4dcdf7750f23be7f
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/data/LocalImage.java
ndroid/gallery3d/data/MediaObject.java
ndroid/gallery3d/data/UriImage.java
|
| 98de2e2ff9ab7959ee7d6035a9f87ed39ebc7537 |
12-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Moves matrix function to GeometryMetadata. Fixes scaling issues.
Bug:7337191
Change-Id: Icfd50c8a07ef02f2346a8ab7b57303de3866d74d
ndroid/gallery3d/filtershow/filters/ImageFilterGeometry.java
ndroid/gallery3d/filtershow/imageshow/GeometryMetadata.java
ndroid/gallery3d/filtershow/imageshow/ImageGeometry.java
|
| f392c6598fd98d3e79583c827809f227071c8269 |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Add back button handling" into gb-ub-photos-arches
|
| a7d7d05c8357049eb2accd75d35203c4be10cdbc |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Add back button handling
bug:7332980
- fix crash as well.
Change-Id: Id93ee7c194df6ac5e38def2e5f0fb3c5ecc0c2e4
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/PanelController.java
ndroid/gallery3d/filtershow/filters/ImageFilterWBalance.java
|
| c0d65a25b154985ea008decf48249d933e6996ac |
12-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Refresh panorama image after stitching completion
Bug: 7336784
Updating photo refreshes the supported operations which indiate if said
MediaItem is a panorama or not.
Change-Id: If3a169c9256b3f898594a30740930b5dfd96dba0
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/data/LocalImage.java
ndroid/gallery3d/data/UriImage.java
|
| 9c53ef91923931f0d8d079760777e6f4507ae48f |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix UI
bug:7328726
- add one pixel border
- hide parameter value on certain effects
- increase scale for border icons
Change-Id: Iffacec18477895701cba069500ee617bf3f9f2b7
ndroid/gallery3d/filtershow/PanelController.java
ndroid/gallery3d/filtershow/imageshow/ImageSmallBorder.java
|
| 1684f14224b7590a4e78b79a367ab2b481152baa |
12-Oct-2012 |
John Hoford <hoford@google.com> |
layouts, image icons, and layer behavour
bug:7328726
Change-Id: I94300771dd7b6ff5b4196365f13320fbc4bdde92
ndroid/gallery3d/filtershow/CenteredLinearLayout.java
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/imageshow/ImageWithIcon.java
|
| bba955a6b6a6134c192c8379a4ce7913b12a8670 |
12-Oct-2012 |
Bart Sears <bsears@google.com> |
Adjust text on Apply button
ALL CAPS was a bit loud, so go back to mixed case, lower
font size to 18dip, and remove ":".
Bug: 7333492
Change-Id: I18885808437e6328ec94c40df25ea0678d381825
ndroid/gallery3d/filtershow/PanelController.java
|
| 968fbe04d088de427646e3ea3ca53026ff8b3514 |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Add new borders
bug:7233749
Change-Id: I34afe40f85c72491dac7b26ea4433ede96e09a0a
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/filters/ImageFilterParametricBorder.java
|
| bcea53b010546ef1fe948ea7d9667e635496d55e |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fixes Rotate, Flip, Straighten tools.
bug:7314849
Bug:7224232
Bug:7218935
Change-Id: I418287ff1f81c25f8e089821d823dc29ee62ff0e
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/PanelController.java
ndroid/gallery3d/filtershow/filters/ImageFilterGeometry.java
ndroid/gallery3d/filtershow/imageshow/GeometryMetadata.java
ndroid/gallery3d/filtershow/imageshow/ImageCrop.java
ndroid/gallery3d/filtershow/imageshow/ImageFlip.java
ndroid/gallery3d/filtershow/imageshow/ImageGeometry.java
ndroid/gallery3d/filtershow/imageshow/ImageRotate.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
ndroid/gallery3d/filtershow/imageshow/ImageSmallFilter.java
ndroid/gallery3d/filtershow/imageshow/ImageStraighten.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
|
| faa46e509993bdba852f6ce03add6022a0e21b6e |
12-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fixed apply bar text. Moved strings to xml." into gb-ub-photos-arches
|
| ab7c2af9e2bad52c27329dd7fa47a1780794ff8e |
12-Oct-2012 |
John Hoford <hoford@google.com> |
Merge "fixed manta image size and double FX issue" into gb-ub-photos-arches
|
| e04a2e291cfae63f52243547468c3ca11e2b902b |
12-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Fixed apply bar text. Moved strings to xml.
Bug: 7333492
Change-Id: I650a7178e5351c98d0bf5808ccdf6c597a88dada
ndroid/gallery3d/filtershow/PanelController.java
|
| 41e5ba847a36925e78f76c5b59898ae907e42d95 |
12-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Change ActionBar spinner text size on rotate" into gb-ub-photos-arches
|
| 83e7d70bccd93c348d70048e1add3cc1c4ac33c6 |
11-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Move calls to LightCycleHelper off the UI thread.
Bug: 7320303
Replace multiple methods in LightCycleHelper with a single one that
returns relevant metadata.
Change-Id: Iaa75b3c1ccc8a5b724b253cec654b5b5acb4878e
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/data/DataManager.java
ndroid/gallery3d/data/LocalImage.java
ndroid/gallery3d/data/MediaItem.java
ndroid/gallery3d/data/MediaObject.java
ndroid/gallery3d/data/PanoramaMetadataJob.java
ndroid/gallery3d/data/UriImage.java
ndroid/gallery3d/ui/ActionModeHandler.java
|
| e6db54f80fafd755121a02ff1e0460bbc1cbfde8 |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Change ActionBar spinner text size on rotate
Bug: 7333151
Update the grid/filmstrip spinner switch text to
look and behave like the text in the Gmail app, as
requested by UX.
Change-Id: If822b21899172a35402477868d4f146a8e00cfea
ndroid/gallery3d/app/AbstractGalleryActivity.java
ndroid/gallery3d/app/GalleryActionBar.java
|
| 5bb3102e71bb3b9954bc710b0e81f5a60f7b5784 |
11-Oct-2012 |
John Hoford <hoford@google.com> |
fixed manta image size and double FX issue
bug:7328636
Change-Id: I572255c65fb2d461dce6f52d056be6b3c4d987f6
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/cache/ImageLoader.java
ndroid/gallery3d/filtershow/filters/ImageFilterParametricBorder.java
ndroid/gallery3d/filtershow/filters/ImageFilterVignette.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
|
| 1ac23d436d226a926adc5685b8cf30a32a0afea7 |
11-Oct-2012 |
George Mount <mount@google.com> |
Merge "Clear cached stitching preview thumbnails." into gb-ub-photos-arches
|
| 44ee4e0a23c2b15c9377b190e27a8243c221a921 |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Fix size of peripheral items when first opening filmstrip" into gb-ub-photos-arches
|
| fa1df1cdba23fa7bbc2c2d9203f6f9c300e3ef30 |
11-Oct-2012 |
John Hoford <hoford@google.com> |
Merge "Fix application of FX to not wipe out borders etc." into gb-ub-photos-arches
|
| c33eee56b585929499dd34435f07257db4f5c245 |
11-Oct-2012 |
George Mount <mount@google.com> |
Clear cached stitching preview thumbnails.
Bug 7328408
Change-Id: Ifbc469dc9eef95025cd8e828a0df80e76d2ff064
ndroid/gallery3d/data/ImageCacheService.java
|
| 031055b7841a8c886c55860597fb3f426067b5a2 |
11-Oct-2012 |
John Reck <jreck@google.com> |
Fix portrait orientation on landscape devices
Bug: 7328349
Change-Id: I0f871ea56e6afb5ba0b54cac15c18f79db07f4f9
ndroid/gallery3d/app/OrientationManager.java
|
| 6f1dfae8dff9114b59d4ae4e44a6cec68d791950 |
11-Oct-2012 |
John Hoford <hoford@google.com> |
Fix application of FX to not wipe out borders etc.
bug:7289442
Change-Id: I9efdfdc1d8a8c02a718e91a089b531ff26fd582d
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/PanelController.java
ndroid/gallery3d/filtershow/filters/ImageFilter.java
ndroid/gallery3d/filtershow/filters/ImageFilterBorder.java
ndroid/gallery3d/filtershow/filters/ImageFilterFx.java
ndroid/gallery3d/filtershow/filters/ImageFilterWBalance.java
ndroid/gallery3d/filtershow/imageshow/ImageSmallFilter.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
ndroid/gallery3d/filtershow/presets/ImagePresetFX.java
ndroid/gallery3d/filtershow/ui/ImageCurves.java
|
| 584907300993449f2ef0e27f4ace320817c667b8 |
11-Oct-2012 |
Owen Lin <owenlin@google.com> |
Revert "Revert "Upload screennails in tiles to prevent jank""
This reverts commit ad7cf187bf0c11b05aa3eab7085148e0353f2af5.
bug: 6399444
Change-Id: I94b286ab3e0db21c582cbfa9183489613da30edb
ndroid/gallery3d/app/PhotoDataAdapter.java
ndroid/gallery3d/ui/BasicTexture.java
ndroid/gallery3d/ui/BitmapScreenNail.java
ndroid/gallery3d/ui/GLCanvas.java
ndroid/gallery3d/ui/GLCanvasImpl.java
ndroid/gallery3d/ui/TileImageView.java
ndroid/gallery3d/ui/TiledTexture.java
|
| 823824122d04c9b0073f3bd13c292abdec210de9 |
11-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Remove compare and reset from apply bar and fix text.
Bug: 7326079
Change-Id: Ifb4d42ec9f30b9c2c6d46e943ca36c915a15c024
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/PanelController.java
|
| 039966884a3ff7eae251fb4d92dd08d9710384c4 |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Behavior of camera filmstrip in gallery closer to camera
Bug: 7329118
Change-Id: I0a5753db301cc53050251455439555aa7ae414c4
ndroid/gallery3d/app/PhotoPage.java
|
| 29cb7d2b2f03d72a9f3cb67097cf753cb2e2d6eb |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix size of peripheral items when first opening filmstrip
Bug: 7327570
Change-Id: I168a0297e9ac65786dbb05c02228665a67f80dff
ndroid/gallery3d/ui/PhotoView.java
|
| 4efd36382462f902e916d89da461ec15eac5fe52 |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix NPE in PhotoPage.updateMenuOperations
Bug: 7324012
Change-Id: If09d20b7ab64abe9020f7f6301356ed9a4155d5b
ndroid/gallery3d/app/PhotoPage.java
|
| 96442bc44c18160583867ad464509c74644a927a |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Make album set grid view reflect latest UI mocks" into gb-ub-photos-arches
|
| ad07e7d984e8d29bd9999b96d2673236b2c9a3ff |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Make album set grid view reflect latest UI mocks
Bug: 7300836
Change-Id: I3024b8ffbba7ee08642012c80509992335bbd5bf
ndroid/gallery3d/app/Config.java
ndroid/gallery3d/ui/AlbumSetSlotRenderer.java
|
| ed2205d0c091f090ef2476e6e58ac29da7768f54 |
10-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Defer expensive UI updates in filmstrip
Bug: 7322925
When using the filmstrip, delay expensive updates to
the action bar and share menus, some of which may require
disk accesses, until the rate of change of photos slows
down, instead of doing this work for every single image
that flies by.
Change-Id: Ie82adb4d54c96fec837d5954a91e1d4a17f548dd
ndroid/gallery3d/app/PhotoPage.java
|
| 38701573fefe46f7a5af8cdf2c6c7002ef2bcaa5 |
11-Oct-2012 |
George Mount <mount@google.com> |
Merge "Fix NPE due to progress bar not existing." into gb-ub-photos-arches
|
| abbcbb11dbd5314780fa81ea80ed1caeb416f0fb |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Change FilterShow theme and extra remove gray line" into gb-ub-photos-arches
|
| 7148ec4b900fcf3cd9c1f148992313d584557f72 |
11-Oct-2012 |
George Mount <mount@google.com> |
Fix NPE due to progress bar not existing.
Bug 7325685
Change-Id: I5e24b4f8a0ee4016c122e14702e3ae575f5bb56f
ndroid/gallery3d/app/PhotoPage.java
|
| 6700d1591e4d7ff77e2eb5a50fe97ebab8d49447 |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Change FilterShow theme and extra remove gray line
Bug: 7326326
Change-Id: Ie2286e36da77fb22907f21d084177268f919d10e
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
|
| 3d78e6dbf22b91b536a5fd14b97244e3e05f9c15 |
11-Oct-2012 |
John Hoford <hoford@google.com> |
forced fx bitmaps to load unscaled
bug:7327105
Change-Id: I780638f6919e89ae957993732fdbe123e8d8e866
ndroid/gallery3d/filtershow/FilterShowActivity.java
|
| 35b33ce66ae3fe0abe628da20b1b03242c98e914 |
11-Oct-2012 |
John Hoford <hoford@google.com> |
Merge "add White balance & disable UI elements" into gb-ub-photos-arches
|
| 9d5c9d1c6642ad2e583737fe4d1f66e3a0489027 |
11-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Merge "Disable in-place crop for 360 panorama" into gb-ub-photos-arches
|
| f19e1870a01aab99529fc28a586f5190556d302c |
10-Oct-2012 |
John Hoford <hoford@google.com> |
add White balance & disable UI elements
bug:7234321
Change-Id: Ic44bfe30b5d25e7d4442c4e6d4fd9e0e8410c7af
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/PanelController.java
ndroid/gallery3d/filtershow/filters/ImageFilterWBalance.java
|
| b34ee65fcc58f2729acd63f4a9e051a467565f4b |
10-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Disable in-place crop for 360 panorama
Bug: 7281479
Change-Id: Id89e25a883a5eab8a91604ebfeab4f178ba1066f
ndroid/gallery3d/data/LocalImage.java
ndroid/gallery3d/data/UriImage.java
|
| aef384c77c316afd4e99946a3cf38c25e200544b |
10-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix missing camera thumbnail in filmstrip
Bug: 7319894
Change-Id: Id1cf4f4bf718853aec73c0765732ac59e448c5d6
ndroid/gallery3d/app/AlbumPage.java
|
| 4de9c3e83ad2c5ea8b5277c7a002520d2bbcd608 |
10-Oct-2012 |
George Mount <mount@google.com> |
Merge changes Ic62822a4,Ie6505c8e into gb-ub-photos-arches
* changes:
Change how stitched images are inserted into Gallery.
Move panorama stitch progress outside the image.
|
| fffc28dcab3ae031c41c5aa290861ab4c4303550 |
10-Oct-2012 |
George Mount <mount@google.com> |
Change how stitched images are inserted into Gallery.
Bug 7299396
Stitching images now use normal LocalImages for their MediaItem
instead of LightCycleItems. They are no longer part of a special
album.
Change-Id: Ic62822a44b9743829dee50bcfa6f455cd538afa7
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/app/StitchingChangeListener.java
ndroid/gallery3d/data/DataManager.java
ndroid/gallery3d/data/LocalAlbumSet.java
ndroid/gallery3d/data/LocalImage.java
ndroid/gallery3d/data/SecureAlbum.java
|
| 895e9fad2bbe6031c30b34e44caedaa1f77ca617 |
10-Oct-2012 |
George Mount <mount@google.com> |
Move panorama stitch progress outside the image.
Bug 7302513
Change-Id: Ie6505c8ed2125b878e54a93c4b8c0f51d80a1385
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/app/PhotoPageProgressBar.java
|
| 8ebbec16fe3de9a08fb7d761b9ce123ce5b9b03d |
10-Oct-2012 |
John Reck <jreck@google.com> |
Support REVERSE in lockOrientation
Bug: 7314703
Change-Id: Id459e49496f562e75c1485d9d717daa28020a587
ndroid/gallery3d/app/OrientationManager.java
|
| 51eaa991537849bbe8e757cd4d1724ab72beffb1 |
10-Oct-2012 |
John Reck <jreck@google.com> |
Fix inverted panorama preview
Bug: 7314703
Panorama only support rotations of 0 and 90, so if it is greater
than that flip the output surface texture
Change-Id: I9885feb88d2d1c3e0dabaa7ecd8db66c2ddfb93b
ndroid/gallery3d/ui/PhotoView.java
|
| 945a768725130741205b2ae949facce2de64c568 |
10-Oct-2012 |
John Hoford <hoford@google.com> |
small fix to red eye code
bug:7234321
Change-Id: I796b11fd3050bf3582749e02f7d8173bc78ea292
ndroid/gallery3d/filtershow/filters/ImageFilterRedEye.java
|
| ce41d9869c7f4d747ccc85a6a2e8f285be0197c2 |
10-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Latest UI
bug:7233983
bug:7233980
Also fixes border scaling issues.
Change-Id: Ia9365800e057f481936ffdd13a5d8c5a9dab14b5
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/filters/ImageFilterBWBlue.java
ndroid/gallery3d/filtershow/filters/ImageFilterBWGreen.java
ndroid/gallery3d/filtershow/filters/ImageFilterBWRed.java
ndroid/gallery3d/filtershow/filters/ImageFilterBorder.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
ndroid/gallery3d/filtershow/imageshow/ImageSmallBorder.java
ndroid/gallery3d/filtershow/imageshow/ImageSmallFilter.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
ndroid/gallery3d/filtershow/presets/ImagePresetBW.java
ndroid/gallery3d/filtershow/presets/ImagePresetBWBlue.java
ndroid/gallery3d/filtershow/presets/ImagePresetBWGreen.java
ndroid/gallery3d/filtershow/presets/ImagePresetBWRed.java
ndroid/gallery3d/filtershow/presets/ImagePresetSaturated.java
|
| 9ea20852baf8a2eeae2e4fc19f12a9f35b106b0c |
10-Oct-2012 |
John Hoford <hoford@google.com> |
add filters
bug:7234321
Change-Id: I4c9695c3ad90fcb7f4d67d40faa0a7da85f99030
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/filters/ImageFilterFx.java
ndroid/gallery3d/filtershow/presets/ImagePresetFX.java
|
| 23c296213a05f5263451c644dad6fce23a15fe0c |
10-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Correct stale background on completely empty gallery" into gb-ub-photos-arches
|
| bcdf1be3081cc4ff5f438033e3300bb1f9494dd8 |
10-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Update design for grid/filmstrip switcher" into gb-ub-photos-arches
|
| 04d0dbc40b7b6a2bc6f05698c6b97b89f665d002 |
10-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Fix lack of snapback on very short scroll" into gb-ub-photos-arches
|
| 25b203e716efd63bc0c354344b6c55c9aee9faac |
10-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Correct stale background on completely empty gallery
Bug: 7314560
When the last album is delete by long pressing and pressing
the delete icon, and the gallery is left completely empty,
the slotview was not being correctly invalidated.
Change-Id: I2d5ec7ac7fb9604fd74ca8fa4fa6df09d6dec49d
ndroid/gallery3d/app/AlbumSetPage.java
|
| 9452a829641ce51438b508d4884b28f72ecd63ae |
10-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix lack of snapback on very short scroll
Bug: 7318609
snapToNeighborImage returns false if it didn't
actually need to move to a neighboring image, so
use this information to correctly snapback if
needed.
Change-Id: I28bbcb5ea224957fefa3838891c4343a1d9b8aff
ndroid/gallery3d/ui/PhotoView.java
|
| 0ba2aa48cb31d835642bb15e15a66eb3a8a8c352 |
09-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Update design for grid/filmstrip switcher
Bug: 7317501
Change-Id: I8975071b2a6d8b9f03c54c4bd3a6aa157fc6dc2e
ndroid/gallery3d/app/GalleryActionBar.java
|
| c7bf12b9d336b73ea7885294da1029147c6e67a6 |
09-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Implementing Geometry save operations." into gb-ub-photos-arches
|
| 8a3f6f388a1d15ec12ebfe1c1dcfb52597cb92c7 |
09-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Dejank camera roll scrolling in grid view." into gb-ub-photos-arches
|
| 0310f3a4a196ac660657746ae03bb789a0835e71 |
09-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Implementing Geometry save operations.
Bug: 7224232
Bug: 7218935
Change-Id: I83e5f8a5dc29c5b6be0bb69f10eadf823122bb97
ndroid/gallery3d/filtershow/filters/ImageFilterGeometry.java
|
| e1060376749a38dfffcdc9175553097fe13aa027 |
09-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix share crash after closing photo editor
Bug: 7306707
Change-Id: If589e1d84bc05c4d68a02feed7aaed05a568359d
ndroid/gallery3d/filtershow/FilterShowActivity.java
|
| d69035a67e0c650e2aa076ee678a6f9a82dffa77 |
09-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Add procedural borders" into gb-ub-photos-arches
|
| ef9ff4b41f483c9c10ff7557bc7ffd7907449213 |
09-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
Handle stitching progress in secure album.
- In secure album, show stitching progress only if it is
captured after the device is locked.
- Make sure image capture intent does not show stitching
progress.
bug:7285105
Change-Id: I0b3ba60fe3c03f488bea25e2f09843dd84ab6dfb
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/app/StitchingChangeListener.java
ndroid/gallery3d/data/SecureAlbum.java
|
| 91af43b868a77560bbb43d2714d5685caa179fc7 |
09-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Fix sharing as photo option for 360 degree panorama
Bug: 7310190
Bug: 7302023
Also, fix disappearing sharing menu item in action bar.
Change-Id: Id555426cce5f25d21405c885b6f7331d238cdd07
ndroid/gallery3d/app/GalleryActionBar.java
ndroid/gallery3d/app/PhotoPage.java
|
| 6cd102dd389b9dc51d6cc3d5f67e36494565a363 |
09-Oct-2012 |
Pin Ting <pinting@google.com> |
Dejank camera roll scrolling in grid view.
Bug:7302644
Change-Id: I280be430101f57dde5a5a6f427cf48e725e39b45
ndroid/gallery3d/data/ImageCacheService.java
ndroid/gallery3d/util/GalleryUtils.java
|
| d0aa2279d8e014b742609805cdb3407daaec2b11 |
09-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Add procedural borders
bug:7233980
Change-Id: I81008efa3d256061ec27d1ca2333debfb0ab6dd5
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/filters/ImageFilterParametricBorder.java
ndroid/gallery3d/filtershow/imageshow/ImageSmallFilter.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
|
| 0f9ebfc80f2db3bcb0ecee9b77418d7d81c5956e |
09-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Start Camera album in grid mode" into gb-ub-photos-arches
|
| feaca8e412e0db58fbcc74f680d8a72e9b29f6d6 |
09-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix crash when starting the editor
Bug: 7224232
CL 236429 readded offending lines after the merge...
Change-Id: I670c60ba366d2c8ec343b26c65580e8900c67819
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
|
| 76cf1a48c4d6c55da052ee5ec006241ffe77ffa6 |
09-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Start Camera album in grid mode
Bug: 7304603
Change-Id: I537f74cd0d34b4b095c031572f8d817dd49b6388
ndroid/gallery3d/app/AlbumSetPage.java
|
| 7b484b4f3a12c73a0105fb4fe817aa73bb2db6b8 |
09-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Added the rest of the Geometryfilter stubs.
Bug: 7224232
Bug: 7218935
Change-Id: I9ebbc4a98b5696e1514995e465aa4e145fdfa4f8
ndroid/gallery3d/filtershow/filters/ImageFilterGeometry.java
ndroid/gallery3d/filtershow/imageshow/GeometryMetadata.java
ndroid/gallery3d/filtershow/imageshow/ImageGeometry.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
|
| b2bdbcebe91aa268ab827dd0ae2f4b638ee39b77 |
09-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix crash introduced with the GeometryMetadata" into gb-ub-photos-arches
|
| adc9c57eb6cbab40bb8a8d58379ebbeb08fe077a |
09-Oct-2012 |
Doris Liu <tianliu@google.com> |
Fix details dialog not being dismissed
Bug: 7300997
Change-Id: I0d0dad50a9777f8ea49889a4517b8704a03021c5
ndroid/gallery3d/app/PhotoPage.java
|
| 18ec21bd07b2f9ccf5a76c407303b3dacbb845fd |
09-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix crash introduced with the GeometryMetadata
bug:7224232
bug:7279964
bug:7298708
- Also remove the slide gesture (only use the slider widget)
- use scaleFactor to apply sharpen proportionally
Change-Id: Icce786cb53f2d3d6feada76c63108a563aaab7a3
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/cache/ImageLoader.java
ndroid/gallery3d/filtershow/filters/ImageFilterRS.java
ndroid/gallery3d/filtershow/filters/ImageFilterSharpen.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
ndroid/gallery3d/filtershow/imageshow/ImageZoom.java
|
| 23c83737da80ba0b186440a8e649dfc8c5272eb0 |
08-Oct-2012 |
John Reck <jreck@google.com> |
Use framework orientation
Bug: 7292373
Change-Id: I66e0c3a3b43a5d544ecc3fc9a4a04fa5521d36b2
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/ui/PhotoView.java
|
| 685bc7b98b1528ee177a277dfad4f5da8563fe25 |
09-Oct-2012 |
John Hoford <hoford@google.com> |
Merge "add redeye and improve shadow removal" into gb-ub-photos-arches
|
| 86aa80d008745a3717666d6773f563865aa6029c |
08-Oct-2012 |
John Hoford <hoford@google.com> |
add redeye and improve shadow removal
bug:7234321
Change-Id: I12c2eb28555d7594fddf86dfa224219b70137681
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/PanelController.java
ndroid/gallery3d/filtershow/filters/ImageFilterRedEye.java
ndroid/gallery3d/filtershow/filters/ImageFilterShadows.java
|
| 65de4b056f718c1f286ecd74ede24ec9b19514fa |
08-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Correct undo behavior
Bug: 7307293
Change-Id: I72f814acd3625024f1e2aeccec4abfd28ad3319b
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/ui/PhotoView.java
|
| d922690a19edb8afbb103381f3a9c329ee2f9681 |
08-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Added stub for applying geometry flip.
Bug: 7224232
Bug: 7218935
Change-Id: Iaeea6a94f4fea44a8046f09a0fce72fe32ed7cc0
ndroid/gallery3d/filtershow/filters/ImageFilterGeometry.java
ndroid/gallery3d/filtershow/imageshow/GeometryMetadata.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
|
| 98c69b734e8c1e2a3c3d8c180cfcfdc4bbac0182 |
27-Sep-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Adding Crop, Rotate, Flip.
Bug: 7224232
Bug: 7218935
Adding geometry manipulation UI features.
Change-Id: If924313c18121e6d192a1934e76691bd578d8eb0
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/PanelController.java
ndroid/gallery3d/filtershow/imageshow/GeometryMetadata.java
ndroid/gallery3d/filtershow/imageshow/ImageCrop.java
ndroid/gallery3d/filtershow/imageshow/ImageFlip.java
ndroid/gallery3d/filtershow/imageshow/ImageGeometry.java
ndroid/gallery3d/filtershow/imageshow/ImageRotate.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
ndroid/gallery3d/filtershow/imageshow/ImageSlave.java
ndroid/gallery3d/filtershow/imageshow/ImageStraighten.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
|
| 96e48d0946d3b3178a784f92fb40f21307cdd518 |
08-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Share only 360-degree panoramas with new MIME type
Bug: 7302972
Instead of using the UsePanoramaViewer attribute in XMP metadata,
ensure that the panorama is full 360 degree by checking if the
cropped width is same as the full panorama width.
Change-Id: I66d864df96052f96db5fa19fb02b3abe214b4dec
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/data/LocalImage.java
ndroid/gallery3d/data/MediaItem.java
ndroid/gallery3d/data/MediaObject.java
ndroid/gallery3d/data/UriImage.java
ndroid/gallery3d/ui/ActionModeHandler.java
ndroid/gallery3d/ui/MenuExecutor.java
ndroid/gallery3d/util/GalleryUtils.java
|
| 6f51ef0ceeac577e983a95a93eb79b42be8f4eaa |
08-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Launch correct photo when tapping grid item in Camera roll
Bug: 7303049
Change-Id: Ie3dd2b010d60669cd000a2ed9b52e0611b0977bd
ndroid/gallery3d/app/PhotoPage.java
|
| 4e82fcb4fecd90087b322f4ad0a40b99d83160ad |
08-Oct-2012 |
Owen Lin <owenlin@google.com> |
Merge "Fix ANR in creating the fallback animation." into gb-ub-photos-arches
|
| 86350720d916bd26faadfead5ef91f7f11f8e8e4 |
08-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
No Camera recenter on resume after editing or viewing items
Bug: 7302361
Change-Id: I7420f89a766dc86d873166789b1875539541825c
ndroid/gallery3d/app/PhotoPage.java
|
| 3dc62b6c99a2e34e49a86ae651353bb41129588d |
08-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Show progress indicator dialog when saving edited image" into gb-ub-photos-arches
|
| 4e73c8fd7e04ce42814ac9ee304d79f2ff5160a2 |
08-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Show progress indicator dialog when saving edited image
Bug: 7301277
Change-Id: Ied4f9abeeaa950a0c78c0a652b3be4634dd96ce3
ndroid/gallery3d/filtershow/FilterShowActivity.java
|
| a9265e4245c25124b0bf4d05fdbe1b6646c420cf |
07-Oct-2012 |
George Mount <mount@google.com> |
Merge "Show stitched panorama in secure album." into gb-ub-photos-arches
|
| e6e562300a0968e22eda1ed413b4922b628c70ed |
07-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix orientation locking issues when going back to Camera
Bug: 7287039
Change-Id: Ib993266706b24269fd759f1ded1b6a85c2c5c7ba
ndroid/gallery3d/app/PhotoPage.java
|
| adc40553a8f4a109b668ef605cc306906e78f30a |
07-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Change display of 360 panorama button" into gb-ub-photos-arches
|
| 11bc06cb67f12b35c38945355c3094eb37d13c48 |
07-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
Show stitched panorama in secure album.
bug:7285105
Change-Id: I36801d4e5b19cceb10600d41a3a3c78244c5ee4a
ndroid/gallery3d/app/StitchingChangeListener.java
ndroid/gallery3d/data/SecureAlbum.java
|
| b484a205122769220709a4783d563a2022f5ccf5 |
07-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Implement new grid layout in Gallery
Bug: 7300836
Change-Id: Iab2b4f1caa52c5aa7638983fec194b3f81cc4c31
ndroid/gallery3d/ui/AlbumSetSlotRenderer.java
|
| ce1c4052595995ccd7efe87fcff4d2c7c503f7ac |
07-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Change display of 360 panorama button
Bug: 7300866
-Move pano button to center and make larger
-Pano button visible even when in full-screen mode
-Show edit button only when image editor is available
-Correctly hide bottom controls when switching from
filmstrip mode to grid mode
Change-Id: I485b1988733bedd0c03e89a261a6ce80be46b9bc
ndroid/gallery3d/app/PhotoPage.java
|
| 86bc3a20a94d744e44a53bc5b277dbb5cbca0073 |
07-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Tune swipe to delete in filmstrip
Bug: 7277872
Change-Id: I01da98f4528b92308984e6ec7f1bc68e3e55697d
ndroid/gallery3d/ui/PhotoView.java
|
| 3eb0a21071f7acae42077d11773f872ffd9628d3 |
06-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix display of spinner and SQL exception for view intent
Bug: 7288544
Bug: 7219163
Remove the query for photo DISPLAY_NAME in view intent
since it is no longer used, and hide the spinner when
launching PhotoPage via this intent.
Change-Id: Id41ff3d623e7fd2e708b1042782333b48e8ba4a7
ndroid/gallery3d/app/Gallery.java
ndroid/gallery3d/app/PhotoPage.java
|
| 82da69ff867e4e19f0adb970933a42eb65d973ed |
06-Oct-2012 |
Bart Sears <bsears@google.com> |
Revert "Upload screennails in tiles to prevent jank"
This CL is reported to cause images to not be displayed correctly when opened via the view intent.
Bug: 7299123
This reverts commit e29fc4a51b99f12f7fae13fae272858df2e1af36
Change-Id: I5052548a826c275cb4559eeb4721c19f06861b3d
ndroid/gallery3d/app/PhotoDataAdapter.java
ndroid/gallery3d/ui/BasicTexture.java
ndroid/gallery3d/ui/BitmapScreenNail.java
ndroid/gallery3d/ui/GLCanvas.java
ndroid/gallery3d/ui/GLCanvasImpl.java
ndroid/gallery3d/ui/TileImageView.java
ndroid/gallery3d/ui/TiledTexture.java
|
| 3da91380c6c8f701a9632a8da53ee551fa62063a |
06-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Add scale factor / quality parameters in filters" into gb-ub-photos-arches
|
| 175aab9db892120554f4c160c0aee732d309f75a |
06-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Add scale factor / quality parameters in filters
bug:7248352
Change-Id: I2e4ca86d681eba2e97ddc550f88d9f702ecba65d
ndroid/gallery3d/filtershow/cache/BitmapCache.java
ndroid/gallery3d/filtershow/cache/DelayedPresetCache.java
ndroid/gallery3d/filtershow/cache/DirectPresetCache.java
ndroid/gallery3d/filtershow/cache/ImageLoader.java
ndroid/gallery3d/filtershow/filters/ImageFilter.java
ndroid/gallery3d/filtershow/filters/ImageFilterBW.java
ndroid/gallery3d/filtershow/filters/ImageFilterBWBlue.java
ndroid/gallery3d/filtershow/filters/ImageFilterBWGreen.java
ndroid/gallery3d/filtershow/filters/ImageFilterBWRed.java
ndroid/gallery3d/filtershow/filters/ImageFilterBorder.java
ndroid/gallery3d/filtershow/filters/ImageFilterContrast.java
ndroid/gallery3d/filtershow/filters/ImageFilterCurves.java
ndroid/gallery3d/filtershow/filters/ImageFilterExposure.java
ndroid/gallery3d/filtershow/filters/ImageFilterGradient.java
ndroid/gallery3d/filtershow/filters/ImageFilterHue.java
ndroid/gallery3d/filtershow/filters/ImageFilterRS.java
ndroid/gallery3d/filtershow/filters/ImageFilterSaturated.java
ndroid/gallery3d/filtershow/filters/ImageFilterShadows.java
ndroid/gallery3d/filtershow/filters/ImageFilterStraighten.java
ndroid/gallery3d/filtershow/filters/ImageFilterVibrance.java
ndroid/gallery3d/filtershow/filters/ImageFilterVignette.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
ndroid/gallery3d/filtershow/tools/ProcessedBitmap.java
|
| 10e960f7d6c940cf6db327d2f68effc441e60ddb |
06-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Set the thumbnail/screennail sizes based on screensize" into gb-ub-photos-arches
|
| 7cbd0d98c83d9023ec00bca70014326d859a1423 |
04-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Set the thumbnail/screennail sizes based on screensize
Bug: 7232758
Prior to this CL, the thumbnail and screennail sizes were
hardcoded which resulted in mediocre image quality when
using the Gallery in general and the camera filmstrip.
Now, we set the size of these items based on the resolution
of the display. Because high-resolution devices tend to
have higher-performance graphics to drive their large
displays, we expect that this will not introduce any
significant performance impact.
Change-Id: I90e08f7aca670e275c913fd9e21e4459c8bf9fcf
ndroid/gallery3d/data/ImageCacheService.java
ndroid/gallery3d/data/MediaItem.java
ndroid/gallery3d/ui/BitmapScreenNail.java
ndroid/gallery3d/util/GalleryUtils.java
|
| 41a6aca3e0c6ef899f020673939d2a936d954fa1 |
05-Oct-2012 |
John Reck <jreck@google.com> |
Don't film strip animate when switching cameras
Bug: 7265781
Change-Id: Ibdef7d804923094f3b26471726a642a1b68e9540
ndroid/gallery3d/ui/PositionController.java
|
| 9fd6c3e2ef4dbe5d245404f24f1585bf358d2635 |
05-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "New UI..." into gb-ub-photos-arches
|
| 3eb4f642da18e1d4510b251fb136344595456372 |
05-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
New UI...
bug:7289525
bug:7289361
Change-Id: Ifde15d57f0d307417a1c7a7ae9b1122be873558f
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/PanelController.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
ndroid/gallery3d/filtershow/imageshow/ImageSlave.java
ndroid/gallery3d/filtershow/imageshow/ImageStraighten.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
ndroid/gallery3d/filtershow/ui/ImageCurves.java
ndroid/gallery3d/filtershow/ui/SliderController.java
|
| e32915d3ad832b7245e64a5df08dedf99474def4 |
05-Oct-2012 |
Owen Lin <owenlin@google.com> |
Fix ANR in creating the fallback animation.
bug: 6620501
Change-Id: Ibb798cce5dd49bb5083de6f29225bae512d589f8
ndroid/gallery3d/ui/GLRootView.java
|
| 7e64ee9eb727c20bc306a0bdda5b2009d0a0bfc5 |
24-Sep-2012 |
Owen Lin <owenlin@google.com> |
Upload screennails in tiles to prevent jank
bug: 6399444
Change-Id: Id2338db34d7f87fbabd7861f78b42f2a81d9794b
ndroid/gallery3d/app/PhotoDataAdapter.java
ndroid/gallery3d/ui/BasicTexture.java
ndroid/gallery3d/ui/BitmapScreenNail.java
ndroid/gallery3d/ui/GLCanvas.java
ndroid/gallery3d/ui/GLCanvasImpl.java
ndroid/gallery3d/ui/TileImageView.java
ndroid/gallery3d/ui/TiledTexture.java
|
| 4303e30017d4a90ee095347106053beaa88895c0 |
05-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Open album in filmstrip only if the item exists." into gb-ub-photos-arches
|
| 7f905f7a79968a713c4da7c80646d92a9b87dcc6 |
05-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Add a reset item menu
bug:7234317
Change-Id: I3129b16f83981ab22ce17341d8401822369686eb
ndroid/gallery3d/filtershow/FilterShowActivity.java
|
| 8d92db225ef508b2fa883adedeab986a90803b56 |
04-Oct-2012 |
John Hoford <hoford@google.com> |
add vibrance fix a free in shadows
bug:7234321
Change-Id: I52b1b952fcdc34c23464793621df60aa7e8e00b2
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/filters/ImageFilterVibrance.java
|
| a0f822613dba5c5b140cc34202574e24c59461a2 |
03-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Implement sharpen
bug:7279964
bug:7247494
bug:7234321
- add a sharpen filter
- add infrastructure to use RenderScript
- some refactoring (add an ImageSlave class)
- add new zoom UI
Change-Id: Id94dc94d32866c7107b6818adf4db35d0c6c0b01
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/cache/ImageLoader.java
ndroid/gallery3d/filtershow/cache/ZoomCache.java
ndroid/gallery3d/filtershow/filters/ImageFilter.java
ndroid/gallery3d/filtershow/filters/ImageFilterRS.java
ndroid/gallery3d/filtershow/filters/ImageFilterSharpen.java
ndroid/gallery3d/filtershow/filters/convolve3x3.rs
ndroid/gallery3d/filtershow/imageshow/ImageBorder.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
ndroid/gallery3d/filtershow/imageshow/ImageSlave.java
ndroid/gallery3d/filtershow/imageshow/ImageStraighten.java
ndroid/gallery3d/filtershow/imageshow/ImageZoom.java
ndroid/gallery3d/filtershow/ui/ImageCurves.java
ndroid/gallery3d/filtershow/ui/SliderController.java
ndroid/gallery3d/filtershow/ui/SliderListener.java
|
| 22ac4de64a2917a5e2b5449b208553a42bd46e6b |
04-Oct-2012 |
George Mount <mount@google.com> |
Merge "Support panorama progress items in Gallery." into gb-ub-photos-arches
|
| c422bd02c4063513e9974dfead3eb12f329bacb8 |
04-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Don't allow switching to filmstrip in get content intent" into gb-ub-photos-arches
|
| e2fc40fb3b1103a0c3e8eec48e92d2e989f01dfa |
04-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Upscale images to fill screen for slideshow" into gb-ub-photos-arches
|
| dc0954ec2aa11564fa1fcc665368c266a966d4bf |
04-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Upscale images to fill screen for slideshow
Bug: 7110382
This fixes the slideshow mode on high-resolution
displays. Note that this will scale up screennails
to fill the screen even if they are fairly low quality.
The resolution to 7232758 will set the size of the
screennails appropriately based on screen size.
Change-Id: I7b5367c2fce1d10f6d5e70c1239d893f54236b10
ndroid/gallery3d/ui/SlideshowView.java
|
| dbf60d199b4bc8fce3ace348e54308880b5eb599 |
04-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Don't allow switching to filmstrip in get content intent
Bug: 7288252
Change-Id: I247e7c22ed3e90de0222ac82a55ed027c9f252c1
ndroid/gallery3d/app/AlbumPage.java
|
| 356ffa04adff94a09fe60849b40397aa8ee018b8 |
19-Sep-2012 |
Angus Kong <shkong@google.com> |
Support panorama progress items in Gallery.
Bug 7259843
Add dummy files for showing panorama progress in filmstrip.
Change-Id: I7ae92b90bbbd992fde00cfcfc68af69b34d34d74
ndroid/gallery3d/app/GalleryApp.java
ndroid/gallery3d/app/GalleryAppImpl.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/app/StitchingChangeListener.java
ndroid/gallery3d/data/DataManager.java
ndroid/gallery3d/data/LocalAlbumSet.java
|
| c36b54f76cbad39c9f27faccbe3d596258ca572f |
04-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Snap back photo after swipe in y-direction in filmstrip
Bug: 7283537
Change-Id: Ifee561a978d418f7a1e96f1a3ddb7cc8df53752c
ndroid/gallery3d/ui/PhotoView.java
|
| 25ab25343c04ed845717b7d25d67be66c247e48d |
04-Oct-2012 |
Pin Ting <pinting@google.com> |
Merge "Accelerate PNG image rendering." into gb-ub-photos-arches
|
| a70201c33d3a8796ac30fd8ec86e2bec41f9820a |
04-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
Open album in filmstrip only if the item exists.
Metadata of picasa photos may not be available when user taps to view a picasa
album. Cannot enter PhotoPage directly in such a case.
Bug: 7213464
Change-Id: Ife2e8768fc9b8d8757235610a02f029f40205b5b
ndroid/gallery3d/app/AlbumSetPage.java
|
| 82d95838d891057b56fd43780e2424e04f1e291b |
04-Oct-2012 |
Pin Ting <pinting@google.com> |
Accelerate PNG image rendering.
Bug:7137662
Change-Id: I050a228a6c8031c6a2d068eb4ba1b39be86e9f4a
ndroid/gallery3d/ui/TileImageView.java
ndroid/gallery3d/ui/TileImageViewAdapter.java
ndroid/gallery3d/util/GalleryUtils.java
|
| 5a7157733bb2229642866a3bb4cbc6850c995a9d |
04-Oct-2012 |
Owen Lin <owenlin@google.com> |
Fix NPE in ImageLoader.
bug: 7275805
Change-Id: Ied04553a97efe5b4996418f20d834d6bd0893976
ndroid/gallery3d/filtershow/cache/ImageLoader.java
|
| 46a19abfb337f168ed3d6694ea812dcf05d4a1ba |
04-Oct-2012 |
Owen Lin <owenlin@google.com> |
Set type as well while launching editor.
bug: 7275805
Change-Id: I6b86dd03d92b2cf453947bd84a0247e1626c81db
ndroid/gallery3d/app/PhotoPage.java
|
| d37dc7f6660d2d01768f93113cbe6efba2448ad0 |
04-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Merge "Revert "Add a overflow menu item to view 360-degree panorama."" into gb-ub-photos-arches
|
| 10f94c1c42aea7df1c66a91f427f8f831718cc32 |
04-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Revert "Add a overflow menu item to view 360-degree panorama."
This reverts commit d84ae72adb147c0e8517a438b3dea3e87d319bb7
Change-Id: I5921cbb476034da2798480534e9084e287312f04
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/ui/MenuExecutor.java
|
| 619471756d8e82ca3b6ba69b2c2d0e81b6031284 |
03-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix ANR in image editor" into gb-ub-photos-arches
|
| b1de2584974b152a166e98d7f865945e4e911517 |
03-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix ANR in image editor
bug:7275425
Change-Id: I01a89579e17a0e4fc0817b61c7fda48ca54d0afa
ndroid/gallery3d/filtershow/filters/ImageFilterGradient.java
ndroid/gallery3d/filtershow/imageshow/ImageStraighten.java
|
| 7411e79a0396d3c78bb3a55bc82c741840d85605 |
03-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Fix snapping behavior in filmstrip" into gb-ub-photos-arches
|
| 91227ee2d83cf8d4ca353d442777567293808eb5 |
03-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix snapping behavior in filmstrip
Bug: 7277936
Change-Id: I57569eaac0b9e633d249754dcb3613c6c4f7ad3a
ndroid/gallery3d/ui/PhotoView.java
|
| ac28e0055388e1d3fab2d6f00e47696e4797c0cb |
03-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Disable destructive rotate for lightcycle panorama
Bug: 7276024
Change-Id: I2b223d3928517b083cc982db8142770da02dd5b9
ndroid/gallery3d/data/LocalImage.java
|
| c0e7a6b8115968736129582d614052a87b21539c |
03-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Add a overflow menu item to view 360-degree panorama.
Bug: 7276026
Change-Id: Ib4979e45867e22267b34fb77342ca625337c7ee4
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/ui/MenuExecutor.java
|
| 4216866c697760da809b6912fb40c146905ce5a3 |
03-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Correct behavior when swiping to placeholder item in PhotoPage
Bug: 7261641
Change-Id: I54deed0f20a4673cb5470ffc128c73cddc071772
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/ui/PhotoView.java
|
| 66fdb16ff418043db62b240a156aac27bbc0a7ee |
03-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Remove redundant handling of share action.
Bug: 7256214
Gallery PhotoPage was handling the menu item selection for the share
action, in addition to the ShareActionProvider. Removing this leftover
code from pre-ActionBar implementation.
Change-Id: I0c91b9a7c05b38758ad1b76dd657225daaab1922
ndroid/gallery3d/app/PhotoPage.java
|
| 3cac6dd4d4c28ee7b0833715fae77ca5ddf4d77d |
03-Oct-2012 |
John Hoford <hoford@google.com> |
Add Shadow feature
bug:7234321
Change-Id: Ib0d4db773486e469ed818385b68b7b907070c297
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/filters/ImageFilterShadows.java
ndroid/gallery3d/filtershow/ui/ControlPoint.java
|
| 7325d6115b91be94e84503c578c5fe40a1ee99b4 |
03-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Implements image sharing" into gb-ub-photos-arches
|
| e091f88847d6c1a142f3503a1d0d42f5ad0ba188 |
01-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Implements image sharing
bug:7233986
Change-Id: I8feb94d77facf8dbb8da5fab89b49ed7c224116e
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/cache/ImageLoader.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
ndroid/gallery3d/filtershow/provider/SharedImageProvider.java
ndroid/gallery3d/filtershow/tools/ProcessedBitmap.java
ndroid/gallery3d/filtershow/tools/SaveCopyTask.java
|
| d176eaab45af7b13d70f0bf5fbfc9c307591134d |
03-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Do not show grid/filmstrip spinner in secure camera mode
Bug: 7274284
Change-Id: I74ede883fe726bd05e95b30d3f91da2856543123
ndroid/gallery3d/app/PhotoPage.java
|
| 7067fa61419d004d4f7d016556ca40512a26a118 |
02-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Show Camera placeholder as first filmstrip item in roll
Bug: 7272674
The camera roll filmstrip view now shows a shortcut to
launch the camera when opened from the Gallery app.
Note: the edits to SnailAlbum and SnailSource were made to
allow sharing code between SingleItemAlbum and SnailAlbum
Change-Id: I1bd2f3db99138c4b79a41c9c5baee46704cd18e0
ndroid/gallery3d/app/AlbumSetPage.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/data/CameraShortcutImage.java
ndroid/gallery3d/data/FilterSource.java
ndroid/gallery3d/data/MediaObject.java
ndroid/gallery3d/data/SingleItemAlbum.java
ndroid/gallery3d/data/SnailAlbum.java
ndroid/gallery3d/data/SnailSource.java
|
| 1ebac746eb319663f44fe9fbb7786cb9bb87489b |
02-Oct-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Merge "Trimming: Exit current activity after click done" into gb-ub-photos-arches
|
| 47f251a757f3ce66374492f08e49843b3651de4e |
02-Oct-2012 |
John Reck <jreck@google.com> |
Merge "Fix NFC regression" into gb-ub-photos-arches
|
| 3cf591b21556be79ecc8549ded191d3b4ccfd2ab |
02-Oct-2012 |
John Reck <jreck@google.com> |
Fix NFC regression
Bug: 7263536
Change-Id: Ieba6147fdc0279888ec1e6ea2101eab235522b9f
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/ui/ActionModeHandler.java
|
| bf2d8a1412c3b88c0a867e8bdb3f91a901fa66bc |
02-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix crash, remove logging added to diagnose bug
Bug: 7216012
LocalMergeAlbum index was not being initialized
in constructor so it was possible to access the
index before it was populated with information.
Change-Id: I7025839b0f3953b827f06c717cff6dc47a15b06c
ndroid/gallery3d/data/LocalMergeAlbum.java
|
| 2bc896eba093277e7e530b4dca35ec09ed523c0b |
02-Oct-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Trimming: Exit current activity after click done
Don't auto exit the trimmed video playing.
bug:7093055
Change-Id: I97fa1556cbe0591f2204ab4135b85375f82abbe8
ndroid/gallery3d/app/TrimVideo.java
|
| b11fb05ae8435dc90375ead6ecab62b7e10fb44f |
02-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Check item is editable before attempting to launch editor
Bug: 7269840
Change-Id: I18af824865b8a158c7a89e2b34f51a32de144057
ndroid/gallery3d/app/PhotoPage.java
|
| 665d2d9a47908c33472e9eda065cdbf13ff0cefa |
02-Oct-2012 |
Owen Lin <owenlin@google.com> |
Remove ActionBarSherlock
bug: 7242682
Change-Id: Ibf1fa136cafdca25273ee39ae9c065560b2db5cb
ndroid/gallery3d/app/AbstractGalleryActivity.java
ndroid/gallery3d/app/ActivityState.java
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/AlbumSetPage.java
ndroid/gallery3d/app/CropImage.java
ndroid/gallery3d/app/Gallery.java
ndroid/gallery3d/app/GalleryActionBar.java
ndroid/gallery3d/app/MovieActivity.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/app/PickerActivity.java
ndroid/gallery3d/app/SinglePhotoDataAdapter.java
ndroid/gallery3d/app/StateManager.java
ndroid/gallery3d/ui/ActionModeHandler.java
ndroid/gallery3d/ui/MenuExecutor.java
ndroid/gallery3d/ui/PopupList.java
|
| 74e0682463c79b475be0b0dfc9a789921b4e31f1 |
02-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Update assets of the lock screen image in the secure album." into gb-ub-photos-arches
|
| 1823ad1a21cdc7327389a27c499453e942955847 |
02-Oct-2012 |
George Mount <mount@google.com> |
Merge "Revert "Enable swiping from LightCycle to Gallery"" into gb-ub-photos-arches
|
| 81416668746d1a8e4ade633be97403683ef75803 |
02-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Improve display of ActionBar album mode switcher" into gb-ub-photos-arches
|
| ba534e23c5a6e065d3d99c6e0b8cf49a62ffa034 |
02-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Improve display of ActionBar album mode switcher
Bug: 7265942
Bug: 7266862
- Ellipsize the title of the album when appropriate
- Show correctly title when swiping from camera to gallery
- Hide the delete icon in the overflow menu to match the
latest UX mocks, making more room for title
Change-Id: Ief77f65c972e75086c5dbf4229c9462cbcc17940
ndroid/gallery3d/app/GalleryActionBar.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/data/ComboAlbum.java
|
| 3a31228c9a80723e3146f3e37150c3d99eada197 |
02-Oct-2012 |
George Mount <mount@google.com> |
Revert "Enable swiping from LightCycle to Gallery"
This reverts commit 6fd25fd9a457346c8c32e8c4e68c7c491205730b
Changed mechanism for enabling swipe in LightCycle.
Change-Id: I5c9395eb97ee88d015fb3765d0594d92c4ae126d
ndroid/gallery3d/ui/ExtTexture.java
ndroid/gallery3d/util/TextureBuffer.java
|
| 190614aa2e176e1b305046265ba767d95a5e6621 |
02-Oct-2012 |
John Hoford <hoford@google.com> |
Merge "Fix exposure and fixed warnings" into gb-ub-photos-arches
|
| aab2640d1eec784f75fea0b4c8bb2ea4fb4325fd |
02-Oct-2012 |
John Hoford <hoford@google.com> |
Fix exposure and fixed warnings
bug:7234321
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/filters/ImageFilterBrightness.java
ndroid/gallery3d/filtershow/filters/ImageFilterExposure.java
|
| 107d6549f8990bb95b2be18a4a88f329ccbdb585 |
02-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fix for exceptions when image has no orientation data." into gb-ub-photos-arches
|
| 2085f1276ac5bfcfe91b9b08f7a77f72d38a5c32 |
02-Oct-2012 |
George Mount <mount@google.com> |
Merge "Enable swiping from LightCycle to Gallery" into gb-ub-photos-arches
|
| db61fdf195283c18b9dfbc523fced2358b437008 |
02-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Move grid/filmstrip switching to ActionBar title "spinner"
Bug: 7233818
Bug: 7240846
Bug: 7258973
Tapping the title of the album, whether in filmstrip or
grid mode, allows switching between these modes using a
menu. The album name is now displayed when viewing pictures
in the filmstrip or zoomed in modes. Finally, no longer
allow switching to grid mode when not appropriate.
Change-Id: I4ee511feb7a74581fe185933ddd5110e5eb9feb0
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/GalleryActionBar.java
ndroid/gallery3d/app/PhotoPage.java
|
| c4f4569dba260d85bbed210c6dc0b646f63b4344 |
02-Oct-2012 |
John Reck <jreck@google.com> |
Merge "Remove OnFrameAvailableListener in tear down" into gb-ub-photos-arches
|
| 7a02f1d1c0b8e5e3805068f08d6e7ed8ff44685d |
02-Oct-2012 |
John Reck <jreck@google.com> |
Remove OnFrameAvailableListener in tear down
Bug: 7217305
Change-Id: I79d1741cd757b2cc15a42336153af755ae84bd57
ndroid/gallery3d/ui/SurfaceTextureScreenNail.java
|
| aede0abc1e73eb6128b87e0cccb04ca0fcfb6bdc |
02-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Fix for exceptions when image has no orientation data.
Bug: 7219163
When image has no orientation data, getOrientation now
catches the SQLiteException.
Change-Id: I6783f05bae67532c1b186fc07ca96b9361440984
ndroid/gallery3d/filtershow/cache/ImageLoader.java
|
| d833a076100ce0350e42b4829910aff1cf0b87e2 |
28-Sep-2012 |
George Mount <mount@google.com> |
Enable swiping from LightCycle to Gallery
Bug 7212420
Change-Id: Ic61bc06c6113c969e4b2e6e9c87c78a8aa2cb402
ndroid/gallery3d/ui/ExtTexture.java
ndroid/gallery3d/util/TextureBuffer.java
|
| fa434b0ece14ed98eb0e25d3a13374720d641709 |
30-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
More logs for gallery crash error, remove a potential cause
Bug: 7216012
Made sure that FilterDeleteSet doesn't ever return stale
item counts, added extra logging in LocalMergeAlbum for
NoSuchElementException so that we can have more info to
diagnose this crash if it happens in the future.
Change-Id: Ic988522fda4a16bb483db6ad34bc7f81ee098b03
ndroid/gallery3d/data/FilterDeleteSet.java
ndroid/gallery3d/data/LocalMergeAlbum.java
|
| 4d82bf874aa99dbe7123ddbfcf1fba7fe62406b3 |
01-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
Update assets of the lock screen image in the secure album.
bug:7192331
Change-Id: I551e14420e43106e97b093884571eaea27b00425
ndroid/gallery3d/data/UnlockImage.java
|
| bea843f7881f4503bcb4f0489da42f119d14ae23 |
01-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix border bug and filter application - fix layout (use framelayout) - fix copy imagepreset - added a current image state panel - remove title for border images for now" into gb-ub-photos-arches
|
| 944e6fd69fc0cfae2c44395104167f1fc45c26a0 |
30-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Fix crash in album page" into gb-ub-photos-arches
|
| 046306e7c4a26f65912f23af3631f23b00860406 |
30-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Merge "Trimming: clean up strings and prevent too short or no trimming." into gb-ub-photos-arches
|
| a7004cf4ad98bb6c8922e6296a952b18eca55ef4 |
30-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix crash in album page
Bug: 7258955
Avoid second call to onPause when finishing
ActivityState instance within onPause.
Change-Id: I6081a6467e109a6edf35e60d24193e550cb0dd21
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/StateManager.java
|
| ff84b98a22048de262b45bded684a69f891070d3 |
30-Sep-2012 |
Mangesh Ghiware <mghiware@google.com> |
Merge "Remove video play icon and tap to play behavior for panorama." into gb-ub-photos-arches
|
| bb89c81f2fd8633729aabe9433d26d7ad5fe1254 |
30-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Update FX/pano button appearance, placement, animation
Bug: 7213162
Bug: 7233446
Change-Id: Ief62e3f17ee08999a23656217dcf39bb91421d1e
ndroid/gallery3d/app/PhotoPageBottomControls.java
|
| 1627c3c20129ea50e36b44f0a576d5567bcdae41 |
30-Sep-2012 |
Mangesh Ghiware <mghiware@google.com> |
Remove video play icon and tap to play behavior for panorama.
Bug: 7258968
Per new UX design, there'll be a panorama viewer icon in the bottom
right instead (see b/7233446)
This is essentially a revert of Change-Id
I17fdb5d6bcab1f3997a1ab92fcf45e0309b394b3
Change-Id: Ib35c99cca4ee9b2422dd16f5ea3b931ad5f08f35
ndroid/gallery3d/app/PhotoDataAdapter.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/app/SinglePhotoDataAdapter.java
ndroid/gallery3d/ui/PhotoView.java
|
| 0e0d71794f9765cd4234386789c882dacbb4e318 |
29-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
Fix border bug and filter application
- fix layout (use framelayout)
- fix copy imagepreset
- added a current image state panel
- remove title for border images for now
bug:7256090
bug:7249672
bug:7234317
bug:7225150
Change-Id: I958628a1604c7e436e5d121556c8744f5748b1ec
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/HistoryAdapter.java
ndroid/gallery3d/filtershow/ImageStateAdapter.java
ndroid/gallery3d/filtershow/filters/ColorSpaceMatrix.java
ndroid/gallery3d/filtershow/filters/ImageFilter.java
ndroid/gallery3d/filtershow/filters/ImageFilterBW.java
ndroid/gallery3d/filtershow/filters/ImageFilterBWBlue.java
ndroid/gallery3d/filtershow/filters/ImageFilterBWGreen.java
ndroid/gallery3d/filtershow/filters/ImageFilterBWRed.java
ndroid/gallery3d/filtershow/filters/ImageFilterBorder.java
ndroid/gallery3d/filtershow/filters/ImageFilterBrightness.java
ndroid/gallery3d/filtershow/filters/ImageFilterContrast.java
ndroid/gallery3d/filtershow/filters/ImageFilterCurves.java
ndroid/gallery3d/filtershow/filters/ImageFilterGradient.java
ndroid/gallery3d/filtershow/filters/ImageFilterHue.java
ndroid/gallery3d/filtershow/filters/ImageFilterSaturated.java
ndroid/gallery3d/filtershow/filters/ImageFilterStraighten.java
ndroid/gallery3d/filtershow/filters/ImageFilterVignette.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
ndroid/gallery3d/filtershow/imageshow/ImageSmallFilter.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
|
| 9d62824904bec0c57e86cc5ca7a82d8083d8a667 |
29-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Trimming: clean up strings and prevent too short or no trimming.
Also view the result if the activity is not stopped.
bug:7093055
Change-Id: If244d567a4be9da22542398f6b7c22a081786339
ndroid/gallery3d/app/TrimVideo.java
|
| dacc688e9237890bd1698ccfa1e6402dc9f24f15 |
29-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
Remove the individual Curves channel filters
Reorder the filters
bug:7234317
Change-Id: Ia726fa8ea82580c97784eb03d4c6740cf4a603c4
ndroid/gallery3d/filtershow/FilterShowActivity.java
|
| fc275d4e972304a8c4935d6161c74cbbbdf600ae |
28-Sep-2012 |
John Hoford <hoford@google.com> |
Add contrast & brightness filters
Added hue fixed contrast
Stablized Contrast, Saturation, Tint, Exposure
bug:7234321
Change-Id: Iadd1e3ab215b60f920b718fa56611a07f24effee
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/filters/ColorSpaceMatrix.java
ndroid/gallery3d/filtershow/filters/ImageFilterBrightness.java
ndroid/gallery3d/filtershow/filters/ImageFilterContrast.java
ndroid/gallery3d/filtershow/filters/ImageFilterHue.java
ndroid/gallery3d/filtershow/filters/ImageFilterSaturated.java
|
| e83215c9a82c811b61357091ff2ba45e5ba08092 |
29-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
Improve ActionBar
- show both undo and redo
- add the checkmark with done instead of the up mark
bug:7233986
Change-Id: I32af8068b08763461b720054f270cb6acabefbbf
ndroid/gallery3d/filtershow/FilterShowActivity.java
|
| 66b4e60be3cb2d5e6f0770f2d3690fc7ad7527e5 |
29-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Debounce after quick fling towards camera but zoom if slow" into gb-ub-photos-arches
|
| c6d34735efceb8d4fa041d46fe13f63c8e3223e5 |
28-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Debounce after quick fling towards camera but zoom if slow
Bug: 7250026
Bug: 7213802
Change-Id: I3c900813937161744a36015469c70112f2cf356b
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/ui/PhotoView.java
ndroid/gallery3d/ui/PositionController.java
|
| 9055cd7d1fecd9b73d1907cac9bc234cb8021894 |
28-Sep-2012 |
Mangesh Ghiware <mghiware@google.com> |
Fix NPE in GalleryActionBar
Bug: 7252666
Change-Id: Ide3c8e0d609743b34a3c53f3bb48dbeddb3f98c0
ndroid/gallery3d/app/GalleryActionBar.java
ndroid/gallery3d/ui/ActionModeHandler.java
|
| 422dd98663e78de1b16accfde49cabda8d5a3568 |
28-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
Change the slider values range to -100 -> 100
bug:7247494
Change-Id: Ie007d93ac5e6c412fb97c1fc8cfb383387cec2a0
ndroid/gallery3d/filtershow/ui/SliderController.java
|
| d2a39c1a71a6f93d64e4a0101e2faed0ecca72af |
28-Sep-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fixed behavior for back key when viewing download." into gb-ub-photos-arches
|
| c3865e7023344ab5f4a573835fe032252a697113 |
28-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Merge "Trimming: Use OnClickListener for saving" into gb-ub-photos-arches
|
| 3c8e25d190e6f7e75be6ce75d4e6a882e824f5ed |
28-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Trimming: Use OnClickListener for saving
bug:7093055
Change-Id: I4b6b408bb051aa1a7fb506f0b5d1db75fe3f1a2f
ndroid/gallery3d/app/TrimVideo.java
|
| 0fa0d96e5e0a8be32066740288ada89e938c33a8 |
28-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Show a placeholder when the camera filmstrip is empty
Bug: 7213757
Tapping the placeholder takes the user back to the
full-screen camera capture mode.
Change-Id: I844f789b8e80f34e79f4a9c366c1c244bbf1f2a5
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/data/ActionImage.java
ndroid/gallery3d/data/EmptyAlbumImage.java
ndroid/gallery3d/data/FilterEmptyPromptSet.java
ndroid/gallery3d/data/FilterSource.java
ndroid/gallery3d/data/MediaObject.java
ndroid/gallery3d/data/UnlockImage.java
ndroid/gallery3d/ui/PhotoView.java
|
| d9b8148210e667c19835460260b8609ac0ad4299 |
28-Sep-2012 |
Mangesh Ghiware <mghiware@google.com> |
Merge "Update to sharing panorama" into gb-ub-photos-arches
|
| 5c9b8b60fec038876778093edbb1fba4005e696a |
28-Sep-2012 |
Mangesh Ghiware <mghiware@google.com> |
Update to sharing panorama
Bug: 7150324
Use separate share intents for sharing panoarma and regular JPGs.
If photo is a 360 panorama, promote sharing it on the action bar,
and move sharing as JPG to overflow menu.
MIME type changed to specify panorama360.
Change-Id: I8d52733d105820ac17ff36a6ad9d7525893f6d27
ndroid/gallery3d/app/GalleryActionBar.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/ui/ActionModeHandler.java
ndroid/gallery3d/ui/MenuExecutor.java
ndroid/gallery3d/util/GalleryUtils.java
|
| 15ecac8f62d550de5e6f597630c650a92ae67d9c |
28-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Use an actionbar - move the "show original" button to the bottom left - move the history button to the overflow menu for now - add a reset item in the overflow menu." into gb-ub-photos-arches
|
| 62a3e83ecf62fc3ecb789a8dd73559e2b701f482 |
28-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
Use an actionbar
- move the "show original" button to the bottom left
- move the history button to the overflow menu for now
- add a reset item in the overflow menu.
bug:7234317
bug:7233975
bug:7233986
Change-Id: Icc1d03d1e1ce18f38b1169b466be62645424bc7e
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
ndroid/gallery3d/filtershow/imageshow/ImageSmallFilter.java
ndroid/gallery3d/filtershow/imageshow/ImageVignette.java
|
| 3a80bbf1edc5f8180be20c67288791267907f857 |
28-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix up button behavior in camera app
Bug: 7233448
Change-Id: Ifb2833f6c1303dc60a9b88b217648d0c0098f242
ndroid/gallery3d/app/AlbumPage.java
|
| 311b00eff28ab8ab7710f1f26242ebc2b0bf390a |
28-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
We weren't applying the parameter on an existing filter
bug:7247494
Change-Id: I482eecc34a5f91bc7d2cc5986e79b832b9aa3ef2
ndroid/gallery3d/filtershow/FilterShowActivity.java
|
| fae561c02aeb1058c149a56a1b51eac8d4a82c62 |
28-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
Only apply the parameter to the currently edited filter
bug:7247494
Change-Id: I88b90ee5ea1d5bb83342a4be392308ea756375a1
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/filters/ImageFilter.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
|
| 8d07dc69a802696ea722ddade749bb573aa7d87c |
28-Sep-2012 |
John Reck <jreck@google.com> |
Merge "Fix Monkey NPE" into gb-ub-photos-arches
|
| 90b3fa4aa65b332aebe5bcc0a87a74770adaecf1 |
28-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
Remove the pie slider, add a linear slider
bug:7247494
Change-Id: Id002b46d4a0ee0ff2a3ed9c4924defd0b1760b79
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
ndroid/gallery3d/filtershow/imageshow/ImageSmallFilter.java
ndroid/gallery3d/filtershow/ui/PieSlider.java
ndroid/gallery3d/filtershow/ui/PieSliderListener.java
ndroid/gallery3d/filtershow/ui/SliderController.java
ndroid/gallery3d/filtershow/ui/SliderListener.java
|
| 6bc3fdbb2dd48d74428aa0de57d725a65d68e2f5 |
28-Sep-2012 |
John Reck <jreck@google.com> |
Fix Monkey NPE
Bug: 7243032
Change-Id: I0e8757e6108f2e86bf4608b1535b1c528f2f3197
ndroid/gallery3d/app/PhotoPage.java
|
| b10a2712931ba35d35f3f795beb585eca4ce6738 |
27-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Trimming: clean up the UI for trimming.
Get rid of the home button and use the done button only in the action bar.
Switch back to use system actionbar / activity.
Rename the ShortenExample.
bug:7093240
Change-Id: I61684e9723af12cecc212bbd911c23aab0258463
ndroid/gallery3d/app/ShortenExample.java
ndroid/gallery3d/app/TrimVideo.java
ndroid/gallery3d/app/TrimVideoUtils.java
|
| 3c196bbaf191c7b0dbb54d45a2f74eb4a78f8943 |
27-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Merge "Trimming: switch to use sherlock action bar" into gb-ub-photos-arches
|
| 07754f138bf0f1f23c952af3375889121df131b1 |
27-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Several secure album changes.
- Make the lock screen photo be a standard portrait size photo
- In the filmstrip, have the first tap on the lock screen photo
take the user directly to the unlock screen.
- Switch the asset to be a "locked" lock rather than an
"unlocked" lock.
bug:7192331
Change-Id: If7541cd67cdfb711f8dd721796db3343ae91343a
ndroid/gallery3d/data/UnlockImage.java
ndroid/gallery3d/ui/PhotoView.java
|
| 39834b19e5d60fa86213b166fa5f72d1d9e8916d |
27-Sep-2012 |
Owen Lin <owenlin@google.com> |
Merge "Don't set treat back as up if there is no parent album." into gb-ub-photos-arches
|
| 89b3bb0b52f5285eb2f67af335e994eb6a9cb2f6 |
27-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Show unlock image in secure album only when camera roll has items." into gb-ub-photos-arches
|
| 4b167794899049a659636523fb2efb275799b535 |
27-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
Load the correct library...
bug:7165910
Change-Id: I4cb19078b00268f179722a1c8ed594e68b35e953
ndroid/gallery3d/filtershow/FilterShowActivity.java
|
| 71111a19a258ded2c9e899d0e4632ea283c8ae8d |
26-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Trimming: switch to use sherlock action bar
Show a "done" instead of the icon according to the UX team.
And we don't have API level dependency.
bug:7093240
Change-Id: Ib331495dd233c4dcbeb3d587bd5a4d0d89039d49
ndroid/gallery3d/app/TrimVideo.java
ndroid/gallery3d/ui/MenuExecutor.java
|
| ff0dba310d010dc19ee6968bc6a9ac7fc3615cbc |
27-Sep-2012 |
John Reck <jreck@google.com> |
Only create debugTag if necessary
Bug: 7238418
String concatenation isn't free
Change-Id: I510a89ef8b673efb631d6f8929ab3d9d9b454931
ndroid/gallery3d/data/ImageCacheRequest.java
|
| 656321672d728d390db78f5bf5ed1601287d6225 |
27-Sep-2012 |
John Reck <jreck@google.com> |
Don't requery a constant
Bug: 7238418
Change-Id: I1b7117cd30ffc51b51980830791779ec899c2f4b
ndroid/gallery3d/app/PhotoPage.java
|
| 5728a84cf5fa2733b09af06b9016957a9a566624 |
25-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
Initial import of the new image editor
bug:7165910
Change-Id: I756d6594f5bddd233772c979410362ca22e232a3
ndroid/gallery3d/filtershow/FilterShowActivity.java
ndroid/gallery3d/filtershow/HistoryAdapter.java
ndroid/gallery3d/filtershow/cache/BitmapCache.java
ndroid/gallery3d/filtershow/cache/Cache.java
ndroid/gallery3d/filtershow/cache/DelayedPresetCache.java
ndroid/gallery3d/filtershow/cache/DirectPresetCache.java
ndroid/gallery3d/filtershow/cache/ImageLoader.java
ndroid/gallery3d/filtershow/filters/ImageFilter.java
ndroid/gallery3d/filtershow/filters/ImageFilterBW.java
ndroid/gallery3d/filtershow/filters/ImageFilterBWBlue.java
ndroid/gallery3d/filtershow/filters/ImageFilterBWGreen.java
ndroid/gallery3d/filtershow/filters/ImageFilterBWRed.java
ndroid/gallery3d/filtershow/filters/ImageFilterBorder.java
ndroid/gallery3d/filtershow/filters/ImageFilterCurves.java
ndroid/gallery3d/filtershow/filters/ImageFilterGradient.java
ndroid/gallery3d/filtershow/filters/ImageFilterSaturated.java
ndroid/gallery3d/filtershow/filters/ImageFilterStraighten.java
ndroid/gallery3d/filtershow/filters/ImageFilterVignette.java
ndroid/gallery3d/filtershow/imageshow/ImageBorder.java
ndroid/gallery3d/filtershow/imageshow/ImageShow.java
ndroid/gallery3d/filtershow/imageshow/ImageSmallFilter.java
ndroid/gallery3d/filtershow/imageshow/ImageStraighten.java
ndroid/gallery3d/filtershow/imageshow/ImageVignette.java
ndroid/gallery3d/filtershow/presets/ImagePreset.java
ndroid/gallery3d/filtershow/presets/ImagePresetBW.java
ndroid/gallery3d/filtershow/presets/ImagePresetBWBlue.java
ndroid/gallery3d/filtershow/presets/ImagePresetBWGreen.java
ndroid/gallery3d/filtershow/presets/ImagePresetBWRed.java
ndroid/gallery3d/filtershow/presets/ImagePresetOld.java
ndroid/gallery3d/filtershow/presets/ImagePresetSaturated.java
ndroid/gallery3d/filtershow/presets/ImagePresetXProcessing.java
ndroid/gallery3d/filtershow/tools/SaveCopyTask.java
ndroid/gallery3d/filtershow/ui/ControlPoint.java
ndroid/gallery3d/filtershow/ui/ImageButtonTitle.java
ndroid/gallery3d/filtershow/ui/ImageCurves.java
ndroid/gallery3d/filtershow/ui/PieSlider.java
ndroid/gallery3d/filtershow/ui/PieSliderListener.java
ndroid/gallery3d/filtershow/ui/Spline.java
|
| 4994b8649de154c59de47cb1a2e14acca1a17096 |
26-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix behavior of up button in Camera app
Bug: 7233448
- Up button now goes to gallery root when appropriate.
Change-Id: Ib474335b2ac4139e7c5a213bda3efa481b24f224
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/util/GalleryUtils.java
|
| 07ada6bf900e104aff8b1c1c6b3e84860afaa53f |
26-Sep-2012 |
John Reck <jreck@google.com> |
Merge "Avoid unnecessary allocation" into gb-ub-photos-arches
|
| 50fe1db1e6d10e44eb2416b206249b332b302b32 |
26-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Merge "Trimming: switch to use selectors." into gb-ub-photos-arches
|
| a33d4f6662b26fcdcc4e92de168260a85631e9b5 |
25-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Trimming: switch to use selectors.
Switch into using 2 selectors for the starting and end point of triming.
Shift the bar up a bit to accommandate the selectors.
bug:7093240
Change-Id: If3b6fe285cd69756ecbfe1d52efd90b499150c72
ndroid/gallery3d/app/TimeBar.java
ndroid/gallery3d/app/TrimTimeBar.java
|
| a6b46808bda90361903eda14fdb4624ff2a03af4 |
26-Sep-2012 |
John Reck <jreck@google.com> |
Avoid unnecessary allocation
Bug: 7238418
Change-Id: Ic0a1ef0368368526401a53f02f680ef9d42ea310
ndroid/gallery3d/app/PhotoPage.java
|
| 79bf0a2c14fdc552db1d36f9fbc0500013af96bf |
20-Sep-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Fixed behavior for back key when viewing download.
Bug: 7205463
Bug: 7164238
Bug: 7175040
When viewing an image via the download notification from browser,
changed the default behavior of the back key to take the user to
the downloads folder.
Change-Id: Ia842bfa0f23c3b0ba767e3f0447add2c9b2cc6a7
ndroid/gallery3d/data/UriSource.java
|
| fb0e11a104271fb7455e929094361a972d966508 |
19-Sep-2012 |
Owen Lin <owenlin@google.com> |
Don't set treat back as up if there is no parent album.
Change-Id: I2ecadd8ace0f8d3e5ed38710a776e7c114f24274
fix: 7180467
ndroid/gallery3d/app/Gallery.java
|
| 3959f7359020a371a861c080d819b47a0be3c2a5 |
26-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix display of clustering items in album set page
Bug: 7217602
There was an incorrect assumption that onCreateActionBar
would always be called before onResume.
Change-Id: Id50c2dc3fd8167958501e12c66d11ac82a86349b
ndroid/gallery3d/app/AlbumSetPage.java
|
| aa4d0ffbe18b0dc953fa778b512fd99aea12ae6b |
26-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Show unlock image in secure album only when camera roll has items.
bug:7192331
Change-Id: I8e0a9ea87181c2256632a4dc802cc0668fac1e0e
ndroid/gallery3d/data/SecureAlbum.java
|
| dc4107678f6ae7ff017c662e94a7cf628940a47e |
25-Sep-2012 |
Doris Liu <tianliu@google.com> |
Merge "Making switchState public" into gb-ub-photos-arches
|
| fcee3ef453be5f1cc2bd88f1e0b3e7f85129ee7a |
20-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Grid/filmstrip switching behavior improvements
Bug: 7200453
Bug: 7196483
Bug: 7222179
Bug: 7224619
Changes:
- Launch camera in capture even if paused in grid/filmstrip
- Fixed behavior of filmstrip button after launching grid
from camera
- Refresh bar timeouts after swiping a photo
- Partially swiping from camera to filmstrip without lifting
finger and then swiping back no longer results in unwanted
switch to filmstrip
- Removed hacky solution to switching to filmstrip mode
Change-Id: I5cdde927e6a27a03b99a7f4883c5601bc281f4c8
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/app/TransitionStore.java
ndroid/gallery3d/ui/PhotoView.java
|
| b2f6a0c2d2ecbac4047f96621980ba36d3c647c8 |
24-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Add an unlock image in the end of secure album.
When camera is started from secure lock screen, put placeholder
"proto-photo" at the end of the camera roll. When it is clicked,
it takes the user to the lock screen.
bug:7192331
Change-Id: Ia444d3bb8a88ba69bba4c47cb9783a60a6986c34
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/data/MediaObject.java
ndroid/gallery3d/data/SecureAlbum.java
ndroid/gallery3d/data/SecureSource.java
ndroid/gallery3d/data/UnlockImage.java
|
| 92d01cafb390a886cf45b9df60007d403a7051eb |
24-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Restore missing "Group by" option in camera roll grid view
Bug: 7217410
Change-Id: I1488f02919a8702be2eb41696f627f9e3d94ce88
ndroid/gallery3d/app/PhotoPage.java
|
| 77551a6b619e63c59d518b42b472556ebf750484 |
24-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix occasional crash when restoring photo page state
Bug: 7216012
If the saved state being used to restore the photo page
includes an out-of-bounds index, ignore it and reset the
index to 0.
Change-Id: I1b8aa82cbc553297189abb57bd274d7eb53f61e0
ndroid/gallery3d/app/PhotoPage.java
|
| 561df21b1651cf6b266f241bb1a3945c05c229bf |
24-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
The trimming solution with the mp4parser library.
bug:7093055
Change-Id: I598a81d80c9c5107696f3af7761207e3ec88f3ff
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/app/ShortenExample.java
ndroid/gallery3d/app/TrimVideo.java
|
| a0222b73be4f34f4ddc263cdacaf108a4d4f56db |
24-Sep-2012 |
Mangesh Ghiware <mghiware@google.com> |
Use vendor specific MIME type for sharing LightCycle panoramas
Bug: 7150324
Change-Id: I78d426672e9a8fc69f0b9b564438e40eb0230719
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/data/LocalImage.java
ndroid/gallery3d/data/MediaObject.java
ndroid/gallery3d/data/UriImage.java
ndroid/gallery3d/ui/ActionModeHandler.java
ndroid/gallery3d/ui/MenuExecutor.java
|
| 94a7444cd0397e830a31cf3b754967bb7e64fcd7 |
22-Sep-2012 |
Doris Liu <tianliu@google.com> |
Making switchState public
Bug: 7208910
switchState was only accessible within package com.android.gallery3d.app . Now
changing it to public so that it can be called from camera. This is part 1 of 2
in fixing the bug. Not sure if it's the best way to fix it. Comments are welcome.
Change-Id: I4aac46f640f2dd3aa973abd9610a37fa2842ed29
ndroid/gallery3d/app/StateManager.java
|
| 4ab4417fd1252df7ad3f8824fc133810090e2ec8 |
21-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Snap a photo to the center after fling ends in filmstrip
Bug: 7050303
Change-Id: I7770d5642b376a1b888f34c5806f2291b64ecf68
ndroid/gallery3d/ui/PositionController.java
|
| 8e23dd070f2c49d64d356c22f55801c4f915de5c |
21-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Support secure image capture mode.
bug:7141738
Change-Id: I4ea010609d16da469998ebb40ad8282b9468de25
ndroid/gallery3d/app/CropImage.java
ndroid/gallery3d/app/PhotoPage.java
|
| 22b82bef36cc04d5f73a5eded39c096c4f35d42f |
20-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Hide grid view menu item in secure album." into gb-ub-photos-arches
|
| 556d928aa36781b56236fa1fb4669eff56c39cd3 |
20-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Hide grid view menu item in secure album.
bug:7200451
Change-Id: I23b6fbc48aac46e9b25b159416bc9f64a357d038
ndroid/gallery3d/app/PhotoPage.java
|
| ca2cdc2a65606c9ffd2954367dac4e0f8e79188b |
19-Sep-2012 |
Earl Ou <shunhsingou@google.com> |
Fix metadata of cropped image for details display.
+ drop the old thumbnail of the cropped image
+ update DateTime tag in EXIF
+ add EXIF Software tag
+ display DATE_MODIFIED in details instead of DATE_TAKEN
Bug:7192433
Change-Id: I89dcb29dd3242f58fe96cd25398217e94f42fc97
ndroid/gallery3d/app/CropImage.java
ndroid/gallery3d/data/LocalImage.java
ndroid/gallery3d/data/LocalMediaItem.java
ndroid/gallery3d/exif/ExifData.java
ndroid/gallery3d/exif/ExifTag.java
|
| 17d76c9d27d6ac09ef3fcc8bef8e26c80cc6ccf0 |
20-Sep-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Simplify the usage of ExifData" into gb-ub-photos-arches
|
| 091e299adaf8d0df1151e0e12dbca87e60661752 |
18-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Add bottom bar UI for photo page
Bug: 7050303
Bug: 7170148
Pulled the handling of the display of the edit (FX) button
out into a separate file and put in the groundwork for
supporting multiple buttons within a container along the
bottom of the screen and managing their display as well as
animating them in and out. Also added a button for launching
the panorama viewer when appropriate
Change-Id: Iee3083e0693ef3c1f55264b922f02b9a702d2103
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/app/PhotoPageBottomControls.java
|
| af8391b14a7ab43618da8874ba21ce8f7243b162 |
20-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Make ActionBar always present in filmstrip
Bug: 7196718
Change-Id: Id297f28402da20efd99a9f90376a18f041fe8448
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/ui/PhotoView.java
|
| b5b30a05b575cac7b00e5f793004900307c3cbc6 |
30-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Simplify the usage of ExifData
Bug:7192363
Change-Id: I2c6ab9974f4472f63483a4de814728584944535e
ndroid/gallery3d/app/CropImage.java
ndroid/gallery3d/exif/ExifData.java
ndroid/gallery3d/exif/ExifOutputStream.java
ndroid/gallery3d/exif/ExifParser.java
ndroid/gallery3d/exif/ExifTag.java
ndroid/gallery3d/exif/IfdData.java
|
| 5439e7f0ec09c59c1159c2ba233ecd95f26fb9fe |
19-Sep-2012 |
Pin Ting <pinting@google.com> |
Merge "Use 565 pixel format for pre-JB; use 888 otherwise." into gb-ub-photos-arches
|
| c5378acab92e5d9428e35acc595f09c4bfcb3823 |
19-Sep-2012 |
Pin Ting <pinting@google.com> |
Use 565 pixel format for pre-JB; use 888 otherwise.
Bug:7189512
Change-Id: Iec5d528fef4f4fc589370339add299a40fc8f26e
ndroid/gallery3d/ui/GLRootView.java
ndroid/gallery3d/ui/GalleryEGLConfigChooser.java
|
| a7f4e15ea94735e31739dd1122ed97018a552dfd |
18-Sep-2012 |
George Mount <mount@google.com> |
Add UriImage support for viewing LightCycle panoramas.
Change-Id: I7f61cef39370fd23b9481708dc3c902c17873074
ndroid/gallery3d/app/PhotoDataAdapter.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/app/SinglePhotoDataAdapter.java
ndroid/gallery3d/data/LocalImage.java
ndroid/gallery3d/data/MediaItem.java
ndroid/gallery3d/data/UriImage.java
|
| 0bb34d3547f62df1a1fbc0bb261b9ffaba280b40 |
18-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Fix incorrect texture size causing artifacts in animation" into gb-ub-photos-arches
|
| 53c755963bfab7614c1c2fe381d7c2b767606ed5 |
18-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix incorrect texture size causing artifacts in animation
Bug: 7181383
Change-Id: I3895b89ccdd03e55acc656f0d6944f4a9d398ad5
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/AlbumSetPage.java
ndroid/gallery3d/ui/PreparePageFadeoutTexture.java
|
| 4cb71a4cefa7ad7fb3bb740ff67c584e9499b535 |
17-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Do not show edit button in secure album.
bug:7183052
Change-Id: I94ca6703e5c3a0e2af552be2065be361210185b2
ndroid/gallery3d/app/PhotoPage.java
|
| ea412e3624c23a65812e86e1d2bf2b5ae7b1ed0a |
18-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Fix bugs relating to grid/filmstrip switching" into gb-ub-photos-arches
|
| bcec1d75de1471623c8efdbaddaa8c76dc379b96 |
17-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Don't switch back to fullscreen camera when flinging
Bug: 7145903
Bug: 7050303
It was very annoying to users to fling in the filmstrip
and end up in the fullscreen camera mode, so disabling
that. Long-term, we want to be smarter about this and
do the zoom to the full-screen if it's a short swipe
rather than a fling.
Change-Id: I40ac4848a267c06fc41e161a7a292b8f03b2ef4c
ndroid/gallery3d/ui/PhotoView.java
|
| 9193ac8ef029767254e4c3dfd49f73156c307f55 |
17-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix bugs relating to grid/filmstrip switching
Bug: 7180582
Bug: 7146147
Change-Id: I3d2ad8866a938f9f162e14f11bc2e021834ba513
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/data/FilterDeleteSet.java
|
| 5d54be7c82a3534cb921c9128677f9f299bf01ff |
17-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Reskin: do not show edit (FX) button in filmstrip mode
Bug: 7050303
Change-Id: Ibab686bc8581e8cc24a722950ff3b8b77023edd4
ndroid/gallery3d/app/PhotoPage.java
|
| f5cf4adb019ed662af8d30d54dc78a160a7b4370 |
17-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix build breakage
Change-Id: I88f1a9f2f1306d959d6a5398faa2c6f50cb24501
ndroid/gallery3d/app/AlbumSetPage.java
|
| ba9c3f7993b817c2b1310138c8a2a48d681a000e |
14-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Show large button to open the camera when gallery is empty
Bug: 7156303
Change-Id: I0447c3eaee680e80f09cc3aff714aace85ee77d9
ndroid/gallery3d/app/AlbumSetPage.java
|
| 6dc73063d683a05509467c915d306c2f68434bc0 |
14-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Only show FX button for photos" into gb-ub-photos-arches
|
| d2ba8d7efb61b5c1a57b3ceb3e29da0dda484afc |
14-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Show animation when opening albums directly in filmstrip" into gb-ub-photos-arches
|
| 07c3fac5195496cb18ec60c82ffc036fc567fd99 |
14-Sep-2012 |
Owen Lin <owenlin@google.com> |
Merge "Cancel the loading task when clicking on back in Cropping." into gb-ub-photos-arches
|
| 726602b9f9b57dcfc213d2a7752ef111389da620 |
14-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Only show FX button for photos
Bug: 7165294
Change-Id: Ia35f5981cba5a69f94964a9c38361b01ea1cdbfd
ndroid/gallery3d/app/PhotoPage.java
|
| a14c4dbc5719fdc95648a1cb4eb7b617836e2a35 |
14-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Show animation when opening albums directly in filmstrip
Bug: 7166947
Change-Id: Id67e93431365043673e08b400aea5df9ae53f14c
ndroid/gallery3d/app/AlbumSetPage.java
|
| ee96fa8b2c67ab4ae2ac1cb3c0d9795af04cc9b7 |
14-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Animate correctly when opening single-photo album
Bug: 7164177
Change-Id: I5ce60a8e842e3ddf0e356568f17ee488edef23cd
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/AlbumSetPage.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/ui/PreparePageFadeoutTexture.java
ndroid/gallery3d/ui/SlotView.java
|
| bd12e52656278fd61635c7d54bfe493e80dc9817 |
13-Sep-2012 |
Owen Lin <owenlin@google.com> |
Cancel the loading task when clicking on back in Cropping.
bug: 5636363
Change-Id: I0e00b6119c4d184328002d1b2128e33ababc798b
ndroid/gallery3d/app/CropImage.java
|
| 2cd3567be7f92c5e89beecc2d672768ef05507c7 |
13-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
When tapping single-photo albums, launch photo directly
Bug: 7145102
Change-Id: I75c66f2f37fc11f3846fdbd40083787ba38af207
ndroid/gallery3d/app/AlbumSetPage.java
ndroid/gallery3d/app/PhotoPage.java
|
| 1de93cc0cbd940ed1d07048dda56406e7c3a7d96 |
12-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Reskin: Fix stability bugs introduced by reskin
Bug: 7150348
Bug: 7144206
Bug: 7050303
If PhotoPage is launched/resumed on a completely empty
album (for instance, if Gallery was opened to the Camera
folder and paused, all photos were deleted via the Camera
app, and then Gallery is resumed), bail out of PhotoPage
since it cannot handle this. Also fixes an NPE.
Change-Id: I162ff5ad149c322704c8af7d4705d87ae6c6098a
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/PhotoPage.java
|
| a1d65900c67ba487dec08727bcd70084ae7f90bf |
12-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Reskin: fix bug introduce by Gallery reskin" into gb-ub-photos-arches
|
| 879ba7b0cd6d9fa61bd412ecb32fc8f156eda843 |
12-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Launch next-gen editor if present and show FX button
Bug: 7050303
Shows editor button on the photo page and launches the
next-gen photo editor if it is present on the device.
Change-Id: I4058cffaec3fc4b446bd90dbecb809681d3255ea
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/data/FilterDeleteSet.java
|
| ada2073e38142154223a9703b1e26af6f58e0e16 |
11-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Reskin: fix bug introduce by Gallery reskin
Bug: 7146147
Bug: 7050303
Change-Id: Ia9782868937cc9a03e4c8b5f77033d13d80d5d8a
ndroid/gallery3d/app/AlbumPage.java
|
| 3a6b33e50aa999d7c1b149a29bf8697d39e21489 |
11-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Reskin: stop at first photo after swipe from camera" into gb-ub-photos-arches
|
| 9c4cf6d5c9d0ced9a19819e31392ecca0a754649 |
11-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Reskin: stop at first photo after swipe from camera
Bug: 6399763
Bug: 7050303
Change-Id: I433bead637416f3c6e47fdc7567bb5de7575c01c
ndroid/gallery3d/ui/PhotoView.java
|
| 25930913dc7129a1e6d07a88f9b79d69029d2535 |
24-Aug-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Add the UI elements for video trim activity.
1. Refactored the classes to support both the video play and trim.
Now the common code for controller overlay is in CommonControllerOverlay,
which is basically the same as the original MovieControllerOverlay without
animation. Because in trimming, we don't want to hide all the controller.
The specific animations are implemented in the sub-classes which are
TrimControllerOverlay and MovieControllerOverlay.
At the same time, TrimTimeBar extended TimeBar to support the extra
trimming start scrubber and end scrubber.
The interface between the timebar and the controllerOverlay are kept almost
the same way, except adding the trimming info when necessary.
With all these, the activity of TrimVideo now relied on the TrimTimeBar
and TrimControllerOverlay. Similarily, the MovieActivity relied on the TimeBar
and MovieControllerOverlay.
2. Hook the TrimVideo activity with the trim menu.
Note that the icons are temporary for now, still need UX input on that.
bug:7093055
Change-Id: Ib9bfbc090106744a569fce4c451ddffc0a2c699b
ndroid/gallery3d/app/CommonControllerOverlay.java
ndroid/gallery3d/app/ControllerOverlay.java
ndroid/gallery3d/app/MovieControllerOverlay.java
ndroid/gallery3d/app/MoviePlayer.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/app/TimeBar.java
ndroid/gallery3d/app/TrimControllerOverlay.java
ndroid/gallery3d/app/TrimTimeBar.java
ndroid/gallery3d/app/TrimVideo.java
ndroid/gallery3d/ui/MenuExecutor.java
|
| 1a980d945c8715de18bdbe6406599503d812185f |
06-Sep-2012 |
Chih-Chung Chang <chihchung@google.com> |
Do not accept fling gesture after we changed from/to filmstrip mode.
Change-Id: Ifb3d692bcf621ff02c6d4e6d91ba8484d702f905
ndroid/gallery3d/ui/PhotoView.java
|
| 4e19aebb22c40beb18ed9b5e8d4c0a07e205674e |
11-Sep-2012 |
Owen Lin <owenlin@google.com> |
Merge "Don't start filmstrip mode in Get Content mode." into gb-ub-photos-arches
|
| 5251514287e41c57076029b08484d20beb5967b5 |
04-Sep-2012 |
Owen Lin <owenlin@google.com> |
Ensure peekObject is called in the syncrhonization block.
bug: 7019598
Change-Id: If153287078826afc9827ea64364b4fb64f2b3a5f
ndroid/gallery3d/app/AlbumDataLoader.java
ndroid/gallery3d/app/AlbumSetDataLoader.java
ndroid/gallery3d/app/PhotoDataAdapter.java
ndroid/gallery3d/data/ClusterAlbumSet.java
ndroid/gallery3d/data/DataManager.java
ndroid/gallery3d/data/LocalAlbum.java
ndroid/gallery3d/data/MediaSource.java
ndroid/gallery3d/data/MtpDevice.java
ndroid/gallery3d/data/Path.java
|
| 960306bb25cb79ded4f5cb0f3b329ff042e0e837 |
11-Sep-2012 |
Owen Lin <owenlin@google.com> |
Merge "Remove the space before colons in details." into gb-ub-photos-arches
|
| 0caf3cfbbc1a200e060da11d44f37dc8da4699be |
11-Sep-2012 |
Owen Lin <owenlin@google.com> |
Don't start filmstrip mode in Get Content mode.
Change-Id: Ib04f5c134d44b2d8e80e7fdecf2503e950487837
fix: 7135936
ndroid/gallery3d/app/AlbumSetPage.java
|
| acbff926677310747417338e22ab018dca80e4ff |
11-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Improvements to empty album behavior in Gallery" into gb-ub-photos-arches
|
| e840cafb77fd7019dc0b7bd41f81289e6ce18600 |
10-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Improvements to empty album behavior in Gallery
Bug: 7131332
Bug: 7009464
Toasts are now immediately dismissed if a non-empty album
is selected, and dismissed once Picasa Albums load at an
otherwise empty gallery root. The alert added in a previous
prompt has been replaced with a Toast also.
Change-Id: Icca79ab264b94979eedcf78e5c3899af745d8813
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/AlbumSetPage.java
|
| b8a207b8b346c6c085e968e6e59d60ee2c6ef589 |
11-Sep-2012 |
Doris Liu <tianliu@google.com> |
More logging added for monkey crash
The crash is difficult to repro. So I'm adding more logging here to help figure out what caused the crash next time it happens.
Bug: 6495745
Change-Id: Ib6a47f45e0508bc5def61fdc9f4e4a488b48ad92
ndroid/gallery3d/data/MediaObject.java
|
| 464b7559175f45b488bb24be3d16843f1bf80cd4 |
10-Sep-2012 |
George Mount <mount@google.com> |
Remove VIEW activity from LightCycle.
Bug 7133257
Change-Id: I4b3c968ceaa01d9461a788553f23bf7694ac4b3c
ndroid/gallery3d/app/PhotoPage.java
|
| 28a935837a20c45c870a95ee075ed9e3ac0df9fd |
07-Sep-2012 |
George Mount <mount@google.com> |
Show play icon for panorama.
Bug 7124494
Change-Id: I17fdb5d6bcab1f3997a1ab92fcf45e0309b394b3
ndroid/gallery3d/app/PhotoDataAdapter.java
ndroid/gallery3d/app/SinglePhotoDataAdapter.java
ndroid/gallery3d/data/LocalImage.java
ndroid/gallery3d/data/LocalVideo.java
ndroid/gallery3d/data/MediaItem.java
ndroid/gallery3d/ui/PhotoView.java
|
| 1ab2f94443bba3ac3db22243216e7cfdf0167931 |
10-Sep-2012 |
Doris Liu <tianliu@google.com> |
Merge "Back button should progress through the app" into gb-ub-photos-arches
|
| d57afb53c887891024a5dad825d88f088a598258 |
10-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Do not allow panorama viewer in secure album.
bug:7053266
Change-Id: I5195638e03e5eb32d47b50b7b568a40cd8a222d9
ndroid/gallery3d/app/PhotoPage.java
|
| df0fd9bc507780cd4594d4358e02e5547deb7c6d |
10-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Fix build error in old version of java.
Change-Id: I2f88846a10afd696d7dd94ddeee767c3d89d5ccf
ndroid/gallery3d/app/TransitionStore.java
|
| 22700f63e0098b2be1a2b13a2920ba56e0952730 |
10-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix import statement breaking build
Change-Id: I0d2acb3ece6ed2aea04033f911a69b266b6cc7de
ndroid/gallery3d/app/PhotoPage.java
|
| 6e3cdcf8604dd202b9de08e0942d40d8cbbd26f5 |
07-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Reskin: switching between filmstrip and grid in album
Bug: 7050303
Bug: 6541425
Allows switching between the filmstrip and the grid views
within albums and launches camera roll in filmstrip mode
by default. Also fixes animation issue when animating from
full-screen to grid view.
Change-Id: I2a37b92c129cc090fd807973f7e3e82fed207cd3
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/AlbumSetPage.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/app/TransitionStore.java
ndroid/gallery3d/data/LocalAlbum.java
ndroid/gallery3d/data/LocalMergeAlbum.java
ndroid/gallery3d/data/MediaSet.java
ndroid/gallery3d/ui/PhotoView.java
ndroid/gallery3d/util/MediaSetUtils.java
|
| 0f229418c48d0d54004702b175564c4e638f15bd |
07-Sep-2012 |
Doris Liu <tianliu@google.com> |
Back button should progress through the app
When Gallery is launched via notification, back button should progress through the app before return to Home
Bug: 6925612
Change-Id: I9da2120c6f607f8b6d3fa57d8a70225bc66fb8ef
ndroid/gallery3d/app/Gallery.java
|
| b05d8805d94dc3d60a0e1b966cf2c0cd58109938 |
07-Sep-2012 |
George Mount <mount@google.com> |
Merge "Use XmpUtil to detect panorama instead of caption." into gb-ub-photos-arches
|
| e1bcbb01bae4beca9c8cc158ac55932e4e4255a9 |
07-Sep-2012 |
George Mount <mount@google.com> |
Use XmpUtil to detect panorama instead of caption.
Bug 7124493
Change-Id: I7a21206b47aea701428132d8500fa0873cb3c91a
ndroid/gallery3d/data/LocalImage.java
|
| 5ca6f98efb5b1d2a48b55a3a5e4cf4ef8e8e4d78 |
05-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Update media items when a picture is deleted in secure album.
Query the database and only show the media items that
still exist.
bug:7053266
Change-Id: Ic8c1b8c514e59741436bca14e918ef100eaf14f8
ndroid/gallery3d/data/SecureAlbum.java
|
| ea9fd1b43e30e9dcb769c1b818b5481ae3604a31 |
06-Sep-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Fix some typos and style in ExifTag" into gb-ub-photos-arches
|
| 441381d3ca400972bd05f6659d456c7a227778a0 |
06-Sep-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Rearrange the constants in ExifTag" into gb-ub-photos-arches
|
| 62ee0284ae490510c82ef681f860200672654e04 |
05-Sep-2012 |
Earl Ou <shunhsingou@google.com> |
Fix some typos and style in ExifTag
Change-Id: I2f8a8f0e529d6db9132ac57e09e86fcc18aba842
ndroid/gallery3d/exif/ExifTag.java
|
| c27ecc21a04d901d8069dddd31a00d335e9ae097 |
30-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Rearrange the constants in ExifTag
Change-Id: I62ab6e52869dfa5b3fee7993bd109f4c5eed91a9
ndroid/gallery3d/app/CropImage.java
ndroid/gallery3d/exif/ExifData.java
ndroid/gallery3d/exif/ExifOutputStream.java
ndroid/gallery3d/exif/ExifParser.java
ndroid/gallery3d/exif/ExifTag.java
|
| 0aa21cfcb47437ba3e3368828d472fb61729e7e4 |
06-Sep-2012 |
Doris Liu <tianliu@google.com> |
Fix tap to focus, back button to camera on Manta
Changed the move threshold from a hard coded value to be proportional to the size of the view.
Bug: 7080033
Bug: 7066859
Change-Id: Id7b81fb3da1783951886d43fe9a3df35186af985
ndroid/gallery3d/ui/PhotoView.java
|
| 0bfb719a5a7996539d7aaaa4a920c49b14c7faf7 |
06-Sep-2012 |
George Mount <mount@google.com> |
Merge "Change lightcycle call to be in Gallery's package" into gb-ub-photos-arches
|
| 34691cc16aaa0866b4ec3322921494aba86fce7f |
05-Sep-2012 |
George Mount <mount@google.com> |
Change lightcycle call to be in Gallery's package
Bug 7076869
Change-Id: I315b660d8a7cd84db6d06f0aa38275c7f5e4b4a6
ndroid/gallery3d/app/PackagesMonitor.java
|
| 482d3c0c4bc10f6ff79a0b003326ed4f31a4227d |
05-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Increase threshold for logging texture size warnings" into gb-ub-photos-arches
|
| 37ce22db2aa8dce5f6b05160c99b65cb3dfae0c1 |
04-Sep-2012 |
Angus Kong <shkong@google.com> |
Move LightCycle checking to the closed source.
bug:7076779
Change-Id: Ieebe0343a46257ca07f06483beb9391a90d7727a
ndroid/gallery3d/app/PackagesMonitor.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/data/LocalImage.java
|
| 02884d1ae2d331c272b02c38dc55efd5a05008ae |
05-Sep-2012 |
Owen Lin <owenlin@google.com> |
Remove the space before colons in details.
bug: 6587084
Change-Id: Ifdbe24e84fb55c1892edb5652455274fc3775291
ndroid/gallery3d/ui/DialogDetailsView.java
|
| f9f44521327cd5206f45755a7bb06fa4065ad4c4 |
04-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Increase threshold for logging texture size warnings
Bug: 7094140
Change-Id: I0dc56dc92db6821527ceb71e49c3e83d818340c2
ndroid/gallery3d/ui/BasicTexture.java
|
| 61152454278c53d2251128779f18ac4fbac6a605 |
04-Sep-2012 |
Owen Lin <owenlin@google.com> |
Merge "Make a time jump when user clicks outsides the scrubber." into gb-ub-photos-arches
|
| f88808169c995219ba9651df8c52161b56d2fedb |
04-Sep-2012 |
Owen Lin <owenlin@google.com> |
Merge "Set inMutable to true if we may reuse the bitmap." into gb-ub-photos-arches
|
| e0e401752dd79d3610fedabe551e62cb852447a7 |
04-Sep-2012 |
Owen Lin <owenlin@google.com> |
Make a time jump when user clicks outsides the scrubber.
bug: 7080593
Change-Id: I913aee6e416c10d68403d7f9d4102d4dcc41e1d4
ndroid/gallery3d/app/TimeBar.java
|
| d01a96e278ea96ee6ee43b37e60c4d37a8959e95 |
04-Sep-2012 |
Owen Lin <owenlin@google.com> |
Set inMutable to true if we may reuse the bitmap.
bug: 7092330
Change-Id: I0def7e2e9ce57d09ba7f5e001b33cc605a6af44c
ndroid/gallery3d/data/DecodeUtils.java
|
| 25d33864d28f6acf25d2e835a85bf04a9a22f57e |
04-Sep-2012 |
Hung-ying Tyan <tyanh@google.com> |
Fix NPE in CropImage.changeExifImageSizeTag().
Bug: 7099850
Change-Id: Ib7b3b7d9fddaf53853bcc98b9588dfadda0aee6f
ndroid/gallery3d/app/CropImage.java
|
| dc433a066188e52593aaf7f0fae96191f44a5e26 |
03-Sep-2012 |
Owen Lin <owenlin@google.com> |
Merge "Fix NPE when deleting a photo in Clustering mode." into gb-ub-photos-arches
|
| b38af94687799862863ef10de91ade4683721dd2 |
03-Sep-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Handle other header tag in ExifParser before APP1" into gb-ub-photos-arches
|
| 3b4506fbc838ba4dbed3f84f0600b74cdf3f7b55 |
03-Sep-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Handle mis-ordered APP segment in ExifOutputStream" into gb-ub-photos-arches
|
| 4a3b0de9f672b7840db4436986c46dea3cb03d0d |
03-Sep-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Remove the parameter of getAllExifTags() in IfdData" into gb-ub-photos-arches
|
| 3a1a370a96a2a09e640e67e370aec8f6a9d93bb4 |
03-Sep-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Fix some typos and style in previous CL" into gb-ub-photos-arches
|
| 8a81312ec4065063ed69147a0340ab96d77b6d7d |
03-Sep-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Save EXIF info to cropped picasa image with the new EXIF lib." into gb-ub-photos-arches
|
| 4c1cb48500c2da3307c3da3744f2c0ce32930ef9 |
31-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Handle other header tag in ExifParser before APP1
Change-Id: I44398e3ed054de441810b795daff8d1edb06df59
ndroid/gallery3d/exif/ExifOutputStream.java
ndroid/gallery3d/exif/ExifParser.java
ndroid/gallery3d/exif/JpegHeader.java
|
| 7347a8ef6bddfc256004e427d5edd736f0b1902b |
31-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Handle mis-ordered APP segment in ExifOutputStream
Change-Id: Ic5ce13d17658e24d1ae42009d3ab30ae538cee10
ndroid/gallery3d/exif/ExifOutputStream.java
|
| b02977e128c7b85ad964c3ed90a6c5ed26ac682d |
30-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Use FLAG_SHOW_WHEN_LOCKED for secure album.
The activity needs this flag to be on top of the lock screen
when the camera is started from the secure lock screen.
bug:5955016
Change-Id: If554a3f7fef4c03a981c83afe22b8c4980b954d1
ndroid/gallery3d/app/ActivityState.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/app/SlideshowPage.java
|
| 397d48c17b398c72ea40f8d0b47a90488d9f8abf |
31-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Remove the parameter of getAllExifTags() in IfdData
Change-Id: Iec7f04a9866c53caa2d66d5ea6f679460980b378
ndroid/gallery3d/exif/ExifOutputStream.java
ndroid/gallery3d/exif/IfdData.java
|
| d4295b44baead5276704016a37ade53075fc209e |
31-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Fix some typos and style in previous CL
Change-Id: If78c0bfebccb20b0c4dad42a11b5dd0946b4e172
ndroid/gallery3d/exif/ExifData.java
ndroid/gallery3d/exif/ExifOutputStream.java
ndroid/gallery3d/exif/OrderedDataOutputStream.java
|
| 1c6566dfa563ece622df26a851e10c1c3b371a52 |
29-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Save EXIF info to cropped picasa image with the new EXIF lib.
Bug:5248023
Change-Id: I35f401826f4fa586e9899e3ca5f5f9b9ab39b28e
ndroid/gallery3d/app/CropImage.java
ndroid/gallery3d/exif/ExifData.java
ndroid/gallery3d/exif/ExifTag.java
|
| afebbfa1b19f70f5c197e781071fadaf560d778d |
29-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Add prefix to GPS tag in ExifTag
Change-Id: Ib07d2847ddcbed3b06d07afa2a6d5851c27760b1
ndroid/gallery3d/exif/ExifTag.java
|
| 81791ebda14bed2f71b15c866df4ec48cbd3b73c |
29-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Re-save Exif info for cropped local image
Bug:5248023
Change-Id: I744330f28b887bff4d12937e06f8d20db153ac7e
ndroid/gallery3d/app/CropImage.java
|
| 04998342fbceaacdb2bfe5e5c47cdda035329640 |
30-Aug-2012 |
Owen Lin <owenlin@android.com> |
Merge "ExifOutputStream" into gb-ub-photos-arches
|
| 06961efbb7552d345a550708d8e40f0fb9345a9e |
29-Aug-2012 |
Owen Lin <owenlin@google.com> |
Remove unused resources and fix some warnings.
Change-Id: I075977150c7da7650e723e29406f24ae2e23ea97
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/AlbumSetPage.java
ndroid/gallery3d/app/CropImage.java
ndroid/gallery3d/app/ManageCachePage.java
ndroid/gallery3d/app/MoviePlayer.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/data/LocalAlbumSet.java
ndroid/gallery3d/data/MtpDevice.java
ndroid/gallery3d/data/MtpImage.java
ndroid/gallery3d/data/SizeClustering.java
ndroid/gallery3d/data/UriSource.java
ndroid/gallery3d/ui/MenuExecutor.java
ndroid/gallery3d/ui/Paper.java
ndroid/gallery3d/ui/PhotoView.java
ndroid/gallery3d/ui/PositionController.java
ndroid/gallery3d/util/GalleryUtils.java
|
| aaad70913d88b943ac2dada2ee7b3e11c2c9d246 |
30-Aug-2012 |
Owen Lin <owenlin@google.com> |
Fix NPE when deleting a photo in Clustering mode.
bug: 7075760
Change-Id: I64b278b8c9436ada23738f28510736dcf7e18755
ndroid/gallery3d/data/MediaSet.java
|
| b282374131b3f9b306968440550fca0dbe756ee0 |
30-Aug-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Add equals() function in ExifData, IfdData, and ExifTag" into gb-ub-photos-arches
|
| c2ac168aaeb959f9f33db3b574a845a4d6686af3 |
30-Aug-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Redesign the set function of ExifTag" into gb-ub-photos-arches
|
| 4729f2992f820d5c03011253cd5f528bf0b40129 |
28-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
ExifOutputStream
Change-Id: I9f2de77e87a502ccdadba0b18658621028c538c9
ndroid/gallery3d/exif/ExifData.java
ndroid/gallery3d/exif/ExifOutputStream.java
ndroid/gallery3d/exif/OrderedDataOutputStream.java
ndroid/gallery3d/exif/Util.java
|
| 1d3dfbf55bb320dc4d1d4379c385b629c107f713 |
28-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Add equals() function in ExifData, IfdData, and ExifTag
Change-Id: I96c5767354548d0f0d7571fd1d8812e1ab54a5c4
ndroid/gallery3d/exif/ExifData.java
ndroid/gallery3d/exif/ExifTag.java
ndroid/gallery3d/exif/IfdData.java
ndroid/gallery3d/exif/Rational.java
ndroid/gallery3d/exif/Util.java
|
| a393402c67ab65c322a1ce4c2f6714397591c363 |
29-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Redesign the set function of ExifTag
Change-Id: Iaf5632d759fe14c167cba54099b99719b31e3431
ndroid/gallery3d/exif/ExifParser.java
ndroid/gallery3d/exif/ExifTag.java
|
| e05f0fa8b946d4eb5c8c8c0361150b90e877c87d |
30-Aug-2012 |
Owen Lin <owenlin@google.com> |
Merge "Fix OOM in TileImageView." into gb-ub-photos-arches
|
| 47301935ff08dc6f8b879ef49be3872fd84543cd |
30-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Reskin: Correctly position rotated thumbs in album listing" into gb-ub-photos-arches
|
| 6826dc9b0358431159008c512bad320b657f0cc6 |
28-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Reskin: Correctly position rotated thumbs in album listing
Bug: 7067732
Bug: 7050303
Changing the slots to be non-square surfaced a small math
error, and also raised the question of where exactly to
render the texture. The solution that makes the most sense
given the current design is to fit the thumbnail (which is
always square in our case) in the largest square that fits
inside the slot, and aligned to the top.
Change-Id: I98d94ad9255399aa4f1e5c403ff81811674bb264
ndroid/gallery3d/ui/AbstractSlotRenderer.java
|
| f40669b90a0e3acd49bf2d3a7f889e0d89c24a95 |
24-Aug-2012 |
Angus Kong <shkong@google.com> |
Invoke LightCycle viewer for panoramas.
1. Add SUPPORT_PANORAMA_VIEW to supported operations.
2. Add helper methods in LightCycleHelper:
a. checks if the image file is a panorama.
b. invokes the panorama view activity.
bug:6912297
Change-Id: I7909e49632cad02a795943a113bca6aec17df9dd
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/data/LocalImage.java
ndroid/gallery3d/data/MediaObject.java
|
| 25f2aa192479a87abdec2ab66b05820290c465d3 |
29-Aug-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Fix pinch out gesture for film strip mode on gingerbread." into gb-ub-photos-arches
|
| fb6aafde995cfaeb57f3009f10a4c0c843993162 |
29-Aug-2012 |
Owen Lin <owenlin@google.com> |
Fix OOM in TileImageView.
The problem is we keep too many decoded images in the upload queue.
Those images will be free after it getting uploaded.
However, there is a bug which suspend the uploading sometimes.
Change-Id: Id97c04eba974cc77e5d8c50588b0cbef776f79da
fix: 6995091
ndroid/gallery3d/ui/TextureUploader.java
ndroid/gallery3d/ui/TileImageView.java
|
| 894300ca4d2da44e9c4fb5d8ec7d7a5d8662da51 |
29-Aug-2012 |
Owen Lin <owenlin@google.com> |
Merge "Fix NPE in viewing single image." into gb-ub-photos-arches
|
| a5371c293c15a3aa09ba7465ab48de36f275214c |
29-Aug-2012 |
Hung-ying Tyan <tyanh@google.com> |
Fix pinch out gesture for film strip mode on gingerbread.
On crespo running Android 2.3.6, a pinch out gesture results in the following
call sequence: onDown(), onUp() and then onSingleTapUp(). The correct sequence
for a single-tap-up gesture should be: onDown(), onSingleTapUp() and onUp().
The call sequence for a pinch out gesture in JB is: onDown() and then onUp().
Base on these observations, a condition is added in onSingleTapUp() to filter
out the false alarm where onSingleTapUp() is called within a pinch out gesture.
Bug: 7023717
Change-Id: I010b87f95c3197a299a7d907ce32e93a1d5e958f
ndroid/gallery3d/ui/PhotoView.java
|
| 650a9df4376e7c4f0b64d439b5d38dd81b7fcdcd |
28-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Save the offset of next IFD in the IfdData
Change-Id: I2c5d2ad390d970603a7a9ce2145029d871098fdb
ndroid/gallery3d/exif/IfdData.java
|
| ebc26da861cbe7b9725e9c8828730ee4c9d5e3de |
28-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Save ByteOrder in the ExifData
This is useful for decoding undefined data.
Change-Id: Ied6864c4d3a8e05ca47215bf5358bd4196f2d3a0
ndroid/gallery3d/exif/ExifData.java
ndroid/gallery3d/exif/ExifParser.java
ndroid/gallery3d/exif/ExifReader.java
|
| 9b7fe0007a8e07f1155dacec7b299042b825da7c |
28-Aug-2012 |
Owen Lin <owenlin@google.com> |
Fix NPE in viewing single image.
bug: 7052228
Change-Id: Iaca5ed062cd3c8233f212551cf4312f0828f12dc
ndroid/gallery3d/app/GalleryActionBar.java
ndroid/gallery3d/app/PhotoPage.java
|
| 45d791d5271e7283550140cfaca5b4bdfa0c0d14 |
27-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Reskin: Launch photos in lights-out mode
Bug: 7050303
- Launch photos in lights out mode when opening from album
- One last missing call to super.onCreate added in
ManageCachePage
Change-Id: I7ad0e64f30748b724d184791e0e0a6a030850049
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/ManageCachePage.java
ndroid/gallery3d/app/PhotoPage.java
|
| 279852dfcec2abacee1c5d8b6f53f94830fd4e86 |
27-Aug-2012 |
Owen Lin <owenlin@google.com> |
Fix some UI bugs in using SherlockActionBar.
- Use sherlock's verion of requestWindowFeature.
- Use sherlock's theme in Custom selection list.
bug: 6927267
Change-Id: I706e45378b10e6e088e048d97fcaca57fb4bf3f4
ndroid/gallery3d/app/CropImage.java
ndroid/gallery3d/app/Gallery.java
ndroid/gallery3d/app/MovieActivity.java
ndroid/gallery3d/app/PickerActivity.java
ndroid/gallery3d/ui/PopupList.java
|
| 1cbddfcb7d1f5ab087a1ee0d2dc98331bd6d4998 |
26-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Disable action bar home button and menu items in secure album.
All menu items are disabled except delete.
bug:5955016
Change-Id: Ibf947b0c50b0591a774d298fbfbe692c9a88575d
ndroid/gallery3d/app/PhotoPage.java
|
| 4a52b40a06fa7bb8fd11c88af0c21cf290e45b39 |
24-Aug-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
add the menu button to support trimming
This is only visible for video item.
Change-Id: I17f8e902f3560cc8524f890705c020901331df74
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/data/LocalVideo.java
ndroid/gallery3d/data/MediaObject.java
ndroid/gallery3d/ui/MenuExecutor.java
|
| de13f16dbffc9a0cadc05913c1fce1ffcd8f6dd3 |
27-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Reskin: tweaks to colors and spacings to match mocks
Bug: 7050303
- Call super.onCreate in ActivityState subclasses in
order to correctly initialize background colors,
correcting oversight in previous change
- Tweak background and label colors to match mocks
- Tweak grid spacings to match mocks
Change-Id: Iba5cba6c60e8a750d8e50c1d0c14c916754a95c2
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/AlbumSetPage.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/app/SlideshowPage.java
|
| 220fb8a924a458f15c2223ff10881d5ec31e818e |
27-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Add secure album support for lock screen camera." into gb-ub-photos-arches
|
| ec3c73a3c4b7f7b841f707a1b965222c0e86195e |
22-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Add secure album support for lock screen camera.
Secure album only shows the media items added by
the camera.
bug:5955016
Change-Id: Id26abec4dfcc036cf9de682398fed25eed73d1a5
ndroid/gallery3d/app/AppBridge.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/data/ChangeNotifier.java
ndroid/gallery3d/data/DataManager.java
ndroid/gallery3d/data/LocalAlbumSet.java
ndroid/gallery3d/data/SecureAlbum.java
ndroid/gallery3d/data/SecureSource.java
|
| 8a35777369b212bf0dd087d20574e9894547a048 |
27-Aug-2012 |
Angus Kong <shkong@google.com> |
Merge "Add LightCycle helper class." into gb-ub-photos-arches
|
| 305e6e3d3091cd4a500fdbaabde18e531b8d450a |
26-Aug-2012 |
Angus Kong <shkong@google.com> |
Add LightCycle helper class.
LightCycleHelper also receives event of package changes to get updated.
bug:6912297
Change-Id: Ib822ee778537b64986389bf8eeec36f61c9289f2
ndroid/gallery3d/app/PackagesMonitor.java
|
| da3df03ed46ac5ce19beba0618dfa3932dad05bc |
25-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Reskin: show placeholder color before album label is ready
Bug: 7050303
Change-Id: I679ecf6360f2ae3bfe19fc0677998ac8b1589bcf
ndroid/gallery3d/ui/AlbumSetSlotRenderer.java
|
| 785e19f5dea93fcd78b4ccf4c98f8c16568f8f48 |
25-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Make transition from album page to photo page even smoother
Bug: 6979922
Bug: 7050303
Change-Id: Iaa2582125f0706a34317fa90fea73749cd2cf995
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/ui/PositionController.java
|
| 75da47f8d384e58367c5458c366978918c0b6696 |
23-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Offer to launch camera when Gallery completely empty
Bug: 7009464
Rather than showing a blank screen, alerts the user that
the gallery is empty and offers to launch the camera, if
the device has one.
Change-Id: I0bf71f1cbe7c96a4dc063b5d38b9a282538234c9
ndroid/gallery3d/app/AlbumSetPage.java
|
| fa3e84a0ce70f03b47c94434fdb52780a8b08e62 |
27-Aug-2012 |
Owen Lin <owenlin@google.com> |
Merge "Uses ActionBarSherlock in Gallery" into gb-ub-photos-arches
|
| e681d65a336c9ae79098b8a7e49cfe1e5affb695 |
23-Aug-2012 |
Owen Lin <owenlin@google.com> |
Uses ActionBarSherlock in Gallery
bug: 6927267
Change-Id: I1c22975d1a1f3a36510ad93e6a0cefea110ca38f
ndroid/gallery3d/actionbar/ActionBarInterface.java
ndroid/gallery3d/actionbar/ActionBarUtils.java
ndroid/gallery3d/actionbar/ActionModeInterface.java
ndroid/gallery3d/actionbar/MenuHolder.java
ndroid/gallery3d/actionbar/SimpleActionBar.java
ndroid/gallery3d/actionbar/SimpleActionBarView.java
ndroid/gallery3d/actionbar/SimpleActionMode.java
ndroid/gallery3d/actionbar/SimpleMenu.java
ndroid/gallery3d/actionbar/SimpleMenuInflater.java
ndroid/gallery3d/actionbar/SystemActionBarWrapper.java
ndroid/gallery3d/actionbar/SystemActionModeWrapper.java
ndroid/gallery3d/app/AbstractGalleryActivity.java
ndroid/gallery3d/app/ActivityState.java
ndroid/gallery3d/app/AlbumDataLoader.java
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/AlbumSetDataLoader.java
ndroid/gallery3d/app/AlbumSetPage.java
ndroid/gallery3d/app/CropImage.java
ndroid/gallery3d/app/FilterUtils.java
ndroid/gallery3d/app/GalleryActionBar.java
ndroid/gallery3d/app/GalleryActivity.java
ndroid/gallery3d/app/MovieActivity.java
ndroid/gallery3d/app/PhotoDataAdapter.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/app/PickerActivity.java
ndroid/gallery3d/app/SinglePhotoDataAdapter.java
ndroid/gallery3d/app/StateManager.java
ndroid/gallery3d/ui/ActionModeHandler.java
ndroid/gallery3d/ui/AlbumSetSlidingWindow.java
ndroid/gallery3d/ui/AlbumSetSlotRenderer.java
ndroid/gallery3d/ui/AlbumSlidingWindow.java
ndroid/gallery3d/ui/AlbumSlotRenderer.java
ndroid/gallery3d/ui/CacheStorageUsageInfo.java
ndroid/gallery3d/ui/CropView.java
ndroid/gallery3d/ui/DetailsAddressResolver.java
ndroid/gallery3d/ui/DetailsHelper.java
ndroid/gallery3d/ui/DialogDetailsView.java
ndroid/gallery3d/ui/ImportCompleteListener.java
ndroid/gallery3d/ui/ManageCacheDrawer.java
ndroid/gallery3d/ui/MenuExecutor.java
ndroid/gallery3d/ui/PhotoView.java
ndroid/gallery3d/ui/SelectionManager.java
ndroid/gallery3d/ui/SlotView.java
|
| 3d5c7f5c79492de43dfe58b78bc97cdce1ec8dd7 |
27-Aug-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Read thumbnail into ExifData" into gb-ub-photos-arches
|
| fd745274358be4afdc0876985b108c2a20ef6b06 |
16-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Read thumbnail into ExifData
Change-Id: Iccc0fbbda1734795ff431075bade700ca5076a08
ndroid/gallery3d/exif/ExifData.java
ndroid/gallery3d/exif/ExifReader.java
|
| 93d87ff509cabdad9f02f379df7eba01a44969c7 |
23-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Ongoing reskin of Gallery app
Bug: 7050303
Moved the majority of color settings from hardcoded to
colors.xml in order to allow rapid iteration with UX input.
Started changing some colors and layouts to reflect latest
UX mocks.
Change-Id: I300338e9f75c71f3ed3f36140d16e893387f3184
ndroid/gallery3d/app/ActivityState.java
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/AlbumSetPage.java
ndroid/gallery3d/app/Config.java
ndroid/gallery3d/app/ManageCachePage.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/app/SlideshowPage.java
ndroid/gallery3d/ui/AlbumLabelMaker.java
ndroid/gallery3d/ui/AlbumSetSlotRenderer.java
ndroid/gallery3d/ui/AlbumSlotRenderer.java
ndroid/gallery3d/ui/BitmapScreenNail.java
ndroid/gallery3d/ui/GLCanvas.java
ndroid/gallery3d/ui/GLCanvasImpl.java
ndroid/gallery3d/ui/ManageCacheDrawer.java
ndroid/gallery3d/ui/PhotoView.java
ndroid/gallery3d/ui/SlotView.java
ndroid/gallery3d/util/GalleryUtils.java
|
| 0b6bca8513ae49dacbfdbd9c800ba9f542b6b68b |
24-Aug-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Rename TiffInputStream to CountedDataInputStream" into gb-ub-photos-arches
|
| 3258a8a39632c39ea68204845bd83a179ef9030d |
24-Aug-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Re-design ExifParser for some strange Exif header" into gb-ub-photos-arches
|
| f073abfda875213723f6323a79756609ca60675d |
15-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Rename TiffInputStream to CountedDataInputStream
Change-Id: Ie52ab9a58ae47f5a0b9113c6006844b73567d864
ndroid/gallery3d/exif/CountedDataInputStream.java
ndroid/gallery3d/exif/ExifParser.java
ndroid/gallery3d/exif/TiffInputStream.java
|
| ccd9f271fa2bfa56196aef78d0a87d3b00be2015 |
14-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Re-design ExifParser for some strange Exif header
The previous design failed to parser file with strange IFD position.
Therefore we need a new design.
Change-Id: I9f008a9259df6ef7d9a5022e126d6f25069e3d00
ndroid/gallery3d/exif/ExifData.java
ndroid/gallery3d/exif/ExifParser.java
ndroid/gallery3d/exif/ExifReader.java
ndroid/gallery3d/exif/ExifTag.java
ndroid/gallery3d/exif/IfdData.java
ndroid/gallery3d/exif/IfdId.java
ndroid/gallery3d/exif/IfdParser.java
ndroid/gallery3d/exif/Rational.java
|
| 54b8926da0bdc30577641af1f2fc7b151ea6f3e5 |
24-Aug-2012 |
Owen Lin <owenlin@android.com> |
Merge "Use GalleryUtils.getSelectionModePrompt instead of duplicated code." into gb-ub-photos-arches
|
| ac46c7f5749141dfa91f7a1d8f923ef3bb7fd600 |
24-Aug-2012 |
Owen Lin <owenlin@google.com> |
Revert "Revert "Uses ActionBarSherlock library in MovieActivity.""
This reverts commit 13da281769d4558c42d86a54536ff6da6826b0ac.
ndroid/gallery3d/app/MovieActivity.java
|
| 139babe614d1f17730665c764bc9e5ed79f1c1ea |
24-Aug-2012 |
Owen Lin <owenlin@google.com> |
Revert "Uses ActionBarSherlock library in MovieActivity."
This reverts commit 89b437722a24d0c7d6e2acffc30c215f22814234.
ndroid/gallery3d/app/MovieActivity.java
|
| cf48d24782e1d44d2126167b5a0db7cb2906b78f |
22-Aug-2012 |
Owen Lin <owenlin@google.com> |
Uses ActionBarSherlock library in MovieActivity.
bug: 6927267
Change-Id: I4b63e41be5cff22af0f7d830739c719e91cd6fff
ndroid/gallery3d/app/MovieActivity.java
|
| cd05ff0772df2c87b29180f0f8a90842c6ac8e52 |
23-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix NPE, ANRs in Gallery
Bug: 7041482
Bug: 7041769
Change-Id: I06596bd9a058a8fe51c19108a0891c458950f22b
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/ui/PreparePageFadeoutTexture.java
|
| b0b56b7d5e2d707c8094b23b058da3cfd1446d3c |
23-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix ANRs in Gallery
Bug: 7041769
Change-Id: Idc2a266bffd0d2c641fba69cfede13e1e83f276b
ndroid/gallery3d/ui/PreparePageFadeoutTexture.java
|
| fe5f61fe12c8537caa4b82f316b99672d7737bd6 |
22-Aug-2012 |
Ahbong Chang <cwahbong@google.com> |
Use GalleryUtils.getSelectionModePrompt instead of duplicated code.
Change-Id: I1cdffb8b8d87f25f91382c3602f12c327ec11849
ndroid/gallery3d/app/AlbumSetPage.java
|
| 455088b7721487df60bd9362d83f8d8e8c5eb686 |
22-Aug-2012 |
Yuli Huang <yuli@google.com> |
Merge "Dismiss dialog in onPause() where we still have the window." into gb-ub-photos-arches
|
| 73270c1a66972666f6f7f5d1d1756780c97366f0 |
21-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Improvements in animation from album page to photo page" into gb-ub-photos-arches
|
| 98fd8558d88db439e21fa126463ea33d2c75ccd3 |
21-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Improvements in animation from album page to photo page
Bug: 6631829
Bug: 6979922
Change-Id: I99fd330f3ec8bf363f8602a2f893167ca2a9c71b
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/ui/BitmapScreenNail.java
ndroid/gallery3d/ui/PositionController.java
ndroid/gallery3d/ui/PreparePageFadeoutTexture.java
|
| 7d912500bbe28aea0295fe05e69bf9c079a22d5a |
21-Aug-2012 |
Yuli Huang <yuli@google.com> |
Dismiss dialog in onPause() where we still have the window.
bug:6561957
Change-Id: I652c4ec1dd64c650c29f3e4e36ae1200da691694
ndroid/gallery3d/app/CropImage.java
|
| a84ecfd1f81f7b2989852631d182d6898a2af32d |
21-Aug-2012 |
Hung-ying Tyan <tyanh@google.com> |
Move ThreadPool to gallerycommon for picasasync and picasastore.
Bug: 7005321
Change-Id: I7ae4bafed141be03bca74772a261c7c2fb3036c4
ndroid/gallery3d/util/Future.java
ndroid/gallery3d/util/FutureListener.java
ndroid/gallery3d/util/PriorityThreadFactory.java
ndroid/gallery3d/util/ThreadPool.java
|
| 183c6c994311fe4aa75dad1e42b69d83981ceeca |
19-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Rotate the camera screen nail correctly in gingerbread.
In gingerbread, camera screen nail is a static image.
Handle its rotation like a bitmap screen nail.
bug:6927809
Change-Id: I554483e58fc9e32399acb20f426d7ec35631b7ac
ndroid/gallery3d/app/AppBridge.java
ndroid/gallery3d/app/PhotoDataAdapter.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/app/SinglePhotoDataAdapter.java
ndroid/gallery3d/ui/PhotoView.java
|
| d4798893a31705ade83c87c8915ea58f905018a0 |
16-Aug-2012 |
George Mount <mount@google.com> |
Clear activity result when launching from lock screen.
Bug 6710029
When the screen is locked during video play, the activity result
from that play will be triggered immediately when unlocking to
camera. The result must be destroyed on unlock so that the resume
goes to the camera rather than to the video display.
Change-Id: Ifa6f00fa1cba119d5fc6e762d1757bd6aac576f4
ndroid/gallery3d/app/ActivityState.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/app/StateManager.java
|
| 82cdb7bf23b0a9f2f26acd141dce7012bd8c70d5 |
17-Aug-2012 |
Owen Lin <owenlin@google.com> |
Fix NPE when view a single photo.
bug: 6995776
Change-Id: Iba213dfefcab04f2c856f55dc3446e3314f30a6f
ndroid/gallery3d/actionbar/SystemActionBarWrapper.java
|
| b195696d6d721084128784c630a410256bfd3a42 |
16-Aug-2012 |
Owen Lin <owenlin@google.com> |
Load AsyncTask class in UI thread.
bug: 7005321
Change-Id: I4f8806553aee34fb2ebeaef010c14c88679a7f72
ndroid/gallery3d/app/GalleryAppImpl.java
|
| ea8c8f1126c75e2284d9eb8be20fc423366871a5 |
16-Aug-2012 |
Owen Lin <owenlin@google.com> |
Merge "Fix some bugs introduced by the ActionBarWrapper." into gb-ub-photos-arches
|
| b2927a6811d4b1c46570d6642f9c872320ac7b5b |
16-Aug-2012 |
Owen Lin <owenlin@google.com> |
Fix some bugs introduced by the ActionBarWrapper.
bug: 6927267
Change-Id: If05082a4fec25f93d38c6096ebacc5a82e7e7c2e
ndroid/gallery3d/actionbar/SystemActionBarWrapper.java
ndroid/gallery3d/actionbar/SystemActionModeWrapper.java
ndroid/gallery3d/ui/ActionModeHandler.java
ndroid/gallery3d/util/Holder.java
|
| ad2d3108ead2b057fb7ece3984bc7252268afabf |
16-Aug-2012 |
Ahbong Chang <cwahbong@google.com> |
Check if actionbar exists at ActionBarUtils.getActionBar().
Bug: 6927267
Change-Id: I85645f25879ced48a85a2bef4f55f1c34b8806ec
ndroid/gallery3d/actionbar/ActionBarUtils.java
|
| a987b12c396ef9b0482c4ca827131db125bf8ef8 |
15-Aug-2012 |
Owen Lin <owenlin@google.com> |
Merge "Add SimpleMenuXXX implementation for the Gingerbread platform." into gb-ub-photos-arches
|
| 2ca946798edb9921847ff411f3c747e441d79824 |
15-Aug-2012 |
Owen Lin <owenlin@google.com> |
Merge "Extract the action bar interface." into gb-ub-photos-arches
|
| 92f8a567fb47496df3a6b3f4a68b5359b0371fd2 |
17-Jul-2012 |
Owen Lin <owenlin@google.com> |
Add SimpleMenuXXX implementation for the Gingerbread platform.
1. Add a SimpleMenuInflator to parse the res/menu/xxx.xml files.
2. Add minimal code to show the menu.
**NOTE**
This change is going to be replaced by the ActionBar compat library
when it gets ready and integrated. The purpose of this change is making
Gallery/Camera run on GB.
Change-Id: Ia7d402c82a6da1b9558ebbd103e161d2471b34dd
ndroid/gallery3d/actionbar/ActionBarUtils.java
ndroid/gallery3d/actionbar/SimpleActionBar.java
ndroid/gallery3d/actionbar/SimpleActionBarView.java
ndroid/gallery3d/actionbar/SimpleActionMode.java
ndroid/gallery3d/actionbar/SimpleMenu.java
ndroid/gallery3d/actionbar/SimpleMenuInflater.java
ndroid/gallery3d/actionbar/SystemActionModeWrapper.java
ndroid/gallery3d/app/ActivityState.java
ndroid/gallery3d/ui/PopupList.java
|
| 7c1e03a70f54fb735e6ef59733a02131579ae1f8 |
13-Jul-2012 |
Owen Lin <owenlin@google.com> |
Extract the action bar interface.
So that we can use different implementation for different API levels.
**NOTE**
This change is going to be replaced by the ActionBar compat library
when it gets ready. The purpose of this change is making Gallery/Camera
run on GB.
bug: 6927267
Change-Id: Ic8bb2518918168ea889db6452d6760de390d96b2
ndroid/gallery3d/actionbar/ActionBarInterface.java
ndroid/gallery3d/actionbar/ActionBarUtils.java
ndroid/gallery3d/actionbar/ActionModeInterface.java
ndroid/gallery3d/actionbar/MenuHolder.java
ndroid/gallery3d/actionbar/SystemActionBarWrapper.java
ndroid/gallery3d/actionbar/SystemActionModeWrapper.java
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/AlbumSetPage.java
ndroid/gallery3d/app/CropImage.java
ndroid/gallery3d/app/GalleryActionBar.java
ndroid/gallery3d/app/MovieActivity.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/ui/ActionModeHandler.java
ndroid/gallery3d/ui/MenuExecutor.java
ndroid/gallery3d/util/HelpUtils.java
|
| 64223e1a46eafaee0502c94dbac5637aeba9414e |
15-Aug-2012 |
Owen Lin <owenlin@android.com> |
Merge "A simple ExifReader and its test" into gb-ub-photos-arches
|
| e81de49429e1c29385baffc7ce17b7188badc49a |
09-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
A simple ExifReader and its test
Change-Id: I1a30d24591bbdab288e04e3705ece388b533f247
ndroid/gallery3d/exif/ExifData.java
ndroid/gallery3d/exif/ExifReader.java
ndroid/gallery3d/exif/IfdData.java
|
| 9ef602b77ad0cc7aca49a05f39f193277e0e8ae7 |
14-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Gallery reskin: album list spacing, action bar theme" into gb-ub-photos-arches
|
| f17dbdf94fb5534266336f99bdd8014ace672ea7 |
13-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Gallery reskin: album list spacing, action bar theme
Change-Id: Ic556f22bd25c57ddd0b659a7f43a7a1afbdcb8df
ndroid/gallery3d/app/AlbumSetPage.java
ndroid/gallery3d/app/Config.java
|
| a7c64453563b15d19b083ba546dce9f4aae42406 |
14-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Make a copy of MotionEvent in MotionEventHelper.transform." into gb-ub-photos-arches
|
| 861fcb65a1f37d9d327585d6e1a5a0e395b60217 |
14-Aug-2012 |
Owen Lin <owenlin@google.com> |
Merge "Extract EXIF info only for JPEG files" into gb-ub-photos-arches
|
| bb99150a872a7265e44ae5bd9eb3ce3534ac12b3 |
13-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Show album counts in Gallery & other small reskin fixes
Bug: 6975144
Change-Id: I2f12c6482cc009aecbca3e26482ebd8944f01bb8
ndroid/gallery3d/app/Config.java
ndroid/gallery3d/ui/AlbumLabelMaker.java
ndroid/gallery3d/ui/AlbumSetSlotRenderer.java
|
| e89a4e7d2808b44b2da6827d13d6da6ce0998896 |
13-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Make a copy of MotionEvent in MotionEventHelper.transform.
RotateLayout transforms the event in dispatchTouchEvent.
If the event is not handled, the parent of RotateLayout
may send the transformed event to other views and the
coordinates will be wrong. Make a copy of MotionEvent in
transform. This also makes the behavior consistent in
different API levels.
bug:6974916
Change-Id: Id835767cc9be3f244e5abe2b855e5188045adedc
ndroid/gallery3d/util/MotionEventHelper.java
|
| 1a6969b26ce90b6acfb4af8aba2f4f8f208e2e57 |
09-Aug-2012 |
Owen Lin <owenlin@google.com> |
Extract EXIF info only for JPEG files
bug: 6489840
Change-Id: I0ad682bffa5374d0d61ebaa502cc8b90e469b4c8
ndroid/gallery3d/data/LocalImage.java
ndroid/gallery3d/data/LocalMediaItem.java
ndroid/gallery3d/ui/PopupList.java
|
| de8079dab0123ea087c3c9adbcf1c476bcf79a42 |
10-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "First gallery reskin iteration." into gb-ub-photos-arches
|
| 58cdc3fb0b7035f74db46f516115ded26f63c454 |
10-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Guard android.media.effect.Effect with TargetApi." into gb-ub-photos-arches
|
| de244e303e70aa0443e78d3923a9966b27d91562 |
10-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Guard SurfaceTextureScreenNail with TargetApi." into gb-ub-photos-arches
|
| b6f5404c42bdba2a7e9c695362e2e623fb2eff46 |
10-Aug-2012 |
Owen Lin <owenlin@android.com> |
Merge "Fix ExifParser bug when APP0 exists in Jpeg file" into gb-ub-photos-arches
|
| 52363de6ad9d4a06fd141c1af2707d979de4ad3a |
10-Aug-2012 |
Owen Lin <owenlin@android.com> |
Merge "Handle error when string length=0 in IfdParser" into gb-ub-photos-arches
|
| 350fff29e3d2b48613c7e78cc1453e4ebd4ce281 |
10-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Guard SurfaceTextureScreenNail with TargetApi.
bug:6927809
Change-Id: If03ffbcbf908a960f00bba97be0cdbf317ecabe8
ndroid/gallery3d/ui/SurfaceTextureScreenNail.java
|
| e4dd6fed7021d181f5b6be50b3e9663b65c125c4 |
10-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Guard android.media.effect.Effect with TargetApi.
bug:6927717
Change-Id: I25f881ab449ea4cb26a41c5219884d93725a1693
ndroid/gallery3d/photoeditor/filters/AutoFixFilter.java
ndroid/gallery3d/photoeditor/filters/ColorTemperatureFilter.java
ndroid/gallery3d/photoeditor/filters/CropFilter.java
ndroid/gallery3d/photoeditor/filters/CrossProcessFilter.java
ndroid/gallery3d/photoeditor/filters/DocumentaryFilter.java
ndroid/gallery3d/photoeditor/filters/DoodleFilter.java
ndroid/gallery3d/photoeditor/filters/DuotoneFilter.java
ndroid/gallery3d/photoeditor/filters/FaceTanFilter.java
ndroid/gallery3d/photoeditor/filters/FaceliftFilter.java
ndroid/gallery3d/photoeditor/filters/FillLightFilter.java
ndroid/gallery3d/photoeditor/filters/Filter.java
ndroid/gallery3d/photoeditor/filters/FisheyeFilter.java
ndroid/gallery3d/photoeditor/filters/FlipFilter.java
ndroid/gallery3d/photoeditor/filters/GrainFilter.java
ndroid/gallery3d/photoeditor/filters/GrayscaleFilter.java
ndroid/gallery3d/photoeditor/filters/HighlightFilter.java
ndroid/gallery3d/photoeditor/filters/LomoishFilter.java
ndroid/gallery3d/photoeditor/filters/NegativeFilter.java
ndroid/gallery3d/photoeditor/filters/PosterizeFilter.java
ndroid/gallery3d/photoeditor/filters/RedEyeFilter.java
ndroid/gallery3d/photoeditor/filters/RotateFilter.java
ndroid/gallery3d/photoeditor/filters/SaturationFilter.java
ndroid/gallery3d/photoeditor/filters/SepiaFilter.java
ndroid/gallery3d/photoeditor/filters/ShadowFilter.java
ndroid/gallery3d/photoeditor/filters/SharpenFilter.java
ndroid/gallery3d/photoeditor/filters/StraightenFilter.java
ndroid/gallery3d/photoeditor/filters/TintFilter.java
ndroid/gallery3d/photoeditor/filters/VignetteFilter.java
|
| 15f32af5378a7afde1996c8dd5ccbd591fe2b9ad |
09-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
First gallery reskin iteration.
Change-Id: I2b79ca9f40346a777141562c9a4762d7a8b460f6
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/app/SlideshowPage.java
ndroid/gallery3d/ui/AlbumLabelMaker.java
ndroid/gallery3d/ui/AlbumSetSlotRenderer.java
ndroid/gallery3d/ui/AlbumSlotRenderer.java
ndroid/gallery3d/ui/GLCanvas.java
ndroid/gallery3d/ui/GLCanvasImpl.java
|
| 103509d112e24814df5064522b8d7856fb969d09 |
09-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Hold WakeLock during MTP import" into gb-ub-photos-arches
|
| 380414670b541d41216fde770b60a442bc72f642 |
08-Aug-2012 |
Owen Lin <owenlin@google.com> |
Rotate the texture in building PhotoFallbackEffect
bug: 6525127
Change-Id: Iba348450b62190a1a2149cf0d7f20f19625cb6cf
ndroid/gallery3d/ui/PhotoView.java
|
| 441606c1291d4042c298862683d268521bb881d6 |
07-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Fix ExifParser bug when APP0 exists in Jpeg file
Change-Id: If5843757e00bc12bc50003eef3d78b9c3cedf69e
ndroid/gallery3d/exif/ExifParser.java
|
| 0d64f476c62215c7738655f62b89f93ac60c7fe2 |
08-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Handle error when string length=0 in IfdParser
Change-Id: I3a51e85060f3acd5026555e5f8d21f8cb2e0641e
ndroid/gallery3d/exif/IfdParser.java
|
| a4b25ba430727beb07b6f75bb5edd8d57b8676e4 |
08-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Hold WakeLock during MTP import
Bug: 6680729
Bug: 6827858
Change-Id: Ida82db3288a429dacc5830b82ec6bbd954f75cf1
ndroid/gallery3d/app/ManageCachePage.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/ui/ImportCompleteListener.java
ndroid/gallery3d/ui/MenuExecutor.java
|
| 4bbfbebdfb584a0c3e348f60f7a95476c43b67f6 |
07-Aug-2012 |
Owen Lin <owenlin@google.com> |
Guard the usage of MenuItem.setShowAsAction in MenuHelper.
bug: 6927642
Change-Id: I3907ac2f86d38c15b681185abee5906ce243339a
ndroid/gallery3d/util/HelpUtils.java
|
| f16413f210f355229aa1271d21a70013da98362d |
07-Aug-2012 |
Wu-Cheng Li <wuchengli@google.com> |
Merge "Move motion event related methods to class MotionEventHelper." into gb-ub-photos-arches
|
| d1975270b68e8b2513bdcf78b4451ddcbd3964fd |
07-Aug-2012 |
Ahbong Chang <cwahbong@google.com> |
Move motion event related methods to class MotionEventHelper.
Bug: 6943189
Change-Id: I9084cc8ebb501a5b772ed4e00bd64a3b2e8bafb3
ndroid/gallery3d/ui/GLRootView.java
ndroid/gallery3d/util/MotionEventHelper.java
|
| 5926da91e2cf4005cc2c7e89fe297d05a4b630c3 |
06-Aug-2012 |
Yuli Huang <yuli@google.com> |
Do not show photo editor before api level 14.
bug:6927717
Change-Id: Iab0fddaa169e03b65dd0a987ee8b5c892f971000
ndroid/gallery3d/app/GalleryAppImpl.java
|
| f64370b97c30338f8231aadf8386b4669d1dffbf |
06-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Add all ExifTag constant
Change-Id: I8a5309cdb1d216c80df9b88973a3b72a5cf9a80f
ndroid/gallery3d/exif/ExifTag.java
|
| b69961bc531bbd402c32f55ab9de881131839813 |
07-Aug-2012 |
Owen Lin <owenlin@android.com> |
Merge "Remove TYPE_SUB_IFD for next() in IfdParser" into gb-ub-photos-arches
|
| eb311f5725171f97868acad2f3567b1fe7481e67 |
07-Aug-2012 |
Owen Lin <owenlin@android.com> |
Merge "fix next ifd bug in ExifParser" into gb-ub-photos-arches
|
| 351f3467bd976465727a3a867e8adccd9aadb0ad |
07-Aug-2012 |
Owen Lin <owenlin@android.com> |
Merge "Fix bug when call next() after nextidf in exif parser" into gb-ub-photos-arches
|
| bdcdb15ad345633bbab6505207008f018059f107 |
03-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Remove TYPE_SUB_IFD for next() in IfdParser
We should not read the offset because there are
too many exception. Users should check the id of the tag
and decide how to read the block by themselves.
Change-Id: Ie3f162c5c6dc25f15107e193adc080c7b51112b5
ndroid/gallery3d/exif/ExifTag.java
ndroid/gallery3d/exif/IfdParser.java
|
| 3da2799ea9bc7b711b164167d09bdda0bd8fee6f |
02-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
fix next ifd bug in ExifParser
Originally if we don't read value of tag we won't get 'NEXT_IFD'
Change-Id: I235977b3b482fbc4736c244d280c384c26df6483
ndroid/gallery3d/exif/IfdParser.java
|
| 52f093f1b7b99622c35931f0af47349d32a67e19 |
01-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Fix bug when call next() after nextidf in exif parser
Change-Id: Ibb0204627418f8fa650ce32e798a768da7762d59
ndroid/gallery3d/exif/IfdParser.java
|
| dabfa4c76ea265d3e5a50711612ec55230a93b98 |
03-Aug-2012 |
Doris Liu <tianliu@google.com> |
Merge "Add logging for monkey" into gb-ub-photos-arches
|
| a10412773da774666363aa9b3cd811d78d7f16a7 |
03-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
TargetApi of ShareActionProvider should be ICS.
bug:6706723
Change-Id: I8d82662c4bdd44f970cb93b9986208e5f4db3c31
ndroid/gallery3d/app/MovieActivity.java
|
| e4554024a216d853f81301e4747c260cd64ee271 |
03-Aug-2012 |
Doris Liu <tianliu@google.com> |
Add logging for monkey
Bug: 6495745
Change-Id: Ib24ba3dd6a887259c5e6083ca5eb270a0bd4e801
ndroid/gallery3d/data/MediaObject.java
|
| fe8367e6f1c5e28a8e01f1c4c3e3e07884a3d762 |
28-Jul-2012 |
Mangesh Ghiware <mghiware@google.com> |
Show the correct image on a ACTION_VIEW
Bug: 6819100
Change-Id: I7c381c506fa627c3f285fb6857b77cdb770addb7
ndroid/gallery3d/app/PhotoDataAdapter.java
|
| 0b144ee37ec84b53e2ac97ead8c0e70b527cadd3 |
01-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Fix typo of datetaken field.
Change-Id: I3d53388696101178598910d0b73444988408cbc3
ndroid/gallery3d/data/BucketHelper.java
|
| c29549176f059e5955627c4349c73ab94ecbd32a |
01-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Merge "Add some constants for exif tag" into gb-ub-photos-arches
|
| 7fbdc58ae8938ea77655e97fdc2235a097d61c7f |
01-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Merge "Fix a bug in IfdParser" into gb-ub-photos-arches
|
| 29446731c8cfa6e0456fe8b39fc3ce21c69207a6 |
31-Jul-2012 |
Owen Lin <owenlin@google.com> |
Don't use Files.getContentUri in previous API levels.
Change-Id: I4d096734d22c93b83b2bf8082450ad0d73ade837
ndroid/gallery3d/data/BucketHelper.java
ndroid/gallery3d/data/LocalAlbum.java
ndroid/gallery3d/data/LocalAlbumSet.java
ndroid/gallery3d/data/LocalMergeAlbum.java
|
| e7e234f2d41dbf2d3a3d1bd7669d848f2c8ac66d |
01-Aug-2012 |
Owen Lin <owenlin@google.com> |
Merge "Remove /mtp from TOP_SET_PATH before HC." into gb-ub-photos-arches
|
| 421069e798b7bca6fe4868c528edcf530abf3929 |
01-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Add some constants for exif tag
Change-Id: I236f8187668bb144f47214b7241a873223111f9e
ndroid/gallery3d/exif/ExifTag.java
|
| d7a9a6cffb4663c4ed28c4205367cf3c41191e36 |
01-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Fix a bug in IfdParser
Originally if we call next after the last tag without read the value,
we will receive a wrong tag.
Change-Id: Ib154d112a568c593270ee6676d4954a7c26567f2
ndroid/gallery3d/exif/IfdParser.java
|
| 876e2d37e7f4e69b5779683b68bf412df5a957d5 |
01-Aug-2012 |
Owen Lin <owenlin@google.com> |
Remove /mtp from TOP_SET_PATH before HC.
bug: 6913061
Change-Id: Iecdb6452035b83070502977265a3e0d526ea784c
ndroid/gallery3d/data/DataManager.java
|
| 3f11bbe72c1245d981c3304b2b6a1a93de76edcf |
01-Aug-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Handle null item in findIndexOfPathInCache." into gb-ub-photos-arches
|
| bfc04b862a7b0c8d8ebca377eac6cb2a73fd64c2 |
01-Aug-2012 |
Chih-Chung Chang <chihchung@google.com> |
Handle null item in findIndexOfPathInCache.
Bug: 6708911
Change-Id: Ifd1e8342906a3c61d30448ea6b0085c37ccdeb03
ndroid/gallery3d/app/PhotoDataAdapter.java
|
| 48ab020fa10500cb89d67782abd824d26339acfa |
19-Jul-2012 |
Wu-cheng Li <wuchengli@google.com> |
Do not use ShareActionProvider before API 14.
Use simple share intent before API 14.
bug:6706723
Change-Id: I47930f0b81c7c8c1943054964a093967a7704bf1
ndroid/gallery3d/app/GalleryActionBar.java
ndroid/gallery3d/app/MovieActivity.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/ui/ActionModeHandler.java
ndroid/gallery3d/ui/MenuExecutor.java
|
| eea522754d385c30d1918ab27c52e09d631ac7be |
31-Jul-2012 |
Chih-Chung Chang <chihchung@google.com> |
Manually transform the event coordinates on older platforms.
Change-Id: I070b27112ea028f2a1596dcdfa480537765174b9
ndroid/gallery3d/ui/GLRootView.java
|
| 12087cb18047940abd3fbad2c8b20d5017e9225b |
31-Jul-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Fix bugs 6882711 and 6836814" into gb-ub-photos-arches
|
| 636b8a77e6002c9827ab9886c1460c22cd18b217 |
31-Jul-2012 |
Ahbong Chang <cwahbong@google.com> |
Merge "Check api level before invoking setHomeButtonEnabled()." into gb-ub-photos-arches
|
| 30d70764999fa00b335502d269e5a170a0f2843e |
31-Jul-2012 |
Owen Lin <owenlin@google.com> |
Merge "Fix some lint warnings in Gallery." into gb-ub-photos-arches
|
| 329a202d49247dd4f496e493d9b0892185dbf3a5 |
31-Jul-2012 |
Ahbong Chang <cwahbong@google.com> |
Check api level before invoking setHomeButtonEnabled().
Bug: 6706785
Change-Id: I2ad4d4961705c38a4d1047732f45dc9c69580782
ndroid/gallery3d/app/GalleryActionBar.java
|
| 830b3c77904916f2a09f8445743db44885226066 |
30-Jul-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix bugs 6882711 and 6836814
Bug: 6882711
Bug: 6836814
A number of issues surrounding the behavior after deleting
the last photo from the camera roll within the Camera app,
including occasional black screen & incorrectly persistent
action bar.
Change-Id: Ib5f41a78c613da90bb844aab2d40f45e314d3ee3
ndroid/gallery3d/app/PhotoDataAdapter.java
|
| 3ff33ee566475998767adff1f32e5aa42d27ea3c |
27-Jul-2012 |
Owen Lin <owenlin@google.com> |
Don't call Action.setLogo and Action.setHomeButtonEnabled in old API levels.
bug: 6706724
bug: 6706785
Change-Id: I09e48b8a042c5ce84442dddaf4e4bdfd1960ec4f
ndroid/gallery3d/app/GalleryActionBar.java
ndroid/gallery3d/app/MovieActivity.java
|
| a51e351e6972845ce37eff2b90571cd9ce73ac62 |
26-Jul-2012 |
Owen Lin <owenlin@google.com> |
Fix some lint warnings in Gallery.
1. Implement our own openPipeHelper
2. Add @TargetApi to TileImageViewAdapter
Change-Id: I74dca78c4c4f18e0f782afad02d5ba9b410a503e
ndroid/gallery3d/provider/GalleryProvider.java
ndroid/gallery3d/ui/TileImageViewAdapter.java
|
| f51196e8b35f6c7ff81fce6a2fb837f1d4f76c40 |
30-Jul-2012 |
Ahbong Chang <cwahbong@google.com> |
Merge "Code clean up." into gb-ub-photos-arches
|
| 9636c66cb89e7243de92eb46ae90d6223b3d79f5 |
30-Jul-2012 |
Earl Ou <shunhsingou@google.com> |
Merge "Low-level exif parser" into gb-ub-photos-arches
|
| 813ac7496e93faa2cf0f2763df421a146d38fc11 |
30-Jul-2012 |
Ahbong Chang <cwahbong@google.com> |
Code clean up.
Remove unused imports.
Remove unused fields.
Remove unnecessary cast.
Add missing override annotations.
Change-Id: Idad2e587697a5015eb5363d7b71fab9de9cc8ffb
ndroid/gallery3d/app/AlbumDataLoader.java
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/AlbumPicker.java
ndroid/gallery3d/app/AlbumSetDataLoader.java
ndroid/gallery3d/app/AppBridge.java
ndroid/gallery3d/app/CropImage.java
ndroid/gallery3d/app/EyePosition.java
ndroid/gallery3d/app/FilterUtils.java
ndroid/gallery3d/app/GalleryActionBar.java
ndroid/gallery3d/app/GalleryAppImpl.java
ndroid/gallery3d/app/ManageCachePage.java
ndroid/gallery3d/app/MovieControllerOverlay.java
ndroid/gallery3d/app/OrientationManager.java
ndroid/gallery3d/app/PhotoDataAdapter.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/app/PickerActivity.java
ndroid/gallery3d/app/SinglePhotoDataAdapter.java
ndroid/gallery3d/app/SlideshowDataAdapter.java
ndroid/gallery3d/app/SlideshowPage.java
ndroid/gallery3d/data/BitmapPool.java
ndroid/gallery3d/data/ClusterAlbum.java
ndroid/gallery3d/data/ClusterAlbumSet.java
ndroid/gallery3d/data/ComboAlbum.java
ndroid/gallery3d/data/ComboAlbumSet.java
ndroid/gallery3d/data/DataManager.java
ndroid/gallery3d/data/DownloadCache.java
ndroid/gallery3d/data/DownloadUtils.java
ndroid/gallery3d/data/Face.java
ndroid/gallery3d/data/FaceClustering.java
ndroid/gallery3d/data/FilterDeleteSet.java
ndroid/gallery3d/data/FilterSource.java
ndroid/gallery3d/data/FilterTypeSet.java
ndroid/gallery3d/data/LocalImage.java
ndroid/gallery3d/data/LocalMediaItem.java
ndroid/gallery3d/data/LocalSource.java
ndroid/gallery3d/data/LocationClustering.java
ndroid/gallery3d/data/MediaDetails.java
ndroid/gallery3d/data/MediaSet.java
ndroid/gallery3d/data/MtpClient.java
ndroid/gallery3d/data/MtpContext.java
ndroid/gallery3d/data/MtpImage.java
ndroid/gallery3d/data/MtpSource.java
ndroid/gallery3d/data/SizeClustering.java
ndroid/gallery3d/data/SnailAlbum.java
ndroid/gallery3d/data/SnailItem.java
ndroid/gallery3d/data/SnailSource.java
ndroid/gallery3d/data/TagClustering.java
ndroid/gallery3d/data/TimeClustering.java
ndroid/gallery3d/data/UriImage.java
ndroid/gallery3d/gadget/LocalPhotoSource.java
ndroid/gallery3d/gadget/MediaSetSource.java
ndroid/gallery3d/gadget/WidgetService.java
ndroid/gallery3d/onetimeinitializer/GalleryWidgetMigrator.java
ndroid/gallery3d/ui/ActionModeHandler.java
ndroid/gallery3d/ui/BasicTexture.java
ndroid/gallery3d/ui/BitmapScreenNail.java
ndroid/gallery3d/ui/CacheStorageUsageInfo.java
ndroid/gallery3d/ui/ColorTexture.java
ndroid/gallery3d/ui/CropView.java
ndroid/gallery3d/ui/DetailsAddressResolver.java
ndroid/gallery3d/ui/DialogDetailsView.java
ndroid/gallery3d/ui/EdgeEffect.java
ndroid/gallery3d/ui/EdgeView.java
ndroid/gallery3d/ui/ExtTexture.java
ndroid/gallery3d/ui/FlingScroller.java
ndroid/gallery3d/ui/GLCanvasImpl.java
ndroid/gallery3d/ui/GalleryEGLConfigChooser.java
ndroid/gallery3d/ui/GestureRecognizer.java
ndroid/gallery3d/ui/MenuExecutor.java
ndroid/gallery3d/ui/Paper.java
ndroid/gallery3d/ui/PhotoView.java
ndroid/gallery3d/ui/SurfaceTextureScreenNail.java
ndroid/gallery3d/ui/UndoBarView.java
ndroid/gallery3d/ui/UploadedTexture.java
ndroid/gallery3d/util/GalleryUtils.java
ndroid/gallery3d/util/MediaSetUtils.java
ndroid/gallery3d/util/PriorityThreadFactory.java
ndroid/gallery3d/util/Profile.java
ndroid/gallery3d/util/ProfileData.java
ndroid/gallery3d/util/ReverseGeocoder.java
ndroid/gallery3d/util/ThreadPool.java
|
| ea8759d2cf72a292a97264955bc895984d1ec257 |
24-Jul-2012 |
Earl Ou <shunhsingou@google.com> |
Low-level exif parser
Change-Id: I592184c79320d08a3cb871a63ea33742071876e3
ndroid/gallery3d/exif/ExifInvalidFormatException.java
ndroid/gallery3d/exif/ExifParser.java
ndroid/gallery3d/exif/ExifTag.java
ndroid/gallery3d/exif/IfdParser.java
ndroid/gallery3d/exif/Rational.java
ndroid/gallery3d/exif/TiffInputStream.java
|
| dbc472eb08c19e78811823f8b83e59c3aeacc6d0 |
20-Jul-2012 |
Michael Kolb <kolby@google.com> |
Use actual selection for album/photo details
Bug: 6533154
Change-Id: I21ce95d79567396840f08095b986ecc54263a295
ndroid/gallery3d/app/AlbumDataLoader.java
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/AlbumSetDataLoader.java
ndroid/gallery3d/app/AlbumSetPage.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/ui/DetailsHelper.java
ndroid/gallery3d/ui/DialogDetailsView.java
|
| 068379c2d04142c6992dcd7a8835a1d5404b47b7 |
26-Jul-2012 |
Owen Lin <owenlin@google.com> |
Merge "Add @TargetApi for all Mtp related code." into gb-ub-photos-arches
|
| 57a755ef3d2c1a529912d8f34f4290a4767d5479 |
26-Jul-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Only give haptic feedback when enabled in system settings" into gb-ub-photos-arches
|
| d840343eb85f99131b61b5dc59cf6cb939cf8d95 |
25-Jul-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix for monkey-generated NPE in PhotoView from bug 6848371
In other parts of the code, there are checks for getGLRoot
returning null, and one was missing here.
Bug: 6848371
Change-Id: I3a7a1e1ea9847a43f4791de84f5f70cc27d53a1a
ndroid/gallery3d/ui/PhotoView.java
|
| 03cb9d26e23a97c44bb4464f0a633a56d4391a98 |
24-Jul-2012 |
Bobby Georgescu <georgescu@google.com> |
Only give haptic feedback when enabled in system settings
Bug: 6866688
Change-Id: I4e349fe666244ef5459dd591c8141768b24c910a
ndroid/gallery3d/app/ActivityState.java
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/AlbumSetPage.java
|
| 394c37fe04d715b09f157c6789b10fc8e563592e |
24-Jul-2012 |
Owen Lin <owenlin@google.com> |
Add @TargetApi for all Mtp related code.
These classes should not be called since the MtpSource won't be
registered to DataManager.
Change-Id: I3f88dc24f295af3d9e18218f56e6c30731c1e328
ndroid/gallery3d/data/MtpClient.java
ndroid/gallery3d/data/MtpContext.java
ndroid/gallery3d/data/MtpDevice.java
ndroid/gallery3d/data/MtpDeviceSet.java
ndroid/gallery3d/data/MtpImage.java
|
| b133af5904c7f0ad5686d78f2c2b464454e3876c |
24-Jul-2012 |
Owen Lin <owenlin@google.com> |
Use our own OverScroller for backward compatibility.
Change-Id: Ibcf48a638ab716116d1ce2ff8c2686741ca0a996
ndroid/gallery3d/ui/ScrollerHelper.java
|
| b54c878d978ec6729edfef6690f59ea55ceae639 |
11-Jul-2012 |
Owen Lin <owenlin@google.com> |
Make CustomMenu compatible with API level 10.
bug: 6802855
Change-Id: I230c91bd9744935a181881131dcd2275ed89d819
ndroid/gallery3d/ui/ActionModeHandler.java
ndroid/gallery3d/ui/CustomMenu.java
ndroid/gallery3d/ui/PopupList.java
ndroid/gallery3d/ui/SelectionMenu.java
|
| 109bbb6199f48aa677f425dc0d5fb2ae3e8765fc |
13-Jul-2012 |
Chih-Chung Chang <chihchung@google.com> |
Only use SurfaceTexture.release and setIconAttribute on newer platforms.
Bug: 6706784
Change-Id: Ic1bb2bb27c3184d791de566d88dbade039fb9d87
ndroid/gallery3d/app/AbstractGalleryActivity.java
ndroid/gallery3d/ui/SurfaceTextureScreenNail.java
|
| f7d461c6efebcd9fa29236fbddc31b702c87fba8 |
06-Jul-2012 |
Yuli Huang <yuli@google.com> |
Avoid using setSystemUiVisibility in old platforms.
bug:6785569
Change-Id: I0a19ab2818b6f34d530c5d65e781d3168533d44f
ndroid/gallery3d/ui/GLRootView.java
|
| b98ecd613b64dff8b025ba14fc017ed6ccb191ab |
05-Jul-2012 |
Owen Lin <owenlin@google.com> |
Don't test the EXTRA_LOCAL_ONLY before HC.
Change-Id: Idebb2aba994e38cf7eead795f1834ff98eaec27d
ndroid/gallery3d/ui/CustomMenu.java
ndroid/gallery3d/util/GalleryUtils.java
|
| 4de3fa9d07bc7a8fdf8089a26badf38d8d2d8a3a |
04-Jul-2012 |
Owen Lin <owenlin@google.com> |
Use different back algorithm for Gallery's widget after JB.
Change-Id: I1c3c6eea4e5794555a36179b295b15d9dba6de74
ndroid/gallery3d/gadget/WidgetClickHandler.java
|
| cdb3717c706421fbf392b5da8018c5a029c59324 |
04-Jul-2012 |
Owen Lin <owenlin@google.com> |
Don't show the shuffle and album widget for old platforms
Change-Id: Ide7074025aefe289bf6c71d623eac5100ab72932
ndroid/gallery3d/gadget/PhotoAppWidgetProvider.java
ndroid/gallery3d/gadget/WidgetConfigure.java
ndroid/gallery3d/gadget/WidgetService.java
|
| fdccf988358df08f711a98aa79d3dbda44141ce4 |
04-Jul-2012 |
Owen Lin <owenlin@google.com> |
Don't use invalidateOptionsMenu before API level 11.
Change-Id: If46d46e44797b2bd4f66235eca0954a55d0008cf
ndroid/gallery3d/app/AbstractGalleryActivity.java
ndroid/gallery3d/app/ActivityState.java
ndroid/gallery3d/app/Gallery.java
|
| 59b53e0547413da04cb4c7409f8331dc5d8481f2 |
03-Jul-2012 |
Chih-Chung Chang <chihchung@google.com> |
Use MTP only if the MTP API is available.
Change-Id: I5c747d0da2905eb344c56dfab6333034dd5eecc3
ndroid/gallery3d/data/DataManager.java
|
| aadaaa8482521a1b468f6b3a65811aac8ac212f0 |
04-Jul-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Add ExifTags to hold tag names that are not available in ExifInterface"
|
| 36d9adcad2a0e74c796737d6521ac2d29afe944c |
03-Jul-2012 |
Hung-ying Tyan <tyanh@google.com> |
Add ExifTags to hold tag names that are not available in ExifInterface
prior to API level 11.
Bug: 6775786
Change-Id: Iab564f577d9a0b87c8fb7b91eda6cabc12b5a11a
ndroid/gallery3d/app/CropImage.java
ndroid/gallery3d/data/MediaDetails.java
|
| 4ebfbc28bc94084b27c87914450699bc5c474d1a |
02-Jul-2012 |
Chih-Chung Chang <chihchung@google.com> |
Remove dependencies on APIs only exist on newer platforms.
Change-Id: I606a23863247454051dd183ddf6b77f6bc882685
ndroid/gallery3d/app/MoviePlayer.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/ui/ActionModeHandler.java
ndroid/gallery3d/ui/PositionController.java
ndroid/gallery3d/ui/SurfaceTextureScreenNail.java
|
| 7aac26484af3d40df81e1d08c673bd925856a7fa |
28-Jun-2012 |
Owen Lin <owenlin@google.com> |
Don't reuse bitmap before HoneyComb.
Change-Id: I0df9bf0a8f43e28ed25b436d4c584dc3ceb43c1d
ndroid/gallery3d/app/AbstractGalleryActivity.java
ndroid/gallery3d/app/CropImage.java
ndroid/gallery3d/app/MoviePlayer.java
ndroid/gallery3d/app/Wallpaper.java
ndroid/gallery3d/data/BitmapPool.java
ndroid/gallery3d/data/DecodeUtils.java
ndroid/gallery3d/data/ImageCacheRequest.java
ndroid/gallery3d/data/LocalImage.java
ndroid/gallery3d/data/MediaItem.java
ndroid/gallery3d/ui/AlbumSetSlidingWindow.java
ndroid/gallery3d/ui/AlbumSlidingWindow.java
ndroid/gallery3d/ui/BitmapScreenNail.java
ndroid/gallery3d/ui/GLRootView.java
|
| ce8b4485801843c14abc3654e57aad96d1364e49 |
29-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Avoid using View.SYSTEM_UI_FLAG_LOW_PROFILE.
Use View.STATUS_BAR_HIDDEN instead.
Bug:6706727
Change-Id: I0324a251b10eba11350f1813ee975d493bbcfafa
ndroid/gallery3d/app/MoviePlayer.java
ndroid/gallery3d/ui/GLRootView.java
|
| fdbf964798ea6d8a55295ddef49be005f076cfde |
02-Jul-2012 |
Yuli Huang <yuli@google.com> |
Merge "Do not use NfcAdapter API in old platforms."
|
| 1c74ba27ea9187de2272f294b663c13d43bb7436 |
29-Jun-2012 |
Yuli Huang <yuli@google.com> |
Do not use NfcAdapter API in old platforms.
bug:6698904
Change-Id: I8cab312a212e4cba43187a73bc76d3f2164527a9
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/ui/ActionModeHandler.java
|
| 374a83f8285bd1b0b86fa7323e07dbc7de3e3487 |
29-Jun-2012 |
Owen Lin <owenlin@google.com> |
Merge "Remove hardwired strings for no external storage."
|
| 0bba10c41de7078ccbf59c401bce17f2b68c7260 |
29-Jun-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Pass correct intent to IntentService in PackagesMonitor"
|
| 0e986a42c334c64e0d4a05d4f1d09ac12069080f |
29-Jun-2012 |
Owen Lin <owenlin@google.com> |
Merge "Don't use Build.VERSION_CODES."
|
| 44c63eea58110b79cb4c2003c161bc2a5f9aa6f3 |
29-Jun-2012 |
Owen Lin <owenlin@google.com> |
Merge "Don't reuse bitmaps in BitmapRegionDecoder before JB."
|
| 1d0ff12ed167d40c3b59c83b06842b2a4941dc28 |
28-Jun-2012 |
Hung-ying Tyan <tyanh@google.com> |
Pass correct intent to IntentService in PackagesMonitor
Bug: 6755040
Change-Id: I073f4acd026cfcae3e2f4759657324f48b7238c4
ndroid/gallery3d/app/PackagesMonitor.java
|
| 1fb473e5f9f61c3117e639286b2d62b2c34d0dbb |
29-Jun-2012 |
Owen Lin <owenlin@google.com> |
Merge "Don't use Display.getSize()."
|
| bfe478b2fdbc3526ce465a18b30fe5195fa1fe8a |
28-Jun-2012 |
Owen Lin <owenlin@google.com> |
Don't use Build.VERSION_CODES.
Since they won't be available on old platform.
bug: 6752318
Change-Id: I55a9e83dbf05b93c83c68cb31f6edcbc29793283
ndroid/gallery3d/app/CropImage.java
ndroid/gallery3d/app/MoviePlayer.java
ndroid/gallery3d/app/Wallpaper.java
ndroid/gallery3d/data/LocalImage.java
ndroid/gallery3d/ui/GLRootView.java
|
| d09121f9fb7cf571a6b71c4174835dd4b7359595 |
27-Jun-2012 |
Owen Lin <owenlin@google.com> |
Don't reuse bitmaps in BitmapRegionDecoder before JB.
Change-Id: I8a2f520f98116af6861fa2cd1460e6f848bbb4e4
ndroid/gallery3d/ui/TileImageView.java
ndroid/gallery3d/ui/TileImageViewAdapter.java
|
| 9d9450fdf1efeb7a906d21913ba859218514dd29 |
27-Jun-2012 |
Hung-ying Tyan <tyanh@google.com> |
Replace BroadcastReceiver.goAsync() with IntentService
to make Gallery run on older API.
Change-Id: I30dacb38eb4e70ed3f89135544d6c514d0379add
ndroid/gallery3d/app/PackagesMonitor.java
|
| a67532ff46d69b39936f209ce73682363b0a43c0 |
27-Jun-2012 |
Owen Lin <owenlin@google.com> |
Don't use Display.getSize().
Change-Id: I9b5c9021bae2b58d2815a909c97104f215d4d2e8
ndroid/gallery3d/app/Wallpaper.java
ndroid/gallery3d/util/GalleryUtils.java
|
| 8ba7701ccacfe48c9632abbf51fac891edb72774 |
27-Jun-2012 |
Chih-Chung Chang <chihchung@google.com> |
am acd75301: am bb52543c: Merge "Show undo option for 3 seconds after the last picture is deleted." into jb-dev
* commit 'acd753010dcf6d8079e4620722921694cb041dbf':
Show undo option for 3 seconds after the last picture is deleted.
|
| 57ec2e5724e4e152d994592193e29e76267a6e9c |
27-Jun-2012 |
Chih-Chung Chang <chihchung@google.com> |
am bb52543c: Merge "Show undo option for 3 seconds after the last picture is deleted." into jb-dev
* commit 'bb52543c6ba40749d7046f6ea9da4a8b30793f8d':
Show undo option for 3 seconds after the last picture is deleted.
|
| d593a2c1853b4a5a900f194b0a32dc1ac9b1939c |
27-Jun-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Show undo option for 3 seconds after the last picture is deleted." into jb-dev
|
| f30aae7dfa064f65697214a3b107b581b42f135b |
27-Jun-2012 |
Hung-ying Tyan <tyanh@google.com> |
am 52d51fff: am fc826a5f: Merge "Migrate local-album gallery widgets from pre-JB." into jb-dev
* commit '52d51fff7affd82bc69b025d261ebf19b25728c2':
Migrate local-album gallery widgets from pre-JB.
|
| ec8e475a4778bf41e237daec73a88adab911bca9 |
27-Jun-2012 |
Hung-ying Tyan <tyanh@google.com> |
am fc826a5f: Merge "Migrate local-album gallery widgets from pre-JB." into jb-dev
* commit 'fc826a5ff488e9e3b27d2a521518e0ae5346b9fe':
Migrate local-album gallery widgets from pre-JB.
|
| 676ec6a3ac03d7f0797325dc7067b82cf55b1ff2 |
27-Jun-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Migrate local-album gallery widgets from pre-JB." into jb-dev
|
| e0dcf33665378829a4a0d437ef06429d95f6e211 |
27-Jun-2012 |
Chih-Chung Chang <chihchung@google.com> |
Show undo option for 3 seconds after the last picture is deleted.
Bug: 6742326
Change-Id: I5008c1984fff0a2affaeabf2a195cfcdc517ebc2
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/data/FilterDeleteSet.java
|
| 7e36dead955115eb1b0c2eab644c6902f3477d1c |
26-Jun-2012 |
Hung-ying Tyan <tyanh@google.com> |
Migrate local-album gallery widgets from pre-JB.
The path of external storage is changed to /storage/sdcard0 in JB and the bucket
IDs in MediaStore are changed accordinly. The local-album gallery widget is
saved by its bucket ID so this needs to be migrated to new value as well.
Bug: 6720251
Change-Id: I58a3044f2f05d428a9524f7a8053259950d5128d
ndroid/gallery3d/gadget/PhotoAppWidgetProvider.java
ndroid/gallery3d/gadget/WidgetDatabaseHelper.java
ndroid/gallery3d/onetimeinitializer/GalleryWidgetMigrator.java
|
| d75226857721967fc59104404b32d9f28afaa26a |
26-Jun-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 27a76801: am c7e89dae: Update thumbnail if a picture is deleted in background.
* commit '27a768018b18f45b9dd912bafd09dea64460f852':
Update thumbnail if a picture is deleted in background.
|
| 6de536dbc81345e1a19355fb9f3ad0aa2ea2ab8a |
26-Jun-2012 |
Chih-Chung Chang <chihchung@google.com> |
am c7e89dae: Update thumbnail if a picture is deleted in background.
* commit 'c7e89daeb178a895de211c411d09a822de52e4e9':
Update thumbnail if a picture is deleted in background.
|
| eb55e15ba4989e172ccfe9b7eeb6768c9020a514 |
26-Jun-2012 |
Chih-Chung Chang <chihchung@google.com> |
Update thumbnail if a picture is deleted in background.
Bug: 6712751
Change-Id: I17f56c9ff04441e51f28b3e3bec23b1ac308b70c
ndroid/gallery3d/data/DataManager.java
ndroid/gallery3d/data/LocalAlbum.java
ndroid/gallery3d/data/LocalImage.java
ndroid/gallery3d/data/LocalVideo.java
|
| 57e297d1c6927759a18e599114676150b6cb0f26 |
26-Jun-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 64cebdd1: am 6118af9d: Fix the behavior of deleting the last picture.
* commit '64cebdd1eebd2c001e6680f247c6f741889ad989':
Fix the behavior of deleting the last picture.
|
| b26c4acfe4e18446a02bc49812f101d1669a92fa |
26-Jun-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 6118af9d: Fix the behavior of deleting the last picture.
* commit '6118af9ddad8acc050133154f8f60c842c7f9bfa':
Fix the behavior of deleting the last picture.
|
| c6e089b29703c8506b7b85c5af796e8c340b0818 |
22-Jun-2012 |
Chih-Chung Chang <chihchung@google.com> |
Fix the behavior of deleting the last picture.
Also fix the jank while deleting multiple pictures quickly.
Bug: 6713932, 6712555
Change-Id: I9d64d8bbdcd4ec0dc9a447a51d50f88ff27363b4
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/data/FilterDeleteSet.java
ndroid/gallery3d/ui/PhotoView.java
|
| fa4fcf8a20203560aa148ce6087cad216a762123 |
26-Jun-2012 |
Pin Ting <pinting@google.com> |
Merge "Use public OverScroller() instead of a hidden one.."
|
| 6f788d8f1b286a37f92b35797ca09a9d7c0d38a4 |
20-Jun-2012 |
Pin Ting <pinting@google.com> |
Use public OverScroller() instead of a hidden one..
Bug:6698374
Change-Id: I3a97d0b4bbfb5e2a1e9f4a656d39db636defcdbd
ndroid/gallery3d/ui/PositionController.java
|
| 343f7984c8184e0a1ade23885699c2aa9be1378f |
22-Jun-2012 |
Owen Lin <owenlin@google.com> |
Use another version of setRemoteViews for backward compatibility.
bug: 6706684
Change-Id: I6fd77845d64cfb9e6830c1eabdcb5c2e9a7df854
ndroid/gallery3d/gadget/PhotoAppWidgetProvider.java
|
| 40228b9d0ac27ae47c30d8fbcf6c253de707b71b |
21-Jun-2012 |
Owen Lin <owenlin@google.com> |
Use MediaColumns.WIDTH and MediaColumns.HEIGHT only when they are available.
bug:6698720
Change-Id: Iaabfd1d5fe16b5d89f564d688a78e773ad36c8bd
ndroid/gallery3d/app/CropImage.java
ndroid/gallery3d/data/LocalImage.java
|
| 628eda8ffb6d6c9280b392f35fdbff1ca362e319 |
21-Jun-2012 |
Owen Lin <owenlin@google.com> |
Remove hardwired strings for no external storage.
bug: 6682495
Change-Id: I68652d6b01842a42907b953574d563cf98e65219
ndroid/gallery3d/app/AbstractGalleryActivity.java
|
| 5d095edd840841440b029b4adc6e4fc2261d9bd6 |
20-Jun-2012 |
Owen Lin <owenlin@google.com> |
Guard the use of SYSTEM_UI_FLAG_XXXX with TargetApi
bug: 6698718
Change-Id: I6962f0128ce2bd57658b7f3b77d2bc150eff1f60
ndroid/gallery3d/app/MovieActivity.java
ndroid/gallery3d/app/MoviePlayer.java
ndroid/gallery3d/ui/GLRootView.java
|
| 13dd0735edee26b5699cbf2abedcebec32e962ca |
21-Jun-2012 |
Wu-cheng Li <wuchengli@google.com> |
Use View.setBackgroundDrawable instead of setBackground.
View.setBackground was added in API 16. Use setBackgroundDrawable
instead.
bug:6698428
Change-Id: I1346ba4c640ae98d76e333779b4620cdc48b6a3a
ndroid/gallery3d/app/MoviePlayer.java
|
| a869ad79695d3e109c1eaa05fd107f25d8971522 |
20-Jun-2012 |
Wei Huang <weih@google.com> |
am 254a6b42: am 82220026: Merge "Fade in/out the undo bar." into jb-dev
* commit '254a6b42372179bcc9cf6166639325d11411be77':
Fade in/out the undo bar.
|
| 26d64699fa23ca6baca8af934dc9c7aec1270523 |
20-Jun-2012 |
Wei Huang <weih@google.com> |
am 82220026: Merge "Fade in/out the undo bar." into jb-dev
* commit '822200267879dfaaf77421007116e59c5bb372cd':
Fade in/out the undo bar.
|
| 387e9ebf3cde1938e5b3fb490656923d60e6a5b6 |
19-Jun-2012 |
Chih-Chung Chang <chihchung@google.com> |
Fade in/out the undo bar.
The fading out happens after 3 seconds or the user swipes away.
Bug: 6610348
Change-Id: Icd4dea7b0396f26556240adab93b9e645a9f1e58
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/ui/PhotoView.java
ndroid/gallery3d/ui/UndoBarView.java
|
| 4fedfdf37a52530c68997637468e26171c93c2d9 |
20-Jun-2012 |
Owen Lin <owenlin@google.com> |
Move LongSparseArray into Gallery for unbundling.
Change-Id: Ifa0d06818a2d21bd8ddeabe808d792f39c31322f
ndroid/gallery3d/ui/TileImageView.java
|
| cc6fb6fa68e3bf2e042a32cd1cbb1b30ddae875c |
19-Jun-2012 |
Wei Huang <weih@google.com> |
am 885f729f: Merge "Make SystemUI always consists with the contrller overlay." into jb-dev
* commit '885f729fa16f9a25e688b23f1f9a94ab1bc591d5':
Make SystemUI always consists with the contrller overlay.
|
| 99aedc6a630d4b8ca3dc586fa52c8b1f8d848824 |
19-Jun-2012 |
Wei Huang <weih@google.com> |
Merge "Make SystemUI always consists with the contrller overlay." into jb-dev
|
| ef294176c1d61714ffbbd324d3e118f249292aaa |
19-Jun-2012 |
Owen Lin <owenlin@google.com> |
Make SystemUI always consists with the contrller overlay.
Change-Id: I81f2a71fd38fc2588a9acb97b9d333978ffb5e48
fix: 6679875
ndroid/gallery3d/app/MoviePlayer.java
ndroid/gallery3d/app/TimeBar.java
|
| b9a1cd4f6c205b5a2a53fe61b1e17ddbb573c969 |
19-Jun-2012 |
Wei Huang <weih@google.com> |
am d937a2e9: Merge "Fix Gallery glitch due to ColorTexture." into jb-dev
* commit 'd937a2e931f222d2e60d9da007df4647b975eb7f':
Fix Gallery glitch due to ColorTexture.
|
| 7802aba4f3ea92df65f7cf8b7de2d61d87b75034 |
19-Jun-2012 |
Wei Huang <weih@google.com> |
Merge "Fix Gallery glitch due to ColorTexture." into jb-dev
|
| a3a225f1f6afe0fb6a8af4fc1a81a8a1a227946d |
19-Jun-2012 |
Owen Lin <owenlin@google.com> |
Fix Gallery glitch due to ColorTexture.
Change the initial value of mTextureTarget to GL_TEXTURE_2D,
since it is default enabled.
bug:6668616
Change-Id: I4bf475ca1a02fed3371e8223003a10e88ce8d519
ndroid/gallery3d/ui/GLCanvasImpl.java
|
| 3772856152d4e404f4f9486d6026adb9fc66bf76 |
18-Jun-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 2ce59cbd: Fix scaling gesture responsiveness.
* commit '2ce59cbd4368eaf0f30cfea28891bd47155182cb':
Fix scaling gesture responsiveness.
|
| 01244eaf188a7f02954b7b269a3efd9330dbc69b |
18-Jun-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 6b891c6a: Add swipe-to-delete gesture.
* commit '6b891c6a3739f8c49d42f9db6fc76cb92c7c5f25':
Add swipe-to-delete gesture.
|
| 8d84cc6d45b956b3ed52ba2a1c5ea49105f047cc |
18-Jun-2012 |
Chih-Chung Chang <chihchung@google.com> |
Fix scaling gesture responsiveness.
Bug: 6632011
Change-Id: I9cfeafa4365354a631565f8ee4a9b53df76d06e9
ndroid/gallery3d/ui/PhotoView.java
ndroid/gallery3d/ui/PositionController.java
|
| 4ddc93e1f61858195a62729e54450502628fe28a |
07-Jun-2012 |
Chih-Chung Chang <chihchung@google.com> |
Add swipe-to-delete gesture.
Change-Id: I992e59702f9dfff17da2f4464e48c9228d42b1b3
ndroid/gallery3d/app/PhotoDataAdapter.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/app/SinglePhotoDataAdapter.java
ndroid/gallery3d/data/FilterDeleteSet.java
ndroid/gallery3d/data/FilterSet.java
ndroid/gallery3d/data/FilterSource.java
ndroid/gallery3d/data/FilterTypeSet.java
ndroid/gallery3d/data/MtpSource.java
ndroid/gallery3d/ui/GLView.java
ndroid/gallery3d/ui/GestureRecognizer.java
ndroid/gallery3d/ui/MenuExecutor.java
ndroid/gallery3d/ui/PhotoView.java
ndroid/gallery3d/ui/PositionController.java
ndroid/gallery3d/ui/StringTexture.java
ndroid/gallery3d/ui/UndoBarView.java
|
| ac9ae4fd0a4ff040fd9cc0c62691be2ef927c1a4 |
15-Jun-2012 |
Jean-Baptiste Queru <jbq@google.com> |
resolved conflicts for merge of cf6f99e7 to jb-dev-plus-aosp
Change-Id: I4d8d85960b5f0289ee442278db39b8f8c445d73e
|
| 0560bd141a709741dc48edc117ab4675347118b2 |
14-Jun-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 8d340042: Merge "Gallery2: Check privative effects"
* commit '8d340042d2b79218b19f650803ea6a584c61f01f':
Gallery2: Check privative effects
|
| 0d21544a1af1b7a77a5990f1418c54d22a72b5d1 |
12-Jun-2012 |
Jorge Ruesga <j.ruesga.criado@gmail.com> |
Gallery2: Check privative effects
Gallery2 has 2 effects (FaceTan and Facelift) from the privative gapps.
If gapps is not present, Gallery2 gets into a FC when click on this effects.
This patch checks if the permission "com.google.android.media.effects" exists
and hide this 2 effects if permission not exists
Patch 2: Use EffectFactory.isEffectSupported to detect if filters exists
Patch 3: Make isPresent method from effect classes a static method
Patch 4: Change actions classes for static calling to effects classes
Change-Id: I8f6b59e57e504114835ab3283f65a72b4f6774a8
ndroid/gallery3d/photoeditor/EffectsBar.java
ndroid/gallery3d/photoeditor/actions/EffectAction.java
ndroid/gallery3d/photoeditor/actions/FaceTanAction.java
ndroid/gallery3d/photoeditor/actions/FaceliftAction.java
ndroid/gallery3d/photoeditor/filters/FaceTanFilter.java
ndroid/gallery3d/photoeditor/filters/FaceliftFilter.java
|
| c2bb1a78a19688f40b80176c1667289ebbfbd418 |
11-Jun-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am b62f354d: am 582c3bb9: Merge "Gallery2: Use ICS alert drawable"
* commit 'b62f354d4f890a20f6bec37eac83226f75a4a475':
Gallery2: Use ICS alert drawable
|
| 4cdb37e1d7cd475e8ad4f04749755a225d8caed8 |
11-Jun-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 582c3bb9: Merge "Gallery2: Use ICS alert drawable"
* commit '582c3bb99cf58b55defa5f788d488c62f771b60e':
Gallery2: Use ICS alert drawable
|
| e2bd0fa7863f5912073bcdee88ebc281b8d125c6 |
11-Jun-2012 |
Yuli Huang <yuli@google.com> |
Don't display loading text when loading album sets.
bug:6635606
Change-Id: I55f0dafd5ead8455ed8bee1f03c06ca03662ebbd
ndroid/gallery3d/ui/AlbumSetSlotRenderer.java
|
| eae57c0ccbb9d22a61f681fed3d2696a5135d3c4 |
30-May-2012 |
Owen Lin <owenlin@google.com> |
Check the offset of output rect when cropping image.
bug: 6568720
Change-Id: I36c98cab5830eaac15369ada1a1a988e10b0fbf4
ndroid/gallery3d/app/CropImage.java
ndroid/gallery3d/app/Wallpaper.java
|
| eb05110658d06001d077b5fe2250e97465e248ed |
04-Jun-2012 |
Wei Huang <weih@google.com> |
Merge "Update the screen nail size even if screen nail is still the same one." into jb-dev
|
| ee4163e667ebf1a972b49c0fad93f1fb90cebcb7 |
31-May-2012 |
Ruei-sung Lin <rslin@google.com> |
Fix b/6590795 dejank photo effect slider
Change-Id: I14737bd01361b58c6bd4af19957d514368cc19ea
ndroid/gallery3d/photoeditor/FilterStack.java
|
| 855f44b021944cbc3c039c92c6d557130abef48e |
01-Jun-2012 |
Chih-Chung Chang <chihchung@google.com> |
Update the screen nail size even if screen nail is still the same one.
Because the rotation value may have changed.
Bug: 6594218
Change-Id: I8da2a3041da0e27e1b80723dab8a825a2350c2dd
ndroid/gallery3d/ui/PhotoView.java
|
| c4be10eadc24a86eb8648fd5273a68cd63e42288 |
31-May-2012 |
Björn Lundén <blunden2@gmail.com> |
Gallery2: Use ICS alert drawable
Same bug here. It's using the old compability drawable
instead of the Holo theme one.
Change-Id: Ia84ce1d305ee63fc6bc1fdb407a91b3421842eb1
ndroid/gallery3d/app/AbstractGalleryActivity.java
|
| 4283ac523be001b6bc2d605d305e34ab9b364d12 |
31-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Don't allow the orientation to be unlocked if "Rotation Lock" is checked in Settings.
Bug: 6577802
Change-Id: I5c8eefbb154eedcf71e80e082261e38450105892
ndroid/gallery3d/app/OrientationManager.java
|
| ae4b345047813f555fd934e7c23f2d935795b21b |
31-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Improve scale gesture snapback.
If the picture is zoomed-in, we want to keep the focus point stay in
the same position on screen, so we need to adjust the target mCurrentX
value.
Bug: 6563619
Change-Id: I87b23da99aced1490187e550bd43fad733122577
ndroid/gallery3d/ui/PositionController.java
|
| 94fd2f9fa2bac08bc6da084d24243e679d44ea78 |
31-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
If the focused box was at minimal scale, we try to make it the
minimal scale under the new view size.
Bug: 6584425
Change-Id: I7dcc748cb3659a06f2ca4d8550d075fdda2949fa
ndroid/gallery3d/ui/PositionController.java
|
| d416516856065b7b652b71700853b02d93376327 |
31-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Move to final position after view size change.
Bug: 6584188
Change-Id: If6ab23532bd7040701e358f9cdd813d2f6a71e5c
ndroid/gallery3d/ui/PhotoView.java
ndroid/gallery3d/ui/PositionController.java
|
| 7507d23f7fb8b9a42a9e01d8af5762a94ccbab85 |
30-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Improve image size change handling." into jb-dev
|
| 860b7463c16f44a7b8fce01a79161ce3e8d47214 |
30-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Improve image size change handling.
- When the camera relative frame is set, we delay the change for camera
rectange until the next setImageSize call. This avoids the unwanted
intermediate state if we change them separately.
- Don't draw other screennails when the camera is in full screen. This
avoids showing other screennails when the image size changes.
- When the aspect ratio of the image changes, we assume the view angle
of the longer side doesn't change (so the aspect ratio change is because
the view angle of the shorter side changes). This matches what camera
preview does.
Bug: 6566612
Change-Id: I7603416f31c96ba77c96cdc2a3d0b79f8921c491
ndroid/gallery3d/ui/PhotoView.java
ndroid/gallery3d/ui/PositionController.java
|
| 26eb4ed5239f59de7a7e212a03047f3e0afa3c74 |
28-May-2012 |
Yuli Huang <yuli@google.com> |
Keep screen on for user-initiated slideshow.
Change-Id: I3085398c663e2c38a31cfde5a07b23446bb7bd7f
b:6450305
ndroid/gallery3d/app/ActivityState.java
ndroid/gallery3d/app/Gallery.java
ndroid/gallery3d/app/SlideshowDream.java
ndroid/gallery3d/app/SlideshowPage.java
|
| b603e674b9e0bc7372fd535f7f3ac0b9b4e3a689 |
24-May-2012 |
Owen Lin <owenlin@google.com> |
Add back the background when we show the action bar
This change fix the following UI issues:
1. We add a black backgorund when ActionBar shows and remove it
when we hide the action bar.
2. Make the postion of video stable when opening
3. Prevent glitching when opening a video
4. Make it really full-screen.
5. Hide ControlOverlay at begining.
bug:6519765
bug:6491674
Change-Id: I3ab033642df2c4a158b99385b02e3e967eebeabd
ndroid/gallery3d/app/MovieActivity.java
ndroid/gallery3d/app/MovieControllerOverlay.java
ndroid/gallery3d/app/MoviePlayer.java
|
| b1475e112677eac0f58e7e2925f801016e7982da |
25-May-2012 |
Angus Kong <shkong@google.com> |
Force to stop scrolling in filmstrip mode.
bug:6554106
Change-Id: I4305ce7068a36e72a325996a88c1d227a2d2b20c
ndroid/gallery3d/ui/PositionController.java
|
| 7adc57932ded45f3d64fa1d70a59968b6600d2ad |
23-May-2012 |
Wei Huang <weih@google.com> |
Merge "Fix 6519765 Ghosting is seen when hiding the actionbar in fullscreen video playback mode b:6519765" into jb-dev
|
| 7bd8d1db664a65fe4ce500f8d96edbb329120857 |
23-May-2012 |
Yuli Huang <yuli@google.com> |
Merge "Back should progress through Gallery and return Home for widget intents." into jb-dev
|
| 527422cf0c871460d050f7935f594620f64397fc |
23-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Remove the background in MovieActivity." into jb-dev
|
| 3066fecc8500acba68b35e8a4d5804405ae863d9 |
23-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Put a black View in front of SurfaceView." into jb-dev
|
| e1e712d28efea7b55e225c660e855e507594a990 |
22-May-2012 |
Ray Chen <raychen@google.com> |
Fix 6519765 Ghosting is seen when hiding the actionbar in fullscreen video playback mode
b:6519765
Ensure SYSTEM_UI_FLAG_LAYOUT_STABLE and SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN is set in all states
so ActionBarOverlayLayout can response to fitSystemWindows and onSystemVisibilityChange correctly.
Change-Id: I41a33c9e7d21243bde6fa64e6cd1b709e7b04203
ndroid/gallery3d/app/MoviePlayer.java
|
| e11a51883b91f5fd439c99562e85ff4374d61467 |
23-May-2012 |
Yuli Huang <yuli@google.com> |
Back should progress through Gallery and return Home for widget intents.
bug:6384492
Change-Id: I7ffb824568e400ff5724a29c1908c34a1e10235c
ndroid/gallery3d/app/Gallery.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/gadget/WidgetClickHandler.java
|
| 8f3c2a770d1877ea882a8b97b1f39bfd492d3cfe |
22-May-2012 |
Owen Lin <owenlin@google.com> |
Remove the background in MovieActivity.
This is a regression. We add the background for bug 6494653.
So we need to remove it in MovieActivity as well.
bug:6491674
Change-Id: I6fb692fa778a1200ffbed741ca0996cb7eeef32f
ndroid/gallery3d/app/MovieActivity.java
|
| 43edc9c33da294f3b5b97e55a58f5fd608d6209d |
23-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Put a black View in front of SurfaceView.
This prevents SurfaceView from being transparent before the first draw.
Bug: 6507478
Change-Id: I2170f23d4c9844bfc3854d6120f5e72cc0d591ca
ndroid/gallery3d/ui/GLRootView.java
|
| 883920dce45c1794a8aa6a696563df1bbafeaf45 |
23-May-2012 |
Wei Huang <weih@google.com> |
Merge "Fix 6259517 "0 images / videos available" toast is displayed in gallery on launch though it has images / videos" into jb-dev
|
| 4a69011efe35e1df830008630b1055ad23ae8176 |
23-May-2012 |
Wei Huang <weih@google.com> |
Merge "Recycle textures when we don't need them." into jb-dev
|
| 0b920dba5d7452132f51c322e4a8282a1f73aac0 |
16-May-2012 |
Ray Chen <raychen@google.com> |
Fix 6259517 "0 images / videos available" toast is displayed in gallery on launch though it has images / videos
And removed sync error toast.
Bug: 6259517
Change-Id: Ib7b25176a6db290220661a2e98e4e031043201d9
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/AlbumSetDataLoader.java
ndroid/gallery3d/app/AlbumSetPage.java
ndroid/gallery3d/data/ComboAlbumSet.java
ndroid/gallery3d/data/LocalAlbumSet.java
ndroid/gallery3d/data/MediaSet.java
ndroid/gallery3d/data/MtpDeviceSet.java
|
| b9e6e7f1dffe3d4e4736ed67a323f11a174afbb1 |
22-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Unlock orientation only when action bar is needed.
Bug: 6482079
Change-Id: I75d96ca7957f80e9c52f35edf74127f82f194f63
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/ui/PhotoView.java
ndroid/gallery3d/ui/PositionController.java
|
| c64d08694f22ad3ba6f5e29b78ad4da83c42bf09 |
22-May-2012 |
Owen Lin <owenlin@google.com> |
Recycle textures when we don't need them.
bug: 6307447
Change-Id: Id0c1abab54e1fbb75364dffda9f1f72d6b39310b
ndroid/gallery3d/ui/AlbumSetSlidingWindow.java
ndroid/gallery3d/ui/AlbumSetSlotRenderer.java
ndroid/gallery3d/ui/AlbumSlidingWindow.java
ndroid/gallery3d/ui/AlbumSlotRenderer.java
ndroid/gallery3d/ui/FadeOutTexture.java
ndroid/gallery3d/ui/FadeTexture.java
|
| 68386e085d3e2338be74996ff99672ff849467cb |
18-May-2012 |
Owen Lin <owenlin@google.com> |
Add a new state uploading to UploadedTexture.
This state means the texture is being uploaded in background and should
not be drawn now to prevent janking.
Sometimes, we may lose GLContext and we will need to reupload
textures again. In this case, we would like to upload these texture in
foreground instead of using TextureUploader.
(for simplicity since this won't happen too often).
bug: 6519344
Change-Id: Ic5d7547c6a0eb4b044b79aa0eb4eb52397faac03
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/ui/AlbumSetSlotRenderer.java
ndroid/gallery3d/ui/AlbumSlotRenderer.java
ndroid/gallery3d/ui/BasicTexture.java
ndroid/gallery3d/ui/ExtTexture.java
ndroid/gallery3d/ui/GLCanvasImpl.java
ndroid/gallery3d/ui/GLRootView.java
ndroid/gallery3d/ui/NinePatchTexture.java
ndroid/gallery3d/ui/PhotoFallbackEffect.java
ndroid/gallery3d/ui/PhotoView.java
ndroid/gallery3d/ui/RawTexture.java
ndroid/gallery3d/ui/TextureUploader.java
ndroid/gallery3d/ui/TileImageView.java
ndroid/gallery3d/ui/UploadedTexture.java
|
| c5c5f2558e9ed3bc46a94c5515481b1dac9ffd77 |
22-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Hide status bar in lights out mode.
Bug: 6451200
Change-Id: I6ad5ffc203fd8e6be9191ba13a4a99eb716c4734
ndroid/gallery3d/ui/GLRootView.java
|
| 08476ae7099dcb4c65e348474d6abe7e9bb2a150 |
18-May-2012 |
Owen Lin <owenlin@google.com> |
Reuse bitmap to prevent GC in TiledImageView.
bug:5948093
Change-Id: Iad89c5809bde0de5409752330f607aab153dceba
ndroid/gallery3d/app/PhotoDataAdapter.java
ndroid/gallery3d/ui/BitmapTileProvider.java
ndroid/gallery3d/ui/TileImageView.java
ndroid/gallery3d/ui/TileImageViewAdapter.java
ndroid/gallery3d/ui/UploadedTexture.java
|
| 3bd73388114f851dcb67d1ce38966e4d22fd1d22 |
22-May-2012 |
Owen Lin <owenlin@google.com> |
Limit the size of a ScreenNail.
bug:6528366
This bug was happened because we are trying to make a texture beyond the
max size allowed in GL.
Here is what we do in this CL:
1. Limit the size of a screen nail
2. Print warning message, if we try to allocate a texture beyond the size
3. Don't show fall-back animation if the image is not loaded yet.
Change-Id: I004b1138efd0eef7ba11aa89556f67743ca46745
ndroid/gallery3d/app/PhotoDataAdapter.java
ndroid/gallery3d/ui/BasicTexture.java
ndroid/gallery3d/ui/BitmapScreenNail.java
ndroid/gallery3d/ui/GLRootView.java
ndroid/gallery3d/ui/PhotoView.java
|
| 7f9061790e1b67b6c674314ac41a399c550f8b88 |
03-May-2012 |
Ray Chen <raychen@google.com> |
Fix 6360834 Select All is shown in place of Deselect all option
The CL changes the SelectionManager's toggle method so it changes itself to
inverse selection mode when all items are already selected, and onSelectionModeChange
will be triggered so the listener can update the selection menu (Select all/Deselect all)
and ActionBar.
Change-Id: I9aa5507067415e52f6800c254ecb4d68e7395ffa
b: 6360834
ndroid/gallery3d/app/AlbumSetPage.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/ui/ActionModeHandler.java
ndroid/gallery3d/ui/SelectionManager.java
|
| 6ca39c75e668eab51645f33117cae5156f64975d |
22-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Don't fire data change notification before the data is made consistent." into jb-dev
|
| b8ab1f5676cd93e11f4afd4ced7032ab92bf3f31 |
22-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix capture animation if we are far away from the camera preview." into jb-dev
|
| 9fb774d2d443388cfa81f2d7e34ca43e9d8b6578 |
21-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Don't fire data change notification before the data is made consistent.
Bug: 6500467
Change-Id: Ia064461daba92bbf1172eae5d321bf5049de6d48
ndroid/gallery3d/app/PhotoDataAdapter.java
|
| 52973767f43e7f7e3637cbd31e1c52c3285a2522 |
21-May-2012 |
Wei Huang <weih@google.com> |
Merge "Fix the detail isn't updated for the selected thumbnail." into jb-dev
|
| fb14073b494ee6ead2538641d04ad8177b433001 |
19-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Fix capture animation if we are far away from the camera preview.
Bug: 6481823
Change-Id: If2511c8dd08e0483cdc3139068ee190e2b08126d
ndroid/gallery3d/ui/PhotoView.java
ndroid/gallery3d/ui/PositionController.java
|
| 07230947ed37713cd600da05abeadcee7781d6b3 |
21-May-2012 |
Yuli Huang <yuli@google.com> |
Fix the detail isn't updated for the selected thumbnail.
bug:6521826
Change-Id: I1c07c10414ad45721b65583ed5f976c992d27698
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/AlbumSetPage.java
|
| 2789bb0256e62b29c04f608510ae11df2d35dca9 |
16-May-2012 |
Ray Chen <raychen@google.com> |
Fix 6385004 When video playback in gallery is launched from another app, Up should cross back to Gallery, except when the logo-bitmap extra is set.
Change-Id: Id0c43872386cc0272bc76d37a9c866d5ffae700f
b: 6385004
ndroid/gallery3d/app/MovieActivity.java
ndroid/gallery3d/app/PhotoPage.java
|
| 9c89d80b702defe324e90050037e91edb83bbeea |
18-May-2012 |
Yuli Huang <yuli@google.com> |
Fix action-bar title for cropping wallpaper.
bug:6513495
Change-Id: I97b76c948d5c9fa0bb11f2fe89a0d10f490dbe14
ndroid/gallery3d/app/CropImage.java
|
| c39c6321e9ff9f2ad8318cde70d1ab12801a2c57 |
18-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Remove camera icon in Gallery if there is no launcher icon.
Bug: 6516793
Change-Id: I7ec88065565bcafdd2534cd8c7fd8f2591743447
ndroid/gallery3d/util/GalleryUtils.java
|
| a77ea1a80f71dbae047155de191b9a9179f2576d |
18-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Handle null for the video resolution field in MediaProvider.
Bug: 6517317
Change-Id: Ic9bb769b3b8e8816bc76a4500c6a2770e69a4dc5
ndroid/gallery3d/data/LocalVideo.java
|
| 2b007514884f0c641e8864f56832f77652c4e11e |
18-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Don't jump back to the camera preview if we started an activity.
Bug: 6429570
Change-Id: Ib25dfc4ade235b8c7d7d87c981671ef9308d128b
ndroid/gallery3d/app/PhotoPage.java
|
| 203af87f102cc8ad1287a838d52f0a70896ab1c8 |
18-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Use View.setSystemUiVisibility to enter/leave lights-out mode.
Bug: 6451200
Change-Id: I8e27b3e5eedfa2652f06dfc8f377c9cef8100160
ndroid/gallery3d/app/ActivityState.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/ui/GLRoot.java
ndroid/gallery3d/ui/GLRootView.java
|
| 1271b1a831bba981d227ec9968ab5ca1cc95d11c |
18-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Show gray tile for screennails not loaded yet." into jb-dev
|
| 17df03ce167eab04f51bf6f67d7f8085ac8ae10d |
11-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Show gray tile for screennails not loaded yet.
Bug: 6452217
Change-Id: Ied9c2e2c91f4ffe218a73ba1a123df92a2aab98a
ndroid/gallery3d/app/PhotoDataAdapter.java
ndroid/gallery3d/app/SinglePhotoDataAdapter.java
ndroid/gallery3d/data/LocalImage.java
ndroid/gallery3d/data/LocalMediaItem.java
ndroid/gallery3d/data/LocalVideo.java
ndroid/gallery3d/ui/BitmapScreenNail.java
ndroid/gallery3d/ui/BitmapTileProvider.java
ndroid/gallery3d/ui/PhotoView.java
ndroid/gallery3d/ui/PositionController.java
ndroid/gallery3d/ui/TileImageView.java
ndroid/gallery3d/ui/TileImageViewAdapter.java
|
| 3b35f3a3e4146e632bd5387a0f5f6683c783f98a |
17-May-2012 |
Owen Lin <owenlin@google.com> |
Refresh the action bar timeout when button is clicked.
Also handle with the confirm dialog, we show the action bar
as long as the confirm dialog is shown. And we start to timeout
the action bar when the confirm dialog get dismissed.
bug: 6478646
Change-Id: I3f0e7e61b43b0dd2bb2b1e2b4444c8dcb5706e1a
ndroid/gallery3d/app/ManageCachePage.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/ui/ImportCompleteListener.java
ndroid/gallery3d/ui/MenuExecutor.java
|
| 931a10095f72a0334ac5ab5da174e646cb5bacf9 |
17-May-2012 |
Owen Lin <owenlin@google.com> |
Merge "Fix a NPE found by Moneky." into jb-dev
|
| 8f7b76df88c4468b54a9977f2687d5fcab19ba7d |
17-May-2012 |
Owen Lin <owenlin@google.com> |
Fix a NPE found by Moneky.
AlbumLabelMaker.mBitmapPool could be null if the setLabelWidth()
has never been called or called with width as 0.
bug:6510386
Change-Id: Idaaa0a1a7239271ba3ae3217e65029b382464c10
ndroid/gallery3d/ui/AlbumLabelMaker.java
|
| 5d895388e23ffe73c10a08b4b1039c0251e569cb |
17-May-2012 |
Angus Kong <shkong@google.com> |
Support Panorama preview.
The panorama preview doesn't consider display rotation.
bug:6305152
Change-Id: I6389a74d3c0e64d8b6bc206e728d1088f04be225
ndroid/gallery3d/app/AppBridge.java
ndroid/gallery3d/app/PhotoDataAdapter.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/app/SinglePhotoDataAdapter.java
ndroid/gallery3d/ui/PhotoView.java
|
| 3aad1aba14d3abe8324e0a0e129627d51a466bc4 |
07-May-2012 |
Owen Lin <owenlin@google.com> |
Add transition animation for tapping from PhotoPage.
bug:6383694
Change-Id: Ib457d6b636dafd3f8ef7340bfa85725f14d90bd0
ndroid/gallery3d/app/AbstractGalleryActivity.java
ndroid/gallery3d/app/ActivityState.java
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/GalleryActivity.java
ndroid/gallery3d/app/PhotoDataAdapter.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/app/SinglePhotoDataAdapter.java
ndroid/gallery3d/app/StateManager.java
ndroid/gallery3d/app/TransitionStore.java
ndroid/gallery3d/ui/AlbumSlotRenderer.java
ndroid/gallery3d/ui/PhotoFallbackEffect.java
ndroid/gallery3d/ui/PhotoView.java
ndroid/gallery3d/ui/SlotView.java
|
| fee562b9bf026d4b3c338ba9ce2592b98bb3c11a |
16-May-2012 |
Owen Lin <owenlin@google.com> |
Set the window backgrond and remove it in onCreate().
To have better transistion when launching the app.
bug: 6494653
Change-Id: I0f28796d599931c676c99e8f19a9f34e05018570
ndroid/gallery3d/app/AbstractGalleryActivity.java
|
| 433a2e5b10824f5355eec02765b0c9ad6ac6c87c |
17-May-2012 |
Ray Chen <raychen@google.com> |
Merge "Fix 6213053 Add Help entry point to Gallery (targeted for J release) b: 6213053" into jb-dev
|
| f2105d95743e9ab8cdbd280e3fa5e4744a0bc0ea |
17-May-2012 |
Ray Chen <raychen@google.com> |
Merge "Fix 6479216 Playing a video should go full-screen first" into jb-dev
|
| 698f086739927ed1ace3754ce8d117365b0cb268 |
17-May-2012 |
Ray Chen <raychen@google.com> |
Fix 6213053 Add Help entry point to Gallery (targeted for J release)
b: 6213053
Change-Id: Ib94a8bbdb3114a198b775025c5864a3d83cdd5ad
ndroid/gallery3d/app/AlbumSetPage.java
ndroid/gallery3d/util/GalleryUtils.java
ndroid/gallery3d/util/HelpUtils.java
|
| ab1c41d2bea026fbb2f29e121413ff164ab326b8 |
17-May-2012 |
Yuli Huang <yuli@google.com> |
Smooth opening animation by modifying interpolation curve.
bug:5367032
Change-Id: I15ad839ede723591f081be200c1c16a8a9a901d0
ndroid/gallery3d/ui/PositionController.java
|
| 3b6b379870fa7899a33e7f5fb8d40f4966694216 |
17-May-2012 |
Yuli Huang <yuli@google.com> |
Merge "Fix card effect shown in opening animation." into jb-dev
|
| 6607de80c095fcd7bdc4fab14cc5a970e661d36e |
17-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Handle layout change between pausing and resuming.
Bug: 6468414
Change-Id: Ib190b620bea5a60f12d6075beaeb3bcd10b87802
ndroid/gallery3d/app/PhotoPage.java
|
| 48e08e8e420ef49bae62d3875c0b4e103ce56293 |
16-May-2012 |
Owen Lin <owenlin@google.com> |
Merge "Fix a dead lock while we freeze the screen." into jb-dev
|
| 40ffdb6244ba8492af8d29dce6d5bacdfd021af6 |
16-May-2012 |
Owen Lin <owenlin@google.com> |
Fix a dead lock while we freeze the screen.
bug: 6504696
Change-Id: If960967142bb0df773ce075bf76f5726c37e1d27
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/ui/GLRoot.java
ndroid/gallery3d/ui/GLRootView.java
|
| ded2316db6f1b2ebd23b68577c8a4a11282118de |
16-May-2012 |
Owen Lin <owenlin@google.com> |
Hide the share button if the shared URI is not "content:".
bug:6494818
Change-Id: I70a2997c07c19433cadee34fa348d27445bf2647
ndroid/gallery3d/app/MovieActivity.java
|
| 3c3b07e3a1511e736d5629c2bc4573d34c48f3ec |
15-May-2012 |
Yuli Huang <yuli@google.com> |
Fix card effect shown in opening animation.
bug:6495753
Change-Id: I7a640c2dddef0b7c58e0b7d5a00cbc4aab6ec43d
ndroid/gallery3d/ui/PhotoView.java
ndroid/gallery3d/ui/PositionController.java
|
| 4fa3d5bb57d166d915225b60e9f659e9c91fb9b3 |
15-May-2012 |
Yuli Huang <yuli@google.com> |
Avoid black screen when PhotoPage just starts.
bug:5367032
Change-Id: I6bd56026ec32bcee972d69855966750b9a57cdf4
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/ui/PhotoView.java
ndroid/gallery3d/ui/PositionController.java
|
| c600cdef0f959fea6b519109466aee6b10bb1e8b |
16-May-2012 |
Ray Chen <raychen@google.com> |
Merge "Fix 6470803 De-jank for video playback in fullscreen" into jb-dev
|
| bbc3c68f7d56a1d51169436d7b7fb15ebf73c1ac |
16-May-2012 |
Ray Chen <raychen@google.com> |
Merge "Fix 6046544: Deleting a photo takes multiple steps and the flow is inconsistent with other deleting flows on other core apps" into jb-dev
|
| 9ad7d738bd36217c85222865cf0bd539dd31a716 |
15-May-2012 |
Ray Chen <raychen@google.com> |
Fix 6046544: Deleting a photo takes multiple steps and the flow is inconsistent with other deleting flows on other core apps
Per request, change the confirm dialog message to "Delete the selected item(s)?"
b: 6046544
Change-Id: I46f7fd42a9f9fbf2399aca78ed9b2e67a15acb65
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/ui/ActionModeHandler.java
ndroid/gallery3d/ui/MenuExecutor.java
|
| c88fabf51e67d1ff83f4b6439cb135b6b877898a |
09-May-2012 |
Owen Lin <owenlin@google.com> |
Add animation for the paddings in SlotView.
bug:6383118
Change-Id: I034be207f73b027de448cef562a534f986d0cbe1
ndroid/gallery3d/ui/SlotView.java
|
| c07003d543a9b2b28dd152372e5355789ef1772e |
14-May-2012 |
Ray Chen <raychen@google.com> |
Fix 6479216 Playing a video should go full-screen first
Change-Id: I7b1d2bd28531ec4fd4b65862122cf058ef69066e
b: 6479216
ndroid/gallery3d/app/MoviePlayer.java
|
| 9617f47a1b307299d98644f54ea5b20839dae615 |
11-May-2012 |
Ray Chen <raychen@google.com> |
Fix 6470803 De-jank for video playback in fullscreen
b: 6470803
Change-Id: I91fd8430c34e84eac45c33070f0f571627e96820
ndroid/gallery3d/app/MovieActivity.java
ndroid/gallery3d/app/MovieControllerOverlay.java
|
| d88db1dbe50b9e147d7d5796e82f0c7bffb03ccb |
11-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Better data change handling for PhotoDataAdapter and PhotoView." into jb-dev
|
| c31bda66b05eae587fd86f758e2bd7ce30c58394 |
11-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Better data change handling for PhotoDataAdapter and PhotoView.
Change-Id: I0f67d918b95000d10786d2035286e036346bfa4e
ndroid/gallery3d/app/PhotoDataAdapter.java
ndroid/gallery3d/data/LocalImage.java
ndroid/gallery3d/ui/PhotoView.java
|
| 97c7b4364de1b1473e8c32449d69bbff2125d503 |
11-May-2012 |
Owen Lin <owenlin@google.com> |
Merge "Make sure we won't upload recycled bitmap." into jb-dev
|
| 34e6b587229c4863bb805859d9515abecd8abc5d |
10-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Add freeze/unfreeze for GLRootView.
Change-Id: Ieb78041fea22b064d176ea1318cf5883d5d4c94f
ndroid/gallery3d/ui/GLRoot.java
ndroid/gallery3d/ui/GLRootView.java
|
| 82f7ac999aae05b251cfe2c886020780832cd4a3 |
09-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Handle ScreenNail size change.
Bug: 6355399
Change-Id: Ice7560c12aa06cf8ac58cc3883f0888b5c6e71a5
ndroid/gallery3d/app/AppBridge.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/data/SnailAlbum.java
ndroid/gallery3d/data/SnailItem.java
ndroid/gallery3d/data/SnailSource.java
ndroid/gallery3d/ui/PhotoView.java
|
| 5bde7b562ec039f392e31a0cf39787a3e466be93 |
09-May-2012 |
Owen Lin <owenlin@google.com> |
Make sure we won't upload recycled bitmap.
bug: 6465117
Change-Id: I97553ba9da0256cfedde3a5752224380b1a3ee6f
ndroid/gallery3d/ui/AlbumSetSlidingWindow.java
ndroid/gallery3d/ui/AlbumSlidingWindow.java
ndroid/gallery3d/ui/TextureUploader.java
|
| ebf0f78490f851766f643d3d45fa351f4e92e091 |
09-May-2012 |
Yuli Huang <yuli@google.com> |
Crop-image doesn't show its title in the action-bar.
bug:6464608
Change-Id: I7b463beaa96f5f475812ec4f0c3de1118a6d0895
ndroid/gallery3d/app/CropImage.java
|
| ac02f46aa7ec727b839affb9aee415f01c1c2193 |
08-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Better orientation change handling.
Bug 6451117: Preview location is wrong after rotating the device quickly
Bug 6444303: The preview location is wrong when camera is started upside down on tablet
Bug 6451710: Tap to focus broken in landscape
Change-Id: I12fd57d6618ec5521ccc6efcbf65de57ff2ea3d2
ndroid/gallery3d/app/AppBridge.java
ndroid/gallery3d/app/OrientationManager.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/ui/GLRoot.java
ndroid/gallery3d/ui/GLRootView.java
ndroid/gallery3d/ui/GLView.java
ndroid/gallery3d/ui/OrientationSource.java
ndroid/gallery3d/ui/PhotoView.java
|
| b503801ebea0280bc5b55b092d4a5a61a7705f4a |
04-May-2012 |
Owen Lin <owenlin@google.com> |
Keep the last page if finish() is rejected.
bug: 6414642
Change-Id: I480edc43608c08088177113cb3607d517c91e9f6
ndroid/gallery3d/app/StateManager.java
|
| 147f9cbcdad905d75a25606bdbe8a5cc8fb5bd4d |
07-May-2012 |
Yuli Huang <yuli@google.com> |
Fix back-button's behavior in Crop.
bug:6452504
Change-Id: Ic11dd58c613764e3e6cf7a35135678777e49a4ef
ndroid/gallery3d/app/CropImage.java
|
| 39a4577a96e71e611cf01bc5d87f65cabc16f996 |
07-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Set default buffer size for SurfaceTexture." into jb-dev
|
| 92a16ddfe7ee187e3b85a5bcd5fcaacedafbd5b2 |
07-May-2012 |
Yuli Huang <yuli@google.com> |
Remove PhotoPage spinner shown in the action-bar.
Remove spinners shown for loading data out of view.
bug:5406790
Change-Id: Iffaf97937b86b869559a27f190941c1de263e422
ndroid/gallery3d/app/Gallery.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/app/StateManager.java
ndroid/gallery3d/util/GalleryUtils.java
ndroid/gallery3d/util/SpinnerVisibilitySetter.java
|
| 5f51073581d5325c88cc3f1d3f86203f2c4f2712 |
07-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Set default buffer size for SurfaceTexture.
This is needed for Panorama.
Change-Id: I452335cfec6357aef7b66ecac003a4b0ca0fd9fe
ndroid/gallery3d/ui/SurfaceTextureScreenNail.java
|
| 43c230018e32608e9d2a7156cedc2e81c1af6309 |
06-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Add transition for card deck effect.
Bug 6442785: Controls disappear & preview surface gets warped after deleting just taken video
Bug 6399861: Filmstrip: Pinch-out animation in fullscreen photo > filmstrip should be metaphorically consistent with the stack of cards model
Bug 6429677: Gray shadow shows up when start
Change-Id: I408cf250e67b4def20f5f15621fe57d7845c90f9
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/ui/PhotoView.java
ndroid/gallery3d/ui/PositionController.java
|
| 2628fcbcd0c8b4c018bef5987beac9f4e8061db1 |
05-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Fix 6429662: Video snapshot doesn't work
Change-Id: I6414be7f00ee103b7047128fdc92e03ca87c7703
ndroid/gallery3d/app/AppBridge.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/ui/PhotoView.java
|
| 1e1341f74fd9199751640d75442aaad2da1139df |
05-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Put play video icon at the same place of the screennails.
Bug: 6412197
Change-Id: Idaae46c598035639907a85f726b763b80bd9572d
ndroid/gallery3d/app/PhotoDataAdapter.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/app/SinglePhotoDataAdapter.java
ndroid/gallery3d/ui/PhotoView.java
ndroid/gallery3d/ui/TileImageView.java
|
| fd7d6bface4230593001e1afede7f4d251589cda |
04-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Tapping on the camera icon no matter what should open camera.
Bug: 6437677
Change-Id: I41ead463652c11986825744465f181ca75674c60
ndroid/gallery3d/app/PhotoPage.java
|
| f6ea3f162565001f91909b06db099a988e1a1a59 |
05-May-2012 |
Martijn Coenen <maco@google.com> |
Merge "Add support for Beaming multiple pictures." into jb-dev
|
| 7f10aa3f5ff28b3d6d392033efb677c6165af1fe |
05-May-2012 |
Yuli Huang <yuli@google.com> |
Fix a TODO by replacing a string.
Change-Id: I17216e0ca83a185842bc69151fcf8c5136e2b873
ndroid/gallery3d/app/PhotoPage.java
|
| 258e1a25312696bce23ceb83c4c731148023b91b |
03-May-2012 |
Yuli Huang <yuli@google.com> |
Don't show spinner to avoid janky transition.
bug:5406790
Change-Id: Ieea09f43d5230e1507c16001ec12b3ea6e3c3f0e
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/AlbumSetPage.java
|
| 1f9d97a22fb095c19cecbb87e08ff5bc7806dfca |
03-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Fix 6399813: tapping on a photo that isn't in the middle of the screen doesn't select it.
Also make tapping while flinging stop the scroll instead of opening the item.
Change-Id: Iefef4738d7d74b29e4594ea3ae2cb1c91e0e17ab
ndroid/gallery3d/ui/PhotoView.java
ndroid/gallery3d/ui/PositionController.java
|
| d6a033d59667a53527d19f1f0e07c950aff6d74a |
04-May-2012 |
Ray Chen <raychen@google.com> |
Merge "Fix 6341866 ANR in com.google.android.gallery3d due to com.android.gallery3d.ui.TileImageViewAdapter.setScreenNail" into jb-dev
|
| 266638231ff0ab052a1ae9b2f8656c71647e1ea6 |
03-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Add camera icon for camera roll." into jb-dev
|
| 2dedb26ed8c8260c11490b7a6e8f195d2a578935 |
03-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix NPE in onFullScreenChanged message handler. Bug: 6430929" into jb-dev
|
| 2c1a35c13d09e601c94e1021c7e4691b83846ec0 |
03-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Add camera icon for camera roll.
Bug: 6411709
Change-Id: I2476dba7edb2b763f3b7727f0034fa300cf0287a
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/AlbumSetPage.java
ndroid/gallery3d/util/GalleryUtils.java
|
| 8616245fcb5ee8e8ddb7b6ea493c07ca309a22a7 |
03-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Fix NPE in onFullScreenChanged message handler.
Bug: 6430929
Also tweak the timing of showing action bar and the timing of unlock orientation.
Change-Id: I1af4703ccf99f5257e9724a20d0aa216d20e13c2
ndroid/gallery3d/app/OrientationManager.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/ui/PhotoView.java
|
| 91a7d446c293d0a58f9857f828b01b1e08bf26db |
03-May-2012 |
Yuli Huang <yuli@google.com> |
Simplify Yes/No/Cancel dialog to Yes/Cancel dialog.
Simplify the dialog options to confirm if the user wants to discard
unsaved edited photo, similar to MMS asking if the user wants to discard
the unsent message.
bug:6436477
Change-Id: Ic5af09a1ed46033a25b4ac42bf05b9739f6e8447
ndroid/gallery3d/photoeditor/ActionBar.java
ndroid/gallery3d/photoeditor/PhotoEditor.java
ndroid/gallery3d/photoeditor/YesCancelDialogBuilder.java
ndroid/gallery3d/photoeditor/YesNoCancelDialogBuilder.java
|
| ccc2ef5296119c723b4b7de3d6d5e562963db420 |
03-May-2012 |
Yuli Huang <yuli@google.com> |
Merge "Fix NPE because of concurrent access in both GL and main threads." into jb-dev
|
| 3e553345da6aa4061f67505882eaae0ac120f89b |
02-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Show/hide action bar at the right time.
Bug: 6399476
Change-Id: I5046b2e73822ebadd94680f61d87db183b40b5c2
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/ui/PhotoView.java
|
| ed5b46b29247cb3edbfc2d89619428a751d3cea5 |
02-May-2012 |
Yuli Huang <yuli@google.com> |
Fix NPE because of concurrent access in both GL and main threads.
bug:6411187
Change-Id: I811c83f49837ee921436fec0c6b1bf2de0156e0a
ndroid/gallery3d/app/GalleryActionBar.java
|
| d7a94a57852e9c0d0f837cdd0bff8f4583b63df9 |
03-May-2012 |
Pin Ting <pinting@google.com> |
Turn on unlockOrientation to make onConfigurationChanged in camera work.
Bug:6304805
Change-Id: Ia5a8df4153a7ddc7847a8a3744a3537120edb143
ndroid/gallery3d/app/PhotoPage.java
|
| a3b71abdb18a974e3269a6808c67431e6c86fc28 |
01-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Fix the Camera controls disappearing after zooming problem.
Bug: 6392682
Change-Id: I065c52b44c02f9314e58e82846cdf22e2d940eab
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/ui/PhotoView.java
|
| 3db691c36312afb934463f0549a33a7eb58bf696 |
01-May-2012 |
Yuli Huang <yuli@google.com> |
Fix 'Edit' and 'Crop' behaviors.
1. Make Gallery show edited local photo after resuming, similar to how
it shows cropped local photo after resuming.
2. Fix inconsistency between cropping local/PWA photo.
bug:6168430
Change-Id: Ia350e0c67f05969ad42f56b9693c09c3b6433d3c
ndroid/gallery3d/app/PhotoDataAdapter.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/photoeditor/PhotoEditor.java
ndroid/gallery3d/ui/MenuExecutor.java
|
| c3d5fcfbbb0cd6bd14cc9930fff36356b0024371 |
02-May-2012 |
Owen Lin <owenlin@google.com> |
Merge "Change thumbnail's position only when it is invisible." into jb-dev
|
| c6ba487196474a75461100ae3b1886151b106026 |
02-May-2012 |
Owen Lin <owenlin@google.com> |
Merge "Fix a issue that we are trying upload a recycled tile." into jb-dev
|
| c7faa9ef9e493d7af0345efa403c74c168c3843e |
02-May-2012 |
Owen Lin <owenlin@google.com> |
Merge "Add support to draw on texture." into jb-dev
|
| 960290b28c2a0d69216c5412c4da2f4e5c58e602 |
02-May-2012 |
Owen Lin <owenlin@google.com> |
Change thumbnail's position only when it is invisible.
bug:6393694
Change-Id: I33f41c3c894b4c6d28e0832cfd4badbfca3a4f64
ndroid/gallery3d/app/AlbumPage.java
|
| 023eb0887e122a41315066dbebb8c89360b98810 |
24-Apr-2012 |
Owen Lin <owenlin@google.com> |
Add support to draw on texture.
Change-Id: I95dd5d29352692b702503969e1ebe07bc91a8a73
ndroid/gallery3d/ui/GLCanvas.java
ndroid/gallery3d/ui/GLCanvasImpl.java
ndroid/gallery3d/ui/Raw2DTexture.java
ndroid/gallery3d/ui/RawTexture.java
|
| 01b38a1d30f9002b67bdf93ea0277fbf9f8813ea |
27-Apr-2012 |
Owen Lin <owenlin@google.com> |
Fix a issue that we are trying upload a recycled tile.
bug:5779992
Change-Id: I2503c87e9cea4e8b0ad5250b1508d06f44125779
ndroid/gallery3d/ui/TileImageView.java
|
| 98db32decd9cbc4d3405f9c75f3a43a0e74f873f |
02-May-2012 |
Ray Chen <raychen@google.com> |
Fix 6341866 ANR in com.google.android.gallery3d due to com.android.gallery3d.ui.TileImageViewAdapter.setScreenNail
RegionDecoder is run in a lower priority thread but it uses the same lock as setScreenNail while decoding, so a priority inversion causes this ANR.
The change tries to separate the lock so setScreenNail doesn't have to wait on the decoding process so the ANR could be avoided.
Change-Id: I02cc26fa0535adaa57cdcf94b819970e179311d1
b:6341866
ndroid/gallery3d/ui/TileImageViewAdapter.java
|
| 82cae104296a478ab5e69dd123266096ec004b2b |
02-May-2012 |
Owen Lin <owenlin@google.com> |
Merge "Fix photo rotates incorrectly in crop image." into jb-dev
|
| 348988dc1934981a96018006b4af6c38f33cf26e |
30-Apr-2012 |
Wei Huang <weih@google.com> |
Merge "Don't enter film mode automatically when moving from camera preview to picture." into jb-dev
|
| a03ad179e64997e3ce7949e5cad6724c9b6054c6 |
30-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Don't enter film mode automatically when moving from camera preview to picture.
Also don't follow the scaling touch once we decide to change film mode, this makes the animation smoother.
Change-Id: I45f97bd8c3cc90666370afeb1c18d21dfcc87c06
ndroid/gallery3d/ui/PhotoView.java
|
| a0310aed2f9facb517b57e538f81e6fb506c2d82 |
30-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix black screen when viewing Gmail image file attachment. Bug: 6415848" into jb-dev
|
| 87baee154396cba12d785d7657bab45fe9285c0f |
30-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Fix black screen when viewing Gmail image file attachment.
Bug: 6415848
Change-Id: Iec369866be6b5546fbd8cb77eb95a29f92e00b84
ndroid/gallery3d/ui/PositionController.java
|
| 28d4c4d0b2df6b297a5ca701cad7f83df864d9a7 |
30-Apr-2012 |
Wu-cheng Li <wuchengli@google.com> |
Fix crash when select all is pressed.
bug:6411186
Change-Id: Iaa71a320bc4d6d70aade41d5144f75ba6db36e6d
ndroid/gallery3d/ui/MenuExecutor.java
|
| 30acac409a65548312ca819e855e40bec1a65cce |
30-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Fix Back behavior in gallery grid and remove camera preview tile.
Bug: 6411801
Bug: 6411709
Change-Id: Iebd7db06d44d315ac67eb8c5133b86044fce30c4
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/PhotoPage.java
|
| ea726188eb28a84dc84389a35e82c632e04c8b04 |
30-Apr-2012 |
Wu-cheng Li <wuchengli@google.com> |
Do not show action bar on camera.
bug:6411406
Change-Id: I4fbb95c9913046b4d5b1cfa4ede10490d156ed3f
ndroid/gallery3d/app/PhotoPage.java
|
| ad08811a71e246d45ecdf97402f08cf7bd68e83b |
26-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Support drawing in different orientation in Gallery.
Bug 6312994: Swipe UX: do not directly show the camera roll when camera starts
Bug 6313191: Swipe UX: Change swipe direction after the user rotated the device
Bug 6313192: Swiping UX: make Gallery display in rotated mode
Bug 6399447: Filmstrip: in Gallery, pressing Back from filmstrip doesn't perform the right animation
Bug 6399974: Filmstrip: when swiping from full-screen photo to filmstrip mode, camera view and the photo-roll don't align correctly
Bug 6400014: Swiping UX: in Camera portrait mode, tapping on the Thumbnail doesn't align camera view and the photo-roll correctly
Bug 6401075: Able to scroll through the gallery pics while capturing video.
Bug 6405087: Filmstrip does not change with orientation
Change-Id: I8c479d87800c63b7a95c199c0c1c3bc512d66d42
ndroid/gallery3d/app/AbstractGalleryActivity.java
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/AppBridge.java
ndroid/gallery3d/app/CameraScreenNail.java
ndroid/gallery3d/app/GalleryActivity.java
ndroid/gallery3d/app/OrientationManager.java
ndroid/gallery3d/app/PhotoDataAdapter.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/app/SinglePhotoDataAdapter.java
ndroid/gallery3d/ui/GLRoot.java
ndroid/gallery3d/ui/GLRootView.java
ndroid/gallery3d/ui/GLView.java
ndroid/gallery3d/ui/PhotoView.java
ndroid/gallery3d/ui/PositionController.java
ndroid/gallery3d/ui/ScreenNailHolder.java
ndroid/gallery3d/ui/TileImageView.java
|
| ac9c2f6f230660a657f9d3b64c7a3bbf8b3bd598 |
30-Apr-2012 |
Pin Ting <pinting@google.com> |
Merge "Remove unused code." into jb-dev
|
| bd4b0ddb075c6a5745fcd07867635af5c1ebe45e |
30-Apr-2012 |
Pin Ting <pinting@google.com> |
Remove unused code.
Change-Id: Icd68f286a8b97594495f56d6b4bfa2e785462f5d
ndroid/gallery3d/app/ManageCachePage.java
|
| a61f19793afe59eaa26d4c02ab23c1fbeea7ead6 |
27-Apr-2012 |
Martijn Coenen <maco@google.com> |
Add support for Beaming multiple pictures.
Change-Id: I12bb82bb605813168a7870807390ce2cb37a9a15
ndroid/gallery3d/ui/ActionModeHandler.java
|
| f375599300f05880a4060f7c8f290ae9f5847d0f |
25-Apr-2012 |
Yuli Huang <yuli@google.com> |
Make 'Edit' behave more consistent with 'Crop'. DO NOT MERGE.
1. Save edited PWA photo in 'dowload', same as cropped images.
2. Fix Crop-image toast may show strings without i18n.
bug:6168430
Change-Id: Ic99a478e684597d3dc1a105c4f592dd98d8f227d
ndroid/gallery3d/app/CropImage.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/data/MtpContext.java
ndroid/gallery3d/photoeditor/SaveCopyTask.java
ndroid/gallery3d/util/BucketNames.java
ndroid/gallery3d/util/MediaSetUtils.java
|
| 52083a2fcca3007ddde51ccd166d602d95583bee |
27-Apr-2012 |
Owen Lin <owenlin@google.com> |
Fix photo rotates incorrectly in crop image.
bug:6399424
Change-Id: Icc0aca5e9abcd643f8e246211e37bd177bf8ff31
ndroid/gallery3d/data/UriSource.java
|
| 9f13c0ec31e748ab7ade660e416efd03b63176fa |
26-Apr-2012 |
Wu-cheng Li <wuchengli@google.com> |
Do not use card effect for camera screen nail.
bug:6402571
Change-Id: I362e675ea4160b7b940e0da4bd018e0e8c7add57
ndroid/gallery3d/ui/PhotoView.java
|
| 79fb06ac02baa80dcf039ef05f0b19b7373038a8 |
26-Apr-2012 |
Wu-cheng Li <wuchengli@google.com> |
Make sure action bar is hidden when camera starts.
bug:6402552
Change-Id: I2ec39e607a505490e431181eb40e259102b9a773
ndroid/gallery3d/app/PhotoPage.java
|
| 6486509ebf29af2c4526342265a620bd371cb96a |
24-Apr-2012 |
Wu-cheng Li <wuchengli@google.com> |
Hide action bar when camera screen nail is displayed.
bug:6363385
Change-Id: Ic37afa779339cfe5f66f0a40cbf4870ff1a6a0ee
ndroid/gallery3d/app/PhotoPage.java
|
| b3afd5505b0e0491fe50e2342df6e6aabb86bf30 |
25-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Remove scissor tests."
|
| 077dbd0511cd5f9b3a8933be9c4072d8c6dbddef |
25-Apr-2012 |
Ray Chen <raychen@google.com> |
Fix 6376466 After deleting photo, the next one will be shown too dark
b:6376466
Change-Id: I7328215c45995d6ae1813ed861da3ad826809461
ndroid/gallery3d/ui/PhotoView.java
|
| cd4795d3c7485a665b9ed2dd8ede980f94dd63c5 |
25-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Remove scissor tests.
Change-Id: I9f2c462a251e518ce5954dde0eb6e509734254c4
ndroid/gallery3d/ui/GLCanvasImpl.java
ndroid/gallery3d/ui/GLRootView.java
ndroid/gallery3d/ui/Raw2DTexture.java
|
| 56363ddedc94981a0745065d792603bbf7d23878 |
20-Apr-2012 |
Owen Lin <owenlin@google.com> |
Fix NPE in Gallery.
This happens if user set type in an intent. But we get a different type from
content resolver.
Change-Id: Iabafce7f7aaff23a7a9ee09e1d38ab50049abc88
fix: 6358473
ndroid/gallery3d/app/CropImage.java
ndroid/gallery3d/app/Gallery.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/data/DataManager.java
ndroid/gallery3d/data/LocalSource.java
ndroid/gallery3d/data/MediaSource.java
ndroid/gallery3d/data/UriImage.java
ndroid/gallery3d/data/UriSource.java
|
| 9e65a3ae634f0e5b6fccaa929b54b884be0380e4 |
25-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Don't do capture animation if we don't have Camera ScreenNail.
Also make "Back" jump to first picture instead of the previous one.
Bug: 6388263
Change-Id: Idf78363cf3952bf66c6b0688e79d99c01956cd07
ndroid/gallery3d/app/PhotoDataAdapter.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/app/SinglePhotoDataAdapter.java
ndroid/gallery3d/ui/PhotoView.java
|
| 210934990196deeea0d19a148e85b3c1c136eb40 |
20-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Add capture animation in Gallery.
Change-Id: Ibf95cc64f37a4518377e64124af6606c4f14cdaa
ndroid/gallery3d/app/AbstractGalleryActivity.java
ndroid/gallery3d/app/Gallery.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/app/PickerActivity.java
ndroid/gallery3d/ui/CaptureAnimation.java
ndroid/gallery3d/ui/PhotoView.java
ndroid/gallery3d/ui/PositionController.java
|
| 337624b3d7a9eab0da9f2829f3f95ef5f101fefc |
24-Apr-2012 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Add a method to disable toggle status bar."
|
| ad761dc6ac5dd9884f12438237d681ac5caac71d |
24-Apr-2012 |
Wu-cheng Li <wuchengli@google.com> |
Add a method to disable toggle status bar.
Camera does not show status bar in both landscape and
portrait.
bug:6378178
Change-Id: I80cead9c0e2ef0256288aafead6bd1a96cc93d7b
ndroid/gallery3d/app/AbstractGalleryActivity.java
|
| 08fe3f900d867ef9cb3be819c67b8e41a9b560c8 |
24-Apr-2012 |
Yuli Huang <yuli@google.com> |
Merge "Add prominent highlights for touch feedback."
|
| ea8e952ea7eb0ba613cebf0e1771dfeac330275b |
24-Apr-2012 |
Angus Kong <shkong@google.com> |
Merge "Add Raw2DTexture."
|
| 21db31f5dd7db63f2a5b24a9da721011a2312a1a |
11-Apr-2012 |
Angus Kong <shkong@google.com> |
Add Raw2DTexture.
Raw2DTexture is a wrapper of GL 2D texture. It also support copy other
texture's content into this texture.
bug:5988937
Change-Id: Ib4f6ff7ed2f6ea499517536366b511b7984a9b98
ndroid/gallery3d/ui/ExtTexture.java
ndroid/gallery3d/ui/GLId.java
ndroid/gallery3d/ui/Raw2DTexture.java
ndroid/gallery3d/ui/SurfaceTextureScreenNail.java
|
| 4072ab93a57bcb2ad9fab6f42edf3805420080ec |
24-Apr-2012 |
Yuli Huang <yuli@google.com> |
Add prominent highlights for touch feedback.
Mimic the system UI to fade out highlights on touch releases.
bug:6145331
bug:5379176
Change-Id: I44c9245a926b2c5eb46b28d494c6393ba7f0c30c
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/AlbumSetPage.java
ndroid/gallery3d/app/ManageCachePage.java
ndroid/gallery3d/ui/AbstractSlotRenderer.java
ndroid/gallery3d/ui/AlbumSetSlotRenderer.java
ndroid/gallery3d/ui/AlbumSlotRenderer.java
ndroid/gallery3d/ui/FadeInTexture.java
ndroid/gallery3d/ui/FadeOutTexture.java
ndroid/gallery3d/ui/FadeTexture.java
ndroid/gallery3d/ui/SlotView.java
|
| 85c9ea40b0026befe79c4ba866a73f5d58ee5555 |
05-Apr-2012 |
Ray Chen <raychen@google.com> |
Fix 6046544 Deleting a photo takes multiple steps and the flow is inconsistent with other deleting flows on other core apps
This CL adds a confirm dialog to delete command and removes all confirm/cancel menu items from the actionbar.
b:6046544
Change-Id: I3afe7b59b4f6d1216e192a621621f7bf544e1919
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/ui/ActionModeHandler.java
ndroid/gallery3d/ui/MenuExecutor.java
|
| 6e98a5bb1862af0056fe009184dc8aa2fc4611a2 |
23-Apr-2012 |
Ray Chen <raychen@google.com> |
Merge "Fix 6208468 21 ANR(s) in: com.google.android.gallery3d on crespo during monkey runs for JRM80 b:6208468"
|
| c2a3c753afba43e211e999881bd2cbbdf2182ffd |
23-Apr-2012 |
Ray Chen <raychen@google.com> |
Merge "Fix 6046987 The header on the contextual action bar when multiple photos are selected is very janky b:6046987"
|
| 75098751ca463136d39719dcdeafc24c8acedb7d |
20-Apr-2012 |
Owen Lin <owenlin@google.com> |
Merge "Fix a UI bug in rendering a rotated image."
|
| f9a5a456aa75949c1065656ba01ab2ca350de7e9 |
20-Apr-2012 |
Ray Chen <raychen@google.com> |
Fix 6208468 21 ANR(s) in: com.google.android.gallery3d on crespo during monkey runs for JRM80
b:6208468
Both getDataManager and getImageCacheService use the same lock but the latter method is blocked on
RandomAccessFile's open syscall. The lock should be separated because they're independent and
getDataManager is very frequently used too.
Change-Id: I4d44cfc949f45a31c7200c8327115bc4b7fde60f
ndroid/gallery3d/app/GalleryAppImpl.java
|
| b79bbd85bc1ce26a18a2be1100b95dfacbbce5e6 |
19-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
In filmstrip, show placeholders for pictures not loaded yet.
Change-Id: I037f1f054da4a3800045d5b89724341ac22272a5
ndroid/gallery3d/app/PhotoDataAdapter.java
ndroid/gallery3d/app/SinglePhotoDataAdapter.java
ndroid/gallery3d/ui/BitmapScreenNail.java
ndroid/gallery3d/ui/BitmapTileProvider.java
ndroid/gallery3d/ui/PhotoView.java
ndroid/gallery3d/ui/PositionController.java
ndroid/gallery3d/ui/ScreenNail.java
ndroid/gallery3d/ui/SurfaceTextureScreenNail.java
ndroid/gallery3d/ui/TileImageViewAdapter.java
|
| 0f4f00b1c311527f31afa2d7a481b46675aeb14e |
19-Apr-2012 |
Ray Chen <raychen@google.com> |
Fix 6046987 The header on the contextual action bar when multiple photos are selected is very janky
b:6046987
Change-Id: I86c79cf4d8995bfa0faab95ecd61e89879847630
ndroid/gallery3d/ui/CustomMenu.java
|
| 4ddae7b90c19375df0f122f5c1770340afb2e14f |
19-Apr-2012 |
Owen Lin <owenlin@google.com> |
Fix a UI bug in rendering a rotated image.
Change-Id: I14f9f74c5d810dfbb56151722c7f604522fea938
ndroid/gallery3d/ui/AbstractSlotRenderer.java
|
| 4831a8fbd146ed627b8f6be4f4d1fed4cd4e3fe5 |
19-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Allow filmstrip to scroll before the screennail is loaded.
Change-Id: I9aa7405902c4bfb7e4946cfe4e1263314a958686
ndroid/gallery3d/app/PhotoDataAdapter.java
ndroid/gallery3d/ui/PhotoView.java
ndroid/gallery3d/ui/PositionController.java
|
| a0b06477b94978c447eedf1686def0fecc356aeb |
18-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Film strip should be accessible only when an image is its default state.
Change-Id: I4df0db809f6a3f8d28b4e7bbbcddc3fa19d35387
ndroid/gallery3d/ui/PhotoView.java
|
| 2eaa2112c460e931ad0261b408213d3d1217d96f |
17-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Add thumb pool the cache Bitmap used for thumbnails.
Change-Id: Ib710f2a6fc1aa86fe4abdd18d1fa7ac71396a3b4
ndroid/gallery3d/app/AbstractGalleryActivity.java
ndroid/gallery3d/app/CameraScreenNail.java
ndroid/gallery3d/app/PhotoDataAdapter.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/app/SinglePhotoDataAdapter.java
ndroid/gallery3d/data/BitmapPool.java
ndroid/gallery3d/data/DecodeUtils.java
ndroid/gallery3d/data/ImageCacheRequest.java
ndroid/gallery3d/data/MediaItem.java
ndroid/gallery3d/ui/AlbumLabelMaker.java
ndroid/gallery3d/ui/AlbumSetSlidingWindow.java
ndroid/gallery3d/ui/BitmapScreenNail.java
ndroid/gallery3d/ui/BitmapTileProvider.java
ndroid/gallery3d/ui/PhotoView.java
ndroid/gallery3d/ui/PositionController.java
ndroid/gallery3d/ui/ScreenNail.java
ndroid/gallery3d/ui/SurfaceTextureScreenNail.java
ndroid/gallery3d/ui/TileImageView.java
ndroid/gallery3d/ui/TileImageViewAdapter.java
|
| 146df37d6a6c7ca8686f5934b3d90b16c24a2583 |
18-Apr-2012 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Add page tap listener."
|
| 36c27fb695ff66bea4a00cfc063b142a736a782f |
18-Apr-2012 |
Wu-cheng Li <wuchengli@google.com> |
Add page tap listener.
Camera needs this for touch focus and video snapshot.
bug:6313318
Change-Id: Ie0b8129160c2a79d4b20fab2173027cddfee7a79
ndroid/gallery3d/app/PhotoPage.java
|
| 4eaad6f512b4c1e7cf01fc56c2af78eca92fbf07 |
18-Apr-2012 |
Owen Lin <owenlin@android.com> |
Merge "Slower scrolling for fling in filmstrip mode."
|
| 101b5d6115100652a25e33f0ffbd6108aa7f9276 |
17-Apr-2012 |
Owen Lin <owenlin@google.com> |
Fix NPE in onContentDirty.
onContentDirty is suppose to be called in Main thread.
Change-Id: Ic6a0fba8abd8a3e17d400bcfc5b82d272b07bc41
ndroid/gallery3d/data/LocalAlbumSet.java
ndroid/gallery3d/data/MtpDeviceSet.java
|
| 3c21751275b2b8719dfc549b059d09436d4c2e19 |
17-Apr-2012 |
Owen Lin <owenlin@google.com> |
Fix NPE in SlotView.
This NPE is actually a concurrent issue. We shall lock renderring when we clean up
the slots' data. But it didn't, so it may access to null data.
Change-Id: I2a8abfbb77f83bd9a240477fa53216ce69b7774d
fix: 6302487
fix: 6308873
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/AlbumSetPage.java
ndroid/gallery3d/app/ManageCachePage.java
ndroid/gallery3d/ui/ActionModeHandler.java
ndroid/gallery3d/ui/SlotView.java
|
| a5c3c853f35416146701ca2fc2cf17ab04ea9738 |
17-Apr-2012 |
Yuli Huang <yuli@google.com> |
Fix b/6318340: window range isn't updated when data size changes.
bug:6318340
Change-Id: I2098ddc75fe1a4422a20ab90f02a12c9be85c31e
ndroid/gallery3d/ui/AlbumSetSlidingWindow.java
ndroid/gallery3d/ui/AlbumSlidingWindow.java
|
| 3d6983be31e4c5a9fc76bf3e89033f7237c5a5ca |
16-Apr-2012 |
Ray Chen <raychen@google.com> |
Fix b/6213053 Add Help entry point to Gallery (targeted for J release)
b:6213053
Change-Id: Ib9d9c5e69f09d6c2fffb4e6ecb09b2c3ae700365
ndroid/gallery3d/app/AlbumSetPage.java
ndroid/gallery3d/util/GalleryUtils.java
|
| 2a8766065ee4ede16bf432a3aeeca9e4ff10c09c |
17-Apr-2012 |
Owen Lin <owenlin@google.com> |
Merge "Fix a concurrent issue in reload()."
|
| 6e32315ba37592eae9d16310d48ce4dbd4a45c5e |
16-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Slower scrolling for fling in filmstrip mode.
Also don't animate scale for the first image size.
Change-Id: I6a71c00e813bd203e9f454bc9a776eadec06fd78
ndroid/gallery3d/ui/PositionController.java
|
| 125649ecc3b3a20f027c11c2eaa3b2868e25a038 |
16-Apr-2012 |
Owen Lin <owenlin@google.com> |
Fix a concurrent issue in reload().
We need to hold the DataManager.LOCK when calling reload.
Change-Id: If908c233bcd835effffc7750a7ef07f56a63136c
fix: 6315479
ndroid/gallery3d/data/LocalAlbumSet.java
ndroid/gallery3d/data/MtpDeviceSet.java
|
| 0fd46993facd2d2ac80eab64e4f0f8c8e79350dc |
16-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Define max height/width for each picture in filmstrip mode.
Change-Id: I844a32f95237724a60a64afe5f746798886dcc2c
ndroid/gallery3d/ui/PositionController.java
|
| a754c6b508bb3c32312c4983d5371b8173f106fd |
16-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Reduce padding between photos, from 96 pixels to 16 dp.
Change-Id: I62b0013da45b7d7495b34e9e4e1e791bac9c9c1f
ndroid/gallery3d/ui/PositionController.java
|
| 0c9b33142eab6dbc2fdfe58179b26fa497b7eff0 |
14-Apr-2012 |
Martijn Coenen <maco@google.com> |
Merge "Use new Beam push API."
|
| 1e648cb762bf539102888846d18c0b3de5d6fc56 |
14-Apr-2012 |
Martijn Coenen <maco@google.com> |
Use new Beam push API.
Change-Id: I3e5a69832d1ac01759e37fbde2cf2c1926219445
ndroid/gallery3d/app/PhotoPage.java
|
| 47795fea8bc6e4bd65af73c2cabcdae593f78952 |
12-Apr-2012 |
Owen Lin <owenlin@google.com> |
Fix ANR in PhotoPage.
This bugs happens because we open too many PhotoPage(s) (and onSingleTapUp is a delayed event).
However, each of the PhotoPage need a Thread to run tile decoder. When we close one of the
PhotoPage, it will wait the tile decoder to get finished first. However, the title decoder may
still waiting in the queue and never got a chance to run.
Change-Id: I113d1150729892edb4fe36bc5a1dc131db300476
fix: 6319833
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/AlbumSetPage.java
|
| fe047898b1afd2b85ab37755cdf3f19b058abc58 |
12-Apr-2012 |
Yuli Huang <yuli@google.com> |
Fix SinglePhotoDataAdapter getScreenNail()
bug:6322259
Change-Id: I6cf5de88fc07e4b73b028faa3b2a063b4d47fd20
ndroid/gallery3d/app/SinglePhotoDataAdapter.java
|
| e6df30dfc67a56a141fa4c0c9ebdd01b6c4c21f5 |
10-Apr-2012 |
Yuli Huang <yuli@google.com> |
Merge "Save edited photo in the source photo directory if applicable."
|
| 785a980f3dc660d82bfb2be81bbe70a42631f5dd |
10-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Add new filmstrip mode for PhotoView."
|
| 8bb545968ebb45b25c7ed88632a1f82f8295baae |
02-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Add new filmstrip mode for PhotoView.
Change-Id: I9da9896303ced8d63a3557d5e6e9bc06fb366cf5
ndroid/gallery3d/app/PhotoDataAdapter.java
ndroid/gallery3d/app/SinglePhotoDataAdapter.java
ndroid/gallery3d/ui/AnimationTime.java
ndroid/gallery3d/ui/BitmapScreenNail.java
ndroid/gallery3d/ui/EdgeView.java
ndroid/gallery3d/ui/GLRootView.java
ndroid/gallery3d/ui/PhotoView.java
ndroid/gallery3d/ui/PositionController.java
ndroid/gallery3d/util/RangeArray.java
ndroid/gallery3d/util/RangeBoolArray.java
ndroid/gallery3d/util/RangeIntArray.java
|
| 68767b61aa7b0b2eebf673a05c9e7b7429eb5ee7 |
10-Apr-2012 |
Yuli Huang <yuli@google.com> |
Save edited photo in the source photo directory if applicable.
bug:6168430
Change-Id: I97d8cf1d286bc4d5d7c38ba5118b9a952f17b252
ndroid/gallery3d/photoeditor/BitmapUtils.java
ndroid/gallery3d/photoeditor/SaveCopyTask.java
|
| d8d1cfdb80a7bcc950e8deb957a6c55ec83a68b0 |
09-Apr-2012 |
Owen Lin <owenlin@google.com> |
Add BytesBufferPool to prevent GC.
Change-Id: Ia8513ff380a60f102481cbf25650eca149b75064
ndroid/gallery3d/app/AbstractGalleryActivity.java
ndroid/gallery3d/data/BitmapPool.java
ndroid/gallery3d/data/BytesBufferPool.java
ndroid/gallery3d/data/ImageCacheRequest.java
ndroid/gallery3d/data/ImageCacheService.java
ndroid/gallery3d/data/MediaItem.java
ndroid/gallery3d/ui/AlbumLabelMaker.java
ndroid/gallery3d/ui/BitmapPool.java
ndroid/gallery3d/ui/TextureUploader.java
|
| a66827d34d8c29a612787e3fa2557a53191494da |
09-Apr-2012 |
Owen Lin <owenlin@google.com> |
Prevent album's label get flashing when content changed.
Change-Id: I1b00b308af740ccab143a073643729ca880770f4
ndroid/gallery3d/app/AlbumSetDataLoader.java
ndroid/gallery3d/ui/AlbumLabelMaker.java
ndroid/gallery3d/ui/AlbumSetSlidingWindow.java
|
| 359dadda41154bd1836312a70280b42d86777be1 |
06-Apr-2012 |
Owen Lin <owenlin@google.com> |
Refactor. Rename AlbumView to AlbumSlotRenderer.
Change-Id: I7d8d3586a910dac35975e4effa0d02528e2ccf98
ndroid/gallery3d/app/AlbumDataAdapter.java
ndroid/gallery3d/app/AlbumDataLoader.java
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/AlbumSetDataAdapter.java
ndroid/gallery3d/app/AlbumSetDataLoader.java
ndroid/gallery3d/app/AlbumSetPage.java
ndroid/gallery3d/app/Config.java
ndroid/gallery3d/app/ManageCachePage.java
ndroid/gallery3d/ui/AlbumLabelMaker.java
ndroid/gallery3d/ui/AlbumSetSlidingWindow.java
ndroid/gallery3d/ui/AlbumSetSlotRenderer.java
ndroid/gallery3d/ui/AlbumSetView.java
ndroid/gallery3d/ui/AlbumSlidingWindow.java
ndroid/gallery3d/ui/AlbumSlotRenderer.java
ndroid/gallery3d/ui/AlbumView.java
ndroid/gallery3d/ui/ManageCacheDrawer.java
|
| da6adcd0ff528338328021747ef9c4dfe5aa8742 |
04-Apr-2012 |
Owen Lin <owenlin@google.com> |
Draw less to improve performance.
Also adjust the upload order to upload nearby textures first.
Change-Id: I2d6a8807a14b4602882dd2e5c03030c356f49e47
ndroid/gallery3d/ui/AlbumLabelMaker.java
ndroid/gallery3d/ui/AlbumSetSlidingWindow.java
ndroid/gallery3d/ui/AlbumSetView.java
ndroid/gallery3d/ui/AlbumSlidingWindow.java
ndroid/gallery3d/ui/AlbumView.java
|
| ed79d50b3f703227dbe55e3272925c260e490831 |
03-Apr-2012 |
Owen Lin <owenlin@google.com> |
Fix flashing in "Make available offline".
Change-Id: I84f0896c6038eb21d32e0d5fe0cafec5d339e6ec
ndroid/gallery3d/ui/FadeInTexture.java
ndroid/gallery3d/ui/GLCanvasImpl.java
|
| 48503a022b1e32e9a8a7597ff2c272eb7a6cab58 |
04-Apr-2012 |
Owen Lin <owenlin@google.com> |
Refactor. Merge SelectionDrawer with SlotRenderer.
Change-Id: Iaa50b2a78beb95fc83208a5f74cf612650cd8643
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/AlbumSetPage.java
ndroid/gallery3d/app/ManageCachePage.java
ndroid/gallery3d/data/DataSourceType.java
ndroid/gallery3d/data/Path.java
ndroid/gallery3d/ui/AbstractSlotRenderer.java
ndroid/gallery3d/ui/AlbumLabelMaker.java
ndroid/gallery3d/ui/AlbumSetSlidingWindow.java
ndroid/gallery3d/ui/AlbumSetView.java
ndroid/gallery3d/ui/AlbumView.java
ndroid/gallery3d/ui/GridDrawer.java
ndroid/gallery3d/ui/HighlightDrawer.java
ndroid/gallery3d/ui/IconDrawer.java
ndroid/gallery3d/ui/ManageCacheDrawer.java
ndroid/gallery3d/ui/SelectionDrawer.java
ndroid/gallery3d/ui/SelectionManager.java
|
| d705545b21241e5f9d98ae732d1aee1856e58b76 |
29-Mar-2012 |
Owen Lin <owenlin@google.com> |
Upload textures in background.
Change-Id: I365f7be9aaab793366884249cbb10e8b6f0ab0e6
ndroid/gallery3d/app/AbstractGalleryActivity.java
ndroid/gallery3d/app/AlbumDataAdapter.java
ndroid/gallery3d/app/AlbumSetDataAdapter.java
ndroid/gallery3d/data/ImageCacheRequest.java
ndroid/gallery3d/data/MediaItem.java
ndroid/gallery3d/ui/AlbumLabelMaker.java
ndroid/gallery3d/ui/AlbumSetSlidingWindow.java
ndroid/gallery3d/ui/AlbumSetView.java
ndroid/gallery3d/ui/AlbumSlidingWindow.java
ndroid/gallery3d/ui/AlbumView.java
ndroid/gallery3d/ui/BitmapPool.java
ndroid/gallery3d/ui/GLRoot.java
ndroid/gallery3d/ui/GLRootView.java
ndroid/gallery3d/ui/SlotView.java
ndroid/gallery3d/ui/TextureUploader.java
ndroid/gallery3d/ui/TileImageView.java
|
| f4db9db978b68d9f1568a7606cf0b5ce055dfe2a |
05-Apr-2012 |
Owen Lin <owenlin@google.com> |
Merge "Make all drawing happens in background."
|
| 8123444bb1cff7a6d1874bbcd100337f30ef8006 |
26-Mar-2012 |
Owen Lin <owenlin@google.com> |
Make all drawing happens in background.
Also move more rendering code to SlotRenderers (AlbumSetView and AlbumView).
Change-Id: I1d678711bfd3655a48bb4b99d8ca175e088bdffb
ndroid/gallery3d/app/AlbumSetDataAdapter.java
ndroid/gallery3d/ui/AbstractDisplayItem.java
ndroid/gallery3d/ui/AlbumLabelMaker.java
ndroid/gallery3d/ui/AlbumSetSlidingWindow.java
ndroid/gallery3d/ui/AlbumSetView.java
ndroid/gallery3d/ui/AlbumSlidingWindow.java
ndroid/gallery3d/ui/AlbumView.java
ndroid/gallery3d/ui/BitmapLoader.java
ndroid/gallery3d/ui/DisplayItem.java
ndroid/gallery3d/ui/GridDrawer.java
ndroid/gallery3d/ui/HighlightDrawer.java
ndroid/gallery3d/ui/IconDrawer.java
ndroid/gallery3d/ui/ManageCacheDrawer.java
ndroid/gallery3d/ui/SlotView.java
|
| 13e61e48a4eb7e09bdcb84fac0b15c33b5970599 |
04-Apr-2012 |
Owen Lin <owenlin@google.com> |
Fix NPE in Gallery.
bug: 6249248
Change-Id: I41851c6524163195f6296a15893d962e706b3449
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/AlbumSetPage.java
|
| f9a737de45b0d9ef5bb3355bb2e79dd1d0402d5c |
27-Mar-2012 |
Martijn Coenen <maco@google.com> |
Support for beaming a picture.
Change-Id: I73d69f164b455ffa90a495001190937025a56dc5
ndroid/gallery3d/app/PhotoPage.java
|
| dbb1d3ffd511e1fa34f8ddc59bbd8f89c3789f9d |
03-Apr-2012 |
Wu-cheng Li <wuchengli@google.com> |
Fix OOM when switching between camera and camcorder.
- Camera activities extend AbstractGalleryActivity. So
onDestroy is moved from Gallery to AbstractGalleryActivity.
- Use WeakReference for values in the WeakHashMap of
SpinnerVisibilitySetter.
bug:5954389
Change-Id: Ib15f269bd4c54a4621bdff58e7ea16b44f8fb3e3
ndroid/gallery3d/app/AbstractGalleryActivity.java
ndroid/gallery3d/app/Gallery.java
ndroid/gallery3d/util/SpinnerVisibilitySetter.java
|
| 4d10b422e7a74a4e5788c45612cea9dee8681ed1 |
03-Apr-2012 |
Ray Chen <raychen@google.com> |
Fix b/3462852 [UI] When linking from Camera preview - App icon with 'Up' arrow should go to next level up
Change startActivity to switchState because not every MediaObject implements "getContentUri" which may
cause runtime exception.
Change-Id: I88be6e9e8f15ad17f4c7347b6dfc200c7682ce01
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/PhotoPage.java
|
| 37c1fd0b77fb5c0e0aeef9b7f65cd47c446b1664 |
03-Apr-2012 |
Yuli Huang <yuli@google.com> |
Merge "Fix b/5974240: Sliders may not be responsive to touches."
|
| fc28f4b3866dd7f5ae841174fd3c28be3a2e672f |
02-Apr-2012 |
Yuli Huang <yuli@google.com> |
Fix b/5974240: Sliders may not be responsive to touches.
Add padding around sliders to increase its touchable areas.
Change-Id: I034e25804811b14ce6137c72472191dabd7bdef8
ndroid/gallery3d/photoeditor/actions/AbstractSeekBar.java
ndroid/gallery3d/photoeditor/actions/ColorSeekBar.java
ndroid/gallery3d/photoeditor/actions/EffectToolKit.java
|
| 2415a060b1cf69f5820e8d4d5c9954271cad2cd6 |
02-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Remove FilmStripView.
Change-Id: I45cee8c32863cc65eba4c5e83e667e104cf24e42
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/Config.java
ndroid/gallery3d/app/PhotoDataAdapter.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/app/SinglePhotoDataAdapter.java
ndroid/gallery3d/ui/AlbumSlidingWindow.java
ndroid/gallery3d/ui/AlbumView.java
ndroid/gallery3d/ui/FilmStripView.java
ndroid/gallery3d/ui/PhotoView.java
ndroid/gallery3d/ui/StripDrawer.java
|
| 948b5ffc4c004b6e4daf18f64165fb555bc4d6b2 |
02-Apr-2012 |
Owen Lin <owenlin@google.com> |
Merge "Delete buffers and textures in GL."
|
| 0ce2e732acac42c875e04943a593b147d9e97d02 |
02-Apr-2012 |
Owen Lin <owenlin@google.com> |
Delete buffers and textures in GL.
Change-Id: I7cd6647c7da56040c040f43859ce8e440db7b498
ndroid/gallery3d/ui/GLCanvasImpl.java
ndroid/gallery3d/ui/GLId.java
|
| f52afa956baba2c616c70466080e8252224cf5de |
23-Mar-2012 |
Owen Lin <owenlin@google.com> |
Remove Position and PositionRepository.
Also fix a regression introduced in previous change.
Change-Id: I534c8ca7838f3518856cf48878dd49beeb331562
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/AlbumSetPage.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/ui/PositionProvider.java
ndroid/gallery3d/ui/PositionRepository.java
ndroid/gallery3d/ui/RelativePosition.java
ndroid/gallery3d/ui/SlotView.java
|
| 037e06c5e11ca4a4e40b0741f2d6604b2fd9337a |
22-Mar-2012 |
Chih-Chung Chang <chihchung@google.com> |
Use SurfaceTexture to show Camera preview.
Change-Id: I8bf63dfc5b969ecce51841378b093a650b6f91d8
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/CameraScreenNail.java
ndroid/gallery3d/app/CameraView.java
ndroid/gallery3d/app/PhotoDataAdapter.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/app/ScreenNailBridge.java
ndroid/gallery3d/data/SnailSource.java
ndroid/gallery3d/ui/BasicTexture.java
ndroid/gallery3d/ui/BitmapScreenNail.java
ndroid/gallery3d/ui/BitmapTileProvider.java
ndroid/gallery3d/ui/ExtTexture.java
ndroid/gallery3d/ui/GLCanvas.java
ndroid/gallery3d/ui/GLCanvasImpl.java
ndroid/gallery3d/ui/GLId.java
ndroid/gallery3d/ui/NinePatchTexture.java
ndroid/gallery3d/ui/PhotoView.java
ndroid/gallery3d/ui/ScreenNail.java
ndroid/gallery3d/ui/ScreenNailHolder.java
ndroid/gallery3d/ui/SurfaceTextureScreenNail.java
ndroid/gallery3d/ui/TileImageView.java
ndroid/gallery3d/ui/UploadedTexture.java
|
| b10f96d2141fae10073ec48f25d7b824647f8f31 |
29-Mar-2012 |
Ray Chen <raychen@google.com> |
Merge "Move getTypeString from PicasaAlbumSet to MediaObject."
|
| 578f58212f6a29ba15c2e5795fbdd04fddb80019 |
23-Mar-2012 |
Ray Chen <raychen@google.com> |
Move getTypeString from PicasaAlbumSet to MediaObject.
b/5344124
Change-Id: I28a43615ebec0aa84c3b16ac006def26f7b56162
ndroid/gallery3d/data/LocalAlbumSet.java
ndroid/gallery3d/data/MediaObject.java
|
| cac5a12dfae2df6ea61c73e961b3222ac3e9c2af |
29-Mar-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Patch 2 for master."
|
| 68299015ac722e050794c5b3d8a3991871cac9f5 |
28-Mar-2012 |
Owen Lin <owenlin@google.com> |
Merge "Refactor. Make the code simpler."
|
| 4062ad476a6fdf65a29a3d2716d7ac3179a02055 |
26-Mar-2012 |
Yuli Huang <yuli@google.com> |
Fix b/6212093: Title wasn't updated for orientation changes.
Change-Id: I407cfb8f2bde5bab302045188f4f511bdcd2347a
b:6212093
ndroid/gallery3d/app/PhotoPage.java
|
| 95860d26aef15e6a87cbbc81b15bd92eff309475 |
21-Mar-2012 |
Chih-Chung Chang <chihchung@google.com> |
Patch 2 for master.
Change-Id: I8b7c9fd326c4f247a1f2129b1d64388a223d79e0
ndroid/gallery3d/ui/GestureRecognizer.java
ndroid/gallery3d/ui/PhotoView.java
ndroid/gallery3d/ui/PositionController.java
|
| 83a036c52d6c157ca52bee67b9c6ec3018b4a47d |
22-Mar-2012 |
Owen Lin <owenlin@google.com> |
Refactor. Make the code simpler.
Change-Id: I2d3b7a1cfed17afcf6b7ee3e7bf1ca13ada8d9c3
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/AlbumSetPage.java
ndroid/gallery3d/app/ManageCachePage.java
ndroid/gallery3d/ui/AlbumSetSlidingWindow.java
ndroid/gallery3d/ui/AlbumSetView.java
ndroid/gallery3d/ui/AlbumSlidingWindow.java
ndroid/gallery3d/ui/AlbumView.java
ndroid/gallery3d/ui/DisplayItem.java
ndroid/gallery3d/ui/FilmStripView.java
ndroid/gallery3d/ui/Paper.java
ndroid/gallery3d/ui/RelativePosition.java
ndroid/gallery3d/ui/SlotView.java
|
| 0499bbe3ba2110ff964018042307a0a7441e3f19 |
22-Mar-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "New effect in photo browsing."
|
| 2b35f06004869b859a33630bbc28238ebc0e6873 |
21-Mar-2012 |
Chih-Chung Chang <chihchung@google.com> |
Patch 2 for MR1.
Change-Id: I39cc780e0ef49c4e0863a1a83e585e16f0a32425
ndroid/gallery3d/ui/PhotoView.java
ndroid/gallery3d/ui/PositionController.java
|
| dc02dbc8aaca26ff4d39ce141d9fdaa0b79e3ffb |
22-Mar-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Make PackagesMonitor go async"
|
| b644675e504488653067204242a82f0a160125be |
21-Mar-2012 |
Hung-ying Tyan <tyanh@google.com> |
Make PackagesMonitor go async
to offload package event processing from main thread.
Bug: 6109890
Change-Id: I77e1fad9a4ac24020eed68d53ca7e1d253248890
ndroid/gallery3d/app/PackagesMonitor.java
|
| 4a01c6ee151797d8a2c04b28ba089c81dbb4362f |
21-Mar-2012 |
Chih-Chung Chang <chihchung@google.com> |
New effect in photo browsing.
Change-Id: I12ca70f56f5c874292a7a6f38f0518bbc855ed70
ndroid/gallery3d/app/PhotoDataAdapter.java
ndroid/gallery3d/ui/BitmapTileProvider.java
ndroid/gallery3d/ui/PhotoView.java
ndroid/gallery3d/ui/TileImageView.java
ndroid/gallery3d/ui/TileImageViewAdapter.java
ndroid/gallery3d/ui/UploadedTexture.java
|
| fd7b017df6323aa9ac81ec297652dfb934986856 |
22-Mar-2012 |
Owen Lin <owenlin@google.com> |
Merge changes I1acef9fc,I53ddb3cd
* changes:
Make top level albums can be loaded concurrently.
Add log to debug loading time.
|
| 54fe02fa80770e26d35c0e132ca23b81c99de945 |
20-Mar-2012 |
Yuli Huang <yuli@google.com> |
Fix incorrect initial position/scale of opening animations.
1. Initial position of opening animation isn't correctly offset if the
position repository isn't properly offset by the action bar height.
2. Initial scale of opening animation should match the thumbnail instead
of using a fixed value 240.
This CL is part of efforts to fix b:6016973.
Change-Id: I620705357ba7594d43685e47488928f9fc93d9f6
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/AlbumSetPage.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/ui/PhotoView.java
ndroid/gallery3d/ui/PositionController.java
|
| 706a7cf399bc0297a80802a311e843e517d32241 |
15-Mar-2012 |
Chih-Chung Chang <chihchung@google.com> |
Create a ScreenNail interface so we can add other types of screenails.
Add a new MediaItem type to contain a ScreenNail.
Change-Id: Ia303949f3013dd48ded204eaf9ec69a102b8503e
ndroid/gallery3d/app/CameraView.java
ndroid/gallery3d/app/PhotoDataAdapter.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/app/ScreenNailBridge.java
ndroid/gallery3d/app/SinglePhotoDataAdapter.java
ndroid/gallery3d/data/DataManager.java
ndroid/gallery3d/data/MediaItem.java
ndroid/gallery3d/data/SnailAlbum.java
ndroid/gallery3d/data/SnailItem.java
ndroid/gallery3d/data/SnailSource.java
ndroid/gallery3d/ui/BitmapScreenNail.java
ndroid/gallery3d/ui/BitmapTileProvider.java
ndroid/gallery3d/ui/PhotoView.java
ndroid/gallery3d/ui/ScreenNail.java
ndroid/gallery3d/ui/TileImageView.java
ndroid/gallery3d/ui/TileImageViewAdapter.java
|
| df47bac7c9000d50420061ac22dd259337bd160a |
20-Mar-2012 |
Chih-Chung Chang <chihchung@google.com> |
Patch for MR1.
Change-Id: I3f4bba2854257008eed95b8eacce598abdca3180
ndroid/gallery3d/app/PhotoDataAdapter.java
ndroid/gallery3d/ui/BitmapTileProvider.java
ndroid/gallery3d/ui/PhotoView.java
ndroid/gallery3d/ui/TileImageView.java
ndroid/gallery3d/ui/TileImageViewAdapter.java
ndroid/gallery3d/ui/UploadedTexture.java
|
| 813ba6f4c7f6c36928bf926f7856eb744a823b43 |
16-Mar-2012 |
Owen Lin <owenlin@google.com> |
Make top level albums can be loaded concurrently.
Change-Id: I1acef9fc9a442c36ad1d9d0931b0defc6091bf33
fix: 5947962
ndroid/gallery3d/data/LocalAlbumSet.java
ndroid/gallery3d/data/MtpDeviceSet.java
|
| e80b47691bfc340f76464b97bac5ad6fe9f561de |
13-Mar-2012 |
Owen Lin <owenlin@google.com> |
Add log to debug loading time.
Change-Id: I53ddb3cdce7abe9de7c5bbd85c1adad474bdff2f
ndroid/gallery3d/app/AlbumSetDataAdapter.java
ndroid/gallery3d/data/LocalAlbumSet.java
|
| 9af4a90dae4c05acfd1ec4f8d63375e8c0ebb430 |
20-Mar-2012 |
Ray Chen <raychen@google.com> |
Fix b/6191707 Unable to set Custom wallpaper from Home
Change-Id: I130f74c94ebf5d93922807f7fee5ae7f189a15d4
ndroid/gallery3d/app/AbstractGalleryActivity.java
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/AlbumSetPage.java
ndroid/gallery3d/app/Gallery.java
ndroid/gallery3d/app/GalleryActionBar.java
ndroid/gallery3d/app/ManageCachePage.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/app/PickerActivity.java
|
| d8d04a85419c75b91348d3baeba416a14c5132f7 |
16-Mar-2012 |
Ray Chen <raychen@google.com> |
Revert "bug #6176711: guard against null GalleryActionBar." and
fix DialogPicker's NPE issue while setting wallpaper.
Change-Id: I833ebfb04907d3a1378df98db51c96b490796a00
ndroid/gallery3d/app/AbstractGalleryActivity.java
ndroid/gallery3d/app/ActivityState.java
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/Gallery.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/app/PickerActivity.java
|
| 01449be9b1b89e72bcbcce9901421fc9c9cf713a |
16-Mar-2012 |
Owen Lin <owenlin@google.com> |
Merge "Fix a regression, we forget assigne a value to a member variable."
|
| 30566df4aa13c0649e89d09298d819102ba7d979 |
16-Mar-2012 |
Owen Lin <owenlin@google.com> |
Fix a regression, we forget assigne a value to a member variable.
Change-Id: I07b6654ddf73f4c92a75d81a3ec8f1075526f5fd
ndroid/gallery3d/ui/AlbumSlidingWindow.java
|
| 6fe7e6ae561511922f99346a8021f44a126c6218 |
15-Mar-2012 |
Wei Huang <weih@google.com> |
bug #6176711: guard against null GalleryActionBar.
When entering Gallery app from WallPaper picker, the activity is DialogPicker, which doesn't initialize GalleryActionbar so getGalleryActionbar() returns null. Guard against using the null object.
I fixed the obvious NPE here, but Ray or Yuli should take a closer look, to see why this is broken.
Change-Id: Ic6923c388ea7b72ab402131fc3b039546509e340
ndroid/gallery3d/app/ActivityState.java
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/PhotoPage.java
|
| be0cb26de2b21fd5166b05ff5db427636344b7b6 |
07-Mar-2012 |
Ray Chen <raychen@google.com> |
Fix 6039387 Wrong app icon shown when playing 'personal video' from Videos app
Change-Id: Idf5af5172d5d413e64712331e3e6331f13e1b95c
ndroid/gallery3d/app/MovieActivity.java
|
| f3f7f56af19f3f04a7daefd16981e5f55e39053d |
06-Mar-2012 |
Ray Chen <raychen@google.com> |
Fix 3462852 [UI] When linking from Camera preview - App icon with 'Up' arrow should go to next level up.
Some changes in this CL:
1. ActivityState can decide whether to enable home button and show up arrow
2. ActivityState can handle home_up event on its own
3. Support getContentUri in LocalAlbum (Image/Video Roll) and LocalMergeAlbum (Camera Roll)
4. Gallery supports view action for AlbumPage (Camera Roll)
Change-Id: I85a75cdce9cbc2a877651fdec34a0180ed8e785c
ndroid/gallery3d/app/ActivityState.java
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/Gallery.java
ndroid/gallery3d/app/GalleryActionBar.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/app/StateManager.java
ndroid/gallery3d/data/LocalAlbum.java
ndroid/gallery3d/data/LocalAlbumSet.java
ndroid/gallery3d/data/LocalMergeAlbum.java
ndroid/gallery3d/data/LocalSource.java
|
| 762f8e20f608bc805d9e9f01fa2c4925f4735cf0 |
14-Mar-2012 |
Chih-Chung Chang <chihchung@google.com> |
Aggregate three gesture detectors.
Change-Id: I270cd7bdeb81d9a8ea5d3aa122f44074413e7616
ndroid/gallery3d/ui/GestureRecognizer.java
ndroid/gallery3d/ui/PhotoView.java
|
| 73a04ff386d590f797d95b02286442108063b569 |
14-Mar-2012 |
Owen Lin <owenlin@google.com> |
Reorganize import for all files.
Change-Id: Ia9188bcde727e317e6a476caccaea562f0758b19
ndroid/gallery3d/anim/Animation.java
ndroid/gallery3d/app/AlbumPicker.java
ndroid/gallery3d/app/Config.java
ndroid/gallery3d/app/DialogPicker.java
ndroid/gallery3d/app/EyePosition.java
ndroid/gallery3d/app/GalleryActionBar.java
ndroid/gallery3d/app/GalleryActivity.java
ndroid/gallery3d/app/GalleryApp.java
ndroid/gallery3d/app/GalleryAppImpl.java
ndroid/gallery3d/app/GalleryContext.java
ndroid/gallery3d/app/ManageCachePage.java
ndroid/gallery3d/app/MovieControllerOverlay.java
ndroid/gallery3d/app/PackagesMonitor.java
ndroid/gallery3d/app/PhotoDataAdapter.java
ndroid/gallery3d/app/PickerActivity.java
ndroid/gallery3d/app/SinglePhotoDataAdapter.java
ndroid/gallery3d/app/SlideshowDream.java
ndroid/gallery3d/app/SlideshowPage.java
ndroid/gallery3d/app/StateManager.java
ndroid/gallery3d/app/TimeBar.java
ndroid/gallery3d/data/ChangeNotifier.java
ndroid/gallery3d/data/ClusterAlbumSet.java
ndroid/gallery3d/data/ComboAlbum.java
ndroid/gallery3d/data/DataManager.java
ndroid/gallery3d/data/DownloadCache.java
ndroid/gallery3d/data/DownloadUtils.java
ndroid/gallery3d/data/Exif.java
ndroid/gallery3d/data/LocalAlbum.java
ndroid/gallery3d/data/LocalAlbumSet.java
ndroid/gallery3d/data/LocalMediaItem.java
ndroid/gallery3d/data/LocalVideo.java
ndroid/gallery3d/data/LocationClustering.java
ndroid/gallery3d/data/MediaDetails.java
ndroid/gallery3d/data/MediaSource.java
ndroid/gallery3d/data/MtpClient.java
ndroid/gallery3d/data/MtpContext.java
ndroid/gallery3d/data/MtpDevice.java
ndroid/gallery3d/data/MtpDeviceSet.java
ndroid/gallery3d/data/MtpImage.java
ndroid/gallery3d/data/SizeClustering.java
ndroid/gallery3d/data/TagClustering.java
ndroid/gallery3d/data/TimeClustering.java
ndroid/gallery3d/data/UriSource.java
ndroid/gallery3d/gadget/LocalPhotoSource.java
ndroid/gallery3d/gadget/MediaSetSource.java
ndroid/gallery3d/gadget/PhotoAppWidgetProvider.java
ndroid/gallery3d/gadget/WidgetClickHandler.java
ndroid/gallery3d/gadget/WidgetConfigure.java
ndroid/gallery3d/gadget/WidgetDatabaseHelper.java
ndroid/gallery3d/gadget/WidgetService.java
ndroid/gallery3d/gadget/WidgetSource.java
ndroid/gallery3d/gadget/WidgetTypeChooser.java
ndroid/gallery3d/gadget/WidgetUtils.java
ndroid/gallery3d/provider/GalleryProvider.java
ndroid/gallery3d/ui/ActionModeHandler.java
ndroid/gallery3d/ui/BitmapTexture.java
ndroid/gallery3d/ui/BitmapTileProvider.java
ndroid/gallery3d/ui/CacheStorageUsageInfo.java
ndroid/gallery3d/ui/CanvasTexture.java
ndroid/gallery3d/ui/CropView.java
ndroid/gallery3d/ui/CustomMenu.java
ndroid/gallery3d/ui/DetailsHelper.java
ndroid/gallery3d/ui/EdgeEffect.java
ndroid/gallery3d/ui/FadeInTexture.java
ndroid/gallery3d/ui/FilmStripView.java
ndroid/gallery3d/ui/FlingScroller.java
ndroid/gallery3d/ui/GLCanvasImpl.java
ndroid/gallery3d/ui/GLRootView.java
ndroid/gallery3d/ui/GLView.java
ndroid/gallery3d/ui/GridDrawer.java
ndroid/gallery3d/ui/HighlightDrawer.java
ndroid/gallery3d/ui/IconDrawer.java
ndroid/gallery3d/ui/ImportCompleteListener.java
ndroid/gallery3d/ui/ManageCacheDrawer.java
ndroid/gallery3d/ui/NinePatchTexture.java
ndroid/gallery3d/ui/Paper.java
ndroid/gallery3d/ui/PhotoView.java
ndroid/gallery3d/ui/PositionController.java
ndroid/gallery3d/ui/PositionRepository.java
ndroid/gallery3d/ui/ProgressSpinner.java
ndroid/gallery3d/ui/ResourceTexture.java
ndroid/gallery3d/ui/ScrollBarView.java
ndroid/gallery3d/ui/ScrollerHelper.java
ndroid/gallery3d/ui/SelectionDrawer.java
ndroid/gallery3d/ui/SlideshowView.java
ndroid/gallery3d/ui/StringTexture.java
ndroid/gallery3d/ui/StripDrawer.java
ndroid/gallery3d/ui/SynchronizedHandler.java
ndroid/gallery3d/ui/TileImageView.java
ndroid/gallery3d/ui/UploadedTexture.java
ndroid/gallery3d/util/CacheManager.java
ndroid/gallery3d/util/GalleryUtils.java
ndroid/gallery3d/util/IdentityCache.java
ndroid/gallery3d/util/MediaSetUtils.java
ndroid/gallery3d/util/Profile.java
ndroid/gallery3d/util/ProfileData.java
ndroid/gallery3d/util/ReverseGeocoder.java
|
| 7e0a28c2999f2d2c0aab4ecb7a03ac3e37078724 |
14-Mar-2012 |
Owen Lin <owenlin@google.com> |
Merge "Reuse bitmap for all micro thumb images to prevent GC."
|
| 504dd40f27893b120c7a978b5b01b73bd23559bb |
07-Mar-2012 |
Owen Lin <owenlin@google.com> |
Reuse bitmap for all micro thumb images to prevent GC.
Change-Id: I27d3002e5bb745a597f52962fe24744c8329441c
ndroid/gallery3d/app/AbstractGalleryActivity.java
ndroid/gallery3d/data/DecodeUtils.java
ndroid/gallery3d/data/ImageCacheRequest.java
ndroid/gallery3d/data/ImageCacheService.java
ndroid/gallery3d/data/LocalImage.java
ndroid/gallery3d/data/LocalVideo.java
ndroid/gallery3d/data/MediaItem.java
ndroid/gallery3d/data/MtpImage.java
ndroid/gallery3d/data/UriImage.java
ndroid/gallery3d/ui/AbstractDisplayItem.java
ndroid/gallery3d/ui/AlbumSetSlidingWindow.java
ndroid/gallery3d/ui/AlbumSlidingWindow.java
ndroid/gallery3d/ui/BitmapPool.java
|
| 2012e23a44435642088d2a505f51bdd9d6c02542 |
12-Mar-2012 |
Yuli Huang <yuli@google.com> |
Simplify PhotoEditor code.
1. Encapsulate spinner usages inside Toolbar.
2. Remove unnecessary static variable usages.
Change-Id: Iaec614c5322a50c1e2c0cfa9cec1971b85e32f8a
ndroid/gallery3d/photoeditor/EffectsBar.java
ndroid/gallery3d/photoeditor/PhotoEditor.java
ndroid/gallery3d/photoeditor/SpinnerProgressDialog.java
ndroid/gallery3d/photoeditor/Toolbar.java
|
| 2fe19c950eb46c425d36279923e1fa0b541ce2c8 |
11-Mar-2012 |
Chih-Chung Chang <chihchung@google.com> |
Change id "root" to "movie_view_root" to avoid confusion.
There is also one id "root" in Camera.
Change-Id: Id6ebc5362f5ddceabe6dab6218de9b091454bde7
ndroid/gallery3d/app/MovieActivity.java
|
| 81ae27226b797f1be88db1d5fd05df4c6fa91d8b |
09-Mar-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Merge Camera into Gallery package."
|
| def22b66ed3faae65972bb7bcc4230ab0d3665f0 |
08-Mar-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge Camera into Gallery package.
Change-Id: If66d4b841eec3d3f5384a561b07c0eeade92597a
ndroid/gallery3d/app/GalleryAppImpl.java
|
| 6720175dbb1817e8dd35a747d43660697084a386 |
08-Mar-2012 |
Yuli Huang <yuli@google.com> |
Fix b/5948180: Photo is repositioned during being scaled.
Avoid repositioning photo to center vertically during scaling it.
Change-Id: Id9f2de6b2b1611419a0c03888cff49a5336b39df
ndroid/gallery3d/ui/PositionController.java
|
| da172796bc166dd9a5321d78ac29fe0aa4cfdcae |
07-Mar-2012 |
Yuli Huang <yuli@google.com> |
Fix b/5948187: Add progress text for loading video.
Change-Id: If85a5db3c6128cf0c59b97dc44f51cdfc87d225b
ndroid/gallery3d/app/MovieControllerOverlay.java
|
| 88b29bb8922b26ec060dafcebaef199b4d82cf5c |
06-Mar-2012 |
Yuli Huang <yuli@google.com> |
Fix b/5885342: Multiple PhotoEditor activities cause exceptions.
Avoid using a static variable to keep tracking views across activities.
Change-Id: Ia53444502d476d37b64344e5aea5f58a06ee3b03
ndroid/gallery3d/photoeditor/EffectsBar.java
ndroid/gallery3d/photoeditor/PhotoEditor.java
ndroid/gallery3d/photoeditor/SpinnerProgressDialog.java
ndroid/gallery3d/photoeditor/Toolbar.java
|
| 6696043a3f116eaad983822a7f077e4d6a106ee0 |
02-Mar-2012 |
Chih-Chung Chang <chihchung@google.com> |
Use AnimationTime for animation caluclation.
Change-Id: I3af8334978c054ddbc2050a240f0d9c113a44012
ndroid/gallery3d/ui/AnimationTime.java
ndroid/gallery3d/ui/FadeInTexture.java
ndroid/gallery3d/ui/GLRootView.java
ndroid/gallery3d/ui/Paper.java
ndroid/gallery3d/ui/PositionController.java
|
| a787d2020e84f078607832ed109ee4b727fc3a9c |
01-Mar-2012 |
Yuli Huang <yuli@google.com> |
Fix a wrong flag value.
Change-Id: I7450dc31bb307b19dcfd34ee7df83126df1d294e
ndroid/gallery3d/app/ActivityState.java
|
| 3976dea546ab53e050f2388a0a75916bbcfcd6d0 |
01-Mar-2012 |
Yuli Huang <yuli@google.com> |
Fix b/6064909: Photo might not be snapped back correctly.
Photo might not be snapped back if the animation wasn't actually started
because of no position/scale changes.
Change-Id: I6b5e938bffd954b848cae04514a06d0427151025
ndroid/gallery3d/ui/PhotoView.java
ndroid/gallery3d/ui/PositionController.java
|
| 75e11d5b2c22efe9c699d5340b365fa9f08da2cd |
23-Feb-2012 |
Yuli Huang <yuli@google.com> |
Fix b/5624131: Panning enlarged photo switches images by mistake.
Avoid swiping images when panning to view vertically enlarged photo.
Change-Id: Ieb72cb8f38595fbedc927e8a0380fe31532ee434
ndroid/gallery3d/ui/PhotoView.java
ndroid/gallery3d/ui/PositionController.java
|
| 31f124e9f1b068cad2ab17c7486fbb5c0d6fb627 |
29-Feb-2012 |
Ray Chen <raychen@google.com> |
Merge "Fix 5948189 BUG BASH: action bar flashes during multi-select"
|
| 60bcd2f71196ce4b6b4a6f5a13455b2ef0dfdec5 |
20-Feb-2012 |
Ray Chen <raychen@google.com> |
Fix 5948189 BUG BASH: action bar flashes during multi-select
This CL fixes the flashing by disabling MenuItem directly instead of setting null intent
to ShareActionProvider, so there won't be any "icons shrinking" effect that causes flashing.
The rest of the change is code refactoring. More comments are added and the final UI operations
are merged into one Runnable object.
Change-Id: I73843c1df6b7a9675176e1b3ae6a35cc1cb715fa
ndroid/gallery3d/ui/ActionModeHandler.java
|
| c3026d7fa398df377ad9f5f414fe3f4770564874 |
17-Feb-2012 |
Ray Chen <raychen@google.com> |
Fix 5948223 [bug bash] Albums text disappears when exiting gallery
Change-Id: Ib787184f747ff30afabc35b16b46950dc3b5b50c
ndroid/gallery3d/app/ActivityState.java
ndroid/gallery3d/app/AlbumSetPage.java
ndroid/gallery3d/app/GalleryActionBar.java
|
| 657f172d9eb7add6745aff1cdb9bc07a4bfff273 |
16-Feb-2012 |
Ray Chen <raychen@google.com> |
Fix 5948410 BUG BASH: Temporarily title is displayed during gallery start
Change-Id: I88a67e3e9437124001be836239736a8275c1abf4
ndroid/gallery3d/app/ActivityState.java
|
| 980724bab5c59526803b302ccba25a9f50f27d1c |
22-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
Remove unused code.
Change-Id: I167596ab023671651df298ddb2b80b7c782f4223
ndroid/gallery3d/anim/AnimationSet.java
ndroid/gallery3d/app/AbstractGalleryActivity.java
ndroid/gallery3d/app/ActivityState.java
ndroid/gallery3d/app/AlbumDataAdapter.java
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/AlbumSetDataAdapter.java
ndroid/gallery3d/app/AlbumSetPage.java
ndroid/gallery3d/app/ControllerOverlay.java
ndroid/gallery3d/app/FilterUtils.java
ndroid/gallery3d/app/GalleryActionBar.java
ndroid/gallery3d/app/GalleryActivity.java
ndroid/gallery3d/app/GalleryContext.java
ndroid/gallery3d/app/MovieControllerOverlay.java
ndroid/gallery3d/data/ChangeNotifier.java
ndroid/gallery3d/data/DataManager.java
ndroid/gallery3d/data/DecodeUtils.java
ndroid/gallery3d/data/DownloadCache.java
ndroid/gallery3d/data/DownloadUtils.java
ndroid/gallery3d/data/Face.java
ndroid/gallery3d/data/LocalVideo.java
ndroid/gallery3d/data/MediaDetails.java
ndroid/gallery3d/data/Path.java
ndroid/gallery3d/provider/GalleryProvider.java
ndroid/gallery3d/ui/AdaptiveBackground.java
ndroid/gallery3d/ui/AlbumSetView.java
ndroid/gallery3d/ui/AlbumSlidingWindow.java
ndroid/gallery3d/ui/BitmapTileProvider.java
ndroid/gallery3d/ui/BoxBlurFilter.java
ndroid/gallery3d/ui/Config.java
ndroid/gallery3d/ui/CustomMenu.java
ndroid/gallery3d/ui/DialogDetailsView.java
ndroid/gallery3d/ui/DrawableTexture.java
ndroid/gallery3d/ui/FilmStripView.java
ndroid/gallery3d/ui/GLCanvas.java
ndroid/gallery3d/ui/GLCanvasImpl.java
ndroid/gallery3d/ui/GLPaint.java
ndroid/gallery3d/ui/GLRoot.java
ndroid/gallery3d/ui/GLRootView.java
ndroid/gallery3d/ui/GLView.java
ndroid/gallery3d/ui/GalleryEGLConfigChooser.java
ndroid/gallery3d/ui/Icon.java
ndroid/gallery3d/ui/OnSelectedListener.java
ndroid/gallery3d/ui/Paper.java
ndroid/gallery3d/ui/RawTexture.java
ndroid/gallery3d/ui/ScrollBarView.java
ndroid/gallery3d/ui/SelectionManager.java
ndroid/gallery3d/ui/SlotView.java
ndroid/gallery3d/ui/StaticBackground.java
ndroid/gallery3d/ui/Texture.java
ndroid/gallery3d/util/FutureTask.java
ndroid/gallery3d/util/GalleryUtils.java
ndroid/gallery3d/util/IdentityCache.java
ndroid/gallery3d/util/IntArray.java
ndroid/gallery3d/util/JobLimiter.java
ndroid/gallery3d/util/LinkedNode.java
ndroid/gallery3d/util/UpdateHelper.java
|
| be55f1e81c6021cf499c24331088fb01a8db9f91 |
17-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
Reduce memory allocation and make small improvements.
Change-Id: Iac3f302454119de6363cd5cfb158619e739b0536
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/ui/AlbumSetSlidingWindow.java
ndroid/gallery3d/ui/AlbumSlidingWindow.java
ndroid/gallery3d/ui/DialogDetailsView.java
ndroid/gallery3d/ui/GLCanvas.java
ndroid/gallery3d/ui/GLCanvasImpl.java
|
| b3d01963463a11d27c286ffbf7f715f59bbecf88 |
17-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
Cache animation time value to reduce work and synchronize animation.
Change-Id: I00081bc6037c01dafc56cf017dcc1da448c1d106
ndroid/gallery3d/ui/AdaptiveBackground.java
ndroid/gallery3d/ui/AnimationTime.java
ndroid/gallery3d/ui/CropView.java
ndroid/gallery3d/ui/EdgeEffect.java
ndroid/gallery3d/ui/GLCanvas.java
ndroid/gallery3d/ui/GLCanvasImpl.java
ndroid/gallery3d/ui/GLRootView.java
ndroid/gallery3d/ui/GLView.java
ndroid/gallery3d/ui/ProgressSpinner.java
ndroid/gallery3d/ui/SlideshowView.java
ndroid/gallery3d/ui/SlotView.java
|
| ed0e84d75ed4f75ac9589bb3ea04b7327f8745f2 |
16-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
Change from fillRect to clearBuffer for pure black background.
Change-Id: Ie3da19b377f3e7926ab37c5936ce48cbb3227f92
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/AlbumSetPage.java
ndroid/gallery3d/app/ManageCachePage.java
ndroid/gallery3d/ui/StaticBackground.java
|
| 5b01ee731c6acbcef657746a23d5cfde2251ab7e |
16-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
Simplify the reference from textures to GLCanvas.
Change-Id: Ia64e60ec4b920b707148f7c2b9373ce484a52d9f
ndroid/gallery3d/ui/BasicTexture.java
ndroid/gallery3d/ui/GLRootView.java
ndroid/gallery3d/ui/NinePatchTexture.java
ndroid/gallery3d/ui/RawTexture.java
|
| 3f43ecbb1b7c8f24c9a6e3d6b9807a1d0ef2f2ab |
16-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
Make GLCanvas a bit faster.
(1) make a faster version of translate(x, y).
(2) make mapPoints() faster.
(3) avoid calling canvas.rotate() when it is not needed.
Change-Id: I364e2aa3fc9ee81c43f42f3af8b2d30a1241b482
ndroid/gallery3d/ui/GLCanvas.java
ndroid/gallery3d/ui/GLCanvasImpl.java
ndroid/gallery3d/ui/GLView.java
ndroid/gallery3d/ui/PhotoView.java
ndroid/gallery3d/ui/ProgressSpinner.java
ndroid/gallery3d/ui/SlideshowView.java
ndroid/gallery3d/ui/SlotView.java
ndroid/gallery3d/ui/TileImageView.java
|
| ad21fbed030fa8c80b65ad6b6866a3e944f24e4f |
15-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
Try to use less of "Long" to make the program faster.
Change-Id: I6adb870a8f2bca97318d0fbb6f42388aef4c19c1
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/AlbumSetPage.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/ui/AbstractDisplayItem.java
ndroid/gallery3d/ui/AlbumSetSlidingWindow.java
ndroid/gallery3d/ui/DisplayItem.java
ndroid/gallery3d/ui/NinePatchTexture.java
ndroid/gallery3d/ui/PhotoView.java
ndroid/gallery3d/ui/PositionProvider.java
ndroid/gallery3d/ui/PositionRepository.java
ndroid/gallery3d/ui/TileImageView.java
|
| cfc4fcf32e99ea142c7ead90a3e246f26684e75b |
14-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Add profiling tools."
|
| 490ed6f3ea8fd90f78719f94ad403c0532ccad64 |
14-Feb-2012 |
Yuli Huang <yuli@google.com> |
Merge "Fix b/5948042: Incorrect scrolling position after deleting pictures."
|
| a9293180184b57a47110f1b3b9e3bc6ff0b2f9bf |
03-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
Add profiling tools.
Change-Id: Ieab118ededaab5ef46408fac6fdb66b9fff4900e
ndroid/gallery3d/ui/GLRootView.java
ndroid/gallery3d/util/Profile.java
ndroid/gallery3d/util/ProfileData.java
|
| 82e43c4a00ccc2c660c8c5b130ef5bc6f4f9e84a |
13-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Use FloatMath instead of Math."
|
| b8e94ce6214b79992bb4dcb4e61a44ad97908b80 |
13-Feb-2012 |
Yuli Huang <yuli@google.com> |
Fix b/5948042: Incorrect scrolling position after deleting pictures.
Scrolling position may not be updated correctly after deleting some
pictures.
Change-Id: I82de2cf1178ed1f97e48162a0e3bdf00a34d9bad
ndroid/gallery3d/ui/SlotView.java
|
| fcd5b3547c69164dcf3c85536a9ae2b25e31010b |
11-Feb-2012 |
Pin Ting <pinting@google.com> |
Merge "Shows video filename read from OpenableColumns."
|
| 4e05190c04eab6f4700c557ae488f3d7e344d29c |
11-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
Use FloatMath instead of Math.
Change-Id: I41661b231f6c034dbca6af26d5950eda6c5fc7da
ndroid/gallery3d/app/CropImage.java
ndroid/gallery3d/app/EyePosition.java
ndroid/gallery3d/data/LocationClustering.java
ndroid/gallery3d/photoeditor/RendererUtils.java
ndroid/gallery3d/ui/AlbumSetSlidingWindow.java
ndroid/gallery3d/ui/AlbumSlidingWindow.java
ndroid/gallery3d/ui/CropView.java
ndroid/gallery3d/ui/PositionController.java
ndroid/gallery3d/ui/StringTexture.java
ndroid/gallery3d/ui/TileImageView.java
|
| 3d2225f6b0ff7f65620feaa283415a045718ffeb |
11-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Revert "Use FloatMath instead of Math.""
|
| 1e33de955973996db59f08db6b843d9cd732c631 |
11-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
Revert "Use FloatMath instead of Math."
This reverts commit 6bb8b2eb8695c042798f0eb798032cd30d642a65
ndroid/gallery3d/app/CropImage.java
ndroid/gallery3d/app/EyePosition.java
ndroid/gallery3d/data/LocationClustering.java
ndroid/gallery3d/photoeditor/RendererUtils.java
ndroid/gallery3d/ui/AlbumSetSlidingWindow.java
ndroid/gallery3d/ui/AlbumSlidingWindow.java
ndroid/gallery3d/ui/CropView.java
ndroid/gallery3d/ui/PositionController.java
ndroid/gallery3d/ui/StringTexture.java
ndroid/gallery3d/ui/TileImageView.java
|
| fc2301b560b161c9e7645a4363ef4f71d155b38b |
11-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Use FloatMath instead of Math."
|
| e1e40b31bfce1885fb96edd1f92016cd73077d36 |
11-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
Use FloatMath instead of Math.
Change-Id: I26eb6a554f72c13ba2801ce35ef0cf2a1466a97b
ndroid/gallery3d/app/CropImage.java
ndroid/gallery3d/app/EyePosition.java
ndroid/gallery3d/data/LocationClustering.java
ndroid/gallery3d/photoeditor/RendererUtils.java
ndroid/gallery3d/ui/AlbumSetSlidingWindow.java
ndroid/gallery3d/ui/AlbumSlidingWindow.java
ndroid/gallery3d/ui/CropView.java
ndroid/gallery3d/ui/PositionController.java
ndroid/gallery3d/ui/StringTexture.java
ndroid/gallery3d/ui/TileImageView.java
|
| 72a973bffbeaf9e9d6ef9bccf1f34e60c6d6b735 |
10-Feb-2012 |
Pin Ting <pinting@google.com> |
Shows video filename read from OpenableColumns.
bug:5796182
Change-Id: I92bc652d713bcc70b5a048f5948dc17e90a5e874
ndroid/gallery3d/app/Gallery.java
ndroid/gallery3d/app/MovieActivity.java
|
| 0a42b2c7973e108d6b82ac20e7537e29ea0686a0 |
10-Feb-2012 |
Yuli Huang <yuli@google.com> |
Merge "Fix b/5974541: Support up to 45 degrees for straighten."
|
| e525e76b9a0ec63a0805e8ce2f04d501c33cdb8d |
09-Feb-2012 |
Ray Chen <raychen@google.com> |
Merge "Fix indent."
|
| fcb34eb96a8e7d9ac5cd408776efa92dd2b55d68 |
09-Feb-2012 |
Yuli Huang <yuli@google.com> |
Fix b/5974541: Support up to 45 degrees for straighten.
Change-Id: I131a478c59f5619e801311d9872440b2c7014578
ndroid/gallery3d/photoeditor/filters/StraightenFilter.java
|
| ab6b92971e8c498abc53cfdaddc0b32f1447b9fc |
09-Feb-2012 |
Yuli Huang <yuli@google.com> |
Merge "Fix b/5974663: inconsistent transparency of disabled action buttons."
|
| b4058ad452ce0d2a1ac5c9f0b3da4d1428e41178 |
09-Feb-2012 |
Pin Ting <pinting@google.com> |
Merge "Shows image filename read from OpenableColumns."
|
| e4fe8b2be9cb28624e78606343d957edb3ed6cfc |
09-Feb-2012 |
Yuli Huang <yuli@google.com> |
Fix b/5974663: inconsistent transparency of disabled action buttons.
1. Avoid gray out save-button again as disabled alpha is already applied
to all text buttons.
2. Reduce disabled alpha of image buttons to make them look consistent
with text buttons.
Change-Id: Ie76988db1424ce036470a754acd2e4501979dd1a
ndroid/gallery3d/photoeditor/ImageActionButton.java
ndroid/gallery3d/photoeditor/RestorableView.java
|
| 0a5e1643d6155e057354907a7ee8d223f9bd28dd |
07-Feb-2012 |
Pin Ting <pinting@google.com> |
Shows image filename read from OpenableColumns.
bug:5796182
Change-Id: If43d2dd048ab003c1703bb1a466a19b6013cae85
ndroid/gallery3d/app/Gallery.java
|
| 464baee5c6b98e1fa67de64660dcf4736562d39a |
07-Feb-2012 |
Ray Chen <raychen@google.com> |
Fix indent.
Change-Id: I3e0c443ddfb2ebc777db7504c89ca1ffec119745
ndroid/gallery3d/app/AbstractGalleryActivity.java
|
| a565ca26f6e11a8298099bbc28481d22a62af4af |
07-Feb-2012 |
Yuli Huang <yuli@google.com> |
Fix b/5840847: Always show 'Loading...' for corrupt pictures.
Change-Id: I040f6e4090dad3e73b86062ddefd9bb0be581bf5
ndroid/gallery3d/app/PhotoDataAdapter.java
ndroid/gallery3d/ui/PhotoView.java
|
| feef78c1ecf63c88e052698040e809f25ffef0c4 |
06-Feb-2012 |
Pin Ting <pinting@google.com> |
Merge "Shows status bar in gallery when in portrait view."
|
| 60e1f075be818f37472607cee30a88cf3cd87c30 |
03-Feb-2012 |
Pin Ting <pinting@google.com> |
Shows status bar in gallery when in portrait view.
bug: 5467810
Shows status bar in gallery, crop activity, picker activity when in
portrait view; hide status bar when in landscape view.
Change-Id: I17e2347f020db209ba0581a8e2f2aa19fcb4ceae
ndroid/gallery3d/app/AbstractGalleryActivity.java
|
| 3f68238643791c0cba312df8549d5dfcd1ef188c |
03-Feb-2012 |
Ray Chen <raychen@google.com> |
Fix 5948229 [Bug Bash] The app icon is clickable in album set view
Change-Id: I563d2322fe5f1954ffaab7424b66d22722ed43a7
ndroid/gallery3d/app/ActivityState.java
|
| 0eef4923a491305e854a7fb141e72d00be212bb6 |
02-Feb-2012 |
Pin Ting <pinting@google.com> |
Merge "Shows video filename passed from other apps."
|
| 3bc1a3498edfc7ce56c82be65e0ea1dbabba8ec2 |
02-Feb-2012 |
Pin Ting <pinting@google.com> |
Merge "Shows image filename passed from other apps."
|
| cfd4375c6446e91d81e64dc72b9f3b9f35ac9cdd |
18-Jan-2012 |
Pin Ting <pinting@google.com> |
Shows video filename passed from other apps.
bug:5796182
Change-Id: I8de80b56105737ac38db117804b55a161150dbe9
ndroid/gallery3d/app/MovieActivity.java
|
| 22c0aec58109136fe8916bb3570857306eeb3c88 |
18-Jan-2012 |
Pin Ting <pinting@google.com> |
Shows image filename passed from other apps.
bug:5796182
This change will be followed up by a change to the class
android.content.Intent.
Change-Id: I3c607c535a4e90d867a98528118d1b6f10fa45cf
ndroid/gallery3d/app/Gallery.java
|
| 52da9b75f29ffe8744aca1e7fba2ad0871af1de0 |
01-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
Localize the "fail to load image" toast message.
Bug 5875813.
Change-Id: Ia11a3e909f90e8178238c390728b407708fabf8e
ndroid/gallery3d/app/CropImage.java
|
| 30627217223af8631669d02f3a00fa58cbc45887 |
17-Jan-2012 |
Chih-Chung Chang <chihchung@google.com> |
am a2b62468: am 8f568da3: Patch.
* commit 'a2b62468fcb23d80295fa25dba5551247204f34d':
Patch.
|
| 382e3a676fc3d4f130bfaeefd10eed2a75f128b4 |
13-Jan-2012 |
Pin Ting <pinting@google.com> |
Fixes gallery crash due to attempt to open deleted photo.
bug:5630894
Change-Id: I540bf067561550def72ac513eed12dcd5a808a1a
ndroid/gallery3d/data/DataManager.java
|
| e9ca81a2fed768af4493c6aba897fa5cfc4523fb |
04-Jan-2012 |
Chih-Chung Chang <chihchung@google.com> |
Patch.
Change-Id: I62fd65461e8989a1d5cf6bc353dfc4b61a2108c8
ndroid/gallery3d/ui/FlingScroller.java
ndroid/gallery3d/ui/PositionController.java
|
| 3cc027083b67ddbabe17c1fc975e1d6459d1054a |
08-Jan-2012 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5835642: Only finish the page when it's still active.
The original code can call finishState twice in a row with the calling
stack: finishState -> onPause -> clearLoadingBit -> finishState.
Change clearLoadingBit to call finishState only when it's currently active.
Change-Id: I537dbdd6ce26b26aeb565e243c4168229d4a70ef
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/AlbumSetPage.java
ndroid/gallery3d/app/StateManager.java
|
| 8dfc48d5aa8cfcec7abfe8c411f76c9cf979a2f3 |
13-Dec-2011 |
Owen Lin <owenlin@google.com> |
Support querying account and picasa id of a picasa image.
Change-Id: I7d24fb70b0a8a01c5d0fbdb6205c25d74d1996a6
fix: 5482269
ndroid/gallery3d/provider/GalleryProvider.java
|
| 72a8d96b9b77a48562e1a650a928638281f9c7aa |
05-Dec-2011 |
Yuli Huang <yuli@google.com> |
Improve Doodle UI for ending Doodle effect.
As doodle-view was removed before the final doodle results are
produced by MFF and displayed, doodles drawn disappeared temporarily
when the user exits Doodle effect.
Change-Id: I72822ba840f41f509fe4e9a2e1022a5b40b14e6a
ndroid/gallery3d/photoeditor/actions/EffectAction.java
ndroid/gallery3d/photoeditor/actions/EffectToolKit.java
|
| 1bcd04ac4b38b50e993533f1f18b5e5f3bc34008 |
02-Dec-2011 |
Yuli Huang <yuli@google.com> |
Fix effect-label layout and a TODO.
1. Seekbar was wrongly placed below effect label because of the added
order.
2. Fix a TODO by refactoring EffectToolFactory to EffectToolKit.
Change-Id: I8d37c2c2b6d15f2af65d4e6b27116afe01df63c9
ndroid/gallery3d/photoeditor/EffectsBar.java
ndroid/gallery3d/photoeditor/actions/ColorTemperatureAction.java
ndroid/gallery3d/photoeditor/actions/CropAction.java
ndroid/gallery3d/photoeditor/actions/DoodleAction.java
ndroid/gallery3d/photoeditor/actions/EffectAction.java
ndroid/gallery3d/photoeditor/actions/EffectToolFactory.java
ndroid/gallery3d/photoeditor/actions/EffectToolKit.java
ndroid/gallery3d/photoeditor/actions/FaceTanAction.java
ndroid/gallery3d/photoeditor/actions/FaceliftAction.java
ndroid/gallery3d/photoeditor/actions/FillLightAction.java
ndroid/gallery3d/photoeditor/actions/FisheyeAction.java
ndroid/gallery3d/photoeditor/actions/FlipAction.java
ndroid/gallery3d/photoeditor/actions/GrainAction.java
ndroid/gallery3d/photoeditor/actions/HighlightAction.java
ndroid/gallery3d/photoeditor/actions/RedEyeAction.java
ndroid/gallery3d/photoeditor/actions/RotateAction.java
ndroid/gallery3d/photoeditor/actions/SaturationAction.java
ndroid/gallery3d/photoeditor/actions/ShadowAction.java
ndroid/gallery3d/photoeditor/actions/SharpenAction.java
ndroid/gallery3d/photoeditor/actions/StraightenAction.java
ndroid/gallery3d/photoeditor/actions/TintAction.java
ndroid/gallery3d/photoeditor/actions/VignetteAction.java
|
| 72f77e4e3147cc856a472f31999d98d08fc19edc |
02-Dec-2011 |
Yuli Huang <yuli@google.com> |
Simplify EffectAction.
1. Make the whole effect item clickable instead of just the icon.
2. Rename interfaces/methods to improve readability.
Change-Id: I647a13dae88b4527b7baba85bb83b9bd15bbe997
ndroid/gallery3d/photoeditor/EffectsBar.java
ndroid/gallery3d/photoeditor/EffectsMenu.java
ndroid/gallery3d/photoeditor/actions/AutoFixAction.java
ndroid/gallery3d/photoeditor/actions/CrossProcessAction.java
ndroid/gallery3d/photoeditor/actions/DocumentaryAction.java
ndroid/gallery3d/photoeditor/actions/DuotoneAction.java
ndroid/gallery3d/photoeditor/actions/EffectAction.java
ndroid/gallery3d/photoeditor/actions/GrayscaleAction.java
ndroid/gallery3d/photoeditor/actions/LomoishAction.java
ndroid/gallery3d/photoeditor/actions/NegativeAction.java
ndroid/gallery3d/photoeditor/actions/PosterizeAction.java
ndroid/gallery3d/photoeditor/actions/SepiaAction.java
ndroid/gallery3d/photoeditor/actions/TintAction.java
|
| 5fa9a3dc0c61ee80363125db5029f3683c3813d3 |
02-Dec-2011 |
Yuli Huang <yuli@google.com> |
Remove unnecessary code.
Revert BitmapUtils changes made in cl:122870 as crop/rotate is now done
in MFF.
Change-Id: I3733c9acf911c4f694dd21dd533b0dd07350acea
ndroid/gallery3d/photoeditor/BitmapUtils.java
|
| f713a5ced2916184c6a9d9cc56d137a404442495 |
02-Dec-2011 |
Yuli Huang <yuli@google.com> |
Merge "Refactor to remove obsolete design and improve code consistency."
|
| 119d3a211076b99934760dfa67013b31891becc0 |
01-Dec-2011 |
Daniel Sandler <dsandler@android.com> |
Remove dependency on support library. DO NOT MERGE.
Bug: 5689684
Change-Id: I95d1090b91302dc6686d36768721cca61e9d1249
ndroid/gallery3d/app/SlideshowDream.java
|
| 11571bf7436900b513dd3696a90f546b25839591 |
28-Nov-2011 |
Yuli Huang <yuli@google.com> |
Refactor to remove obsolete design and improve code consistency.
1. Remove isValid()/validate() in Filter; EffectAction would push
filters into the stack when being notified by notifyChanged().
2. Make RedEyeAction consistent with DoodleAction by ignoring
out-of-bounds operations.
3. Improve consistency by encapsulate effect-tool creation/removal in
one class (EffectToolFactory).
4. Minimize variable visibility in EffectAction subclasses.
5. Fix unfinished doodle lost when exiting Doodle effect by multi-touch.
Change-Id: I8d3b127c5fe8777eb45b7c5ae680f6a30a99635a
ndroid/gallery3d/photoeditor/EffectsBar.java
ndroid/gallery3d/photoeditor/actions/AutoFixAction.java
ndroid/gallery3d/photoeditor/actions/ColorTemperatureAction.java
ndroid/gallery3d/photoeditor/actions/CropAction.java
ndroid/gallery3d/photoeditor/actions/CrossProcessAction.java
ndroid/gallery3d/photoeditor/actions/DocumentaryAction.java
ndroid/gallery3d/photoeditor/actions/Doodle.java
ndroid/gallery3d/photoeditor/actions/DoodleAction.java
ndroid/gallery3d/photoeditor/actions/DoodleView.java
ndroid/gallery3d/photoeditor/actions/DuotoneAction.java
ndroid/gallery3d/photoeditor/actions/EffectAction.java
ndroid/gallery3d/photoeditor/actions/EffectToolFactory.java
ndroid/gallery3d/photoeditor/actions/FaceTanAction.java
ndroid/gallery3d/photoeditor/actions/FaceliftAction.java
ndroid/gallery3d/photoeditor/actions/FillLightAction.java
ndroid/gallery3d/photoeditor/actions/FisheyeAction.java
ndroid/gallery3d/photoeditor/actions/FlipAction.java
ndroid/gallery3d/photoeditor/actions/GrainAction.java
ndroid/gallery3d/photoeditor/actions/GrayscaleAction.java
ndroid/gallery3d/photoeditor/actions/HighlightAction.java
ndroid/gallery3d/photoeditor/actions/LomoishAction.java
ndroid/gallery3d/photoeditor/actions/NegativeAction.java
ndroid/gallery3d/photoeditor/actions/PosterizeAction.java
ndroid/gallery3d/photoeditor/actions/RedEyeAction.java
ndroid/gallery3d/photoeditor/actions/RotateAction.java
ndroid/gallery3d/photoeditor/actions/SaturationAction.java
ndroid/gallery3d/photoeditor/actions/SepiaAction.java
ndroid/gallery3d/photoeditor/actions/ShadowAction.java
ndroid/gallery3d/photoeditor/actions/SharpenAction.java
ndroid/gallery3d/photoeditor/actions/StraightenAction.java
ndroid/gallery3d/photoeditor/actions/TintAction.java
ndroid/gallery3d/photoeditor/actions/TouchView.java
ndroid/gallery3d/photoeditor/actions/VignetteAction.java
ndroid/gallery3d/photoeditor/filters/AbstractScaleFilter.java
ndroid/gallery3d/photoeditor/filters/CropFilter.java
ndroid/gallery3d/photoeditor/filters/CrossProcessFilter.java
ndroid/gallery3d/photoeditor/filters/DocumentaryFilter.java
ndroid/gallery3d/photoeditor/filters/DoodleFilter.java
ndroid/gallery3d/photoeditor/filters/DuotoneFilter.java
ndroid/gallery3d/photoeditor/filters/Filter.java
ndroid/gallery3d/photoeditor/filters/FlipFilter.java
ndroid/gallery3d/photoeditor/filters/GrayscaleFilter.java
ndroid/gallery3d/photoeditor/filters/LomoishFilter.java
ndroid/gallery3d/photoeditor/filters/NegativeFilter.java
ndroid/gallery3d/photoeditor/filters/PosterizeFilter.java
ndroid/gallery3d/photoeditor/filters/RedEyeFilter.java
ndroid/gallery3d/photoeditor/filters/RotateFilter.java
ndroid/gallery3d/photoeditor/filters/SepiaFilter.java
ndroid/gallery3d/photoeditor/filters/StraightenFilter.java
ndroid/gallery3d/photoeditor/filters/TintFilter.java
|
| 58209e95e523d67523dd93cb0a71a9d2d9b5d9c1 |
30-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 764482c4: Merge "Fix 5685925: Handle PACKAGE_CHANGED intent (when a package is enabled/disabled)" into ics-mr1
* commit '764482c4ebffc9c3cac21fcd8707811e981cd092':
Fix 5685925: Handle PACKAGE_CHANGED intent (when a package is enabled/disabled)
|
| 47873020e4d1d1ab7e1b80a09cd5a41d94798d12 |
30-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 002a3fec: Fix 5686493: Crash when try to click any thumbnail
* commit '002a3fece284f713537fad4523ee963d257350e9':
Fix 5686493: Crash when try to click any thumbnail
|
| ac11391cb7da2ae3856c1ec732a0769f40cb8eab |
30-Nov-2011 |
Daniel Sandler <dsandler@android.com> |
am 45fa6771: Merge "Improve screen on/off logic in slideshow." into ics-mr1
* commit '45fa677140112f725df3765be56edc715c226aa5':
Improve screen on/off logic in slideshow.
|
| 546b394f550e57afbb3c491b7b5bfae7645af157 |
30-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5685925: Handle PACKAGE_CHANGED intent (when a package is enabled/disabled)" into ics-mr1
|
| 8c26741a616311034a1540a667fc181f1467433e |
30-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5685925: Handle PACKAGE_CHANGED intent (when a package is enabled/disabled)
Change-Id: Ia994264fb2c11fbc971840c8a103bbe9fa6ee7f7
ndroid/gallery3d/app/PackagesMonitor.java
|
| 9e22248b0e17d4ceafe6c2d774c566504eb87520 |
30-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5686493: Crash when try to click any thumbnail
Change-Id: Ia109333c3a207ca2a60889c2731f6c11737b5592
ndroid/gallery3d/app/ActivityState.java
|
| cdbaba43954012a317119cc20183eb4de5220e58 |
30-Nov-2011 |
Daniel Sandler <dsandler@android.com> |
Merge "Improve screen on/off logic in slideshow." into ics-mr1
|
| 92d916aa51e1b3ca85e4e93dc483b1fd31d37fc5 |
29-Nov-2011 |
Wei Huang <weih@google.com> |
am 622c2b2c: Merge "Show a dialog to require updating PlusOne." into ics-mr1
* commit '622c2b2c7721008e7851d0af3d89d3fc545ceaf6':
Show a dialog to require updating PlusOne.
|
| ecc9ab9e13cce49715b7c1acd3dcc6eb015c3f0f |
29-Nov-2011 |
Wei Huang <weih@google.com> |
Merge "Show a dialog to require updating PlusOne." into ics-mr1
|
| c37ce29d625fa97d6cd1d4fe158d5c8a2c33e263 |
29-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am fc8c503d: Fix 5661035: Accepts bluetooth keys while playing a video from gallery.
* commit 'fc8c503d1351c6ee62d233a944f2bd5220e64a55':
Fix 5661035: Accepts bluetooth keys while playing a video from gallery.
|
| b4a1da9f32d61cf9347617a382291e488428a744 |
28-Nov-2011 |
Daniel Sandler <dsandler@android.com> |
Improve screen on/off logic in slideshow.
When used as a screensaver or otherwise, the slideshow
should not keep the screen on if the device is not plugged
in. It should also allow the screen to lock while the
slideshow is playing (otherwise a device left in this state
may be left unsecured for long periods by accident).
Additionally, when used as a screensaver, it must dismiss
the keyguard in order to be shown on a secured device.
Bug: 5660833
Change-Id: I1bafc50127aaa7ae2b67235d30736faa606c5ac1
ndroid/gallery3d/app/ActivityState.java
ndroid/gallery3d/app/SlideshowPage.java
|
| b5947c5669b3492d7e1295c16ab3efa00bfeb431 |
29-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5661035: Accepts bluetooth keys while playing a video from gallery.
Change-Id: I8174b1a97baad563d8bbd685b9aab3a8ca428ead
ndroid/gallery3d/app/MovieActivity.java
ndroid/gallery3d/app/MoviePlayer.java
|
| c74fa8c2e8aee1649547447d42e523a3fb39c7ec |
24-Nov-2011 |
Owen Lin <owenlin@google.com> |
Show a dialog to require updating PlusOne.
Change-Id: I1ff4f5eca90ade49b0785324b9319ef0b7d751ca
fix: 5608342
ndroid/gallery3d/app/AlbumDataAdapter.java
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/AlbumSetPage.java
ndroid/gallery3d/app/Gallery.java
ndroid/gallery3d/data/ComboAlbum.java
ndroid/gallery3d/data/ComboAlbumSet.java
ndroid/gallery3d/data/MediaSet.java
|
| 8646eb70356c2a323a554d1a7df35db058244c43 |
21-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 8cbc7c4e: Merge "Fix 5637927: NPE while trying to do slide show for gmail image attachment" into ics-mr1
* commit '8cbc7c4eedb204e3ad9fa1cb8a7a1b21f7464c74':
Fix 5637927: NPE while trying to do slide show for gmail image attachment
|
| ef71b24dbf31f73e6df8ae15ac2a1ad1cbc255f6 |
21-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5637927: NPE while trying to do slide show for gmail image attachment" into ics-mr1
|
| 23f6c6e51114909e1e6f294b5faa8dee219572ba |
19-Nov-2011 |
Ray Chen <raychen@google.com> |
am 00b5f3c6: Fix 5635260 Albums view goes blank after changing view option and returning to albums view
* commit '00b5f3c66113d14a7fc6f37d3a4e9d0c9b566eaa':
Fix 5635260 Albums view goes blank after changing view option and returning to albums view
|
| a536a575c770ed560a478e692d4af7e6e28e696a |
18-Nov-2011 |
Wei Huang <weih@google.com> |
am 71a296c2: Merge "Make sure startAnimation won\'t be called after onPause." into ics-mr1
* commit '71a296c27389fefa9361adada41715ae4623af32':
Make sure startAnimation won't be called after onPause.
|
| 86024818e1c03d1a1179510d91a038e1b756c9f4 |
18-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5637927: NPE while trying to do slide show for gmail image attachment
Change-Id: If30aa9798a030a5b97c7ff626f91187d7da93ab5
ndroid/gallery3d/app/PhotoPage.java
|
| 980202694fa6ad982fe04c5742c9042f47fe2dc2 |
18-Nov-2011 |
Ray Chen <raychen@google.com> |
Fix 5635260 Albums view goes blank after changing view option and returning to albums view
Change-Id: I1fd9776f050d16fc3abb723cc17b1cf07bd2f948
ndroid/gallery3d/app/AlbumSetPage.java
ndroid/gallery3d/app/GalleryActionBar.java
|
| 4acafbe1b90e3d817ceb6fa965402e49236ca885 |
18-Nov-2011 |
Wei Huang <weih@google.com> |
Merge "Make sure startAnimation won't be called after onPause." into ics-mr1
|
| c907c3215c63402348599e532e2ea74caa9b95fc |
17-Nov-2011 |
Owen Lin <owenlin@google.com> |
Make sure startAnimation won't be called after onPause.
Change-Id: I6c5238394b2ad64e22fbcb250ecd1534da7e8d03
fix: 5629252
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/ui/SlotView.java
|
| d441f560d3e9302af814267b33d5e52e4b54e086 |
16-Nov-2011 |
Ray Chen <raychen@google.com> |
am d7401652: Fix 5611147 attachments (picture) can\'t be viewed after they\'re saved
* commit 'd74016524fa899747411240daa453e5ca9cac219':
Fix 5611147 attachments (picture) can't be viewed after they're saved
|
| cc8a5c291d9cd16ecf2047f167365adf1e68d635 |
16-Nov-2011 |
Ray Chen <raychen@google.com> |
Fix 5611147 attachments (picture) can't be viewed after they're saved
Change-Id: I0de0b8c176e1c3f838e81e3549c6795613b90069
ndroid/gallery3d/data/MediaItem.java
ndroid/gallery3d/data/UriImage.java
|
| 9ffec1a40c20b522c0baa9ef591ec0108015f734 |
15-Nov-2011 |
Wei Huang <weih@google.com> |
am bfbd7bb4: Merge "Fix 5481444 Face clustering should use PWA profile shot instead of random photo" into ics-mr1
* commit 'bfbd7bb47582be2a636eadffb041a698c52817f6':
Fix 5481444 Face clustering should use PWA profile shot instead of random photo
|
| 24f681fd6c17efc715cac68495d3c64bda8317e2 |
15-Nov-2011 |
Yuli Huang <yuli@google.com> |
am c5d42ff7: Merge "Fix b/5517002 by dismissing running progress dialog in onPause()." into ics-mr1
* commit 'c5d42ff75d53d8e1321da7c901d7b0e5e2bbaa1b':
Fix b/5517002 by dismissing running progress dialog in onPause().
|
| ce7d151a4a11169976a7055484f1ed4ca9faa105 |
15-Nov-2011 |
Wei Huang <weih@google.com> |
Merge "Fix 5481444 Face clustering should use PWA profile shot instead of random photo" into ics-mr1
|
| ad92ae7dd24f73b89ca80261b8f465c403ca5748 |
15-Nov-2011 |
Owen Lin <owenlin@google.com> |
am c903fd67: Fix the memory leak by WeakHashMap.
* commit 'c903fd67c26d652f9dbd5cb321b64d1601357985':
Fix the memory leak by WeakHashMap.
|
| 122d0e411fc2cad77777a9087ccc2848bfe66e9c |
15-Nov-2011 |
Yuli Huang <yuli@google.com> |
Merge "Fix b/5517002 by dismissing running progress dialog in onPause()." into ics-mr1
|
| 12cbc0984310035f98c2440d974f31ceaf149a00 |
14-Nov-2011 |
Yuli Huang <yuli@google.com> |
Fix b/5517002 by dismissing running progress dialog in onPause().
Change-Id: I524f876e53776c38bc850120a2d7b7e6381ca33a
ndroid/gallery3d/photoeditor/EffectsBar.java
ndroid/gallery3d/photoeditor/PhotoEditor.java
ndroid/gallery3d/photoeditor/SpinnerProgressDialog.java
|
| 606931461adcccaa0c906fd8ba31c472321e5d99 |
13-Nov-2011 |
Owen Lin <owenlin@google.com> |
Fix the memory leak by WeakHashMap.
fix: 5601885
Also simplify the code.
Change-Id: I97cdf00d84fa093ad7032e85ec7c31c3365e2447
ndroid/gallery3d/util/SpinnerVisibilitySetter.java
|
| 15539653a1b1a5009bdbc6a5cbf94462e62d5209 |
11-Nov-2011 |
Ray Chen <raychen@google.com> |
am c9af80a1: Merge "Fix 5213252 [UI] Updated action bar layouts and action orders" into ics-mr1
* commit 'c9af80a1e46106b93271903753d36682b480479c':
Fix 5213252 [UI] Updated action bar layouts and action orders
|
| 51f0610147218ee72da9322ee9c10424f33a4227 |
03-Nov-2011 |
Ray Chen <raychen@google.com> |
Fix 5481444 Face clustering should use PWA profile shot instead of random photo
Change-Id: Ie4e3f9ae19431ab5b36d216cd7f4c626de503bbf
ndroid/gallery3d/data/ClusterAlbum.java
ndroid/gallery3d/data/ClusterAlbumSet.java
ndroid/gallery3d/data/Clustering.java
ndroid/gallery3d/data/Face.java
ndroid/gallery3d/data/FaceClustering.java
ndroid/gallery3d/data/LocalImage.java
ndroid/gallery3d/data/MediaItem.java
|
| 09e671801928490afe77151072f7ec118fa4d640 |
11-Nov-2011 |
Owen Lin <owenlin@google.com> |
resolved conflicts for merge of 64d592c0 to master
Change-Id: Iae4a66e37fcb852c4b105fe732c6597b638b2059
|
| 63507711044202f1a590dc429a32c826b24789a4 |
11-Nov-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5213252 [UI] Updated action bar layouts and action orders" into ics-mr1
|
| cd33014879b3b4a7d7c9c9f7699fb82282a860df |
11-Nov-2011 |
Owen Lin <owenlin@google.com> |
am d80bb597: Merge "Show control overlay when earphone is unplugged" into ics-mr1
* commit 'd80bb5974b0ec43ca1755aff4287fc7815504058':
Show control overlay when earphone is unplugged
|
| 65b1c3d4b5b14012ed9e7952ad35f75a714a2774 |
11-Nov-2011 |
Yuli Huang <yuli@google.com> |
am e193bc40: Merge "Fix b/5518211 by disabling effects when photo cannot be loaded." into ics-mr1
* commit 'e193bc40110b0606806c864234e95141be6bd312':
Fix b/5518211 by disabling effects when photo cannot be loaded.
|
| a28f9aab0c8f704eaf02e05a364b29601164a219 |
11-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am b86c6aa0: Fix 5548567: Don\'t play video immediately.
* commit 'b86c6aa085a66ffee2a178f4b5e2426cc67ca90b':
Fix 5548567: Don't play video immediately.
|
| b4f0a855e6bfcaff390cc763383b15ef500e767b |
11-Nov-2011 |
Owen Lin <owenlin@google.com> |
Merge "Request sync when opening Gallery/Album." into ics-mr1
|
| 7e0d6039f2ca726756277f31bbbce77c8476b911 |
11-Nov-2011 |
Owen Lin <owenlin@google.com> |
Merge "Show control overlay when earphone is unplugged" into ics-mr1
|
| 50dab504e89c026ce7a5012e0f8ec342b41c738d |
10-Nov-2011 |
Owen Lin <owenlin@google.com> |
Show control overlay when earphone is unplugged
Change-Id: I3e259e66d318010a3f9e9b47b561a09b2db2b6a5
fix: 5563251
ndroid/gallery3d/app/MoviePlayer.java
|
| c9ac7f1c5e5b5d665aad8919ab98645b9a18a28e |
11-Nov-2011 |
Yuli Huang <yuli@google.com> |
Merge "Fix b/5518211 by disabling effects when photo cannot be loaded." into ics-mr1
|
| 1a03de88b2821a357be8e2060f7d5145cee901c0 |
08-Nov-2011 |
Owen Lin <owenlin@google.com> |
Request sync when opening Gallery/Album.
fix: 5519437
Change-Id: I0fb60415e3a92a677ca72ee8e0b95ae57e802152
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/AlbumSetPage.java
|
| 96b60271935b345b633883688e470e1b497928f2 |
10-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am af92c510: Merge "Fix 5585254: Make system UI enter "low profile mode" while playing." into ics-mr1
* commit 'af92c5100158fe39cca21abb76ca685bfe106eeb':
Fix 5585254: Make system UI enter "low profile mode" while playing.
|
| 0358bbb83b717544d1d20f650a6b8be4f6ff2e99 |
10-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5548567: Don't play video immediately.
Change-Id: I30e9ebf7461e12250e1ef240c157e7f59b1ce2a1
ndroid/gallery3d/app/AlbumPage.java
|
| c3ed4ec81e47ff0d72e0513a1d039bc34e48f0b1 |
09-Nov-2011 |
Ray Chen <raychen@google.com> |
Fix 5213252 [UI] Updated action bar layouts and action orders
Change-Id: I798a86ed1f6883af1ea3cd3e9c67a6603d0273cc
ndroid/gallery3d/app/AbstractGalleryActivity.java
|
| fd3d9dab304d66f2f7d995440d996c688b6d9a31 |
10-Nov-2011 |
Yuli Huang <yuli@google.com> |
Fix b/5518211 by disabling effects when photo cannot be loaded.
Change-Id: I9e5ae9cfaf9bee52cd63a0e77a3b083e47b59335
ndroid/gallery3d/photoeditor/EffectsBar.java
ndroid/gallery3d/photoeditor/PhotoEditor.java
ndroid/gallery3d/photoeditor/SpinnerProgressDialog.java
|
| 39062ff91ec6042ee2c4c46c3058dadacf62d171 |
10-Nov-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5453262 No pictures / Videos available in Gallery message not displayed"
|
| d470122388b4c063697de2774019453843842eed |
10-Nov-2011 |
Yuli Huang <yuli@google.com> |
am 8cfe549a: Fix b/5587210: Add file extension to display-name.
* commit '8cfe549a3c6e50653ce50cedf90e8463d641987d':
Fix b/5587210: Add file extension to display-name.
|
| 669f5b8aed366c59c8c062e1049bc287ff73babf |
10-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5585254: Make system UI enter "low profile mode" while playing." into ics-mr1
|
| 8b2e521b418e1a86d7644c8860dff6c8e9eb2b96 |
10-Nov-2011 |
Yuli Huang <yuli@google.com> |
am 90b7a7a1: Fix b/5510870 by persisting states of save/share buttons.
* commit '90b7a7a1fed287cab3500acdfaf4e82ec0a59dec':
Fix b/5510870 by persisting states of save/share buttons.
|
| de1b184b2efd498c8ef8b203d38f4b30d6f7ca68 |
09-Nov-2011 |
Yuli Huang <yuli@google.com> |
Fix b/5587210: Add file extension to display-name.
Change-Id: I7c3522f2532bbce688ee8d4d0403f7314baca481
ndroid/gallery3d/photoeditor/SaveCopyTask.java
|
| c62e804a74df652881a0b6180412f1c1955c64b5 |
09-Nov-2011 |
Yuli Huang <yuli@google.com> |
am 738e82e1: Fix b/5510870 by saving/restoring Activity states.
* commit '738e82e163f90e1fe7aeef8bd153dc7763631f30':
Fix b/5510870 by saving/restoring Activity states.
|
| 9d9226a7025a3516d7f1fa052a61ac993d51e7db |
09-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5585254: Make system UI enter "low profile mode" while playing.
Change-Id: I91f680871b7a965f6776cb017dcd825a587e5054
ndroid/gallery3d/app/MoviePlayer.java
|
| b69298a00f20f2a3b7ac8f5d3c350c3152d428c3 |
09-Nov-2011 |
Yuli Huang <yuli@google.com> |
Fix b/5510870 by persisting states of save/share buttons.
Change-Id: Ida5c2868199b75a1a710ee5b92e0e3dffd71cec6
ndroid/gallery3d/photoeditor/FilterStack.java
ndroid/gallery3d/photoeditor/PhotoEditor.java
|
| c011a6b3ea4702c7fa68c8103172af71f937e88d |
09-Nov-2011 |
Ray Chen <raychen@google.com> |
Fix 5453262 No pictures / Videos available in Gallery message not displayed
Change-Id: Ib6c8691e4206f9d6a07a7587d22a67c1a21bc5a5
ndroid/gallery3d/app/AlbumSetPage.java
|
| 3e65008308c4cf8b63c78fe5ae1ea141d25a0562 |
08-Nov-2011 |
Yuli Huang <yuli@google.com> |
am 13105e73: Merge "Add face tanning effect to gallery" into ics-mr1
* commit '13105e73298f7ed0031232d48a7cf43ac4c0d21f':
Add face tanning effect to gallery
|
| 16ac4446300bdc6b23a9436328a667996a70c278 |
04-Nov-2011 |
Yuli Huang <yuli@google.com> |
Fix b/5510870 by saving/restoring Activity states.
1. Filters implement Parcelable for saving/restoring states.
2. Extract Doodle for making doodling paths parcelable.
Change-Id: Ice8e6e068891da8a8f9251e62d95ea755fa99933
ndroid/gallery3d/photoeditor/FilterStack.java
ndroid/gallery3d/photoeditor/PhotoEditor.java
ndroid/gallery3d/photoeditor/actions/ColorTemperatureAction.java
ndroid/gallery3d/photoeditor/actions/Doodle.java
ndroid/gallery3d/photoeditor/actions/DoodleAction.java
ndroid/gallery3d/photoeditor/actions/DoodlePaint.java
ndroid/gallery3d/photoeditor/actions/DoodleView.java
ndroid/gallery3d/photoeditor/actions/FillLightAction.java
ndroid/gallery3d/photoeditor/actions/HighlightAction.java
ndroid/gallery3d/photoeditor/actions/SaturationAction.java
ndroid/gallery3d/photoeditor/actions/ShadowAction.java
ndroid/gallery3d/photoeditor/actions/SharpenAction.java
ndroid/gallery3d/photoeditor/filters/AbstractScaleFilter.java
ndroid/gallery3d/photoeditor/filters/AutoFixFilter.java
ndroid/gallery3d/photoeditor/filters/ColorTemperatureFilter.java
ndroid/gallery3d/photoeditor/filters/CropFilter.java
ndroid/gallery3d/photoeditor/filters/CrossProcessFilter.java
ndroid/gallery3d/photoeditor/filters/DocumentaryFilter.java
ndroid/gallery3d/photoeditor/filters/DoodleFilter.java
ndroid/gallery3d/photoeditor/filters/DuotoneFilter.java
ndroid/gallery3d/photoeditor/filters/FaceTanFilter.java
ndroid/gallery3d/photoeditor/filters/FaceliftFilter.java
ndroid/gallery3d/photoeditor/filters/FillLightFilter.java
ndroid/gallery3d/photoeditor/filters/Filter.java
ndroid/gallery3d/photoeditor/filters/FilterCreator.java
ndroid/gallery3d/photoeditor/filters/FisheyeFilter.java
ndroid/gallery3d/photoeditor/filters/FlipFilter.java
ndroid/gallery3d/photoeditor/filters/GrainFilter.java
ndroid/gallery3d/photoeditor/filters/GrayscaleFilter.java
ndroid/gallery3d/photoeditor/filters/HighlightFilter.java
ndroid/gallery3d/photoeditor/filters/LomoishFilter.java
ndroid/gallery3d/photoeditor/filters/NegativeFilter.java
ndroid/gallery3d/photoeditor/filters/PosterizeFilter.java
ndroid/gallery3d/photoeditor/filters/RedEyeFilter.java
ndroid/gallery3d/photoeditor/filters/RotateFilter.java
ndroid/gallery3d/photoeditor/filters/SaturationFilter.java
ndroid/gallery3d/photoeditor/filters/SepiaFilter.java
ndroid/gallery3d/photoeditor/filters/ShadowFilter.java
ndroid/gallery3d/photoeditor/filters/SharpenFilter.java
ndroid/gallery3d/photoeditor/filters/StraightenFilter.java
ndroid/gallery3d/photoeditor/filters/TintFilter.java
ndroid/gallery3d/photoeditor/filters/VignetteFilter.java
|
| b820346074c813500f2ea5b5ae1488fae2b29103 |
08-Nov-2011 |
Yuli Huang <yuli@google.com> |
Merge "Add face tanning effect to gallery" into ics-mr1
|
| 9fc9468421510d7b170f230aa66a12b3f60f7287 |
07-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am d6985f9b: Fix 5457600: In UriImage, read exif to determine orientation.
* commit 'd6985f9ba58c11c29760f28be07ebd229a9b7a39':
Fix 5457600: In UriImage, read exif to determine orientation.
|
| 89e853d8b714fcef0a864265bb4ddfdd50f07e43 |
24-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5457600: In UriImage, read exif to determine orientation.
Change-Id: Iacc5c52747a4ed4dd8f6cab48ce784aff907525b
ndroid/gallery3d/data/Exif.java
ndroid/gallery3d/data/UriImage.java
ndroid/gallery3d/ui/AbstractDisplayItem.java
|
| 4543d36c587153400b27c96a1a5fdfaab67bd3e2 |
14-Oct-2011 |
Ruei-sung Lin <rslin@google.com> |
Add face tanning effect to gallery
bug: 5453164
Change-Id: I259e80325854b9e4a2d2c93db74b306b8e15535c
ndroid/gallery3d/photoeditor/actions/FaceTanAction.java
ndroid/gallery3d/photoeditor/filters/FaceTanFilter.java
|
| 61b9880c8bd9fb4063d65e8543a94217f43f1a3e |
03-Nov-2011 |
Wei Huang <weih@google.com> |
am 529f5341: Merge "Fix 5556160 Crash in gallery after playing slideshow Crespo IML33B." into ics-mr1
* commit '529f53415f34835a32105a73a23f7aa94c5a7e16':
Fix 5556160 Crash in gallery after playing slideshow Crespo IML33B.
|
| a93cf07b2cc645122b5699374e5a0bc85080059e |
03-Nov-2011 |
Wei Huang <weih@google.com> |
Merge "Fix 5556160 Crash in gallery after playing slideshow Crespo IML33B." into ics-mr1
|
| 664a3f521fe8bdcbf5a81fcb41b823e1a58e6ae3 |
03-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am cc2f8c4e: Merge "Fix 5543077: Gallery UI tweaks." into ics-mr1
* commit 'cc2f8c4e24a9cd8fcf99e960f0148a57128b6133':
Fix 5543077: Gallery UI tweaks.
|
| 456d213a9f66b183bd5a0be362349350aabd12a4 |
03-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5543077: Gallery UI tweaks." into ics-mr1
|
| b7c95db2eabb6377e65b4dfc83fcd123e2024cfe |
03-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 1a9b69fb: Merge "3252698: Make drawing target 60fps." into ics-mr1
* commit '1a9b69fbc17263e00aa138dde0c52b37fab6766b':
3252698: Make drawing target 60fps.
|
| bcb316c3ff9b8be8f8cfeeacf2b6022f78de6c48 |
03-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "3252698: Make drawing target 60fps." into ics-mr1
|
| 344617d81ac1c1b113be871e37a7294ee3d9d0a7 |
03-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5543077: Gallery UI tweaks.
Change-Id: I0b85b37ba851628acd0853e4de0985b494606487
ndroid/gallery3d/ui/ManageCacheDrawer.java
|
| a935dd8c5d9e7a5874d01f117ea8e1518eb16b59 |
03-Nov-2011 |
Ray Chen <raychen@google.com> |
am eda8303b: Merge "Fix 5511057 Action bar UI is broken when sorting within an album" into ics-mr1
* commit 'eda8303bebf12f60edf15a2abbc08b99a7c35eef':
Fix 5511057 Action bar UI is broken when sorting within an album
|
| 6a023b3d85faeaba3b0ce4647b6bdbfa275b9cf8 |
03-Nov-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5511057 Action bar UI is broken when sorting within an album" into ics-mr1
|
| c095cf0178a6bc8efec2a56c57b11f9b01173454 |
03-Nov-2011 |
Ray Chen <raychen@google.com> |
Fix 5556160 Crash in gallery after playing slideshow Crespo IML33B.
Change-Id: Ia3de43eae5d96c9f1674dd1ccb01dc004612bda9
ndroid/gallery3d/app/SlideshowPage.java
|
| eb638b3acc8f956d6ee2c50f6e7f67837dc0cbc8 |
02-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
3252698: Make drawing target 60fps.
Change-Id: I5dbff93713422e49378b8e215cac8b7f749ef38a
ndroid/gallery3d/ui/GLRootView.java
|
| 705c427a8b059f7e3937d46801be63fe266fff12 |
03-Nov-2011 |
Owen Lin <owenlin@google.com> |
am a98d3c4d: Merge "Add cover image to MediaSet." into ics-mr1
* commit 'a98d3c4dbed84296496f5f710bd1289d735581d5':
Add cover image to MediaSet.
|
| 6e1e2cdb8c1a29dceb3596459747db110e8832db |
03-Nov-2011 |
Owen Lin <owenlin@google.com> |
Merge "Add cover image to MediaSet." into ics-mr1
|
| 25958570ba1a1e81f3ae86f451bd713069e75634 |
02-Nov-2011 |
Ray Chen <raychen@google.com> |
am c0c13c38: Merge "Fix 5471518 Playing slide show from any picture doesn\'t start from the current picture which is unexpected IRL17 Crespo" into ics-mr1
* commit 'c0c13c38c8e4e86689f4989ca268f71cbb46bff0':
Fix 5471518 Playing slide show from any picture doesn't start from the current picture which is unexpected IRL17 Crespo
|
| 264c19077bd71de041bdab98b196997b1b4b4093 |
02-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 6fb1ddf5: Merge "Fix 5533861: Correct the thumbnail area hit testing calculation." into ics-mr1
* commit '6fb1ddf56809a3eedfc36cb4c2ea56e0010bbaba':
Fix 5533861: Correct the thumbnail area hit testing calculation.
|
| 957ee6b245beedb1fa4af87771ebc756132f8fd8 |
02-Nov-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5471518 Playing slide show from any picture doesn't start from the current picture which is unexpected IRL17 Crespo" into ics-mr1
|
| de8bb7f94b33d395bb3a5a5510ea998881e9cedc |
02-Nov-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5453262 No pictures / Videos available in Gallery message not displayed"
|
| 735d01043e33127e9daba11f96d3325ece426d7c |
27-Oct-2011 |
Owen Lin <owenlin@google.com> |
Add cover image to MediaSet.
fix: 5519437
So that subclass can has its own definition on albums' cover.
Change-Id: Idf2f89933291bedf02054b9488acffe4bd68b1b3
ndroid/gallery3d/app/AlbumSetDataAdapter.java
ndroid/gallery3d/data/MediaSet.java
|
| 809bff64030c4a3afb992a7f92089eda3a450803 |
31-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5533861: Correct the thumbnail area hit testing calculation.
Change-Id: I3a9229497c955628cb49c42c0ee02c41eaadd705
ndroid/gallery3d/ui/SlotView.java
|
| 09efcf9a9367bda0a9d28f312c9b3d0e93dd49da |
21-Oct-2011 |
Ray Chen <raychen@google.com> |
Fix 5471518 Playing slide show from any picture doesn't start from the current picture which is unexpected IRL17 Crespo
Change-Id: I2ed78cee2f6257254794a7724897845c43a3e0a5
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/app/SlideshowDataAdapter.java
ndroid/gallery3d/app/SlideshowPage.java
|
| 6f20eed048d1fc4a03afa435e78aba75fbe1a8b6 |
26-Oct-2011 |
Ray Chen <raychen@google.com> |
Fix 5511057 Action bar UI is broken when sorting within an album
Change-Id: I1b2d22b2fae8b20f03a761696ba1e2c5665d282b
ndroid/gallery3d/app/AlbumSetPage.java
|
| 23c23055b6bd0a8b2aebc732969edf57443ba21a |
27-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 25a329cf: Fix 5516359: Not able to share video to YouTube when the video is playing.
* commit '25a329cfd7e055dd7c8ce69532aefe9a69ee4d75':
Fix 5516359: Not able to share video to YouTube when the video is playing.
|
| 67318092c00cf7ccbb3cabb271a7ebc3d3928306 |
27-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5516359: Not able to share video to YouTube when the video is playing.
YouTube needs a content URI to share.
Change-Id: I7088c11d9d5a0b97bbb6de4ca72d4cc097f9a03c
ndroid/gallery3d/data/LocalVideo.java
|
| ec4a17d4ad24b527801b2c32d60294239542d5f5 |
26-Oct-2011 |
Yuli Huang <yuli@google.com> |
am b1ac0614: am f66bd12b: Fix b/5501285 by ensuring bitmap in ARGB8888 format.
* commit 'b1ac0614afa725aa1bd759fb681d853983b2f1fb':
Fix b/5501285 by ensuring bitmap in ARGB8888 format.
|
| f07097f19d0821ff007c7f2c037287c34181c4f6 |
26-Oct-2011 |
Yuli Huang <yuli@google.com> |
am f66bd12b: Fix b/5501285 by ensuring bitmap in ARGB8888 format.
* commit 'f66bd12b33e0d590e192a3551e9affc55eef9a48':
Fix b/5501285 by ensuring bitmap in ARGB8888 format.
|
| 1f96795daee8d21bf41847a59428b4f25837898f |
26-Oct-2011 |
Yuli Huang <yuli@google.com> |
Fix b/5501285 by ensuring bitmap in ARGB8888 format.
Change-Id: I48ece547543207ba92276962fc6131859f615313
ndroid/gallery3d/photoeditor/BitmapUtils.java
|
| a384b3e3e815ace802038939f0abb2eb9af09142 |
26-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 4083882: When scrolling repeatedly, the Gallery jumps."
|
| b642bea4fda8ca5df04f7c017fb4c14517a24f6f |
25-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 4083882: When scrolling repeatedly, the Gallery jumps.
Change-Id: I1d69330c54d94e3f8917fa8e502cb5c244628a15
ndroid/gallery3d/ui/ScrollerHelper.java
|
| 7c216174c27b4b905a50b95709a12401e85c2c7d |
24-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5454748: Localize hardcoded folder names.
Change-Id: I91586d6f707a0352be6be524e848bd2c2dacab7e
ndroid/gallery3d/data/LocalAlbum.java
ndroid/gallery3d/util/MediaSetUtils.java
|
| 10f0b76507444af1a42539456464bd3867bc7bad |
21-Oct-2011 |
Ray Chen <raychen@google.com> |
Fix 5453262 No pictures / Videos available in Gallery message not displayed
Change-Id: Ia4c03d4f4a89ebaa2534720d8a679243fbf81d52
ndroid/gallery3d/app/AlbumSetPage.java
|
| 773d368357ce50bc299551a768584d5a222fd440 |
20-Oct-2011 |
Yuli Huang <yuli@google.com> |
am 7b62f488: Fix b/5401109.
* commit '7b62f4889a95406a00a4a5f25ef15f01322607eb':
Fix b/5401109.
|
| 960647247705f2c3e375061d234424b71c286e4d |
20-Oct-2011 |
Yuli Huang <yuli@google.com> |
Fix b/5401109.
1. Add FlipView similar to existing RotateView.
2. Add flipPhoto() similar to existing rotatePhoto() in PhotoView, and
add setRenderToFlip() in RendererUtils.
3. Make FlipAction use FlipView/PhotoView similar to how RotateAction
uses RotateView/PhotoView.
Change-Id: I5642266adbc248c0b8eda48ddc29558ae9cbd21e
ndroid/gallery3d/photoeditor/PhotoView.java
ndroid/gallery3d/photoeditor/RendererUtils.java
ndroid/gallery3d/photoeditor/actions/EffectToolFactory.java
ndroid/gallery3d/photoeditor/actions/FlipAction.java
ndroid/gallery3d/photoeditor/actions/FlipView.java
ndroid/gallery3d/photoeditor/actions/RotateAction.java
ndroid/gallery3d/photoeditor/actions/RotateView.java
ndroid/gallery3d/photoeditor/actions/StraightenAction.java
|
| 64dbda50d5a05842b2f793bf6c0d3d9c88a7d587 |
20-Oct-2011 |
Owen Lin <owenlin@google.com> |
am a77f6c46: Fix the issue that cropping wrong region for protrait image.
* commit 'a77f6c46815195c8a2a39c9539163ea3e8683b5d':
Fix the issue that cropping wrong region for protrait image.
|
| c1965fc2a109cf9d267b161800356c0dc4326cf0 |
19-Oct-2011 |
Owen Lin <owenlin@google.com> |
Fix the issue that cropping wrong region for protrait image.
Change-Id: Iea7a3874eb7170f8cae943c00cf92669a92b0ae2
fix: 5470203
ndroid/gallery3d/app/CropImage.java
|
| 82d1bb02f8e29e8364b26acde6f28d0c4e0dd338 |
19-Oct-2011 |
Ray Chen <raychen@google.com> |
am c0ba0936: Fix 5418759 User should be able to view only the preview of that attached
* commit 'c0ba0936bac7d56b92a409380c4d378ed2c272b0':
Fix 5418759 User should be able to view only the preview of that attached
|
| 1ce57c4093b75959ccff03bff9027d9cc8902c4a |
19-Oct-2011 |
Ray Chen <raychen@google.com> |
Fix 5418759 User should be able to view only the preview of that attached
Change-Id: Ie3eb2583f7753fc38db3d59aca544a95112010c7
ndroid/gallery3d/app/Gallery.java
|
| c0755d0b8f17f56604374236262137ee8071d255 |
19-Oct-2011 |
Wei Huang <weih@google.com> |
am 6172a060: Merge "Fix a IllegalArgumentException in Gallery 0 not in (0, 0)" into ics-mr0
* commit '6172a060689e424ad089594abd5ef1761f6f2ed3':
Fix a IllegalArgumentException in Gallery 0 not in (0, 0)
|
| 2c6f312f908f863b93226fafab127a8f69d9d49a |
19-Oct-2011 |
Wei Huang <weih@google.com> |
Merge "Fix a IllegalArgumentException in Gallery 0 not in (0, 0)" into ics-mr0
|
| 3c6da1fb74d0843b27ba424b75b25d18b0e58eb2 |
19-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
am d82ac818: Merge "Fix 5424444: Add code to save cropped image for non-local, non-picasa cases." into ics-mr0
* commit 'd82ac818b88f0755d0515b282445ac1752976140':
Fix 5424444: Add code to save cropped image for non-local, non-picasa cases.
|
| 318d78ca0b69cb8dffb200e6ae563501d9847bf5 |
19-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
am bd47a5c6: Fix 5352588: Accept view intent without URI.
* commit 'bd47a5c6bcdcb127adb13c454fec00d4989c50b6':
Fix 5352588: Accept view intent without URI.
|
| 6156a86c4c2232165575b243a284ff10a87f1663 |
19-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5424444: Add code to save cropped image for non-local, non-picasa cases.
Change-Id: Ib9f780f71fc9c50fa68a03ebb49f1bd007ca333d
ndroid/gallery3d/app/CropImage.java
|
| fff46c04cffa09f37cc45d53ad3ddc7b020d20df |
18-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5352588: Accept view intent without URI.
Change-Id: I719fd853b66c05c4fdbe70ff97993b9487997694
ndroid/gallery3d/app/Gallery.java
ndroid/gallery3d/util/GalleryUtils.java
|
| 97bc33f5a2c114d922d466c4e0d984ea3254f9c9 |
18-Oct-2011 |
Yuli Huang <yuli@google.com> |
am 07a3b570: Merge "Fix b/5403449." into ics-mr0
* commit '07a3b57049665faf56f2c65b3310143a4ef464e7':
Fix b/5403449.
|
| d96b0b6334052bded3ccaf3596019df574300faf |
18-Oct-2011 |
Yuli Huang <yuli@google.com> |
Merge "Fix b/5403449." into ics-mr0
|
| 3b671ed16b2bdf2d63038c045edb08d7316067e2 |
18-Oct-2011 |
Wei Huang <weih@google.com> |
am 40ac84e6: Merge "Fix NPE while flipping through pictures." into ics-mr0
* commit '40ac84e663e89a25540751075db1ff597124de66':
Fix NPE while flipping through pictures.
|
| d9d6d481276656dfae1c377f829a4e9220735aaf |
18-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 209a9163: Fix 5393669: New Player Control UI.
* commit '209a9163d4e8cee0bfe162ae598ef40e6051479c':
Fix 5393669: New Player Control UI.
|
| 828fc0990b7a82613083511893de28f7ea367771 |
18-Oct-2011 |
Wei Huang <weih@google.com> |
Merge "Fix NPE while flipping through pictures." into ics-mr0
|
| d1d573b15391b54a3b36e603d08929c23ce1c4f4 |
18-Oct-2011 |
Owen Lin <owenlin@google.com> |
Fix a IllegalArgumentException in Gallery 0 not in (0, 0)
fix: 5379253
We add a hack to prevent flush out cached data. But the hack will leave
the content window in an invalid values.
Change-Id: I3ed1527b9ee9023b07ca44cafc27510ef9f08d59
ndroid/gallery3d/ui/AlbumSetSlidingWindow.java
ndroid/gallery3d/ui/AlbumSetView.java
ndroid/gallery3d/ui/AlbumSlidingWindow.java
ndroid/gallery3d/ui/AlbumView.java
|
| 2e4790ceb28294ccc0fa7456ca379d9e902e7d98 |
18-Oct-2011 |
Owen Lin <owenlin@google.com> |
Fix NPE while flipping through pictures.
Add a DECODE_FAIL state to Tile's lifecycle.
fix: 5376092
Change-Id: I26ff946d5435f12a6ee84c80f07255cf8327ef32
ndroid/gallery3d/ui/TileImageView.java
ndroid/gallery3d/ui/TileImageViewAdapter.java
|
| 306f9d2b11f65e8ff35ad707a0d85c66c34b0c8b |
17-Oct-2011 |
Yuli Huang <yuli@google.com> |
Fix b/5403449.
1. Extract code that recreates/restores ActionBar as RestorableView, and
make both ActionBar and EffectsMenu extend RestorableView.
2. Fix effects-menu buttons too close to each other.
3. Remove effects-menu buttons' highlight animations to look more
responsive.
Change-Id: I68e5bdcde702e611ccced5e169852c0e58a949fc
ndroid/gallery3d/photoeditor/ActionBar.java
ndroid/gallery3d/photoeditor/EffectsBar.java
ndroid/gallery3d/photoeditor/EffectsMenu.java
ndroid/gallery3d/photoeditor/PhotoEditor.java
ndroid/gallery3d/photoeditor/RestorableView.java
|
| 6645e87b4889a96cc977cc3b35ed9d43b33de328 |
14-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5393669: New Player Control UI.
Change-Id: I1aa310eee3b7715dbefea6b2f24e6f32481db49c
ndroid/gallery3d/app/ControllerOverlay.java
ndroid/gallery3d/app/MovieActivity.java
ndroid/gallery3d/app/MovieControllerOverlay.java
ndroid/gallery3d/app/MoviePlayer.java
ndroid/gallery3d/app/TimeBar.java
|
| f7e81320e4db190c441743906d1ffad9c0826bf0 |
14-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
am b289d441: Fix 5398768: Add requestCreateBitmapRegionDecoder for InputStream.
* commit 'b289d441eb5af97ac8716479831b1a2c5fe2e878':
Fix 5398768: Add requestCreateBitmapRegionDecoder for InputStream.
|
| 903bb336e915b6c7ce560dd8a2c2722ae5fa3bf5 |
14-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5398768: Add requestCreateBitmapRegionDecoder for InputStream.
Change-Id: Ied273ffbabc134fdd930e6415fc175a6221eb662
ndroid/gallery3d/data/DecodeUtils.java
|
| e8fd92235fb40a3302ea7219c7c5c17f8ac32a29 |
13-Oct-2011 |
Yuli Huang <yuli@google.com> |
am 85bc435c: Fix UI.
* commit '85bc435c06ace72f5da72475e9b03b0ada9455e0':
Fix UI.
|
| c22d67d46f1d7dbf3f77f4ec597c0cc3752a1ce6 |
13-Oct-2011 |
Yuli Huang <yuli@google.com> |
Fix UI.
1. Replace slider assets on tablets.
2. Add face-tan effect icon.
3. Change orange color to blue color in straighten effect to be
consistent with crop effect.
Change-Id: I073dea539d68d2a3d7782a520daa911879bc41cd
ndroid/gallery3d/photoeditor/actions/CropView.java
ndroid/gallery3d/photoeditor/actions/RotateView.java
|
| 83046ac7bbc8862ec082380af8d63fac179fec80 |
06-Oct-2011 |
Ray Chen <raychen@google.com> |
Fix 5417248 Gallery shows Details for the same video no matter which is selected
Change-Id: If221ac3d22adfd3a47d98923dab5c4c1e5ca263d
ndroid/gallery3d/app/AlbumPage.java
|
| 782ad9e465b57f863c5a85784a35bb52e48484b0 |
13-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 532d93ca: Fix 5254974: Add EdgeEffect for PhotoView.
* commit '532d93caddc91a7aa33ca113adbc0b8255d498eb':
Fix 5254974: Add EdgeEffect for PhotoView.
|
| 6fca4a3fb1b707bfd7c9b7c65cfad086e6bc7868 |
13-Oct-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5434523 No affordance in Gallery to share a video other than long-press in album view"
|
| be074856000e2b417425585da0b4ffb36fc45bd1 |
12-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5254974: Add EdgeEffect for PhotoView.
Change-Id: Ib9ea8fff14a932e8ec25c3f272fe0539776bb062
ndroid/gallery3d/ui/EdgeEffect.java
ndroid/gallery3d/ui/EdgeView.java
ndroid/gallery3d/ui/FilmStripView.java
ndroid/gallery3d/ui/FlingScroller.java
ndroid/gallery3d/ui/GLCanvasImpl.java
ndroid/gallery3d/ui/PhotoView.java
ndroid/gallery3d/ui/PositionController.java
|
| d077e2524a49ea66e8d003020172b659158358f0 |
13-Oct-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5413911 Gallery app does not recognize that no files are selected for delete"
|
| 5e38ffd51fae92b696969bddb27eddda0371f1a9 |
12-Oct-2011 |
Yuli Huang <yuli@google.com> |
am eb83d83d: Fix b/5392171 and b/5389281.
* commit 'eb83d83d8ce6e5b7ff7a99a5da738f251bae0f21':
Fix b/5392171 and b/5389281.
|
| 80481cb46180021abe0f3cf959dacca2519b9c53 |
11-Oct-2011 |
Yuli Huang <yuli@google.com> |
Fix b/5392171 and b/5389281.
1. Fix b/5392171 by moving effect context creation into Filter to make
sure it'd be created when needed.
2. Revise the fix for b/5389281 by clearing surface background even
there's no photo.
Change-Id: I212a552291c7df28b75a909bf6560634ba061e9f
ndroid/gallery3d/photoeditor/FilterStack.java
ndroid/gallery3d/photoeditor/PhotoView.java
ndroid/gallery3d/photoeditor/RendererUtils.java
ndroid/gallery3d/photoeditor/filters/Filter.java
|
| 2b45bac3feb6a3b92322e873e7a4897415f8f8de |
11-Oct-2011 |
Wei Huang <weih@google.com> |
Merge "Fix 5421152 [UI] Selecting "Posts - <username>" as an album for Gallery widget fails"
|
| c2c9df91a8f9b35d18d43593d75f65b78e6bfc38 |
11-Oct-2011 |
Yuli Huang <yuli@google.com> |
Merge "Fix b/5433856 and b/5433907."
|
| c1f9318b9e80280eaab683eca2aad0beca16591d |
11-Oct-2011 |
Ray Chen <raychen@google.com> |
Fix 5421152 [UI] Selecting "Posts - <username>" as an album for Gallery widget fails
Change-Id: I32722ad2d5f83bb180baceeb887f1cf216eaf692
ndroid/gallery3d/data/ComboAlbum.java
|
| 16e520ebdced709889a4994f52b1985510fa2a45 |
10-Oct-2011 |
Ray Chen <raychen@google.com> |
Fix 5199444 In crop interface, check button and X button should be switched
Fix 5424781 Two "Tick mark" and "OK" option shows together in crop picture screen in Crespo IRL06.
Fix some other UI issues. (HOME_UP)
Change-Id: Idfa5a258af17b22f13a238cee63a43f3abff776b
ndroid/gallery3d/app/CropImage.java
|
| 3539b1c7f4e75846a4950ad54295c36ae5aa7da1 |
11-Oct-2011 |
Ray Chen <raychen@google.com> |
Fix 5434523 No affordance in Gallery to share a video other than long-press in album view
Change-Id: I99361fa209ee5ba4200ccb8c1708f649c04519c2
ndroid/gallery3d/app/MovieActivity.java
|
| 566f653e477d8d594e6c69e394a52f616100bd31 |
09-Oct-2011 |
Yuli Huang <yuli@google.com> |
Fix b/5433856 and b/5433907.
1. Make PhotoView restore rotation after the device awakes or
the orientation changes.
2. Avoid outputting top filter until the active effect requests its
output to fix incorrect Crop/Rotate/Doodle effects after device awakes.
3. Speed up rotation speed by removing queued outdated rotation.
Change-Id: I5b82ccfe4e27ad5f1d2505bdd7a7540e0a77b55d
ndroid/gallery3d/photoeditor/FilterStack.java
ndroid/gallery3d/photoeditor/Photo.java
ndroid/gallery3d/photoeditor/PhotoView.java
ndroid/gallery3d/photoeditor/actions/RotateAction.java
|
| 9d62da7986aef9d89356f6b169fafecd8936d9f6 |
30-Sep-2011 |
Hung-ying Tyan <tyanh@google.com> |
Request sync when there's no mediaItem in a mediaSet.
This is to fix the problem where media items haven't been sync'ed when the album
set or album is viewed for the first time.
+ Add MediaSet.SyncListener.
+ Make AlbumPage and AlbumSetPage implement SyncListener.
+ Implement requestSync() for ComboAlbum and ComboAlbumSet.
+ add ActivityState.isDestroyed(). This also fixes the problem where
StateManager.finishState() may be called twice.
Bug: 5337899
Change-Id: I25364c3ac25721a2650701c5d7931bfb6daa9303
ndroid/gallery3d/app/ActivityState.java
ndroid/gallery3d/app/AlbumDataAdapter.java
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/AlbumSetPage.java
ndroid/gallery3d/app/StateManager.java
ndroid/gallery3d/data/ComboAlbum.java
ndroid/gallery3d/data/ComboAlbumSet.java
ndroid/gallery3d/data/MediaSet.java
|
| 78eac46afd4c5b33c8c32f976974ebff6870c0a4 |
07-Oct-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5343229 Location displayed as co-ordinates in details of picture captured from camera"
|
| e2d426993d2d516aabeaa88681e6b9a739c618ac |
07-Oct-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5250813 Use new standardized no account screen on first launch"
|
| 875423f9a4185968a4ea83f45c31add457559dfb |
05-Oct-2011 |
Ray Chen <raychen@google.com> |
Fix 5413911 Gallery app does not recognize that no files are selected for delete
Change-Id: I90efb3d7676a0810025dd37890c1251725a48223
ndroid/gallery3d/ui/ActionModeHandler.java
ndroid/gallery3d/ui/MenuExecutor.java
|
| cc9bda9e1d83bc31c5432fb5b791f0e9d6dc0eeb |
06-Oct-2011 |
Yuli Huang <yuli@google.com> |
Replace slider assets and fix save-share-button height.
1. Use the same slider asset for both fill-light and highlights.
2. Update slider assets and dimensions.
3. Fix save-share-button height didn't fill action-bar.
Change-Id: I6b3a735c8f745084b89b1d6a035c7ed9bd4ff287
ndroid/gallery3d/photoeditor/actions/EffectToolFactory.java
ndroid/gallery3d/photoeditor/actions/FillLightAction.java
ndroid/gallery3d/photoeditor/actions/HighlightAction.java
|
| 55a31faaa2a8fb5ee1a3c4c2a373adeb6a92c063 |
06-Oct-2011 |
Yuli Huang <yuli@google.com> |
Merge "Fix b/5413887 and b/5389281."
|
| 52a460c34bda8b3bb28ae3139371068dbc1eb606 |
04-Oct-2011 |
Ray Chen <raychen@google.com> |
Fix 5343229 Location displayed as co-ordinates in details of picture captured from camera
Change-Id: I223b69a3e10fe85a4622cf33110414cd14624f36
ndroid/gallery3d/ui/DetailsAddressResolver.java
ndroid/gallery3d/ui/DialogDetailsView.java
|
| 73e791c4c42b66b7de3e6a4fa7ca05d9daa10cde |
04-Oct-2011 |
Ray Chen <raychen@google.com> |
Fix 5250813 Use new standardized no account screen on first launch
This CL also fixes a bug in AlbumSetDataAdapter's ReloadTask, which
causes empty screen after pause/resume.
Change-Id: I7991d40a790384105ccb3021e1e51ba3e5ec8635
ndroid/gallery3d/app/AlbumSetDataAdapter.java
ndroid/gallery3d/app/AlbumSetPage.java
ndroid/gallery3d/app/Gallery.java
ndroid/gallery3d/ui/AlbumSetSlidingWindow.java
ndroid/gallery3d/ui/AlbumSetView.java
ndroid/gallery3d/ui/SlotView.java
|
| 466734f088158151d872c59def524eada1f4005b |
05-Oct-2011 |
Wei Huang <weih@google.com> |
Merge "Use merged album as the default parent set for an local media."
|
| 05922af13db6fb928658e998802b89eb6ae47062 |
05-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5319007: Add fling to PhotoView."
|
| 4fdf38fbc8756ae232fbe7692d69df638e6055c4 |
03-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5319007: Add fling to PhotoView.
Change-Id: Iacda65fbe1fcb3ad245ad99e0b062606ca6792b9
ndroid/gallery3d/ui/FlingScroller.java
ndroid/gallery3d/ui/PhotoView.java
ndroid/gallery3d/ui/PositionController.java
|
| 60c3c4b104eb3c23b8f23fdcfa570ee8417457cd |
05-Oct-2011 |
Owen Lin <owenlin@google.com> |
Use merged album as the default parent set for an local media.
Change-Id: I36062cc1ea06ec9d2eb05e74157f4a071484a8a7
fix: 5141166
ndroid/gallery3d/data/LocalSource.java
|
| f94475fb525ef65c40365925da5b5a44ef645c05 |
05-Oct-2011 |
Yuli Huang <yuli@google.com> |
Fix b/5413887 and b/5389281.
1. Fix b/5413887 by releasing MFF effects as well as release
MFF effect-context.
2. Fix b/5389281 by removing photoView.setPhoto(null).
Change-Id: I1b848f6c87b03ba2539432fd6d6f13f4ac3a2907
ndroid/gallery3d/photoeditor/FilterStack.java
ndroid/gallery3d/photoeditor/filters/AutoFixFilter.java
ndroid/gallery3d/photoeditor/filters/ColorTemperatureFilter.java
ndroid/gallery3d/photoeditor/filters/CropFilter.java
ndroid/gallery3d/photoeditor/filters/CrossProcessFilter.java
ndroid/gallery3d/photoeditor/filters/DocumentaryFilter.java
ndroid/gallery3d/photoeditor/filters/DoodleFilter.java
ndroid/gallery3d/photoeditor/filters/DuotoneFilter.java
ndroid/gallery3d/photoeditor/filters/FaceliftFilter.java
ndroid/gallery3d/photoeditor/filters/FillLightFilter.java
ndroid/gallery3d/photoeditor/filters/Filter.java
ndroid/gallery3d/photoeditor/filters/FisheyeFilter.java
ndroid/gallery3d/photoeditor/filters/FlipFilter.java
ndroid/gallery3d/photoeditor/filters/GrainFilter.java
ndroid/gallery3d/photoeditor/filters/GrayscaleFilter.java
ndroid/gallery3d/photoeditor/filters/HighlightFilter.java
ndroid/gallery3d/photoeditor/filters/LomoishFilter.java
ndroid/gallery3d/photoeditor/filters/NegativeFilter.java
ndroid/gallery3d/photoeditor/filters/PosterizeFilter.java
ndroid/gallery3d/photoeditor/filters/RedEyeFilter.java
ndroid/gallery3d/photoeditor/filters/RotateFilter.java
ndroid/gallery3d/photoeditor/filters/SaturationFilter.java
ndroid/gallery3d/photoeditor/filters/SepiaFilter.java
ndroid/gallery3d/photoeditor/filters/ShadowFilter.java
ndroid/gallery3d/photoeditor/filters/SharpenFilter.java
ndroid/gallery3d/photoeditor/filters/StraightenFilter.java
ndroid/gallery3d/photoeditor/filters/TintFilter.java
ndroid/gallery3d/photoeditor/filters/VignetteFilter.java
|
| 3807c5774cc60d0a8745d8e396ecc679dc7b7270 |
04-Oct-2011 |
Yuli Huang <yuli@google.com> |
Fix b/5032231: Allow share in Photo Editor.
Change-Id: I5fd48243df76fd0c2617c92d7f73936172bf6c47
ndroid/gallery3d/photoeditor/ActionBar.java
ndroid/gallery3d/photoeditor/PhotoEditor.java
|
| c8957b85a13e9993c7620076be132876cb9ad6b7 |
04-Oct-2011 |
Yuli Huang <yuli@google.com> |
Fix b/5375999: replace effect thumbnails.
1. Replace Doodle/Facelift thumbnails.
2. Adjust effect label margins.
3. Remove unused imports from FaceliftFilter.java.
Change-Id: I9e5f162721455ace62bb30d90301a9c70ff95fdc
ndroid/gallery3d/photoeditor/filters/FaceliftFilter.java
|
| f3c77ac39cf1af57285eab0da8db5eb4ec34bfd4 |
30-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Simplify some calculation and add more comments.
Change-Id: I0fcb2e48ba88dc957c5454de09059a265c3dbec1
ndroid/gallery3d/ui/PhotoView.java
ndroid/gallery3d/ui/PositionController.java
|
| ab83e37376705de78048188e0e28ee167d34a815 |
03-Oct-2011 |
Evan Millar <emillar@google.com> |
Remove the "Gallery" title from the AlbumSet page.
bug:5239335
Change-Id: Iebe624fe8829cf6f905872caa958ebdc76aaa349
ndroid/gallery3d/app/AlbumSetPage.java
|
| 3745ce03f718935d96c6b1dd3a9fe50127873f19 |
03-Oct-2011 |
Evan Millar <emillar@google.com> |
Merge "Get rid of "flashies" in the action bar."
|
| f63ed4000f3641929747627c51825fb77be1aa21 |
03-Oct-2011 |
Evan Millar <emillar@google.com> |
Merge "Various UI fixes in Gallery"
|
| 4995b5d02e67ff06b7db699a1a891da2c9e77bfa |
03-Oct-2011 |
Evan Millar <emillar@google.com> |
Get rid of "flashies" in the action bar.
-Filter out short spinner events. All spinner events that last <1sec are
now ignored. We also enforce a minimum delay time of 2 sec.
-Mark the share and delete menu items as visible="false" by default to
get rid of the quick display/removal of them under scenarios where they
are ultimately removed.
bug:5398336
Change-Id: I0620532f3ab59d9fde46123620eb781a87445b54
ndroid/gallery3d/util/GalleryUtils.java
ndroid/gallery3d/util/SpinnerVisibilitySetter.java
|
| 305740f973407ec783fac92490a6df1b675632e2 |
30-Sep-2011 |
Yuli Huang <yuli@google.com> |
Fix b/5317371 to make action-bar consistent with framework CAB.
1. Refactor to decouple ActionBar from FilterStackListener and
ActionBarListener to avoid FilterStack/Toolbar depending on ActionBar.
2. Recreate the action-bar on configuration changes and restore button
status and behaviors from the old action-bar.
3. Use framework CAB styles/dimensions to have consistent look and feel.
Change-Id: Ib7be0e0b8135f5f86af65b320f09b3d691464f54
ndroid/gallery3d/photoeditor/ActionBar.java
ndroid/gallery3d/photoeditor/FilterStack.java
ndroid/gallery3d/photoeditor/LoadScreennailTask.java
ndroid/gallery3d/photoeditor/PhotoEditor.java
ndroid/gallery3d/photoeditor/SaveCopyTask.java
ndroid/gallery3d/photoeditor/Toolbar.java
ndroid/gallery3d/photoeditor/ToolbarIdleHandler.java
ndroid/gallery3d/photoeditor/YesNoCancelDialogBuilder.java
|
| 1d9e17fbaae27845bec3c20723a6a67e5d8a5891 |
30-Sep-2011 |
Evan Millar <emillar@google.com> |
Various UI fixes in Gallery
-New assets for grid and strip selection borders.
-Fix spacing in details dialog.
-New scrollbar asset in the strip view.
-Deleted unused ScrollView.java and GlDetailsView.java
bug:5327238
Change-Id: I147b8f8069f42e345110f7ae86c47d331551f089
ndroid/gallery3d/ui/DetailsHelper.java
ndroid/gallery3d/ui/DialogDetailsView.java
ndroid/gallery3d/ui/GLDetailsView.java
ndroid/gallery3d/ui/ScrollBarView.java
ndroid/gallery3d/ui/ScrollView.java
ndroid/gallery3d/ui/StripDrawer.java
|
| e0856697e69a7802040c004232e4cdec4113a88e |
19-Sep-2011 |
Ruei-sung Lin <rslin@google.com> |
facelift in gallery
Change-Id: I7cb67c3d977d8b23957586bb5ad1dada096ef07b
ndroid/gallery3d/photoeditor/actions/FaceliftAction.java
ndroid/gallery3d/photoeditor/filters/FaceliftFilter.java
|
| 4074ff352ed8fafd2146eec9c6356b9b5e3bcd94 |
30-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5336726: sort local albums by reverse chronological order."
|
| fbef386d12258a963295aa09afe62f7f1f44fba8 |
29-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5336726: sort local albums by reverse chronological order.
Change-Id: I3a04286bea7f43d5f3542b37eddbb4a0801e94f5
ndroid/gallery3d/data/LocalAlbumSet.java
|
| 1ebc9345a9e0aee724ba00c02cfcd975131d5b4f |
29-Sep-2011 |
Owen Lin <owenlin@google.com> |
Rotate the image according to FullImageRotation.
Change-Id: I2c1285aa50b71e0efdbe3c4c50264e42c7b9ab97
fix: 5389974
ndroid/gallery3d/app/CropImage.java
|
| ffaaec327edcce246b5b5b0cb2786dd74d1d6ec8 |
29-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Small UI tweak: only show fade-in animation when the bitmap
has not been available for rendering before.
Change-Id: I57df7911c5afa7aa2eec910d0e21679ed978ddad
ndroid/gallery3d/ui/AlbumSetSlidingWindow.java
ndroid/gallery3d/ui/AlbumSlidingWindow.java
|
| e3f4b8fd2435e0af778230df455c905e23ec583e |
27-Sep-2011 |
Michael Jurka <mikejurka@google.com> |
Change gallery crop interface to be consistent with widget resizing
- Always show the resize controls when you're not touching the UI
- Change the resize controls to the holo style
Change-Id: Ia32235d6d82196a24b26fc78b9e9e1e3fb1f5250
ndroid/gallery3d/photoeditor/actions/CropView.java
ndroid/gallery3d/ui/CropView.java
|
| b160bf641958039fb43c66b945e237ef78318c0e |
28-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5384679: Back button doesn't work in Video Player"
|
| 5bf3bba0c72f1b7171ab60753385dbeb0628070e |
28-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5384679: Back button doesn't work in Video Player
Change-Id: Idde8778fc5643ef21fd4ad39ffbaa3c9e0c7d147
ndroid/gallery3d/app/MoviePlayer.java
|
| 489b7c2bfc3e07ca503bb0f8bb6ceb8b5d2939af |
28-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5158468: Hide system bar when no play control is shown."
|
| 399bb7eab79c9e48efb5b481a5f9dc2536ff45b4 |
27-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5158468: Hide system bar when no play control is shown.
Change-Id: Iada70c39440f19eec1cb00088531719bc1bb8328
ndroid/gallery3d/app/MovieActivity.java
ndroid/gallery3d/app/MoviePlayer.java
|
| 5be6dbe487c9db0945d332fc1cc6a6d96d7c016f |
28-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5367072: Add thumbnail fade-in animation."
|
| 1b2af5e5a75cf4c117e3e6c8d02fdb4587dff0be |
27-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5367072: Add thumbnail fade-in animation.
Change-Id: I1101721c703d6dcb98f11178d54d65446f74ce06
ndroid/gallery3d/ui/AlbumSetSlidingWindow.java
ndroid/gallery3d/ui/AlbumSlidingWindow.java
ndroid/gallery3d/ui/DisplayItem.java
ndroid/gallery3d/ui/FadeInTexture.java
ndroid/gallery3d/ui/GridDrawer.java
ndroid/gallery3d/ui/HighlightDrawer.java
ndroid/gallery3d/ui/IconDrawer.java
ndroid/gallery3d/ui/ManageCacheDrawer.java
ndroid/gallery3d/ui/SelectionDrawer.java
ndroid/gallery3d/ui/SlotView.java
ndroid/gallery3d/ui/StripDrawer.java
ndroid/gallery3d/ui/Texture.java
|
| c29a5a347120a9aed277b578b0ea888c7e89b060 |
28-Sep-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5341761 gallery vibrate on confirm delete"
|
| 5050145590309e519d062421e3fc3b161375a613 |
27-Sep-2011 |
Yuli Huang <yuli@google.com> |
am fef5b986: Fix b/5287869 (and b/5369640).
* commit 'fef5b9860f0a88fc673af2187938956ebd0ade75':
Fix b/5287869 (and b/5369640).
|
| a9c225508657af33060ff1fd950e8e3e954dea42 |
27-Sep-2011 |
Yuli Huang <yuli@google.com> |
Fix b/5287869 (and b/5369640).
Images from some app (MMS) may not have columns that PhotoEditor tries
to query, for example: the orientation. Just ignore the absent columns.
Change-Id: I1cda4e32241d9be7819453ede225388c7535c18c
ndroid/gallery3d/photoeditor/BitmapUtils.java
ndroid/gallery3d/photoeditor/SaveCopyTask.java
|
| 1e86a2be16bc7e01ad33c9a52d339d351bfbadf2 |
27-Sep-2011 |
Ray Chen <raychen@google.com> |
Fix 5341761 gallery vibrate on confirm delete
Change-Id: I819855f28246c91324ea86ab9e0ac1ec1c19783c
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/AlbumSetPage.java
ndroid/gallery3d/ui/SelectionManager.java
|
| e251416400ea8870c3a6494ef4a5e7a4b59a0d4a |
27-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5299746: Update panorama thumbnail overlay.
Change-Id: Ide3e592ad5f697acc6b2ebc2a092044803b82d7b
ndroid/gallery3d/ui/IconDrawer.java
|
| 07e6fca4b1b477bc0f4a0387ddb61f6c481efa5a |
26-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Move out PositionController from PhotoView.
Change-Id: Id1088ffbd67ff5e986fdf16f70ba24f1537d10ab
ndroid/gallery3d/ui/PhotoView.java
ndroid/gallery3d/ui/PositionController.java
|
| 1ef98e32ccc4c6f3f69f812c1a92294065d80271 |
13-Sep-2011 |
Owen Lin <owenlin@google.com> |
(DO NOT MERGE)
Add a hard limit on the size of the widget images.
There is a limit on the size of the data transfered by binder.
For now, we just add a hard limit (360 pixel) to ensure the widget's image
can be passed by binder.
Also adjust the size of widget to make it looks better.
Fix a bug in DecodeUtils which cause OOM for a image in size 12200x1920.
In that case, we should generate a screen nail of size 640x101 instead of
4066x640.
Change-Id: Ie42805d9e9e579b063fc99f5130ec433d695b8c9
fix: 5273271
ndroid/gallery3d/data/DecodeUtils.java
ndroid/gallery3d/gadget/WidgetConfigure.java
|
| ca07852ce136f83cc1badac7d8c0ce234570bca2 |
26-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5223982: Add animation when scrolling hits the edge.
Change-Id: I3c5191af3fe44ba835ae9b22755613a933065bcd
ndroid/gallery3d/ui/Paper.java
ndroid/gallery3d/ui/ScrollerHelper.java
ndroid/gallery3d/ui/SlotView.java
|
| f02dacf2c5d46eb65a4d6b7ba7a85964b04001e2 |
23-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5349519: The Select photo/video activity should use action bar."
|
| 65e26535c22da813e1a8cb08cfa4f586a233af34 |
23-Sep-2011 |
Owen Lin <owenlin@google.com> |
Fix crop never returns
fix: 5359106
We should return true if the save is successfully.
Also make it more robust even with exceptions.
Change-Id: I4d06b625177d4d479c89a7de1bcdf6f6f301a3da
ndroid/gallery3d/app/CropImage.java
|
| a64e3e5327e7a007877ed3081d15738913de1fc9 |
23-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5349519: The Select photo/video activity should use action bar.
Change-Id: Ib537926c780fff6edd60d54c3d28740988d6221b
ndroid/gallery3d/app/AlbumPicker.java
ndroid/gallery3d/app/DialogPicker.java
ndroid/gallery3d/app/PickerActivity.java
|
| e3312ff2fe784f56c4f14601eaafe272ef95eade |
22-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5223982: Adding one pixel transparent border around the texture.
This avoids the jigged edge around the thumbnails when they are rotated.
Change-Id: Ib2c5a75d1aa69a2f024e003a45111a8af4537f67
ndroid/gallery3d/ui/AlbumSetSlidingWindow.java
ndroid/gallery3d/ui/AlbumSlidingWindow.java
ndroid/gallery3d/ui/BasicTexture.java
ndroid/gallery3d/ui/BitmapTexture.java
ndroid/gallery3d/ui/GLCanvasImpl.java
ndroid/gallery3d/ui/GridDrawer.java
ndroid/gallery3d/ui/HighlightDrawer.java
ndroid/gallery3d/ui/IconDrawer.java
ndroid/gallery3d/ui/SlotView.java
ndroid/gallery3d/ui/UploadedTexture.java
|
| 9b16e79ea2eaf249063f846b0e73c021741840f5 |
21-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5229466: Add "up" button to MovieActivity"
|
| cb577fbc1d33722c9b58aa9c732a4bc220e2e558 |
21-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5299746: Tweak layout and icons"
|
| 3f0de57839c38f8e4b29b8d353f26325b681aa81 |
21-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5229466: Add "up" button to MovieActivity
Change-Id: I5d71bec7a7b09553c12afdd753cd77a73ace2c44
ndroid/gallery3d/app/MovieActivity.java
|
| 32a8c908d1ad9e1562d3daab08980b84dffe3cf6 |
21-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5299746: Tweak layout and icons
Change-Id: I36d050fb2459ca559b74be1112b4ac6a8566dc1e
ndroid/gallery3d/app/Config.java
ndroid/gallery3d/app/ManageCachePage.java
ndroid/gallery3d/ui/ManageCacheDrawer.java
|
| a312ccdd7be8cf2b733512429bdc9807c2cbb1c7 |
21-Sep-2011 |
Yuli Huang <yuli@google.com> |
Merge "Fix tile-size to sync with the fix in factory branch."
|
| dce7cab7a006b5fb16c777a508ccc28d8738eca1 |
20-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5224359: query width and height from media provider."
|
| 60de1c033af8a8e058b34ea96d14839666cd08fb |
20-Sep-2011 |
Yuli Huang <yuli@google.com> |
Fix tile-size to sync with the fix in factory branch.
Change-Id: I208529a688d44c439dbf0c4d30e4d99e0631fc08
ndroid/gallery3d/photoeditor/filters/Filter.java
|
| 090cb8c3a5c862e4fe47fe6d40cfde26be30e135 |
20-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5224359: query width and height from media provider.
Change-Id: Ib7a560822a1d1fdc2be8c572d4d9319f908f7c16
ndroid/gallery3d/data/LocalImage.java
ndroid/gallery3d/data/LocalVideo.java
|
| 6b3b2ded57b98f5ce58320ea3a3c861f3ff25156 |
20-Sep-2011 |
Owen Lin <owenlin@google.com> |
Merge "Lock rendering when switching state."
|
| 5e3892a940615f5ba782a320707c186b79e296d1 |
15-Sep-2011 |
Ruei-sung Lin <rslin@google.com> |
parameter change to match api
Cherry-pick to fix b/5339529.
Change-Id: Id84274e60c0feb8019f3418bd1f1feed0542ca51
ndroid/gallery3d/photoeditor/filters/DoodleFilter.java
ndroid/gallery3d/photoeditor/filters/FillLightFilter.java
ndroid/gallery3d/photoeditor/filters/GrainFilter.java
ndroid/gallery3d/photoeditor/filters/RotateFilter.java
ndroid/gallery3d/photoeditor/filters/VignetteFilter.java
|
| 63de03a9ecc1af9224cce437728ef9eb38b7398b |
20-Sep-2011 |
Owen Lin <owenlin@google.com> |
Merge "Pause the playback of video if the activity is resumed after 3 mins."
|
| 70a73a7f7fad0a8d09fdb744bd3ca2051b39a93d |
19-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5299746: New UI layout, part 2.
- Replace various icons and add xhdpi/sw600dp-mdpi versions of them.
- When user press on the thumbnails, show a color overlay on it.
- For a wide (w/h > 2) picture, add panorama overlay on it.
- Align photo count label position when there is no icon for it.
- Adjust offline page layout.
Change-Id: I327d25806e99843bfa05d3ca0e9be5a8f9375595
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/AlbumSetPage.java
ndroid/gallery3d/app/Config.java
ndroid/gallery3d/app/ManageCachePage.java
ndroid/gallery3d/data/LocalImage.java
ndroid/gallery3d/data/LocalVideo.java
ndroid/gallery3d/data/MediaItem.java
ndroid/gallery3d/data/MtpImage.java
ndroid/gallery3d/data/UriImage.java
ndroid/gallery3d/ui/AlbumSetSlidingWindow.java
ndroid/gallery3d/ui/AlbumSetView.java
ndroid/gallery3d/ui/AlbumSlidingWindow.java
ndroid/gallery3d/ui/FilmStripView.java
ndroid/gallery3d/ui/GridDrawer.java
ndroid/gallery3d/ui/HighlightDrawer.java
ndroid/gallery3d/ui/IconDrawer.java
ndroid/gallery3d/ui/ManageCacheDrawer.java
ndroid/gallery3d/ui/SelectionDrawer.java
ndroid/gallery3d/ui/SelectionManager.java
ndroid/gallery3d/ui/SlotView.java
ndroid/gallery3d/ui/StripDrawer.java
ndroid/gallery3d/util/GalleryUtils.java
|
| 733efc5bd620caf52a7179cb7609f66e55d86aae |
19-Sep-2011 |
Ray Chen <raychen@google.com> |
Fix 5329642 Gallery crashes when viewing Details on certain photos
AddressResolvingListener (mAdapter) is not set until constructor returns, so NPE is thrown
if the resolving happens really fast. This CL uses 'this' instead of mAdapter.
Change-Id: Ifce0ea92a3eb5c794a73cf0e89a236ff3d948c18
ndroid/gallery3d/ui/DialogDetailsView.java
|
| 0fdbf235f6021738172f6f1ca4b6bbfa0d7ce655 |
14-Sep-2011 |
Owen Lin <owenlin@google.com> |
Pause the playback of video if the activity is resumed after 3 mins.
fix: 5260232
Also keep the current playback position when the activity is resumed.
Originally, we use the bookmark to keep the position. However, the bookmark
will be ignored if
1.) The video duration is less than 2 mins, 2.) The video
is just started (with 30sec), or 3.) The video is approching the end.
I think resume should not limited by the above rules. And we did get some
reports on this. (We mark them as WORK AS INTENTDED).
Change-Id: Ib9ac359d7ccb6a0278777b0892f0821e16bbb745
ndroid/gallery3d/app/MovieActivity.java
ndroid/gallery3d/app/MoviePlayer.java
|
| b591b41ab6c9c541ce30f7eac14d71467d2f09f9 |
15-Sep-2011 |
Owen Lin <owenlin@google.com> |
Lock rendering when switching state.
fix: 5126875
Change-Id: I118660b80cc5dfa8913865e303ed48f23e1c0705
ndroid/gallery3d/app/GalleryActionBar.java
|
| af84ef2bc0b41c029ab1f8f589b4cf25c90331c1 |
19-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5337270: Thumbnail is not generated for large GIF images.
Change-Id: I8e2e8cafb01b2289f59b28b7e2eadae3dc5c0c50
ndroid/gallery3d/data/DecodeUtils.java
|
| 9ed28cc0b7108a95aebbc3fe59671e36149d2aa7 |
13-Sep-2011 |
Owen Lin <owenlin@google.com> |
Add a hard limit on the size of the widget images.
There is a limit on the size of the data transfered by binder.
For now, we just add a hard limit (360 pixel) to ensure the widget's image
can be passed by binder.
Also adjust the size of widget to make it looks better.
Fix a bug in DecodeUtils which cause OOM for a image in size 12200x1920.
In that case, we should generate a screen nail of size 640x101 instead of
4066x640.
Change-Id: Ia8227d8e5368471fe7af94bf164d67017aa321fa
fix: 5273271
ndroid/gallery3d/data/DecodeUtils.java
ndroid/gallery3d/gadget/WidgetConfigure.java
|
| 56e813b555f7723a033bbb84ffc2ac517d4c1a2d |
19-Sep-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5329642 Gallery crashes when viewing Details on certain photos"
|
| c154a12e776019ec4230d06ff5230eb5b96f4fd3 |
19-Sep-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5331012 [UI] No dropdown label when entering multi-select modes via menu > Select item(s) / group(s) / album(s)"
|
| 1e4adaa16112edc86bdedd0c2e1a8b4a5eeb3e3c |
19-Sep-2011 |
Ray Chen <raychen@google.com> |
Fix 5329642 Gallery crashes when viewing Details on certain photos
AddressResolvingListener (mAdapter) is not set until constructor returns, so NPE is thrown
if the resolving happens really fast. This CL uses 'this' instead of mAdapter.
Change-Id: Ifce0ea92a3eb5c794a73cf0e89a236ff3d948c18
ndroid/gallery3d/ui/DialogDetailsView.java
|
| 350646b3edc73227bfcd1024202cc0fe0405c1b9 |
19-Sep-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5291553 Not able to share downloaded image file"
|
| afa492c195838a0884f59ab2b86d7f5207181d82 |
18-Sep-2011 |
Ray Chen <raychen@google.com> |
Fix 5331012 [UI] No dropdown label when entering multi-select modes via menu > Select item(s) / group(s) / album(s)
Change-Id: Ie46432dd136447942011f3565ab7a6406c461887
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/ui/ActionModeHandler.java
|
| f95aed139ef3292948f1ade97cc48312a62fc30d |
13-Sep-2011 |
Ray Chen <raychen@google.com> |
Fix 5239335 ICS Gallery: convert tabs at Gallery home to drop down
Change-Id: I7503f724dbf16034513a6d8d6b0cb0425166a365
ndroid/gallery3d/app/AlbumSetPage.java
ndroid/gallery3d/app/GalleryActionBar.java
|
| e12984c0c9766a6b4e157253492fcf7334f76115 |
16-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "New UI for Gallery."
|
| 414190774a73ba9029808f946a4ee066628862d7 |
14-Sep-2011 |
Ray Chen <raychen@google.com> |
Fix 5291553 Not able to share downloaded image file
Change-Id: I8e57b04e0231c592cc0dfe8a4f31e585510e753c
ndroid/gallery3d/app/PhotoPage.java
|
| 07069deef65cad3a094afd8da3014f2e33df5628 |
14-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
New UI for Gallery.
Change-Id: I5f243c00ebac55a9b333a9e13d0cc9c371a85005
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/AlbumSetDataAdapter.java
ndroid/gallery3d/app/AlbumSetPage.java
ndroid/gallery3d/app/Config.java
ndroid/gallery3d/app/ManageCachePage.java
ndroid/gallery3d/ui/AlbumSetSlidingWindow.java
ndroid/gallery3d/ui/AlbumSetView.java
ndroid/gallery3d/ui/AlbumSlidingWindow.java
ndroid/gallery3d/ui/AlbumView.java
ndroid/gallery3d/ui/DisplayItem.java
ndroid/gallery3d/ui/FilmStripView.java
ndroid/gallery3d/ui/GLDetailsView.java
ndroid/gallery3d/ui/GridDrawer.java
ndroid/gallery3d/ui/HighlightDrawer.java
ndroid/gallery3d/ui/IconDrawer.java
ndroid/gallery3d/ui/ManageCacheDrawer.java
ndroid/gallery3d/ui/MultiLineTexture.java
ndroid/gallery3d/ui/SelectionDrawer.java
ndroid/gallery3d/ui/SlotView.java
ndroid/gallery3d/ui/StringTexture.java
ndroid/gallery3d/ui/StripDrawer.java
|
| 8e90387256db7b9d89eca2ec25325ee61d817903 |
16-Sep-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5290260 Unable to rotate left or right to album from Gallery"
|
| 571c9e1f8d11cc8df2be2f1c79e6ede701a08e41 |
14-Sep-2011 |
Ray Chen <raychen@google.com> |
Fix 5290260 Unable to rotate left or right to album from Gallery
Separate menu operation and sharing options to different methods so
execution side is consistent with menu options.
Change-Id: Ia0105b333035051e33e9563fb2186cf1a29bc225
ndroid/gallery3d/ui/ActionModeHandler.java
|
| 89635c7fded2db6c6d0f06ca9bd4ce7a93d6a93e |
15-Sep-2011 |
Ruei-sung Lin <rslin@google.com> |
parameter change to match api
Change-Id: Ia6df0c3a52ee7c6a499a7088a800a2ea9ada1294
ndroid/gallery3d/photoeditor/filters/DoodleFilter.java
ndroid/gallery3d/photoeditor/filters/FillLightFilter.java
ndroid/gallery3d/photoeditor/filters/Filter.java
ndroid/gallery3d/photoeditor/filters/GrainFilter.java
ndroid/gallery3d/photoeditor/filters/RotateFilter.java
ndroid/gallery3d/photoeditor/filters/VignetteFilter.java
|
| 6dce07c9ddad36e1d0de957534c948f83bc89e85 |
15-Sep-2011 |
Marius Renn <renn@google.com> |
Update for compatibility with Effects API naming change.
Part of bugfix 5287103.
NOTE: This will fix the build, but temporarily break the Doodle effect
on the photo editor. Will check in fixes later.
Change-Id: I4a0e1696965c296ac9388c2ee9c49c0bdcaaf5a1
ndroid/gallery3d/photoeditor/filters/DoodleFilter.java
|
| da84812ef3020e39b9268339a6b70e96b292ff3c |
14-Sep-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5288270 PTP camera gallery launch, prompts the user to "select all" instead if "Deselect all""
|
| 3e544dfd4f84483249274a7d2107a68310bdd36b |
14-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5196286: Crash if the last clustered album is deleted."
|
| df483f4f21ae34147d9023ae0297dc8b9792a224 |
10-Sep-2011 |
Ray Chen <raychen@google.com> |
Fix 5288270 PTP camera gallery launch, prompts the user to "select all" instead if "Deselect all"
Change-Id: I80bcb347d3d2384e3fd18d2692ab459e0d39e86f
ndroid/gallery3d/ui/ActionModeHandler.java
ndroid/gallery3d/ui/SelectionManager.java
|
| 47d6ad0a4025be6b185639596595da7aabeb4f57 |
14-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5196286: Crash if the last clustered album is deleted.
Change-Id: I5e451d3cebd61c31465cba56aebe66cc3a999e2d
ndroid/gallery3d/app/AlbumSetDataAdapter.java
|
| 5eea58a345d419c6eda16e4500413192e78f848f |
14-Sep-2011 |
Yuli Huang <yuli@google.com> |
Merge "Fix b/5182741: Add 'Edit' title in the action-bar."
|
| 4694f2097b7bd59c050369722ac3ce787c18ccb4 |
14-Sep-2011 |
Owen Lin <owenlin@google.com> |
Merge "Use different UIs for phone's portrait mode in manage offline page."
|
| 72963d1288aa082e8a0497cb7acc1c15d95b0233 |
14-Sep-2011 |
Yuli Huang <yuli@google.com> |
Fix b/5182741: Add 'Edit' title in the action-bar.
Change-Id: I3964bfcb23818f2f3f8364475f74b401f7eed097
ndroid/gallery3d/photoeditor/ActionBar.java
|
| 6eb768fc3012ee427f267d1b5312669afea9624b |
14-Sep-2011 |
Owen Lin <owenlin@google.com> |
Merge "Fix picasa images rotate incorrectly."
|
| 5f01ca642b0edce21a6941c4c7a4b41190773e13 |
09-Sep-2011 |
Owen Lin <owenlin@google.com> |
Use different UIs for phone's portrait mode in manage offline page.
fix: 5100503
The original UI design is not suitable for phone's portait mode. I move the
UIs from GL view to android View to get better support.
Change-Id: Ice5f536129f66b51cdaf4db1be750be7bc072c7f
ndroid/gallery3d/app/AbstractGalleryActivity.java
ndroid/gallery3d/app/ActivityState.java
ndroid/gallery3d/app/ManageCachePage.java
ndroid/gallery3d/app/StateManager.java
ndroid/gallery3d/ui/CacheBarView.java
ndroid/gallery3d/ui/CacheStorageUsageInfo.java
ndroid/gallery3d/ui/Label.java
ndroid/gallery3d/ui/ProgressBar.java
ndroid/gallery3d/ui/TextButton.java
|
| 36064d1d4450494983652a5264a5d27cab454eed |
13-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5280798: Click on filmstrip during swiping causes crash.
After swiping animation finishes we move to the previous
picture. But if during the animation the user clicks the first
thumbnail on the filmstrip, we will have no previous picture
to move to.
Now disallow clicking on the filmstrip during the swiping animation.
Change-Id: Ie910c346cbf35543fedb6812b04c8e78faab0d0f
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/app/SinglePhotoDataAdapter.java
ndroid/gallery3d/ui/FilmStripView.java
ndroid/gallery3d/ui/PhotoView.java
|
| e0c32157e3aabdb8f78692d777232eb30a2513e2 |
13-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5058723: Don't show screennails of videos in slide show"
|
| 346003ea5005fb2dacbc08b8c34230ae6e33e034 |
13-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5284804: Kill 3D tilt effect based on device rotation."
|
| 96309a4205f69bd79a10d7d149a11e8b8a846acd |
09-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5058723: Don't show screennails of videos in slide show
Change-Id: I25c3ee3f1ae69c9c54c1e579a6469ee20f1774be
ndroid/gallery3d/app/SlideshowDataAdapter.java
ndroid/gallery3d/app/SlideshowPage.java
|
| 2fc88b09bebe78917efb371274d43220b2bd86a7 |
13-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5284804: Kill 3D tilt effect based on device rotation.
Change-Id: Ic8a81d591e42fc97b6ca8eca2b6c66cd90f74cdc
ndroid/gallery3d/app/EyePosition.java
|
| ab5055ac921f194f4d43f173881d17cf76719efd |
12-Sep-2011 |
Yuli Huang <yuli@google.com> |
Fix b/4643148: Make PhotoEditor integrated into Gallery.
1. Move PhotoEditor code/resources into Gallery for single apk.
2. Change PhotoEditor package to com.android.gallery3d.photoeditor.
3. Rename PhotoEditor resources to avoid mess up Gallery resources.
4. Move Doodle effect from fix-effects to color-effects.
5. Update PhotoEditor bottom action-bar background.
Change-Id: I1a2f7d27d89a14fe6a0435575b993ed8b75e6bf4
ndroid/gallery3d/photoeditor/ActionBar.java
ndroid/gallery3d/photoeditor/BitmapUtils.java
ndroid/gallery3d/photoeditor/EffectsBar.java
ndroid/gallery3d/photoeditor/FilterStack.java
ndroid/gallery3d/photoeditor/LoadScreennailTask.java
ndroid/gallery3d/photoeditor/OnDoneBitmapCallback.java
ndroid/gallery3d/photoeditor/OnDoneCallback.java
ndroid/gallery3d/photoeditor/Photo.java
ndroid/gallery3d/photoeditor/PhotoEditor.java
ndroid/gallery3d/photoeditor/PhotoView.java
ndroid/gallery3d/photoeditor/RendererUtils.java
ndroid/gallery3d/photoeditor/SaveCopyTask.java
ndroid/gallery3d/photoeditor/SpinnerProgressDialog.java
ndroid/gallery3d/photoeditor/Toolbar.java
ndroid/gallery3d/photoeditor/ToolbarIdleHandler.java
ndroid/gallery3d/photoeditor/actions/AbstractSeekBar.java
ndroid/gallery3d/photoeditor/actions/AutoFixAction.java
ndroid/gallery3d/photoeditor/actions/ColorSeekBar.java
ndroid/gallery3d/photoeditor/actions/ColorTemperatureAction.java
ndroid/gallery3d/photoeditor/actions/CropAction.java
ndroid/gallery3d/photoeditor/actions/CropView.java
ndroid/gallery3d/photoeditor/actions/CrossProcessAction.java
ndroid/gallery3d/photoeditor/actions/DocumentaryAction.java
ndroid/gallery3d/photoeditor/actions/DoodleAction.java
ndroid/gallery3d/photoeditor/actions/DoodlePaint.java
ndroid/gallery3d/photoeditor/actions/DoodleView.java
ndroid/gallery3d/photoeditor/actions/DuotoneAction.java
ndroid/gallery3d/photoeditor/actions/EffectAction.java
ndroid/gallery3d/photoeditor/actions/EffectToolFactory.java
ndroid/gallery3d/photoeditor/actions/FillLightAction.java
ndroid/gallery3d/photoeditor/actions/FisheyeAction.java
ndroid/gallery3d/photoeditor/actions/FlipAction.java
ndroid/gallery3d/photoeditor/actions/FullscreenToolView.java
ndroid/gallery3d/photoeditor/actions/GrainAction.java
ndroid/gallery3d/photoeditor/actions/GrayscaleAction.java
ndroid/gallery3d/photoeditor/actions/HighlightAction.java
ndroid/gallery3d/photoeditor/actions/LomoishAction.java
ndroid/gallery3d/photoeditor/actions/NegativeAction.java
ndroid/gallery3d/photoeditor/actions/PosterizeAction.java
ndroid/gallery3d/photoeditor/actions/RedEyeAction.java
ndroid/gallery3d/photoeditor/actions/RotateAction.java
ndroid/gallery3d/photoeditor/actions/RotateView.java
ndroid/gallery3d/photoeditor/actions/SaturationAction.java
ndroid/gallery3d/photoeditor/actions/ScaleSeekBar.java
ndroid/gallery3d/photoeditor/actions/SepiaAction.java
ndroid/gallery3d/photoeditor/actions/ShadowAction.java
ndroid/gallery3d/photoeditor/actions/SharpenAction.java
ndroid/gallery3d/photoeditor/actions/StraightenAction.java
ndroid/gallery3d/photoeditor/actions/TintAction.java
ndroid/gallery3d/photoeditor/actions/TouchView.java
ndroid/gallery3d/photoeditor/actions/VignetteAction.java
ndroid/gallery3d/photoeditor/filters/AutoFixFilter.java
ndroid/gallery3d/photoeditor/filters/ColorTemperatureFilter.java
ndroid/gallery3d/photoeditor/filters/CropFilter.java
ndroid/gallery3d/photoeditor/filters/CrossProcessFilter.java
ndroid/gallery3d/photoeditor/filters/DocumentaryFilter.java
ndroid/gallery3d/photoeditor/filters/DoodleFilter.java
ndroid/gallery3d/photoeditor/filters/DuotoneFilter.java
ndroid/gallery3d/photoeditor/filters/FillLightFilter.java
ndroid/gallery3d/photoeditor/filters/Filter.java
ndroid/gallery3d/photoeditor/filters/FisheyeFilter.java
ndroid/gallery3d/photoeditor/filters/FlipFilter.java
ndroid/gallery3d/photoeditor/filters/GrainFilter.java
ndroid/gallery3d/photoeditor/filters/GrayscaleFilter.java
ndroid/gallery3d/photoeditor/filters/HighlightFilter.java
ndroid/gallery3d/photoeditor/filters/LomoishFilter.java
ndroid/gallery3d/photoeditor/filters/NegativeFilter.java
ndroid/gallery3d/photoeditor/filters/PosterizeFilter.java
ndroid/gallery3d/photoeditor/filters/RedEyeFilter.java
ndroid/gallery3d/photoeditor/filters/RotateFilter.java
ndroid/gallery3d/photoeditor/filters/SaturationFilter.java
ndroid/gallery3d/photoeditor/filters/SepiaFilter.java
ndroid/gallery3d/photoeditor/filters/ShadowFilter.java
ndroid/gallery3d/photoeditor/filters/SharpenFilter.java
ndroid/gallery3d/photoeditor/filters/StraightenFilter.java
ndroid/gallery3d/photoeditor/filters/TintFilter.java
ndroid/gallery3d/photoeditor/filters/VignetteFilter.java
|
| b251df22a421b5affb15d7a18700889647dbc856 |
11-Sep-2011 |
Owen Lin <owenlin@google.com> |
Fix picasa images rotate incorrectly.
fix: 5268469
Change-Id: I58fc4a6d4a10c2952040eedee5936efa949b66e2
ndroid/gallery3d/app/PhotoDataAdapter.java
ndroid/gallery3d/data/MediaItem.java
|
| 6a5a246ca7973054364f5ee8ca2df3164bf38458 |
09-Sep-2011 |
Owen Lin <owenlin@google.com> |
Merge "Revert "bug #5252975: guard against null bitmap object, don't NPE.""
|
| 5a0da44db4a7dafd5ebef34ae3e999faa291db87 |
09-Sep-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5267234 com.google.android.gallery3d: java.lang.IllegalArgumentException: The stateview to be finished is not at the top of the stack:"
|
| 93db577592f48c09b87865db43bab4e93a6ab732 |
09-Sep-2011 |
Ray Chen <raychen@google.com> |
Fix 5267234 com.google.android.gallery3d: java.lang.IllegalArgumentException:
The stateview to be finished is not at the top of the stack:
setNavigationMode triggers recursive tabs onSelected events.
Change-Id: Id9f58b4a73c4d7836b62e33e2f9b3676ba3f95c2
ndroid/gallery3d/app/GalleryActionBar.java
|
| 377436d87c014ae5ebf641c6f22c64f527a7e3fb |
08-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5263604: View not attached to window manager.
We need to make sure the dialog is dismissed before onDestroy
is finished so we still have the window. (We do it in onPause.)
Change-Id: I896583a67e117c9e4c5a1312541d67efa01295bf
ndroid/gallery3d/app/PhotoPage.java
|
| 6ee3afc7db3f844b92f5ad8c14cf7349167f7000 |
07-Sep-2011 |
Owen Lin <owenlin@google.com> |
Merge "Copy exif data for cropped image."
|
| 3190f6975341d1e726c42c1b86a17b956578a40c |
02-Sep-2011 |
Owen Lin <owenlin@google.com> |
Copy exif data for cropped image.
fix: 5248023
Change-Id: I2f59bfd96ca7533195f7019cc76080579dff8d1e
ndroid/gallery3d/app/CropImage.java
ndroid/gallery3d/util/GalleryUtils.java
|
| ae55055aa223715f6d5924fe7dcc96c73e67c560 |
06-Sep-2011 |
Owen Lin <owenlin@google.com> |
Fix a no-thumbnail error message.
This happens if we cancel the first image reqest and then resend another
in a very short time. We may got an null image for the first request and
think this is a invalid bitmap.
Change-Id: I9ab62a658c281ef3d197474a5db50579e560f1bd
ndroid/gallery3d/app/PhotoDataAdapter.java
|
| e616606914e730cd34e21eada52b54e60aab0e10 |
06-Sep-2011 |
Owen Lin <owenlin@google.com> |
Revert "bug #5252975: guard against null bitmap object, don't NPE."
This reverts commit 7012ebe1c85e538c572e23d4cb98cad88699c782.
We would like to know the crash as soon as possible.
bug: 5252975
ndroid/gallery3d/data/ImageCacheRequest.java
|
| ace280a70fd1ead67039b9667d3905c85703c094 |
30-Aug-2011 |
Owen Lin <owenlin@google.com> |
Improve the performance of Reviewing a photo.
fix: 5144370
There is two componenet in the photo page. One is the large photo and the
other is the thumbnail strip. They idenpendently load their own data and images.
This change fixes several issues here:
1. Prevent sending to many jobs to ThreadPool and block others.
In a worse case, if the thumbnail strip send image requests first,
it may block the ThreadPool very long.
2. Improve the performance of extracting thumbnails from local files.
Now we try to extract the thumbnails from EXIF data first.
Change-Id: I45100d4daa025efb479f47c4f105de2b4731b498
ndroid/gallery3d/app/PhotoDataAdapter.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/data/DecodeUtils.java
ndroid/gallery3d/data/LocalImage.java
ndroid/gallery3d/ui/AlbumSlidingWindow.java
ndroid/gallery3d/ui/FilmStripView.java
ndroid/gallery3d/ui/GLView.java
ndroid/gallery3d/util/JobLimiter.java
|
| 9c12d7512df688131384328fb6ffb89b36cc4393 |
02-Sep-2011 |
Wei Huang <weih@google.com> |
bug #5252975: guard against null bitmap object, don't NPE.
- check for null Bitmap object before using.
Change-Id: I99d85916dae45128d67be084860d66dd89ec2f95
ndroid/gallery3d/data/ImageCacheRequest.java
|
| 28eb58218cfd50d07e8e333b4b7fd000037c6749 |
02-Sep-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix a few monkey issues: 5157713 and 5157712 Add debugging message for 5192628."
|
| ce811df0fc04278e440aed176c0f2ab4a64f22f5 |
31-Aug-2011 |
Ray Chen <raychen@google.com> |
Fix a few monkey issues: 5157713 and 5157712
Add debugging message for 5192628.
Change-Id: I257cabf1a93be256ed84aeaf3c9a871ecc5b1171
ndroid/gallery3d/ui/MenuExecutor.java
ndroid/gallery3d/ui/TileImageView.java
|
| 83d4691e8dae4e6fe9090f71283b96ee2b911236 |
30-Aug-2011 |
Ray Chen <raychen@google.com> |
Debugging 5166199. Add log messages for analysis.
Change-Id: I1786e540b5bf19460dcca06acd8a77c9287593f8
ndroid/gallery3d/app/AlbumSetPage.java
ndroid/gallery3d/app/GalleryActionBar.java
ndroid/gallery3d/app/ManageCachePage.java
|
| 3f414cbd44b45e98262c1ac214f93f7e6bbee1ce |
30-Aug-2011 |
Ray Chen <raychen@google.com> |
Fix 5188208 [UI] Remove action bar title in Photo/Video view for portrait phone
Change-Id: I20fba5894e46536f6972bc812d7f2aa5f52840b5
ndroid/gallery3d/app/PhotoPage.java
|
| 4105c5e73185c792c3576a20f620791e32dd316c |
29-Aug-2011 |
Ray Chen <raychen@google.com> |
Fix 5189197: NPE in MovieActivity
Change-Id: I58f9e2c0840b4d752c2f795451ed4bc8212bb1ce
ndroid/gallery3d/app/MovieActivity.java
|
| ea80ff93b6070ff671da46d6078cdf753cc6f8c3 |
30-Aug-2011 |
Wei Huang <weih@google.com> |
bug #5234237: fix NPE in Gallery
- mActivity.getGalleryActionBar() can return null, check for null before using it.
Change-Id: Ib84d5d56e51e6098adee9323c5e8d5c78f9a76e8
ndroid/gallery3d/app/AlbumSetPage.java
|
| 0ba0e9e5e4bae838e0cce29a509f875b434a0542 |
30-Aug-2011 |
Wei Huang <weih@google.com> |
Merge "Fix 4975579 PTP: Unable to load the thumbnails while connected to camera"
|
| 44aac4bcb6ddd0b6553a198db4adb479d3437c8e |
28-Aug-2011 |
Owen Lin <owenlin@google.com> |
Fix several issues in Gallery2.
fix: 5189318 - use transparent background for tabs
fix: 5174277 - menu mailfunctioned after slideshow (a hack):
fix: 5153387 - wrong tab is selected in album set page
Change-Id: I68092039e566b5f7409ae509f65b227b06da16bb
ndroid/gallery3d/app/ActivityState.java
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/AlbumSetPage.java
ndroid/gallery3d/app/GalleryActionBar.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/gadget/WidgetDatabaseHelper.java
|
| 7474877ffcaa8480872083b36e3d2b00eb0bc867 |
29-Aug-2011 |
Ray Chen <raychen@google.com> |
Fix 4975579 PTP: Unable to load the thumbnails while connected to camera
There's a deadlock in threadpool. The fix has been verified.
Change-Id: I000527f55fc2a3777bd4bb06817a9967b2f50488
ndroid/gallery3d/data/MtpImage.java
ndroid/gallery3d/ui/ActionModeHandler.java
|
| b60402ba7551478d324fb777bb5f45b11dffe37c |
29-Aug-2011 |
Owen Lin <owenlin@google.com> |
Make sure the sides of a backup image are less than 1024.
fix: 5117367
In this case(5117367), the original backup image would be 2325x1029,
which exceeds the limit of an texture and thus shows a blank image.
Change-Id: I3176e191c68199308fe3770c10ee0ae2d310c96a
ndroid/gallery3d/app/SinglePhotoDataAdapter.java
|
| 7f24a84d74a761eb66c90307358269246a716647 |
28-Aug-2011 |
Owen Lin <owenlin@google.com> |
Merge "Launch Gallery from review intent."
|
| 335cad27ab9924a3781888cef21dc9a5de4d9c1c |
27-Aug-2011 |
Owen Lin <owenlin@google.com> |
Merge "Fix: 5217165, cannot edit downloaded image"
|
| 57382b756d26cb58fe6e53e8238edb745c882cd8 |
26-Aug-2011 |
Owen Lin <owenlin@google.com> |
Fix: 5217165, cannot edit downloaded image
The contentUri of the download image is "file:///xxx". Thus, it cannot get the correct
file type. So, we pass the mimetype in the intent to fix this issue.
Change-Id: I49b4b96472eb6a1561fbada95190c829728c037e
ndroid/gallery3d/ui/MenuExecutor.java
|
| f595f26b83a5f30b7356e4dcbb85c23a6c0bd554 |
26-Aug-2011 |
Ray Chen <raychen@google.com> |
Fix 5133608 [UI] Details should be displayed as a system dialog in phone UI
We need this to reset the grid drawer.
Change-Id: Iead6568db1903d7e722f0e8154388ccd8f1aee67
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/AlbumSetPage.java
ndroid/gallery3d/ui/DialogDetailsView.java
|
| 799c8444584db9fc945454997669432c279e17ae |
26-Aug-2011 |
Owen Lin <owenlin@google.com> |
Launch Gallery from review intent.
Change-Id: Iaa2e9bdfde3ac6566dd65464ece82f4a5ced6831
fix: 3462852
ndroid/gallery3d/app/ActivityState.java
ndroid/gallery3d/app/Gallery.java
ndroid/gallery3d/app/StateManager.java
|
| 327eeb846fa6b2649db90fc4e5708f7fdcbbfaa2 |
24-Aug-2011 |
Ray Chen <raychen@google.com> |
Fix 5133608 [UI] Details should be displayed as a system dialog in phone UI
Fix 5132798 [UI] Details popup on tablet is incorrectly placed and should not have x icon to close
Fix 5199822 Long press and select "detail" shows details of another item
Change-Id: I0e992ded8a154edb1c7a81b75d0461d5bf309f31
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/AlbumSetPage.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/ui/DetailsAddressResolver.java
ndroid/gallery3d/ui/DetailsHelper.java
ndroid/gallery3d/ui/DetailsWindow.java
ndroid/gallery3d/ui/DialogDetailsView.java
ndroid/gallery3d/ui/GLDetailsView.java
ndroid/gallery3d/ui/ScrollView.java
|
| ca69a7dd02057818b7d3d61979561958d6109758 |
26-Aug-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5205456 After sharing multiple images, the selection should be cleared"
|
| 11e7f198384fc18a624b27980fc65ef65fd3cbcb |
25-Aug-2011 |
Ray Chen <raychen@google.com> |
Fix 5188970 Cannot close Gallery when opened from Email/Gmail
Change-Id: I7af203a9aec8ebaf6c33fa592c996f917e0caca8
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/AlbumSetPage.java
|
| 6b7d527695cfbe5681865654bf078358f5ca687f |
18-Aug-2011 |
Ray Chen <raychen@google.com> |
Fix 5027908 Crash in MMS while attaching a picture from Picasa
Change-Id: I7f67a7da5191f0ec8fbe3fc3c2d79e54394c4715
ndroid/gallery3d/provider/GalleryProvider.java
|
| 90464f2241c2f0fcd1aee23ccff7255ca4dc4242 |
24-Aug-2011 |
Owen Lin <owenlin@google.com> |
Merge "Fix shortcup broken issue."
|
| 5673202ac99b89112a82210016885a9355f7e991 |
18-Aug-2011 |
Owen Lin <owenlin@google.com> |
Fix shortcup broken issue.
fix: 5154308
Change-Id: I5cd2ef8efb84d4f356b3fe93106bddf10e0823cc
ndroid/gallery3d/app/GalleryAppImpl.java
ndroid/gallery3d/gadget/LocalPhotoSource.java
ndroid/gallery3d/gadget/MediaSetSource.java
ndroid/gallery3d/gadget/PhotoAppWidgetProvider.java
ndroid/gallery3d/gadget/WidgetClickHandler.java
ndroid/gallery3d/gadget/WidgetConfigure.java
ndroid/gallery3d/gadget/WidgetDatabaseHelper.java
ndroid/gallery3d/gadget/WidgetService.java
ndroid/gallery3d/gadget/WidgetSource.java
ndroid/gallery3d/gadget/WidgetTypeChooser.java
ndroid/gallery3d/gadget/WidgetUtils.java
ndroid/gallery3d/widget/LocalPhotoSource.java
ndroid/gallery3d/widget/MediaSetSource.java
ndroid/gallery3d/widget/WidgetClickHandler.java
ndroid/gallery3d/widget/WidgetConfigure.java
ndroid/gallery3d/widget/WidgetDatabaseHelper.java
ndroid/gallery3d/widget/WidgetProvider.java
ndroid/gallery3d/widget/WidgetService.java
ndroid/gallery3d/widget/WidgetSource.java
ndroid/gallery3d/widget/WidgetTypeChooser.java
ndroid/gallery3d/widget/WidgetUtils.java
|
| 13160eec854c6ac8985db1c5fb86d1523e92f860 |
24-Aug-2011 |
Owen Lin <owenlin@google.com> |
Fix cannot edit picasa synced images.
Change-Id: Ic2df3f6a8a93711c8616b1532acef12d67341062
fix: 5202762
ndroid/gallery3d/data/MtpImage.java
ndroid/gallery3d/provider/GalleryProvider.java
|
| d2e19e16729154f4924951cf3c89fd79768538c2 |
24-Aug-2011 |
Ray Chen <raychen@google.com> |
Fix 5205456 After sharing multiple images, the selection should be cleared
Change-Id: I9fd12d371269197e1e05a6c49dae2b9a81ae4ca0
ndroid/gallery3d/app/GalleryActionBar.java
ndroid/gallery3d/ui/ActionModeHandler.java
|
| 31c7b13bf1c93f7eabd658e55c545eccd9d347a9 |
23-Aug-2011 |
Owen Lin <owenlin@google.com> |
Merge "Fix unknown type for GL issue."
|
| b225416022949bbc265ead6832ef92e9e08aa3fe |
19-Aug-2011 |
Owen Lin <owenlin@google.com> |
Fix unknown type for GL issue.
fix: 5171449
Change-Id: Ib62e3237584144e94be6be773c292002bea5d21c
ndroid/gallery3d/data/DecodeUtils.java
ndroid/gallery3d/ui/TileImageView.java
|
| e979160a10fcfc9d580b6bbacc11af6ee40ef32a |
19-Aug-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5179285 "Show on Map" intent for geotagged images mis-formatted in French"
|
| d39cf88ba45d82e5dbb7475a6de042ea072c100c |
19-Aug-2011 |
Ray Chen <raychen@google.com> |
Fix 5179825 Toast is created in a unprepared looper.
Change-Id: I80021755bc012340ed00fa52a20bf560369e9368
ndroid/gallery3d/data/LocationClustering.java
|
| 06d90f453e650ddece8423ef2bef888f64b40ae3 |
19-Aug-2011 |
Ray Chen <raychen@google.com> |
Fix 5179285 "Show on Map" intent for geotagged images mis-formatted in French
Change-Id: I4af6b549b534786163505d41b181888d347743d9
ndroid/gallery3d/ui/DetailsWindow.java
ndroid/gallery3d/util/GalleryUtils.java
|
| a2fba687d4d2dbb3b2db8866b054ecb0e42871b2 |
17-Aug-2011 |
Owen Lin <owenlin@google.com> |
Initial code for Gallery2.
fix: 5176434
Change-Id: I041e282b9c7b34ceb1db8b033be2b853bb3a992c
ndroid/gallery3d/anim/AlphaAnimation.java
ndroid/gallery3d/anim/Animation.java
ndroid/gallery3d/anim/AnimationSet.java
ndroid/gallery3d/anim/CanvasAnimation.java
ndroid/gallery3d/anim/FloatAnimation.java
ndroid/gallery3d/app/AbstractGalleryActivity.java
ndroid/gallery3d/app/ActivityState.java
ndroid/gallery3d/app/AlbumDataAdapter.java
ndroid/gallery3d/app/AlbumPage.java
ndroid/gallery3d/app/AlbumPicker.java
ndroid/gallery3d/app/AlbumSetDataAdapter.java
ndroid/gallery3d/app/AlbumSetPage.java
ndroid/gallery3d/app/Config.java
ndroid/gallery3d/app/CropImage.java
ndroid/gallery3d/app/DialogPicker.java
ndroid/gallery3d/app/EyePosition.java
ndroid/gallery3d/app/FilterUtils.java
ndroid/gallery3d/app/Gallery.java
ndroid/gallery3d/app/GalleryActionBar.java
ndroid/gallery3d/app/GalleryActivity.java
ndroid/gallery3d/app/GalleryApp.java
ndroid/gallery3d/app/GalleryAppImpl.java
ndroid/gallery3d/app/GalleryContext.java
ndroid/gallery3d/app/LoadingListener.java
ndroid/gallery3d/app/Log.java
ndroid/gallery3d/app/ManageCachePage.java
ndroid/gallery3d/app/MovieActivity.java
ndroid/gallery3d/app/MoviePlayer.java
ndroid/gallery3d/app/PackagesMonitor.java
ndroid/gallery3d/app/PhotoDataAdapter.java
ndroid/gallery3d/app/PhotoPage.java
ndroid/gallery3d/app/SinglePhotoDataAdapter.java
ndroid/gallery3d/app/SlideshowDataAdapter.java
ndroid/gallery3d/app/SlideshowDream.java
ndroid/gallery3d/app/SlideshowPage.java
ndroid/gallery3d/app/StateManager.java
ndroid/gallery3d/app/UsbDeviceActivity.java
ndroid/gallery3d/app/Wallpaper.java
ndroid/gallery3d/data/ChangeNotifier.java
ndroid/gallery3d/data/ClusterAlbum.java
ndroid/gallery3d/data/ClusterAlbumSet.java
ndroid/gallery3d/data/ClusterSource.java
ndroid/gallery3d/data/Clustering.java
ndroid/gallery3d/data/ComboAlbum.java
ndroid/gallery3d/data/ComboAlbumSet.java
ndroid/gallery3d/data/ComboSource.java
ndroid/gallery3d/data/ContentListener.java
ndroid/gallery3d/data/DataManager.java
ndroid/gallery3d/data/DecodeUtils.java
ndroid/gallery3d/data/DownloadCache.java
ndroid/gallery3d/data/DownloadEntry.java
ndroid/gallery3d/data/DownloadUtils.java
ndroid/gallery3d/data/Face.java
ndroid/gallery3d/data/FaceClustering.java
ndroid/gallery3d/data/FilterSet.java
ndroid/gallery3d/data/FilterSource.java
ndroid/gallery3d/data/ImageCacheRequest.java
ndroid/gallery3d/data/ImageCacheService.java
ndroid/gallery3d/data/LocalAlbum.java
ndroid/gallery3d/data/LocalAlbumSet.java
ndroid/gallery3d/data/LocalImage.java
ndroid/gallery3d/data/LocalMediaItem.java
ndroid/gallery3d/data/LocalMergeAlbum.java
ndroid/gallery3d/data/LocalSource.java
ndroid/gallery3d/data/LocalVideo.java
ndroid/gallery3d/data/LocationClustering.java
ndroid/gallery3d/data/Log.java
ndroid/gallery3d/data/MediaDetails.java
ndroid/gallery3d/data/MediaItem.java
ndroid/gallery3d/data/MediaObject.java
ndroid/gallery3d/data/MediaSet.java
ndroid/gallery3d/data/MediaSource.java
ndroid/gallery3d/data/MtpClient.java
ndroid/gallery3d/data/MtpContext.java
ndroid/gallery3d/data/MtpDevice.java
ndroid/gallery3d/data/MtpDeviceSet.java
ndroid/gallery3d/data/MtpImage.java
ndroid/gallery3d/data/MtpSource.java
ndroid/gallery3d/data/Path.java
ndroid/gallery3d/data/PathMatcher.java
ndroid/gallery3d/data/SizeClustering.java
ndroid/gallery3d/data/TagClustering.java
ndroid/gallery3d/data/TimeClustering.java
ndroid/gallery3d/data/UriImage.java
ndroid/gallery3d/data/UriSource.java
ndroid/gallery3d/provider/GalleryProvider.java
ndroid/gallery3d/ui/AbstractDisplayItem.java
ndroid/gallery3d/ui/ActionModeHandler.java
ndroid/gallery3d/ui/AdaptiveBackground.java
ndroid/gallery3d/ui/AlbumSetSlidingWindow.java
ndroid/gallery3d/ui/AlbumSetView.java
ndroid/gallery3d/ui/AlbumSlidingWindow.java
ndroid/gallery3d/ui/AlbumView.java
ndroid/gallery3d/ui/BasicTexture.java
ndroid/gallery3d/ui/BitmapTexture.java
ndroid/gallery3d/ui/BitmapTileProvider.java
ndroid/gallery3d/ui/BoxBlurFilter.java
ndroid/gallery3d/ui/CacheBarView.java
ndroid/gallery3d/ui/CanvasTexture.java
ndroid/gallery3d/ui/ColorTexture.java
ndroid/gallery3d/ui/Config.java
ndroid/gallery3d/ui/CropView.java
ndroid/gallery3d/ui/CustomMenu.java
ndroid/gallery3d/ui/DetailsWindow.java
ndroid/gallery3d/ui/DisplayItem.java
ndroid/gallery3d/ui/DownUpDetector.java
ndroid/gallery3d/ui/DrawableTexture.java
ndroid/gallery3d/ui/FilmStripView.java
ndroid/gallery3d/ui/GLCanvas.java
ndroid/gallery3d/ui/GLCanvasImpl.java
ndroid/gallery3d/ui/GLPaint.java
ndroid/gallery3d/ui/GLRoot.java
ndroid/gallery3d/ui/GLRootView.java
ndroid/gallery3d/ui/GLView.java
ndroid/gallery3d/ui/GalleryEGLConfigChooser.java
ndroid/gallery3d/ui/GridDrawer.java
ndroid/gallery3d/ui/HighlightDrawer.java
ndroid/gallery3d/ui/Icon.java
ndroid/gallery3d/ui/IconDrawer.java
ndroid/gallery3d/ui/ImportCompleteListener.java
ndroid/gallery3d/ui/Label.java
ndroid/gallery3d/ui/Log.java
ndroid/gallery3d/ui/ManageCacheDrawer.java
ndroid/gallery3d/ui/MeasureHelper.java
ndroid/gallery3d/ui/MenuExecutor.java
ndroid/gallery3d/ui/MultiLineTexture.java
ndroid/gallery3d/ui/NinePatchChunk.java
ndroid/gallery3d/ui/NinePatchTexture.java
ndroid/gallery3d/ui/OnSelectedListener.java
ndroid/gallery3d/ui/Paper.java
ndroid/gallery3d/ui/PhotoView.java
ndroid/gallery3d/ui/PositionProvider.java
ndroid/gallery3d/ui/PositionRepository.java
ndroid/gallery3d/ui/ProgressBar.java
ndroid/gallery3d/ui/ProgressSpinner.java
ndroid/gallery3d/ui/RawTexture.java
ndroid/gallery3d/ui/ResourceTexture.java
ndroid/gallery3d/ui/ScrollBarView.java
ndroid/gallery3d/ui/ScrollView.java
ndroid/gallery3d/ui/ScrollerHelper.java
ndroid/gallery3d/ui/SelectionDrawer.java
ndroid/gallery3d/ui/SelectionManager.java
ndroid/gallery3d/ui/SlideshowView.java
ndroid/gallery3d/ui/SlotView.java
ndroid/gallery3d/ui/StaticBackground.java
ndroid/gallery3d/ui/StringTexture.java
ndroid/gallery3d/ui/StripDrawer.java
ndroid/gallery3d/ui/SynchronizedHandler.java
ndroid/gallery3d/ui/TextButton.java
ndroid/gallery3d/ui/Texture.java
ndroid/gallery3d/ui/TileImageView.java
ndroid/gallery3d/ui/TileImageViewAdapter.java
ndroid/gallery3d/ui/UploadedTexture.java
ndroid/gallery3d/ui/UserInteractionListener.java
ndroid/gallery3d/util/CacheManager.java
ndroid/gallery3d/util/Future.java
ndroid/gallery3d/util/FutureListener.java
ndroid/gallery3d/util/FutureTask.java
ndroid/gallery3d/util/GalleryUtils.java
ndroid/gallery3d/util/IdentityCache.java
ndroid/gallery3d/util/IntArray.java
ndroid/gallery3d/util/InterruptableOutputStream.java
ndroid/gallery3d/util/LinkedNode.java
ndroid/gallery3d/util/Log.java
ndroid/gallery3d/util/MediaSetUtils.java
ndroid/gallery3d/util/PriorityThreadFactory.java
ndroid/gallery3d/util/ReverseGeocoder.java
ndroid/gallery3d/util/ThreadPool.java
ndroid/gallery3d/util/UpdateHelper.java
ndroid/gallery3d/widget/LocalPhotoSource.java
ndroid/gallery3d/widget/MediaSetSource.java
ndroid/gallery3d/widget/WidgetClickHandler.java
ndroid/gallery3d/widget/WidgetConfigure.java
ndroid/gallery3d/widget/WidgetDatabaseHelper.java
ndroid/gallery3d/widget/WidgetProvider.java
ndroid/gallery3d/widget/WidgetService.java
ndroid/gallery3d/widget/WidgetSource.java
ndroid/gallery3d/widget/WidgetTypeChooser.java
ndroid/gallery3d/widget/WidgetUtils.java
|