OSDN Git Service

android-x86/packages-apps-Camera2.git
9 years agoam adc2e32e: am b524167d: am 9a2ff1e8: am 89e485e0: am cdf62f78: am d3ee86b7: Merge...
Senpo Hu [Fri, 19 Sep 2014 06:17:44 +0000 (06:17 +0000)]
am adc2e32e: am b524167d: am 9a2ff1e8: am 89e485e0: am cdf62f78: am d3ee86b7: Merge "Return to filmstrip when video playback finishes." into ub-camera-glacier

* commit 'adc2e32e60a3e33c8bfbd2463b8b01a83bed8c6e':

9 years agoam 2573f791: (-s ours) am f1eeedb7: (-s ours) am 4bd2b9b5: (-s ours) am f5cafa5a...
Baligh Uddin [Fri, 19 Sep 2014 06:17:44 +0000 (06:17 +0000)]
am 2573f791: (-s ours) am f1eeedb7: (-s ours) am 4bd2b9b5: (-s ours) am f5cafa5a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

* commit '2573f7917166f837dae1e79c377279ea5d5741ad':
  Import translations. DO NOT MERGE

9 years agoam a8b58fd3: am 31e3d15f: am dcf60eea: am 5675b8af: Fix the upside-down orienation...
Senpo Hu [Fri, 19 Sep 2014 06:17:43 +0000 (06:17 +0000)]
am a8b58fd3: am 31e3d15f: am dcf60eea: am 5675b8af: Fix the upside-down orienation bug in CaptureModule.

* commit 'a8b58fd36b62996f63d73e1b3cbcc9c12bfeefc3':

9 years agoam 67eaeed4: am 8f6e750d: am 45090bab: am d79b38d6: Merge "Remove jank on camera...
Alan Newberger [Fri, 19 Sep 2014 06:17:43 +0000 (06:17 +0000)]
am 67eaeed4: am 8f6e750d: am 45090bab: am d79b38d6: Merge "Remove jank on camera options switching" into ub-camera-glacier

* commit '67eaeed4bf11bc38bb966f0919adf0feb9df8d0e':

9 years agoam f129d9eb: am edf2b787: am d7a4c3e2: am 9cefdd49: Changed double to float. viewFind...
Jiawen Chen [Fri, 19 Sep 2014 06:17:42 +0000 (06:17 +0000)]
am f129d9eb: am edf2b787: am d7a4c3e2: am 9cefdd49: Changed double to float. viewFinder -> viewfinder.

* commit 'f129d9eb617cadfc3866327812bc5b8c172a1a58':

9 years agoam 6b4e11b8: am 59a9d83b: am 0a156cf6: am ffc395d6: Reinitialize shutter button in...
Alan Newberger [Fri, 19 Sep 2014 06:17:42 +0000 (06:17 +0000)]
am 6b4e11b8: am 59a9d83b: am 0a156cf6: am ffc395d6: Reinitialize shutter button in Camera mode upon preview start

* commit '6b4e11b80fe56bc195fb4fa32f4e0ed23d13be81':

9 years agoam 0e7b4567: am 309cdabd: am 2acdb01d: am 5c4bd6b5: Reduce logging for unknown camera...
Alan Newberger [Fri, 19 Sep 2014 06:17:41 +0000 (06:17 +0000)]
am 0e7b4567: am 309cdabd: am 2acdb01d: am 5c4bd6b5: Reduce logging for unknown camera scope

* commit '0e7b45670a16afae88fa4c5f8fe8f0577349b4f0':

9 years agoam 1a0b19e1: am 5af3ed93: am 91c1c555: am a710f371: Merge "This fixes Bitmap.createBi...
Andy Huibers [Fri, 19 Sep 2014 06:17:40 +0000 (06:17 +0000)]
am 1a0b19e1: am 5af3ed93: am 91c1c555: am a710f371: Merge "This fixes Bitmap.createBitmap offset bug in L, not sure why." into ub-camera-glacier

* commit '1a0b19e14b280c38c64c5efecb5b69cccaf0fa6f':

9 years agoam a605959f: (-s ours) am c6456b7b: am 031bcdbd: am fd97c6da: (-s ours) Merge "DO...
Qiwen Zhao [Fri, 19 Sep 2014 06:17:40 +0000 (06:17 +0000)]
am a605959f: (-s ours) am c6456b7b: am 031bcdbd: am fd97c6da: (-s ours) Merge "DO NOT MERGE: Adjust for camera2 API changes" into ub-camera-glacier

* commit 'a605959fe487264591fa7f3b1d541b07b1e8bd7a':

9 years agoam eed1539e: am 0c7af463: am aefc884c: am 42a5ad5a: Merge "Granting read permission...
Nicolas Prevot [Fri, 19 Sep 2014 06:17:39 +0000 (06:17 +0000)]
am eed1539e: am 0c7af463: am aefc884c: am 42a5ad5a: Merge "Granting read permission in the result intent for VIDEO_CAPTURE." into ub-camera-glacier

* commit 'eed1539e431b8e757f70e387e9d84c052b729c84':

