OSDN Git Service

android-x86/packages-apps-Camera2.git
10 years agoMerge "Exit Camera on Up button if no APP_GALLERY handler found." into gb-ub-photos...
Mangesh Ghiware [Thu, 3 Oct 2013 04:15:47 +0000 (04:15 +0000)]
Merge "Exit Camera on Up button if no APP_GALLERY handler found." into gb-ub-photos-carlsbad

10 years agoMerge "Increase char limit for camera timer sound message." into gb-ub-photos-carlsbad
Sascha Haeberling [Wed, 2 Oct 2013 22:49:21 +0000 (22:49 +0000)]
Merge "Increase char limit for camera timer sound message." into gb-ub-photos-carlsbad

10 years agoExit Camera on Up button if no APP_GALLERY handler found.
Mangesh Ghiware [Wed, 2 Oct 2013 21:38:12 +0000 (14:38 -0700)]
Exit Camera on Up button if no APP_GALLERY handler found.

Bug: 11047289
Change-Id: I532e4ab4fc057bb260d74466af6c1926b0e9900c

10 years agoMerge "Reads PhotoSphere metadata once fully loaded so that PhotoSphere viewer icon...
Erin Dahlgren [Wed, 2 Oct 2013 20:36:06 +0000 (20:36 +0000)]
Merge "Reads PhotoSphere metadata once fully loaded so that PhotoSphere viewer icon is visible." into gb-ub-photos-carlsbad

10 years agoMerge "Make scroll animation smoother." into gb-ub-photos-carlsbad
Angus Kong [Wed, 2 Oct 2013 20:18:25 +0000 (20:18 +0000)]
Merge "Make scroll animation smoother." into gb-ub-photos-carlsbad

10 years agoMake scroll animation smoother.
Angus Kong [Tue, 1 Oct 2013 23:58:52 +0000 (16:58 -0700)]
Make scroll animation smoother.

  bug:10802703

Change-Id: I2e759a5b45eb8f68eb63163ad7e42cc670971bf4

10 years agoMerge "Deactivate the backup agent in Camera2" into gb-ub-photos-carlsbad
Sascha Haeberling [Wed, 2 Oct 2013 01:11:41 +0000 (01:11 +0000)]
Merge "Deactivate the backup agent in Camera2" into gb-ub-photos-carlsbad

10 years agoMerge "Add content description to post-capture thumbnail." into gb-ub-photos-carlsbad
Sascha Haeberling [Wed, 2 Oct 2013 01:09:30 +0000 (01:09 +0000)]
Merge "Add content description to post-capture thumbnail." into gb-ub-photos-carlsbad

10 years agoDeactivate the backup agent in Camera2
Sascha Haeberling [Wed, 2 Oct 2013 00:46:20 +0000 (17:46 -0700)]
Deactivate the backup agent in Camera2

  Bug: 11033304

Change-Id: I9fc4d3b02b1dd041988fb9d0f313693b5ae1b865

10 years agoIncrease char limit for camera timer sound message.
Sascha Haeberling [Tue, 1 Oct 2013 23:58:08 +0000 (16:58 -0700)]
Increase char limit for camera timer sound message.

  Bug: 10962439

Change-Id: Ib08734a059082dd6a20a7ded67bc3495500c598e

10 years agoAdd content description to post-capture thumbnail.
Sascha Haeberling [Tue, 1 Oct 2013 23:42:47 +0000 (16:42 -0700)]
Add content description to post-capture thumbnail.

  Bug: 10916138

Change-Id: I6fc5316cf622da8ba7bfcff5c6b43104d50c6652

10 years agoMerge "Fix FilmStrip crash by checking if photos are present before updating action...
Erin Dahlgren [Tue, 1 Oct 2013 23:35:12 +0000 (23:35 +0000)]
Merge "Fix FilmStrip crash by checking if photos are present before updating action bar" into gb-ub-photos-carlsbad

10 years agoReads PhotoSphere metadata once fully loaded so that PhotoSphere viewer icon is visible.
Erin Dahlgren [Tue, 1 Oct 2013 18:00:12 +0000 (11:00 -0700)]
Reads PhotoSphere metadata once fully loaded so that PhotoSphere viewer icon is visible.

