OSDN Git Service

android-x86/packages-apps-Camera2.git
10 years agoam 4d21fc2e: Merge "Show status bar in filmstrip mode" into gb-ub-photos-carlsbad
Sascha Haeberling [Tue, 1 Oct 2013 03:51:49 +0000 (20:51 -0700)]
am 4d21fc2e: Merge "Show status bar in filmstrip mode" into gb-ub-photos-carlsbad

* commit '4d21fc2e3f7e7e64e5910b9ee4f6b7662a441427':
  Show status bar in filmstrip mode

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 agoam 4feabff8: Fix MediaStore correction code.
ztenghui [Tue, 1 Oct 2013 00:20:12 +0000 (17:20 -0700)]
am 4feabff8: Fix MediaStore correction code.

* commit '4feabff8b87e1b71e8040dbcd6289a313bf9f593':
  Fix MediaStore correction code.

10 years agoam c4aa7c0e: Change crop label to avoid aapt dump badging from failing.
Sascha Haeberling [Tue, 1 Oct 2013 00:20:11 +0000 (17:20 -0700)]
am c4aa7c0e: Change crop label to avoid aapt dump badging from failing.

* commit 'c4aa7c0e3c9b6a15eca03ba7bdaaccf3ceb8c15d':
  Change crop label to avoid aapt dump badging from failing.

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 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 agoam fb344efd: Temporary removal of resize code to evaluate GCam image bug
Alan Newberger [Sun, 29 Sep 2013 22:18:13 +0000 (15:18 -0700)]
am fb344efd: Temporary removal of resize code to evaluate GCam image bug

* commit 'fb344efde20ffab903fae7c6e5a2e1c90b4ef085':
  Temporary removal of resize code to evaluate GCam image bug

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 agoam ac5cb243: Merge "Add basic EXIF to the tiny planet so that rotate succeeds." into...
Sascha Haeberling [Sat, 28 Sep 2013 00:06:49 +0000 (17:06 -0700)]
am ac5cb243: Merge "Add basic EXIF to the tiny planet so that rotate succeeds." into gb-ub-photos-carlsbad

* commit 'ac5cb2430408f9a1854a4e22e8297733279bf75b':
  Add basic EXIF to the tiny planet so that rotate succeeds.

10 years agoam b7be228d: Fix incorrect width and height from MediaStore.
ztenghui [Sat, 28 Sep 2013 00:06:48 +0000 (17:06 -0700)]
am b7be228d: Fix incorrect width and height from MediaStore.

* commit 'b7be228d192cb8f91079caaa2f77a884a40b1160':
  Fix incorrect width and height from MediaStore.

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 agoam 9ba47bf4: Merge "Restore HQ preference in GCam module." into gb-ub-photos-carlsbad
Angus Kong [Fri, 27 Sep 2013 19:09:18 +0000 (12:09 -0700)]
am 9ba47bf4: Merge "Restore HQ preference in GCam module." into gb-ub-photos-carlsbad

* commit '9ba47bf4b755337786bb2bbc810ab69a5772e38f':
  Restore HQ preference in GCam module.

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 agoam af41aaa4: Don\'t update the width and height in MediaStore after rotation
ztenghui [Fri, 27 Sep 2013 18:24:10 +0000 (11:24 -0700)]
am af41aaa4: Don\'t update the width and height in MediaStore after rotation

* commit 'af41aaa4005d7abcc45ea3c7fb87af098ef49ce8':
  Don't update the width and height in MediaStore after rotation

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 agoam 3cde3ece: Merge "Add orientation information to the details dialog." into gb-ub...
Sascha Haeberling [Fri, 27 Sep 2013 00:20:46 +0000 (17:20 -0700)]
am 3cde3ece: Merge "Add orientation information to the details dialog." into gb-ub-photos-carlsbad

* commit '3cde3ece3e6e384f831a02f21c677e292a824df8':
  Add orientation information to the details dialog.

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 agoam 2b86d873: Fix memory leak of context in LocalMediaObserver
Doris Liu [Thu, 26 Sep 2013 23:47:15 +0000 (16:47 -0700)]
am 2b86d873: Fix memory leak of context in LocalMediaObserver