9 years agoam a665c7da: am 614e05da: am 458590b6: am 5e3bf4cc: Remove toast. This reverts commit...
Andy Huibers [Fri, 19 Sep 2014 06:17:39 +0000 (06:17 +0000)]
am a665c7da: am 614e05da: am 458590b6: am 5e3bf4cc: Remove toast. This reverts commit 779414e8bfe23d66de310570ff2314654e45ec9f.

* commit 'a665c7da57b42a67d85cab722e63fa7165376542':

9 years agoam 5e442857: am 877489aa: am c4f2f4d9: am b954b3e8: Merge "Always match camera orient...
Senpo Hu [Fri, 19 Sep 2014 06:17:38 +0000 (06:17 +0000)]
am 5e442857: am 877489aa: am c4f2f4d9: am b954b3e8: Merge "Always match camera orientation with device orientation regardless portrait lock." into ub-camera-glacier

* commit '5e44285741e1034d7d417aa896a4bad34d2470cd':

9 years agoam 7d63dbcf: am 12f408cc: am 7a3bdb23: am 65c00136: Set video quality pref default...
Senpo Hu [Fri, 19 Sep 2014 06:17:37 +0000 (06:17 +0000)]
am 7d63dbcf: am 12f408cc: am 7a3bdb23: am 65c00136: Set video quality pref default values at startup.

* commit '7d63dbcf80b79358269f9ed902266cf9aaa86e43':

9 years agoam c8db704b: am 58eb8853: am 420c2c42: Merge "Adjust for camera2 API changes" into...
Eino-Ville Talvala [Fri, 19 Sep 2014 06:17:37 +0000 (06:17 +0000)]
am c8db704b: am 58eb8853: am 420c2c42: Merge "Adjust for camera2 API changes" into lmp-dev

* commit 'c8db704bc6f41afcbee0cabdb2ecb135a42a3765':

9 years agoam 03b99c42: Merge branch \'lmp-mr1-dev-plus-aosp\' of https://googleplex-android...
bulic [Thu, 18 Sep 2014 22:46:18 +0000 (22:46 +0000)]
am 03b99c42: Merge branch \'lmp-mr1-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/packages/apps/Camera2 into lmp-mr1-dev-plus-aosp

* commit '03b99c42afcbe367f4db6358b7e76510106b8a43':

9 years agoam b40e7d28: am ba677c7e: am b8555b66: am 767a1186: Merge "back to bigger HDR+ icons...
Spike Sprague [Thu, 18 Sep 2014 22:37:10 +0000 (22:37 +0000)]
am b40e7d28: am ba677c7e: am b8555b66: am 767a1186: Merge "back to bigger HDR+ icons" into ub-camera-glacier

* commit 'b40e7d2834030fd3bd80f17eed27c7e0265e2d7e':

9 years agoam 6bb99f62: am 5d3bebde: keep history after reset to lmp-dev
Baligh Uddin [Thu, 18 Sep 2014 22:37:10 +0000 (22:37 +0000)]
am 6bb99f62: am 5d3bebde: keep history after reset to lmp-dev

* commit '6bb99f623bf8ca7d9624705193483413314a7f3c':
  Import translations. DO NOT MERGE

9 years agoam 23f27f22: am d99f98a3: am af25fb04: am 3c3b31df: mode switch jank fixes
Spike Sprague [Thu, 18 Sep 2014 21:17:48 +0000 (21:17 +0000)]
am 23f27f22: am d99f98a3: am af25fb04: am 3c3b31df: mode switch jank fixes

* commit '23f27f22033525b5ea428a4a387ae528502759dc':
  mode switch jank fixes

9 years agoam d99f98a3: am af25fb04: am 3c3b31df: mode switch jank fixes
Spike Sprague [Thu, 18 Sep 2014 20:57:08 +0000 (20:57 +0000)]
am d99f98a3: am af25fb04: am 3c3b31df: mode switch jank fixes

* commit 'd99f98a3751fe414aaa03ad85e66625c3cf481e6':
  mode switch jank fixes

9 years agoam af25fb04: am 3c3b31df: mode switch jank fixes
Spike Sprague [Thu, 18 Sep 2014 20:17:22 +0000 (20:17 +0000)]
am af25fb04: am 3c3b31df: mode switch jank fixes

* commit 'af25fb04968d9212ec47367f6ba78ee20ca76d05':
  mode switch jank fixes

9 years agoam 3c3b31df: mode switch jank fixes
Spike Sprague [Thu, 18 Sep 2014 20:11:13 +0000 (20:11 +0000)]
am 3c3b31df: mode switch jank fixes

* commit '3c3b31dfd5ec7a43e89cd4695cc8c498afc3a91d':
  mode switch jank fixes

9 years agomode switch jank fixes
Spike Sprague [Mon, 8 Sep 2014 17:43:04 +0000 (10:43 -0700)]
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

9 years agoam 6eba7685: (-s ours) am 3cb0aab3: (-s ours) am 9a275f5e: (-s ours) Merge "Import...
Baligh Uddin [Tue, 16 Sep 2014 18:21:54 +0000 (18:21 +0000)]
am 6eba7685: (-s ours) am 3cb0aab3: (-s ours) am 9a275f5e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '6eba768550a5fe7c3dba506bdaf19c6de83b3819':
  Import translations. DO NOT MERGE