Bug: 10715651
Change-Id: Ib71a3e4469d1ecee87b9423b03b8898294a7ffa6

10 years agoA workaround for crash in zoom view
Doris Liu [Tue, 1 Oct 2013 22:04:09 +0000 (15:04 -0700)]
A workaround for crash in zoom view

Bug: 10636636
Change-Id: Iffa126781fd71796b8816d637263450911cb7e8e

10 years agoFix FilmStrip crash by checking if photos are present before updating action bar
Erin Dahlgren [Tue, 1 Oct 2013 20:42:51 +0000 (13:42 -0700)]
Fix FilmStrip crash by checking if photos are present before updating action bar

Bug: 11027838
Change-Id: I770f8d0187b4f92f5395b27496620acb099eeb6a

10 years agoPrevent NPE in gesture handling.
Angus Kong [Tue, 1 Oct 2013 18:32:52 +0000 (11:32 -0700)]
Prevent NPE in gesture handling.

  bug:11023769

Change-Id: Iee9e5c2d295378f327c3b01349eda5d80a579ed7

10 years agoMerge "Double tap to full screen from filmstrip" into gb-ub-photos-carlsbad
Doris Liu [Tue, 1 Oct 2013 17:44:14 +0000 (17:44 +0000)]
Merge "Double tap to full screen from filmstrip" into gb-ub-photos-carlsbad

10 years agoMerge "Updates newly centered photos in FilmStrip after a delete." into gb-ub-photos...
Erin Dahlgren [Tue, 1 Oct 2013 15:49:59 +0000 (15:49 +0000)]
Merge "Updates newly centered photos in FilmStrip after a delete." into gb-ub-photos-carlsbad

10 years agoMerge "Don't adjust the position while scrolling." into gb-ub-photos-carlsbad
Angus Kong [Tue, 1 Oct 2013 04:03:53 +0000 (04:03 +0000)]
Merge "Don't adjust the position while scrolling." into gb-ub-photos-carlsbad

10 years agoMerge "Show status bar in filmstrip mode" into gb-ub-photos-carlsbad
Sascha Haeberling [Tue, 1 Oct 2013 02:36:39 +0000 (02:36 +0000)]
Merge "Show status bar in filmstrip mode" into gb-ub-photos-carlsbad

10 years agoUpdates newly centered photos in FilmStrip after a delete.
Erin Dahlgren [Mon, 30 Sep 2013 21:14:44 +0000 (14:14 -0700)]
Updates newly centered photos in FilmStrip after a delete.

Bug: 10715651

Change-Id: Idf4029270c5d0de2885322b2e25ad75e98def84a

10 years agoShow status bar in filmstrip mode
Sascha Haeberling [Mon, 30 Sep 2013 22:52:28 +0000 (15:52 -0700)]
Show status bar in filmstrip mode

  Bug: 11005642

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

Change-Id: I6e4709c63c25a4e69219ec7518dc284cef303aaa

10 years agoFix MediaStore correction code.
ztenghui [Mon, 30 Sep 2013 19:19:31 +0000 (12:19 -0700)]
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

10 years agoDon't adjust the position while scrolling.
Angus Kong [Mon, 30 Sep 2013 22:54:46 +0000 (15:54 -0700)]
Don't adjust the position while scrolling.

  bug:10802703

Change-Id: I493c36b87c99de97275add1243f5ac363a28787e

10 years agoChange crop label to avoid aapt dump badging from failing.
Sascha Haeberling [Mon, 30 Sep 2013 21:12:39 +0000 (14:12 -0700)]
Change crop label to avoid aapt dump badging from failing.

  Bug: 11006006

Change-Id: Ie6bb4cecc58f25947998f1faa4da6b3b84dc5df3

10 years agoTemporary removal of resize code to evaluate GCam image bug
Alan Newberger [Sun, 29 Sep 2013 22:02:50 +0000 (15:02 -0700)]
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

10 years agoMerge "Add basic EXIF to the tiny planet so that rotate succeeds." into gb-ub-photos...
Sascha Haeberling [Sat, 28 Sep 2013 00:05:44 +0000 (00:05 +0000)]
Merge "Add basic EXIF to the tiny planet so that rotate succeeds." into gb-ub-photos-carlsbad