* commit '2b86d873ca4fb3a921139633ed7be9959ab452df':
  Fix memory leak of context in LocalMediaObserver

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 agoam 66788094: Remove PopupManager to remove a memory leak
Seth Raphael [Thu, 26 Sep 2013 21:07:42 +0000 (14:07 -0700)]
am 66788094: Remove PopupManager to remove a memory leak

* commit '667880948de7a051f62359878cb61c1e0a867e24':
  Remove PopupManager to remove a memory leak

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 agoam 67685a78: Add HQ icon indicator support.
Sascha Haeberling [Thu, 26 Sep 2013 20:37:07 +0000 (13:37 -0700)]
am 67685a78: Add HQ icon indicator support.

* commit '67685a78a29a0311043f38f8766a1fbbf881a599':
  Add HQ icon indicator support.

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 agoam f5fc8d67: Merge "Finalize deletion when app exits and for last photo" into gb...
Doris Liu [Thu, 26 Sep 2013 19:47:52 +0000 (12:47 -0700)]
am f5fc8d67: Merge "Finalize deletion when app exits and for last photo" into gb-ub-photos-carlsbad

* commit 'f5fc8d67dcbb5df2cb6ac802c5caa50a850d72d2':
  Finalize deletion when app exits and for last photo

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 agoam 2ba03263: Make ROI size 1/8 of longer edge of the image
Doris Liu [Thu, 26 Sep 2013 19:42:40 +0000 (12:42 -0700)]
am 2ba03263: Make ROI size 1/8 of longer edge of the image

* commit '2ba03263340639635120be467f8cabec2889aa08':
  Make ROI size 1/8 of longer edge of the image

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 agoam 22236064: Merge "Use Camcorder label and icon for video camera activity." into...
Mangesh Ghiware [Thu, 26 Sep 2013 17:17:01 +0000 (10:17 -0700)]
am 22236064: Merge "Use Camcorder label and icon for video camera activity." into gb-ub-photos-carlsbad

* commit '22236064c8ec28196c07e847d4acb06e214deda8':
  Use Camcorder label and icon for video camera activity.

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 agoam 192686cf: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Sep 2013 04:36:01 +0000 (21:36 -0700)]
am 192686cf: (-s ours) Import translations. DO NOT MERGE

* commit '192686cfde67ae1cc9933b865e8c196b363b54f7':
  Import translations. DO NOT MERGE

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 agoam 15ccccf6: Merge "Fix the checks for when to remove the HDR/HQ icons from the pie...
Sascha Haeberling [Wed, 25 Sep 2013 21:40:59 +0000 (14:40 -0700)]
am 15ccccf6: Merge "Fix the checks for when to remove the HDR/HQ icons from the pie menu." into gb-ub-photos-carlsbad

* commit '15ccccf6df50b465514eef85f64393d6f2022e0d':
  Fix the checks for when to remove the HDR/HQ icons from the pie menu.

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 agoam c9c15044: Merge "Checks for low storage in wide-angle pano mode." into gb-ub-photo...
Angus Kong [Wed, 25 Sep 2013 21:11:14 +0000 (14:11 -0700)]
am c9c15044: Merge "Checks for low storage in wide-angle pano mode." into gb-ub-photos-carlsbad

* commit 'c9c1504408819bda3fb6b2b264f9dbf6012f9b7f':
  Checks for low storage in wide-angle pano mode.

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 agoam 0537d4f7: Merge "Increase ROI size to 1/8 of the image width" into gb-ub-photos...
Doris Liu [Wed, 25 Sep 2013 21:03:50 +0000 (14:03 -0700)]
am 0537d4f7: Merge "Increase ROI size to 1/8 of the image width" into gb-ub-photos-carlsbad

* commit '0537d4f7abe9e137f626e5cff3fcf252bb04c626':
  Increase ROI size to 1/8 of the image width

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 agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Wed, 25 Sep 2013 19:59:22 +0000 (19:59 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

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 agoam b998a491: Enlarge the native buffer of wide-angle-pano.
Angus Kong [Wed, 25 Sep 2013 19:17:11 +0000 (12:17 -0700)]
am b998a491: Enlarge the native buffer of wide-angle-pano.

* commit 'b998a491a5b24e710bc1711dbb00cbfa05273bf2':
  Enlarge the native buffer of wide-angle-pano.

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 agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 25 Sep 2013 17:06:13 +0000 (10:06 -0700)]
Import translations. DO NOT MERGE

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