9 years agoam 3cb0aab3: (-s ours) am 9a275f5e: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Tue, 16 Sep 2014 18:02:50 +0000 (18:02 +0000)]
am 3cb0aab3: (-s ours) am 9a275f5e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '3cb0aab3eb4e17c86f91160d476eca00a85a1017':
  Import translations. DO NOT MERGE

9 years agoam 9a275f5e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Tue, 16 Sep 2014 15:31:49 +0000 (15:31 +0000)]
am 9a275f5e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '9a275f5eed1e0b6fdcafd9fdd42cd2568db2cfc6':
  Import translations. DO NOT MERGE

9 years agoam b524167d: am 9a2ff1e8: am 89e485e0: am cdf62f78: am d3ee86b7: Merge "Return to...
Senpo Hu [Tue, 16 Sep 2014 15:21:32 +0000 (15:21 +0000)]
am b524167d: am 9a2ff1e8: am 89e485e0: am cdf62f78: am d3ee86b7: Merge "Return to filmstrip when video playback finishes." into ub-camera-glacier

* commit 'b524167dbf8bce0c73657486e21347c75482b453':

9 years agoam f1eeedb7: (-s ours) am 4bd2b9b5: (-s ours) am f5cafa5a: (-s ours) Merge "Import...
Baligh Uddin [Tue, 16 Sep 2014 15:21:32 +0000 (15:21 +0000)]
am f1eeedb7: (-s ours) am 4bd2b9b5: (-s ours) am f5cafa5a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

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

9 years agoam 31e3d15f: am dcf60eea: am 5675b8af: Fix the upside-down orienation bug in CaptureM...
Senpo Hu [Tue, 16 Sep 2014 15:21:31 +0000 (15:21 +0000)]
am 31e3d15f: am dcf60eea: am 5675b8af: Fix the upside-down orienation bug in CaptureModule.

* commit '31e3d15fff19598aebf89b29a2dc56488c50a219':

9 years agoam 8f6e750d: am 45090bab: am d79b38d6: Merge "Remove jank on camera options switching...
Alan Newberger [Tue, 16 Sep 2014 15:21:31 +0000 (15:21 +0000)]
am 8f6e750d: am 45090bab: am d79b38d6: Merge "Remove jank on camera options switching" into ub-camera-glacier

* commit '8f6e750d8adadad2044da945f47da2aea3492925':

9 years agoam edf2b787: am d7a4c3e2: am 9cefdd49: Changed double to float. viewFinder -> viewfinder.
Jiawen Chen [Tue, 16 Sep 2014 15:21:30 +0000 (15:21 +0000)]
am edf2b787: am d7a4c3e2: am 9cefdd49: Changed double to float. viewFinder -> viewfinder.

* commit 'edf2b787e94d7b9af0aee07412da0925e9515082':

9 years agoam 59a9d83b: am 0a156cf6: am ffc395d6: Reinitialize shutter button in Camera mode...
Alan Newberger [Tue, 16 Sep 2014 15:21:30 +0000 (15:21 +0000)]
am 59a9d83b: am 0a156cf6: am ffc395d6: Reinitialize shutter button in Camera mode upon preview start

* commit '59a9d83b968077f9267b15bac3395d51fda22021':

9 years agoam 309cdabd: am 2acdb01d: am 5c4bd6b5: Reduce logging for unknown camera scope
Alan Newberger [Tue, 16 Sep 2014 15:21:29 +0000 (15:21 +0000)]
am 309cdabd: am 2acdb01d: am 5c4bd6b5: Reduce logging for unknown camera scope

* commit '309cdabd062de6dae4fb5387948a4ad823f965ae':

9 years agoam 5af3ed93: am 91c1c555: am a710f371: Merge "This fixes Bitmap.createBitmap offset...
Andy Huibers [Tue, 16 Sep 2014 15:21:28 +0000 (15:21 +0000)]
am 5af3ed93: am 91c1c555: am a710f371: Merge "This fixes Bitmap.createBitmap offset bug in L, not sure why." into ub-camera-glacier

* commit '5af3ed93aa84ee5360681cad6db385c0e89bdc35':

9 years agoam c6456b7b: am 031bcdbd: am fd97c6da: (-s ours) Merge "DO NOT MERGE: Adjust for...
Qiwen Zhao [Tue, 16 Sep 2014 15:21:28 +0000 (15:21 +0000)]
am c6456b7b: am 031bcdbd: am fd97c6da: (-s ours) Merge "DO NOT MERGE: Adjust for camera2 API changes" into ub-camera-glacier

* commit 'c6456b7b90fdc367888a50009821c916e04c143a':

9 years agoam 0c7af463: am aefc884c: am 42a5ad5a: Merge "Granting read permission in the result...
Nicolas Prevot [Tue, 16 Sep 2014 15:21:27 +0000 (15:21 +0000)]
am 0c7af463: am aefc884c: am 42a5ad5a: Merge "Granting read permission in the result intent for VIDEO_CAPTURE." into ub-camera-glacier