10 years agoFix incorrect width and height from MediaStore.
ztenghui [Fri, 20 Sep 2013 23:07:42 +0000 (16:07 -0700)]
Fix incorrect width and height from MediaStore.

bug:10768232

Change-Id: I53673b8ef341f7388a9a4aaa7b03f804485928cf

10 years agoAdd basic EXIF to the tiny planet so that rotate succeeds.
Sascha Haeberling [Fri, 27 Sep 2013 21:38:39 +0000 (14:38 -0700)]
Add basic EXIF to the tiny planet so that rotate succeeds.

  Bug: 10861115

Change-Id: I1eec2bf4d6879c227a07c5364bc821749ace312b

10 years agoDouble tap to full screen from filmstrip
Doris Liu [Fri, 27 Sep 2013 21:12:00 +0000 (14:12 -0700)]
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

10 years agoMerge "Restore HQ preference in GCam module." into gb-ub-photos-carlsbad
Angus Kong [Fri, 27 Sep 2013 19:06:02 +0000 (19:06 +0000)]
Merge "Restore HQ preference in GCam module." into gb-ub-photos-carlsbad

10 years agoDon't update the width and height in MediaStore after rotation
ztenghui [Fri, 27 Sep 2013 17:51:02 +0000 (10:51 -0700)]
Don't update the width and height in MediaStore after rotation

bug:10917681

Change-Id: I897d883636991f5b95290acf57c2a84eadd7c5d2

10 years agoRestore HQ preference in GCam module.
Angus Kong [Fri, 27 Sep 2013 18:01:36 +0000 (11:01 -0700)]
Restore HQ preference in GCam module.

  bug:10860305

Change-Id: Ibb563c53b63efb2d0656b59c09148423af2ee41b

10 years agoMerge "Add orientation information to the details dialog." into gb-ub-photos-carlsbad
Sascha Haeberling [Fri, 27 Sep 2013 00:17:43 +0000 (00:17 +0000)]
Merge "Add orientation information to the details dialog." into gb-ub-photos-carlsbad

10 years agoAdd orientation information to the details dialog.
Sascha Haeberling [Thu, 26 Sep 2013 23:01:23 +0000 (16:01 -0700)]
Add orientation information to the details dialog.

  Bug: 10649902

Change-Id: Icaf17abdbd48a86d55e1555115fdb7817faf6359

10 years agoFix memory leak of context in LocalMediaObserver
Doris Liu [Thu, 26 Sep 2013 22:23:41 +0000 (15:23 -0700)]
Fix memory leak of context in LocalMediaObserver

Bug: 10728773
Change-Id: Ie5a50590e71fd4b853cb7590db4fa14f5b6dc73b

10 years agoRemove PopupManager to remove a memory leak
Seth Raphael [Thu, 26 Sep 2013 20:51:07 +0000 (13:51 -0700)]
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

10 years agoAdd HQ icon indicator support.
Sascha Haeberling [Thu, 26 Sep 2013 20:07:41 +0000 (13:07 -0700)]
Add HQ icon indicator support.

  Bug: 10785988

Change-Id: If844caaedc3468dce8153cb434bd89328a4a92ca

10 years agoMerge "Finalize deletion when app exits and for last photo" into gb-ub-photos-carlsbad
Doris Liu [Thu, 26 Sep 2013 19:44:55 +0000 (19:44 +0000)]
Merge "Finalize deletion when app exits and for last photo" into gb-ub-photos-carlsbad

10 years agoMake ROI size 1/8 of longer edge of the image
Doris Liu [Thu, 26 Sep 2013 19:32:38 +0000 (12:32 -0700)]
Make ROI size 1/8 of longer edge of the image

Bug: 10863323
Change-Id: Iabe0685e48ecbf5f456d377af6a73d10dcdf0eda

10 years agoFinalize deletion when app exits and for last photo
Doris Liu [Thu, 26 Sep 2013 18:24:37 +0000 (11:24 -0700)]
Finalize deletion when app exits and for last photo

Bug: 10892925
Change-Id: I94a29ec26f657b5c6c2f784f05b63d45e5e3e010