10 years agoam be7dc627: Fix HQ mode change to allow return to regular photo mode.
Ruben Brunk [Wed, 25 Sep 2013 15:14:43 +0000 (08:14 -0700)]
am be7dc627: Fix HQ mode change to allow return to regular photo mode.

* commit 'be7dc6279dfe17cb93fab8cf88d1115966acb2e0':
  Fix HQ mode change to allow return to regular photo mode.

10 years agoam 98f38bb0: Add HQ option and use it to switch to GCam.
Sascha Haeberling [Wed, 25 Sep 2013 15:14:42 +0000 (08:14 -0700)]
am 98f38bb0: Add HQ option and use it to switch to GCam.

* commit '98f38bb04daa3db49a072718cd8b5005b8b73af1':
  Add HQ option and use it to switch to GCam.

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 agoam 4601f5d9: Enable gcam as HDR pie menu option.
Ruben Brunk [Wed, 25 Sep 2013 01:39:22 +0000 (18:39 -0700)]
am 4601f5d9: Enable gcam as HDR pie menu option.

* commit '4601f5d987ad2f57db6b1b65a716f00308e5ae99':
  Enable gcam as HDR pie menu option.

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 agoam e0bf566d: Merge "Removed unused assets from Camera2 Bug: 10493013 Change-Id: Id078...
Kevin Gabayan [Wed, 25 Sep 2013 00:27:40 +0000 (17:27 -0700)]
am e0bf566d: Merge "Removed unused assets from Camera2 Bug: 10493013 Change-Id: Id07878cbe1a89e0aaeb70942e0f4ca39cd4a3399" into gb-ub-photos-carlsbad

* commit 'e0bf566d4ab2c45e05635397bdfd6c9f9a92a356':
  Removed unused assets from Camera2 Bug: 10493013 Change-Id: Id07878cbe1a89e0aaeb70942e0f4ca39cd4a3399

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 agoam 601d8041: Don\'t expose the Camera crop intent.
Sascha Haeberling [Tue, 24 Sep 2013 23:30:11 +0000 (16:30 -0700)]
am 601d8041: Don\'t expose the Camera crop intent.

* commit '601d804177a8d4abf02b2c0cb2805178f980c96b':
  Don't expose the Camera crop intent.

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 agoam e5d39a52: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Tue, 24 Sep 2013 22:05:03 +0000 (15:05 -0700)]
am e5d39a52: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad

* commit 'e5d39a522ff2f44fea8d56fddfbd785ddec8314a':
  Import translations. DO NOT MERGE

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 agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Tue, 24 Sep 2013 21:57:16 +0000 (21:57 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoam 29e7a34e: De-blue camera
Mindy Pereira [Tue, 24 Sep 2013 21:31:14 +0000 (14:31 -0700)]
am 29e7a34e: De-blue camera

* commit '29e7a34e01e791641030f7687402f12bc091a70d':
  De-blue camera

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 agoam 4863db01: Remove hideybars from Camera.
Sascha Haeberling [Tue, 24 Sep 2013 20:38:19 +0000 (13:38 -0700)]
am 4863db01: Remove hideybars from Camera.

* commit '4863db01e3629a0a29c718b94445332ef74441e9':
  Remove hideybars from Camera.

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 agoam 3180ac90: Merge "Fix SRI UX issues and improve UI efficiency" into gb-ub-photos...
Doris Liu [Tue, 24 Sep 2013 18:59:37 +0000 (11:59 -0700)]
am 3180ac90: Merge "Fix SRI UX issues and improve UI efficiency" into gb-ub-photos-carlsbad

* commit '3180ac90af3e63ed7d9b487de5a35ba216d9463f':
  Fix SRI UX issues and improve UI efficiency

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 agoam c74825b1: Merge "Allow user to tap on lock icon from secure camera." into gb-ub...
Angus Kong [Tue, 24 Sep 2013 16:31:40 +0000 (09:31 -0700)]
am c74825b1: Merge "Allow user to tap on lock icon from secure camera." into gb-ub-photos-carlsbad

* commit 'c74825b1666857cbfd0ad3750f0d509de8e86953':
  Allow user to tap on lock icon from secure camera.

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 agoam d897d5c9: Merge "192x192 icon added to mipmap-xxxhdpi." into gb-ub-photos-carlsbad
Kevin Gabayan [Tue, 24 Sep 2013 01:10:58 +0000 (18:10 -0700)]
am d897d5c9: Merge "192x192 icon added to mipmap-xxxhdpi." into gb-ub-photos-carlsbad

* commit 'd897d5c9048ba96d79b9893d0ebc7eb7e6b84260':
  192x192 icon added to mipmap-xxxhdpi.

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 agoam 8fed926c: Merge "Localize the numbers in the time laps popup." into gb-ub-photos...
Sascha Haeberling [Tue, 24 Sep 2013 00:40:37 +0000 (17:40 -0700)]
am 8fed926c: Merge "Localize the numbers in the time laps popup." into gb-ub-photos-carlsbad

* commit '8fed926c9f1a3b205165a2f9aad05379c85ececd':
  Localize the numbers in the time laps popup.

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 agoam 4c478ffe: Merge "Sort and select the preview fps range for still image." into...
ztenghui [Mon, 23 Sep 2013 21:31:41 +0000 (14:31 -0700)]
am 4c478ffe: Merge "Sort and select the preview fps range for still image." into gb-ub-photos-carlsbad

* commit '4c478ffe556bff91f9c7574384ab6d482c947627':
  Sort and select the preview fps range for still image.

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 agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 23 Sep 2013 21:14:42 +0000 (14:14 -0700)]
Import translations. DO NOT MERGE

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

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 agoam 283beaf6: Fix build: Don\'t build GCam for non-arm targets
Ruben Brunk [Mon, 23 Sep 2013 18:34:26 +0000 (11:34 -0700)]
am 283beaf6: Fix build: Don\'t build GCam for non-arm targets

* commit '283beaf677d0c3235fbb22bfd5cd8338459bed1b':
  Fix build: Don't build GCam for non-arm targets

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 agoam b21215a1: Improve the animation to filmstrip.
Angus Kong [Sat, 21 Sep 2013 02:47:37 +0000 (19:47 -0700)]
am b21215a1: Improve the animation to filmstrip.

* commit 'b21215a1a59812592380f31891becedbdec7468b':
  Improve the animation to filmstrip.

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 agoam aa874428: Hide action bar after a timeout
Doris Liu [Fri, 20 Sep 2013 18:24:34 +0000 (11:24 -0700)]
am aa874428: Hide action bar after a timeout

* commit 'aa8744284864cda5570e8dfa4eccc2747cee52dc':
  Hide action bar after a timeout

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 agoam cdbba4c8: Merge "Refine Filmstrip gesture/position handling." into gb-ub-photos...
Angus Kong [Fri, 20 Sep 2013 01:20:40 +0000 (18:20 -0700)]
am cdbba4c8: Merge "Refine Filmstrip gesture/position handling." into gb-ub-photos-carlsbad

* commit 'cdbba4c8395cd765b3464e2d980a8a0ea1ff54c7':
  Refine Filmstrip gesture/position handling.

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 agoam 4821c541: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Thu, 19 Sep 2013 21:38:02 +0000 (14:38 -0700)]
am 4821c541: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad

* commit '4821c5418d44d936ca222bfe1fdc1ac367e129f8':
  Import translations. DO NOT MERGE

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 "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 19 Sep 2013 21:33:14 +0000 (21:33 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoam 30a21ea3: Merge "Fix drawable location." into gb-ub-photos-carlsbad
Ruben Brunk [Thu, 19 Sep 2013 19:35:48 +0000 (12:35 -0700)]
am 30a21ea3: Merge "Fix drawable location." into gb-ub-photos-carlsbad

* commit '30a21ea3356e87bdff0e072b840fa73215597326':
  Fix drawable location.

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