* commit '0c7af4631f8764c89626f16e47cfe88bb212db0a':

9 years agoam 614e05da: am 458590b6: am 5e3bf4cc: Remove toast. This reverts commit 779414e8bfe2...
Andy Huibers [Tue, 16 Sep 2014 15:21:27 +0000 (15:21 +0000)]
am 614e05da: am 458590b6: am 5e3bf4cc: Remove toast. This reverts commit 779414e8bfe23d66de310570ff2314654e45ec9f.

* commit '614e05da970792a02e11d35f5d0cb519a7b758e8':

9 years agoam 877489aa: am c4f2f4d9: am b954b3e8: Merge "Always match camera orientation with...
Senpo Hu [Tue, 16 Sep 2014 15:21:26 +0000 (15:21 +0000)]
am 877489aa: am c4f2f4d9: am b954b3e8: Merge "Always match camera orientation with device orientation regardless portrait lock." into ub-camera-glacier

* commit '877489aae0927c0038e9d29b79717d6f1e12800a':

9 years agoam 12f408cc: am 7a3bdb23: am 65c00136: Set video quality pref default values at startup.
Senpo Hu [Tue, 16 Sep 2014 15:21:26 +0000 (15:21 +0000)]
am 12f408cc: am 7a3bdb23: am 65c00136: Set video quality pref default values at startup.

* commit '12f408cc7acbdcf6f742841a21166f26e9ce12fc':

9 years agoam 58eb8853: am 420c2c42: Merge "Adjust for camera2 API changes" into lmp-dev
Eino-Ville Talvala [Tue, 16 Sep 2014 15:21:25 +0000 (15:21 +0000)]
am 58eb8853: am 420c2c42: Merge "Adjust for camera2 API changes" into lmp-dev

* commit '58eb8853bc9002dfcb7caf48c251d90070eda5a0':

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Tue, 16 Sep 2014 15:20:49 +0000 (15:20 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev

9 years agoam 38827648: am a82d6ce2: am 0d7a8c08: am 6f1dfe69: Merge "Don\'t set mCameraAppUI...
Puneet Lall [Tue, 16 Sep 2014 09:02:33 +0000 (09:02 +0000)]
am 38827648: am a82d6ce2: am 0d7a8c08: am 6f1dfe69: Merge "Don\'t set mCameraAppUI to null in onDestroy" into ub-camera-glacier

* commit '38827648c2fae431b106c8845bfb7be49d67ecab':
  Don't set mCameraAppUI to null in onDestroy

9 years agoam 023a45e8: am 22173edc: am ad1462a9: am a16219d5: set proper alpha on shutter butto...
Spike Sprague [Tue, 16 Sep 2014 09:02:33 +0000 (09:02 +0000)]
am 023a45e8: am 22173edc: am ad1462a9: am a16219d5: set proper alpha on shutter button on mode switch, eliminates a janky alpha flash

* commit '023a45e82a1cf7486d7a142308f27b5683b9c238':
  set proper alpha on shutter button on mode switch, eliminates a janky alpha flash

9 years agoam a82d6ce2: am 0d7a8c08: am 6f1dfe69: Merge "Don\'t set mCameraAppUI to null in...
Puneet Lall [Tue, 16 Sep 2014 08:48:03 +0000 (08:48 +0000)]
am a82d6ce2: am 0d7a8c08: am 6f1dfe69: Merge "Don\'t set mCameraAppUI to null in onDestroy" into ub-camera-glacier

* commit 'a82d6ce220f6bd972aa24d73642cee503dbbf5f8':
  Don't set mCameraAppUI to null in onDestroy

9 years agoam 22173edc: am ad1462a9: am a16219d5: set proper alpha on shutter button on mode...
Spike Sprague [Tue, 16 Sep 2014 08:48:02 +0000 (08:48 +0000)]
am 22173edc: am ad1462a9: am a16219d5: set proper alpha on shutter button on mode switch, eliminates a janky alpha flash

* commit '22173edc3ebcadfa30de386794cb0a72ad72fbe2':
  set proper alpha on shutter button on mode switch, eliminates a janky alpha flash

9 years agoam 0d7a8c08: am 6f1dfe69: Merge "Don\'t set mCameraAppUI to null in onDestroy" into...
Puneet Lall [Tue, 16 Sep 2014 08:37:44 +0000 (08:37 +0000)]
am 0d7a8c08: am 6f1dfe69: Merge "Don\'t set mCameraAppUI to null in onDestroy" into ub-camera-glacier

* commit '0d7a8c08446f94264870538f76bc0c2846e0dd48':
  Don't set mCameraAppUI to null in onDestroy

9 years agoam ad1462a9: am a16219d5: set proper alpha on shutter button on mode switch, eliminat...
Spike Sprague [Tue, 16 Sep 2014 08:32:18 +0000 (08:32 +0000)]
am ad1462a9: am a16219d5: set proper alpha on shutter button on mode switch, eliminates a janky alpha flash

* commit 'ad1462a9492cdf9e98bb0c94cdd4b6c89e0dd47f':
  set proper alpha on shutter button on mode switch, eliminates a janky alpha flash

9 years agoam 6f1dfe69: Merge "Don\'t set mCameraAppUI to null in onDestroy" into ub-camera...
Puneet Lall [Tue, 16 Sep 2014 08:21:16 +0000 (08:21 +0000)]
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

9 years agoMerge "Don't set mCameraAppUI to null in onDestroy" into ub-camera-glacier
Puneet Lall [Mon, 15 Sep 2014 21:41:55 +0000 (21:41 +0000)]
Merge "Don't set mCameraAppUI to null in onDestroy" into ub-camera-glacier

9 years agoDon't set mCameraAppUI to null in onDestroy
Puneet Lall [Mon, 15 Sep 2014 18:29:59 +0000 (11:29 -0700)]
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

9 years agoam a16219d5: set proper alpha on shutter button on mode switch, eliminates a janky...
Spike Sprague [Mon, 15 Sep 2014 19:26:53 +0000 (19:26 +0000)]
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

9 years agoMerge branch 'lmp-mr1-dev-plus-aosp' of https://googleplex-android.googlesource.com...
bulic [Mon, 15 Sep 2014 18:00:30 +0000 (18:00 +0000)]
Merge branch 'lmp-mr1-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/packages/apps/Camera2 into lmp-mr1-dev-plus-aosp

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 15 Sep 2014 06:11:10 +0000 (23:11 -0700)]
Import translations. DO NOT MERGE

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