10 years agoMerge "Use Camcorder label and icon for video camera activity." into gb-ub-photos...
Mangesh Ghiware [Thu, 26 Sep 2013 17:14:56 +0000 (17:14 +0000)]
Merge "Use Camcorder label and icon for video camera activity." into gb-ub-photos-carlsbad

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Sep 2013 04:10:30 +0000 (21:10 -0700)]
Import translations. DO NOT MERGE

Change-Id: I9fbfdbc9853215d57f6de75e33da059cd9cc4f43
Auto-generated-cl: translation import

10 years agoUse Camcorder label and icon for video camera activity.
Mangesh Ghiware [Wed, 25 Sep 2013 21:46:30 +0000 (14:46 -0700)]
Use Camcorder label and icon for video camera activity.

Bug: 10932790
Change-Id: If8847e06049e63116381904382db7dfcebb55010

10 years agoMerge "Fix the checks for when to remove the HDR/HQ icons from the pie menu." into...
Sascha Haeberling [Wed, 25 Sep 2013 21:38:51 +0000 (21:38 +0000)]
Merge "Fix the checks for when to remove the HDR/HQ icons from the pie menu." into gb-ub-photos-carlsbad

10 years agoFix the checks for when to remove the HDR/HQ icons from the pie menu.
Sascha Haeberling [Wed, 25 Sep 2013 21:31:49 +0000 (14:31 -0700)]
Fix the checks for when to remove the HDR/HQ icons from the pie menu.

  Bug: 10932511

Change-Id: I4d80d028335c2f45c5c59d56898846a76755ec44

10 years agoMerge "Checks for low storage in wide-angle pano mode." into gb-ub-photos-carlsbad
Angus Kong [Wed, 25 Sep 2013 21:08:03 +0000 (21:08 +0000)]
Merge "Checks for low storage in wide-angle pano mode." into gb-ub-photos-carlsbad

10 years agoChecks for low storage in wide-angle pano mode.
Angus Kong [Wed, 25 Sep 2013 20:00:08 +0000 (13:00 -0700)]
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

10 years agoMerge "Increase ROI size to 1/8 of the image width" into gb-ub-photos-carlsbad
Doris Liu [Wed, 25 Sep 2013 20:59:17 +0000 (20:59 +0000)]
Merge "Increase ROI size to 1/8 of the image width" into gb-ub-photos-carlsbad

10 years agoIncrease ROI size to 1/8 of the image width
Doris Liu [Wed, 25 Sep 2013 19:22:08 +0000 (12:22 -0700)]
Increase ROI size to 1/8 of the image width

Bug: 10863323
Change-Id: I962afbb0b49a6902fac0bbd5209b52591604ed20

10 years agoEnlarge the native buffer of wide-angle-pano.
Angus Kong [Wed, 25 Sep 2013 18:34:08 +0000 (11:34 -0700)]
Enlarge the native buffer of wide-angle-pano.

  bug:10654457

Change-Id: I6f5edda309b94f91986dd468bb4e3131fdcc6678

10 years agoFix HQ mode change to allow return to regular photo mode.
Ruben Brunk [Wed, 25 Sep 2013 06:14:41 +0000 (23:14 -0700)]
Fix HQ mode change to allow return to regular photo mode.

Bug: 10848559
Change-Id: I6645bc17d29af664b9689e4bd05164100b155aa3

10 years agoAdd HQ option and use it to switch to GCam.
Sascha Haeberling [Wed, 25 Sep 2013 01:58:34 +0000 (18:58 -0700)]
Add HQ option and use it to switch to GCam.

  Bug: 10430748
  Bug: 10785988

Change-Id: If824d1d1876d8434958b2a5bc97d2852da118a8b

10 years agoEnable gcam as HDR pie menu option.
Ruben Brunk [Wed, 25 Sep 2013 01:35:22 +0000 (18:35 -0700)]
Enable gcam as HDR pie menu option.

Bug: 10430748
Change-Id: I0f589126bac895b31ef7475afd093680766de39e

10 years agoMerge "Removed unused assets from Camera2 Bug: 10493013 Change-Id: Id07878cbe1a89e0aa...
Kevin Gabayan [Wed, 25 Sep 2013 00:25:55 +0000 (00:25 +0000)]
Merge "Removed unused assets from Camera2 Bug: 10493013 Change-Id: Id07878cbe1a89e0aaeb70942e0f4ca39cd4a3399" into gb-ub-photos-carlsbad