9 years agoam 909506d7: am a4d1c140: am 5c56b2c4: am 70a96525: Don\'t send redundant requests...
Puneet Lall [Sat, 13 Sep 2014 02:19:51 +0000 (02:19 +0000)]
am 909506d7: am a4d1c140: am 5c56b2c4: am 70a96525: Don\'t send redundant requests to start the preview

* commit '909506d73801fb0036c076220e7c92cd928d12aa':
  Don't send redundant requests to start the preview

9 years agoam ba677c7e: am b8555b66: am 767a1186: Merge "back to bigger HDR+ icons" into ub...
Spike Sprague [Fri, 12 Sep 2014 23:29:05 +0000 (23:29 +0000)]
am ba677c7e: am b8555b66: am 767a1186: Merge "back to bigger HDR+ icons" into ub-camera-glacier

* commit 'ba677c7e1234ebfa8893eac40281217d7901f05a':

9 years agoam 5d3bebde: keep history after reset to lmp-dev
Baligh Uddin [Fri, 12 Sep 2014 23:29:04 +0000 (23:29 +0000)]
am 5d3bebde: keep history after reset to lmp-dev

* commit '5d3bebdef686cb5af4a765b30bf92ad88230bf45':
  Import translations. DO NOT MERGE

9 years agoam 9a2ff1e8: am 89e485e0: am cdf62f78: am d3ee86b7: Merge "Return to filmstrip when...
Senpo Hu [Fri, 12 Sep 2014 23:06:09 +0000 (23:06 +0000)]
am 9a2ff1e8: am 89e485e0: am cdf62f78: am d3ee86b7: Merge "Return to filmstrip when video playback finishes." into ub-camera-glacier

* commit '9a2ff1e83b45c6ed00a7133a6d701ccb2a7f4a7f':
  Return to filmstrip when video playback finishes.

9 years agoam 4bd2b9b5: (-s ours) am f5cafa5a: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Fri, 12 Sep 2014 23:06:08 +0000 (23:06 +0000)]
am 4bd2b9b5: (-s ours) am f5cafa5a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

* commit '4bd2b9b5c5b55c48e2775e627caf2a7a73722e9a':
  Import translations. DO NOT MERGE

9 years agoset proper alpha on shutter button on mode switch,
Spike Sprague [Fri, 12 Sep 2014 22:01:04 +0000 (15:01 -0700)]
set proper alpha on shutter button on mode switch,
eliminates a janky alpha flash

bug: 17487040

Change-Id: I08e66b5be53e58e9e16d32c09ef50081e90e9284

9 years agoam 87ab720d: am 55e9bf0f: am 3c324d34: am 486ba1da: Revert layout change for Camera
Alan Newberger [Fri, 12 Sep 2014 19:29:00 +0000 (19:29 +0000)]
am 87ab720d: am 55e9bf0f: am 3c324d34: am 486ba1da: Revert layout change for Camera

* commit '87ab720d3ebc5a8da5488bab1b52c317840f36c6':
  Revert layout change for Camera

9 years agoam 3da05094: am 85fb40bc: am 4a7668d7: am ca5173d8: Move launcher icons to mipmap
Alan Newberger [Fri, 12 Sep 2014 19:28:58 +0000 (19:28 +0000)]
am 3da05094: am 85fb40bc: am 4a7668d7: am ca5173d8: Move launcher icons to mipmap

* commit '3da05094f62baa070a39c803fc232122af1d5778':
  Move launcher icons to mipmap

9 years agoam 5c4cb7d0: am 1f58c3d8: am 1bbdb135: am 45f316bc: Establish synchronous camera...
Alan Newberger [Fri, 12 Sep 2014 19:20:16 +0000 (19:20 +0000)]
am 5c4cb7d0: am 1f58c3d8: am 1bbdb135: am 45f316bc: Establish synchronous camera closing when app utilizes API1/API2

* commit '5c4cb7d07af7b9962960ddf342db4ed630452a9f':
  Establish synchronous camera closing when app utilizes API1/API2

9 years agoam a4d1c140: am 5c56b2c4: am 70a96525: Don\'t send redundant requests to start the...
Puneet Lall [Fri, 12 Sep 2014 19:20:09 +0000 (19:20 +0000)]
am a4d1c140: am 5c56b2c4: am 70a96525: Don\'t send redundant requests to start the preview

* commit 'a4d1c14021a2b46597ecbe3bea1d4efb37d205e0':
  Don't send redundant requests to start the preview

9 years agoam cab39e0a: (-s ours) am 95d4d6bc: (-s ours) am f2382657: (-s ours) am 0c5fc1d3...
Baligh Uddin [Fri, 12 Sep 2014 19:17:16 +0000 (19:17 +0000)]
am cab39e0a: (-s ours) am 95d4d6bc: (-s ours) am f2382657: (-s ours) am 0c5fc1d3: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier

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

9 years agoam 96c2fe9d: (-s ours) am 5d5362ef: (-s ours) am 91225f8b: (-s ours) Merge "Import...
Baligh Uddin [Fri, 12 Sep 2014 19:17:15 +0000 (19:17 +0000)]
am 96c2fe9d: (-s ours) am 5d5362ef: (-s ours) am 91225f8b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '96c2fe9d2cde671442b5aa5e6fbc87e4ec9bd108':
  Import translations. DO NOT MERGE

9 years agoam 5c56b2c4: am 70a96525: Don\'t send redundant requests to start the preview
Puneet Lall [Fri, 12 Sep 2014 18:59:44 +0000 (18:59 +0000)]
am 5c56b2c4: am 70a96525: Don\'t send redundant requests to start the preview

* commit '5c56b2c4bf6b31dee65806fcfa67b877657c3975':
  Don't send redundant requests to start the preview

9 years agoam 70a96525: Don\'t send redundant requests to start the preview
Puneet Lall [Fri, 12 Sep 2014 18:02:34 +0000 (18:02 +0000)]
am 70a96525: Don\'t send redundant requests to start the preview

* commit '70a96525f16ca6c6abb9a7a9dab26ba1e61235dd':
  Don't send redundant requests to start the preview

9 years agoam 89e485e0: am cdf62f78: am d3ee86b7: Merge "Return to filmstrip when video playback...
Senpo Hu [Fri, 12 Sep 2014 10:38:08 +0000 (10:38 +0000)]
am 89e485e0: am cdf62f78: am d3ee86b7: Merge "Return to filmstrip when video playback finishes." into ub-camera-glacier

* commit '89e485e0970bce2e1e2ec011738a50090bc6a2ac':
  Return to filmstrip when video playback finishes.

9 years agoam f5cafa5a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Baligh Uddin [Fri, 12 Sep 2014 10:38:08 +0000 (10:38 +0000)]
am f5cafa5a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

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

9 years agoam 55e9bf0f: am 3c324d34: am 486ba1da: Revert layout change for Camera
Alan Newberger [Fri, 12 Sep 2014 08:26:08 +0000 (08:26 +0000)]
am 55e9bf0f: am 3c324d34: am 486ba1da: Revert layout change for Camera

* commit '55e9bf0fe8060bc43bfe5d0f02618cb530ed6596':
  Revert layout change for Camera

9 years agoam 85fb40bc: am 4a7668d7: am ca5173d8: Move launcher icons to mipmap
Alan Newberger [Fri, 12 Sep 2014 08:26:07 +0000 (08:26 +0000)]
am 85fb40bc: am 4a7668d7: am ca5173d8: Move launcher icons to mipmap

* commit '85fb40bc72bdc6e38ecb80e0a74b8285ccd6b0e6':
  Move launcher icons to mipmap

9 years agoam 3c324d34: am 486ba1da: Revert layout change for Camera
Alan Newberger [Fri, 12 Sep 2014 05:07:22 +0000 (05:07 +0000)]
am 3c324d34: am 486ba1da: Revert layout change for Camera

* commit '3c324d34bd0930c615bac32bdb6bbbf7d9cf31c5':
  Revert layout change for Camera

9 years agoam 4a7668d7: am ca5173d8: Move launcher icons to mipmap
Alan Newberger [Fri, 12 Sep 2014 05:07:21 +0000 (05:07 +0000)]
am 4a7668d7: am ca5173d8: Move launcher icons to mipmap

* commit '4a7668d72b2f80e90156bfae4befbe37b10c4d2e':
  Move launcher icons to mipmap

9 years agoDon't send redundant requests to start the preview
Puneet Lall [Fri, 12 Sep 2014 00:33:21 +0000 (17:33 -0700)]
Don't send redundant requests to start the preview

Change-Id: I43d8a2917bbe0140f1e9367cce21f68b19807aa8

9 years agoam 486ba1da: Revert layout change for Camera
Alan Newberger [Fri, 12 Sep 2014 01:46:46 +0000 (01:46 +0000)]
am 486ba1da: Revert layout change for Camera