10 years agoDon't expose the Camera crop intent.
Sascha Haeberling [Tue, 24 Sep 2013 23:25:13 +0000 (16:25 -0700)]
Don't expose the Camera crop intent.

  Bug: 10912467

Change-Id: I2f03b7e7c84d76add7a43c30f097f902f1e25e56

10 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
Baligh Uddin [Tue, 24 Sep 2013 22:02:41 +0000 (22:02 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad

10 years agoDe-blue camera
Mindy Pereira [Tue, 24 Sep 2013 02:12:13 +0000 (19:12 -0700)]
De-blue camera

fixes b/10914366 de-blue camera
Change-Id: I36616639e701d7d76fb354e0911e5e64c973060d

10 years agoRemove hideybars from Camera.
Sascha Haeberling [Tue, 24 Sep 2013 19:24:30 +0000 (12:24 -0700)]
Remove hideybars from Camera.

  Bug: 10859173

Change-Id: I6e6677ace3d1c35c974e003bebd25c9a43d43719

10 years agoMerge "Fix SRI UX issues and improve UI efficiency" into gb-ub-photos-carlsbad
Doris Liu [Tue, 24 Sep 2013 18:58:11 +0000 (18:58 +0000)]
Merge "Fix SRI UX issues and improve UI efficiency" into gb-ub-photos-carlsbad

10 years agoFix SRI UX issues and improve UI efficiency
Doris Liu [Tue, 24 Sep 2013 03:43:20 +0000 (20:43 -0700)]
Fix SRI UX issues and improve UI efficiency

Bug: 10674078
Change-Id: I0bb820b5866e3acb8534592a4eec246df24fd441

10 years agoMerge "Allow user to tap on lock icon from secure camera." into gb-ub-photos-carlsbad
Angus Kong [Tue, 24 Sep 2013 16:28:50 +0000 (16:28 +0000)]
Merge "Allow user to tap on lock icon from secure camera." into gb-ub-photos-carlsbad

10 years agoAllow user to tap on lock icon from secure camera.
Angus Kong [Sat, 21 Sep 2013 21:48:51 +0000 (14:48 -0700)]
Allow user to tap on lock icon from secure camera.

  bug:10857973

Change-Id: Id3c03f4d83c676986748ed083e85e85cea8eb507

10 years agoMerge "192x192 icon added to mipmap-xxxhdpi." into gb-ub-photos-carlsbad
Kevin Gabayan [Tue, 24 Sep 2013 01:09:06 +0000 (01:09 +0000)]
Merge "192x192 icon added to mipmap-xxxhdpi." into gb-ub-photos-carlsbad

10 years agoRemoved unused assets from Camera2
Kevin Gabayan [Mon, 23 Sep 2013 22:23:29 +0000 (15:23 -0700)]
Removed unused assets from Camera2
Bug: 10493013
Change-Id: Id07878cbe1a89e0aaeb70942e0f4ca39cd4a3399

10 years agoMerge "Localize the numbers in the time laps popup." into gb-ub-photos-carlsbad
Sascha Haeberling [Tue, 24 Sep 2013 00:37:29 +0000 (00:37 +0000)]
Merge "Localize the numbers in the time laps popup." into gb-ub-photos-carlsbad

10 years agoLocalize the numbers in the time laps popup.
Sascha Haeberling [Mon, 23 Sep 2013 23:06:24 +0000 (16:06 -0700)]
Localize the numbers in the time laps popup.

  Bug: 10889796

Change-Id: I44c476519b785a83af1c72aed07378c5e02d9073

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 23 Sep 2013 21:31:34 +0000 (14:31 -0700)]
Import translations. DO NOT MERGE

Change-Id: I6579c8050e160f317ced1f098af607a622c8a87c
Auto-generated-cl: translation import

10 years agoMerge "Sort and select the preview fps range for still image." into gb-ub-photos...
ztenghui [Mon, 23 Sep 2013 21:30:33 +0000 (21:30 +0000)]
Merge "Sort and select the preview fps range for still image." into gb-ub-photos-carlsbad

10 years agoSort and select the preview fps range for still image.
ztenghui [Mon, 23 Sep 2013 18:35:36 +0000 (11:35 -0700)]
Sort and select the preview fps range for still image.

bug:10842868

Change-Id: Ic7d64aead7fd877e2c404d22ce42fd2d3566e57b

10 years agoFix build: Don't build GCam for non-arm targets
Ruben Brunk [Mon, 23 Sep 2013 17:59:38 +0000 (10:59 -0700)]
Fix build: Don't build GCam for non-arm targets

Bug: 10430748

Change-Id: I26e1208b38f40808ff59e3976f5c4a76efa15b4c

10 years agoImprove the animation to filmstrip.
Angus Kong [Sat, 21 Sep 2013 01:41:46 +0000 (18:41 -0700)]
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

10 years ago192x192 icon added to mipmap-xxxhdpi.
Kevin Gabayan [Sat, 21 Sep 2013 00:06:07 +0000 (17:06 -0700)]
192x192 icon added to mipmap-xxxhdpi.

Change-Id: I2531fc226c97f5a3948f9616dc40e269e792b29c

10 years agoHide action bar after a timeout
Doris Liu [Thu, 19 Sep 2013 02:43:12 +0000 (19:43 -0700)]
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

10 years agoMerge "Refine Filmstrip gesture/position handling." into gb-ub-photos-carlsbad
Angus Kong [Fri, 20 Sep 2013 01:18:33 +0000 (01:18 +0000)]
Merge "Refine Filmstrip gesture/position handling." into gb-ub-photos-carlsbad

10 years agoRefine Filmstrip gesture/position handling.
Angus Kong [Thu, 19 Sep 2013 06:56:01 +0000 (23:56 -0700)]
Refine Filmstrip gesture/position handling.

  bug:10749052
  bug:10802996
  bug:10711578

Change-Id: I9080a930209118a5c1bdc11b1ef7b316c55a741e

10 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
Baligh Uddin [Thu, 19 Sep 2013 21:35:41 +0000 (21:35 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad

10 years agoMerge "Fix drawable location." into gb-ub-photos-carlsbad
Ruben Brunk [Thu, 19 Sep 2013 19:33:09 +0000 (19:33 +0000)]
Merge "Fix drawable location." into gb-ub-photos-carlsbad

10 years agoFix drawable location.
Ruben Brunk [Thu, 19 Sep 2013 19:23:39 +0000 (12:23 -0700)]
Fix drawable location.

Bug: 10430748

- Drawable wasn't included when building from klp-dev.

Change-Id: I85e57eebbab3a25e18e3fd6738ffa43bdd61f974

10 years agoAdd crop activity
nicolasroard [Wed, 18 Sep 2013 23:54:05 +0000 (16:54 -0700)]
Add crop activity

bug:10367125

Change-Id: I8dce6d799e7469ff048d419598d87b0c04bef2a0

10 years agoUse contentObserver to refresh the data when dirty.
ztenghui [Thu, 5 Sep 2013 22:47:58 +0000 (15:47 -0700)]
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

10 years agoBring back NFC beam support to filmstrip
Mangesh Ghiware [Thu, 19 Sep 2013 16:24:23 +0000 (09:24 -0700)]
Bring back NFC beam support to filmstrip

Bug: 10805211
Change-Id: I457d47625c69fcdaba663e53f46d461d29c7cb92

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 19 Sep 2013 10:32:46 +0000 (03:32 -0700)]
Import translations. DO NOT MERGE

Change-Id: I14087e2afde009daca03e6005fab8043d36c7e0c
Auto-generated-cl: translation import

10 years agoMerge "Adding gcam module to Camera2 app." into gb-ub-photos-carlsbad
Ruben Brunk [Thu, 19 Sep 2013 07:18:26 +0000 (07:18 +0000)]
Merge "Adding gcam module to Camera2 app." into gb-ub-photos-carlsbad

10 years agoAdding gcam module to Camera2 app.
Ruben Brunk [Fri, 6 Sep 2013 18:56:32 +0000 (11:56 -0700)]
Adding gcam module to Camera2 app.

Bug: 10430748

Change-Id: I0c53085553cd8505ba376b1518507d36065894f5

10 years agoMerge "Make Up button in filmstrip go to Gallery." into gb-ub-photos-carlsbad
Mangesh Ghiware [Thu, 19 Sep 2013 04:27:58 +0000 (04:27 +0000)]
Merge "Make Up button in filmstrip go to Gallery." into gb-ub-photos-carlsbad

10 years agoMake Up button in filmstrip go to Gallery.
Mangesh Ghiware [Thu, 19 Sep 2013 01:25:26 +0000 (18:25 -0700)]
Make Up button in filmstrip go to Gallery.

Bug: 10748904
Change-Id: If80f3354071893dc4f8bd60e4ca605d3626ecdf9

10 years agoFix various message issues
Sascha Haeberling [Thu, 19 Sep 2013 00:08:29 +0000 (17:08 -0700)]
Fix various message issues

  Bug: 10568697
  Bug: 10589224
  Bug: 10561095
  Bug: 10589353
  Bug: 10570925

Change-Id: I1affdf37d74bef37e099c70775f669ee0ff33acf

10 years agoClean up ApiHelper and remove unused code paths.
Sascha Haeberling [Wed, 18 Sep 2013 21:28:51 +0000 (14:28 -0700)]
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

10 years agoAdding Hideybar support for K and up.
Sascha Haeberling [Fri, 13 Sep 2013 18:58:33 +0000 (11:58 -0700)]
Adding Hideybar support for K and up.

  Bug: 10723047

Change-Id: Ie1d0bdadfbe6dee6a4e0998facac61ff1fb6e02a

10 years agoMerge "Delete the captured video if cancel in review." into gb-ub-photos-carlsbad
ztenghui [Wed, 18 Sep 2013 00:02:45 +0000 (00:02 +0000)]
Merge "Delete the captured video if cancel in review." into gb-ub-photos-carlsbad

10 years agoDelete the captured video if cancel in review.
ztenghui [Tue, 17 Sep 2013 23:51:15 +0000 (16:51 -0700)]
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

10 years agoFall back to Photo module if stores index is illegal.
Sascha Haeberling [Tue, 17 Sep 2013 22:44:22 +0000 (15:44 -0700)]
Fall back to Photo module if stores index is illegal.

  Bug: 10805249

Change-Id: Iace590af34cf646abf7af74b498520d686c04511

10 years agoMerge "Don't crash the app if camera is not available." into gb-ub-photos-carlsbad
Sascha Haeberling [Tue, 17 Sep 2013 22:58:47 +0000 (22:58 +0000)]
Merge "Don't crash the app if camera is not available." into gb-ub-photos-carlsbad

10 years agoMerge "Adding a simple done handler interface." into gb-ub-photos-carlsbad
Sascha Haeberling [Tue, 17 Sep 2013 22:51:43 +0000 (22:51 +0000)]
Merge "Adding a simple done handler interface." into gb-ub-photos-carlsbad

10 years agoDon't crash the app if camera is not available.
Sascha Haeberling [Tue, 17 Sep 2013 22:36:13 +0000 (15:36 -0700)]
Don't crash the app if camera is not available.

  Bug: 10747001

Change-Id: I8a4e302a9b458c73901776a95a0118da0e4e8b6c

10 years agoMerge "Fix camera controls rotation for secure camera" into gb-ub-photos-carlsbad
Doris Liu [Tue, 17 Sep 2013 22:19:06 +0000 (22:19 +0000)]
Merge "Fix camera controls rotation for secure camera" into gb-ub-photos-carlsbad

10 years agoFix camera controls rotation for secure camera
Doris Liu [Tue, 17 Sep 2013 22:07:31 +0000 (15:07 -0700)]
Fix camera controls rotation for secure camera

Bug: 8878379
Change-Id: I80b06d98010dbed14a46994f365d1fbb9aa8ba49

10 years agoMerge "Show dialog when camera device is not connected." into gb-ub-photos-carlsbad
Angus Kong [Tue, 17 Sep 2013 21:51:50 +0000 (21:51 +0000)]
Merge "Show dialog when camera device is not connected." into gb-ub-photos-carlsbad

10 years agoShow dialog when camera device is not connected.
Angus Kong [Mon, 16 Sep 2013 21:25:35 +0000 (14:25 -0700)]
Show dialog when camera device is not connected.

  bug:10726516

Change-Id: I3d3433d0b2eced54027b19910473fd55135d0e1c