* commit '486ba1da145f70b07235617e5f1f64186daa0fc0':
  Revert layout change for Camera

9 years agoam ca5173d8: Move launcher icons to mipmap
Alan Newberger [Fri, 12 Sep 2014 01:46:44 +0000 (01:46 +0000)]
am ca5173d8: Move launcher icons to mipmap

* commit 'ca5173d84722383d2d9ef49dd85fba28af035429':
  Move launcher icons to mipmap

9 years agoRevert layout change for Camera
Alan Newberger [Thu, 11 Sep 2014 23:29:20 +0000 (16:29 -0700)]
Revert layout change for Camera

Changing from LAYOUT_FULLSCREEN to FULLSCREEN interferes with layout of
Action Bar.

Bug: 17477202
Change-Id: I029a84adbe4c5017cc8185c5c0c2601a03196bde

9 years agoMove launcher icons to mipmap
Alan Newberger [Thu, 11 Sep 2014 21:39:22 +0000 (14:39 -0700)]
Move launcher icons to mipmap

Bug: 17457682
Change-Id: I6a626c8547f3eea8a06fc47fc70c1a587767b040

9 years agoam 1f58c3d8: am 1bbdb135: am 45f316bc: Establish synchronous camera closing when...
Alan Newberger [Thu, 11 Sep 2014 18:32:25 +0000 (18:32 +0000)]
am 1f58c3d8: am 1bbdb135: am 45f316bc: Establish synchronous camera closing when app utilizes API1/API2

* commit '1f58c3d8ee90a39ee37e480ead1e00d944a24074':
  Establish synchronous camera closing when app utilizes API1/API2

9 years agoam 1bbdb135: am 45f316bc: Establish synchronous camera closing when app utilizes...
Alan Newberger [Thu, 11 Sep 2014 18:01:03 +0000 (18:01 +0000)]
am 1bbdb135: am 45f316bc: Establish synchronous camera closing when app utilizes API1/API2

* commit '1bbdb135f84e0c223bac9ee68e5ef6960e03ae62':
  Establish synchronous camera closing when app utilizes API1/API2

9 years agoam 45f316bc: Establish synchronous camera closing when app utilizes API1/API2
Alan Newberger [Thu, 11 Sep 2014 17:51:52 +0000 (17:51 +0000)]
am 45f316bc: Establish synchronous camera closing when app utilizes API1/API2

* commit '45f316bcecb8713cbb217507981fd657fcdaa274':
  Establish synchronous camera closing when app utilizes API1/API2

9 years agoEstablish synchronous camera closing when app utilizes API1/API2
Alan Newberger [Thu, 11 Sep 2014 17:25:54 +0000 (10:25 -0700)]
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

9 years agoam ac7d02e4: am bc96895d: am d3db7916: am e6ebf3d7: If we are using CaptureModule...
Andy Huibers [Thu, 11 Sep 2014 17:29:55 +0000 (17:29 +0000)]
am ac7d02e4: am bc96895d: am d3db7916: am e6ebf3d7: If we are using CaptureModule for Gcam only, turn off flash.

* commit 'ac7d02e4bb0b650a59733fab324681a47ac9ff3d':
  If we are using CaptureModule for Gcam only, turn off flash.

9 years agoam 6a016780: am 23ccf2e8: am 11d3405c: am 0c9af933: Merge "Revert "Delay PhotoModule...
Alan Newberger [Thu, 11 Sep 2014 17:28:37 +0000 (17:28 +0000)]
am 6a016780: am 23ccf2e8: am 11d3405c: am 0c9af933: Merge "Revert "Delay PhotoModule preview cover removal to address jank"" into ub-camera-glacier

* commit '6a016780ab57b96545c15c2696a9b43a2a9d55ce':
  Revert "Delay PhotoModule preview cover removal to address jank"

9 years agoam a645b993: am e2508ea0: am 73d569d4: am 7351415d: Reset aspect ratio on pause
Alan Newberger [Thu, 11 Sep 2014 17:27:37 +0000 (17:27 +0000)]
am a645b993: am e2508ea0: am 73d569d4: am 7351415d: Reset aspect ratio on pause

* commit 'a645b993b29897026d0bbb9b86a7b42391d96da4':
  Reset aspect ratio on pause

9 years agoam d4b3211d: am cda65018: am ac1dd2f6: am 87a2300f: Merge "workaround fix" into ub...
Spike Sprague [Thu, 11 Sep 2014 17:26:24 +0000 (17:26 +0000)]
am d4b3211d: am cda65018: am ac1dd2f6: am 87a2300f: Merge "workaround fix" into ub-camera-glacier

* commit 'd4b3211d6c3f5d9ce908f2fd68e16cd5d3835b7f':
  workaround fix

9 years agoam 98c7ab3c: am 6743394f: am 3d330a60: am 3096e672: Merge "Delay PhotoModule preview...
Alan Newberger [Thu, 11 Sep 2014 17:26:04 +0000 (17:26 +0000)]
am 98c7ab3c: am 6743394f: am 3d330a60: am 3096e672: Merge "Delay PhotoModule preview cover removal to address jank" into ub-camera-glacier

* commit '98c7ab3c6841589a7ae547fb9afa704e349b1520':
  Delay PhotoModule preview cover removal to address jank

9 years agoam 2454e9b6: am 60226c1f: am cdf62f78: am d3ee86b7: Merge "Return to filmstrip when...
Senpo Hu [Thu, 11 Sep 2014 17:25:40 +0000 (17:25 +0000)]
am 2454e9b6: am 60226c1f: am cdf62f78: am d3ee86b7: Merge "Return to filmstrip when video playback finishes." into ub-camera-glacier

* commit '2454e9b65b164624883f7b8874154b52a73d64e9':
  Return to filmstrip when video playback finishes.

9 years agoam 917aa5f3: am c03da30a: am dcf60eea: am 5675b8af: Fix the upside-down orienation...
Senpo Hu [Thu, 11 Sep 2014 17:25:17 +0000 (17:25 +0000)]
am 917aa5f3: am c03da30a: am dcf60eea: am 5675b8af: Fix the upside-down orienation bug in CaptureModule.

* commit '917aa5f359bcfa7955be5af6f6c034acde15fc64':
  Fix the upside-down orienation bug in CaptureModule.

9 years agoam 0e1adc06: am 4fb8cfb6: am 45090bab: am d79b38d6: Merge "Remove jank on camera...
Alan Newberger [Thu, 11 Sep 2014 17:23:40 +0000 (17:23 +0000)]
am 0e1adc06: am 4fb8cfb6: am 45090bab: am d79b38d6: Merge "Remove jank on camera options switching" into ub-camera-glacier

* commit '0e1adc061bfd635896c0856660c1c0f3b7004ba5':
  Remove jank on camera options switching

9 years agoam c558a866: am f06952f8: am d7a4c3e2: am 9cefdd49: Changed double to float. viewFind...
Jiawen Chen [Thu, 11 Sep 2014 17:23:40 +0000 (17:23 +0000)]
am c558a866: am f06952f8: am d7a4c3e2: am 9cefdd49: Changed double to float. viewFinder -> viewfinder.

* commit 'c558a866abb327773a9801addab0fea910617a59':
  Changed double to float. viewFinder -> viewfinder.

9 years agoam 38968eb2: am 54434532: am 0a156cf6: am ffc395d6: Reinitialize shutter button in...
Alan Newberger [Thu, 11 Sep 2014 17:22:46 +0000 (17:22 +0000)]
am 38968eb2: am 54434532: am 0a156cf6: am ffc395d6: Reinitialize shutter button in Camera mode upon preview start

* commit '38968eb27f927667167d3533b940d12d97113cf9':
  Reinitialize shutter button in Camera mode upon preview start

9 years agoam 95d4d6bc: (-s ours) am f2382657: (-s ours) am 0c5fc1d3: (-s ours) Merge "Import...
Baligh Uddin [Thu, 11 Sep 2014 16:12:35 +0000 (16:12 +0000)]
am 95d4d6bc: (-s ours) am f2382657: (-s ours) am 0c5fc1d3: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier

* commit '95d4d6bc9b095ef61930ceaf7b9c0a8107b4112d':
  Import translations. DO NOT MERGE

9 years agoam 5d5362ef: (-s ours) am 91225f8b: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Thu, 11 Sep 2014 16:12:34 +0000 (16:12 +0000)]
am 5d5362ef: (-s ours) am 91225f8b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '5d5362ef5fe47dae6f4ecd43a83b57d5c8b8e31a':
  Import translations. DO NOT MERGE

9 years agoam f2382657: (-s ours) am 0c5fc1d3: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Thu, 11 Sep 2014 16:06:18 +0000 (16:06 +0000)]
am f2382657: (-s ours) am 0c5fc1d3: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier

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

9 years agoam 91225f8b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Thu, 11 Sep 2014 16:02:34 +0000 (16:02 +0000)]
am 91225f8b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '91225f8b7d51be3f2ca8c187de70e775551b3ce4':
  Import translations. DO NOT MERGE

9 years agoam 0c5fc1d3: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
Baligh Uddin [Thu, 11 Sep 2014 15:58:23 +0000 (15:58 +0000)]
am 0c5fc1d3: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier

* commit '0c5fc1d311eaa82dff09cee6332140fda21d473e':
  Import translations. DO NOT MERGE

9 years agoam cdf62f78: am d3ee86b7: Merge "Return to filmstrip when video playback finishes...
Senpo Hu [Thu, 11 Sep 2014 15:57:42 +0000 (15:57 +0000)]
am cdf62f78: am d3ee86b7: Merge "Return to filmstrip when video playback finishes." into ub-camera-glacier

* commit 'cdf62f7876cbf24fd8a645a95d1948e65c33c88b':
  Return to filmstrip when video playback finishes.

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Thu, 11 Sep 2014 15:49:05 +0000 (15:49 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Baligh Uddin [Thu, 11 Sep 2014 15:49:04 +0000 (15:49 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

9 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 11 Sep 2014 15:49:02 +0000 (15:49 +0000)]
Merge "Import translations. DO NOT MERGE"