git.osdn.net Git - android-x86/packages-apps-Camera2.git/log

(root) / android-x86 / packages-apps-Camera2.git / log

Alan Newberger [Tue, 23 Sep 2014 02:14:46 +0000 (02:14 +0000)]

am b3c72147: am 34920701: am 8f1ffed7: am b2b0e02c: Clean up unused code

* commit 'b3c7214788b78af1366417d0acef2245745b18af':
Clean up unused code

commit | commitdiff | tree

Alan Newberger [Tue, 23 Sep 2014 00:53:41 +0000 (00:53 +0000)]

am 34920701: am 8f1ffed7: am b2b0e02c: Clean up unused code

* commit '349207016a09a174c6a4a8c5b2698cdd11145183':
Clean up unused code

commit | commitdiff | tree

Alan Newberger [Tue, 23 Sep 2014 00:44:42 +0000 (00:44 +0000)]

am 8f1ffed7: am b2b0e02c: Clean up unused code

* commit '8f1ffed79db5d7e17f56501b5d62157846fb55bd':
Clean up unused code

commit | commitdiff | tree

Alan Newberger [Tue, 23 Sep 2014 00:35:30 +0000 (00:35 +0000)]

am b2b0e02c: Clean up unused code

* commit 'b2b0e02cb5f0aba8fed9389193fa98150da75efc':
Clean up unused code

commit | commitdiff | tree

Alan Newberger [Mon, 22 Sep 2014 19:05:56 +0000 (12:05 -0700)]

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

commit | commitdiff | tree

Baligh Uddin [Fri, 19 Sep 2014 23:18:28 +0000 (23:18 +0000)]

am 8399a0c5: (-s ours) am 67bcd21a: (-s ours) am 82da5e95: (-s ours) am 02758e4c: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier

* commit '8399a0c584316d499b191b6ab9764faa38a289b2':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Fri, 19 Sep 2014 23:03:13 +0000 (23:03 +0000)]

am 67bcd21a: (-s ours) am 82da5e95: (-s ours) am 02758e4c: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier

* commit '67bcd21a8245e4f478dd581085902a644dfeacdf':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Jiawen Chen [Fri, 19 Sep 2014 22:57:33 +0000 (22:57 +0000)]

am 8867d3d0: am 5b88b83a: am 284a9b48: am 30ae8c64: Merge "Changed tap-to-meter rectangle and weights." into ub-camera-glacier

* commit '8867d3d04af805ce9b7b54ddb2cb81a6467ab1d9':
Changed tap-to-meter rectangle and weights.

commit | commitdiff | tree

Baligh Uddin [Fri, 19 Sep 2014 22:57:32 +0000 (22:57 +0000)]

am dc3d4642: (-s ours) am 5628cfde: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

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

commit | commitdiff | tree

Baligh Uddin [Fri, 19 Sep 2014 22:54:21 +0000 (22:54 +0000)]

am 82da5e95: (-s ours) am 02758e4c: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier

* commit '82da5e9543cf97c5e25a78b90ae94ea9cb32f5ee':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Jiawen Chen [Fri, 19 Sep 2014 22:47:40 +0000 (22:47 +0000)]

am 5b88b83a: am 284a9b48: am 30ae8c64: Merge "Changed tap-to-meter rectangle and weights." into ub-camera-glacier

* commit '5b88b83ac82974c0b80343175c29644d226ee772':
Changed tap-to-meter rectangle and weights.

commit | commitdiff | tree

Baligh Uddin [Fri, 19 Sep 2014 22:47:40 +0000 (22:47 +0000)]

am 5628cfde: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

* commit '5628cfde3c815fdfd6814be94c536dedd69e79e9':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Fri, 19 Sep 2014 22:43:59 +0000 (22:43 +0000)]

am 02758e4c: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier

* commit '02758e4c60ea1ff5a78c6d7d8d77ee353a2bf6f5':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Jiawen Chen [Fri, 19 Sep 2014 22:42:45 +0000 (22:42 +0000)]

am 284a9b48: am 30ae8c64: Merge "Changed tap-to-meter rectangle and weights." into ub-camera-glacier

* commit '284a9b48c896d4435362e7f757885b47ff748a1b':
Changed tap-to-meter rectangle and weights.

commit | commitdiff | tree

Baligh Uddin [Fri, 19 Sep 2014 22:33:41 +0000 (22:33 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

commit | commitdiff | tree

Baligh Uddin [Fri, 19 Sep 2014 22:33:35 +0000 (22:33 +0000)]

Merge "Import translations. DO NOT MERGE" into ub-camera-glacier

commit | commitdiff | tree

Jiawen Chen [Fri, 19 Sep 2014 22:28:39 +0000 (22:28 +0000)]

am 30ae8c64: Merge "Changed tap-to-meter rectangle and weights." into ub-camera-glacier

* commit '30ae8c64cec9313fc050daf94ae3fbddedf80b36':
Changed tap-to-meter rectangle and weights.

commit | commitdiff | tree

Jiawen Chen [Fri, 19 Sep 2014 22:17:29 +0000 (22:17 +0000)]

Merge "Changed tap-to-meter rectangle and weights." into ub-camera-glacier

commit | commitdiff | tree

Alan Newberger [Fri, 19 Sep 2014 21:36:03 +0000 (21:36 +0000)]

am 0d4ad844: am 14f9d310: am 40b52050: am e684ea54: Merge "Fix CameraSettingsActivityHelper" into ub-camera-glacier

* commit '0d4ad84475bc930a7303df8f2fa29eacdbb148aa':
Fix CameraSettingsActivityHelper

commit | commitdiff | tree

Spike Sprague [Fri, 19 Sep 2014 21:36:02 +0000 (21:36 +0000)]

am a34f0972: am 545c313a: am 94cd6522: am 19942a17: Merge "implement new trash icon, plus some asset cleanup" into ub-camera-glacier

* commit 'a34f0972185ee99ad34d9828ae5b4ada2bf9f5cd':
implement new trash icon, plus some asset cleanup

commit | commitdiff | tree

Alan Newberger [Fri, 19 Sep 2014 21:27:03 +0000 (21:27 +0000)]

am 14f9d310: am 40b52050: am e684ea54: Merge "Fix CameraSettingsActivityHelper" into ub-camera-glacier

* commit '14f9d3102161b59b46988cd6bfd48ff3b2a6aa7a':
Fix CameraSettingsActivityHelper

commit | commitdiff | tree

Spike Sprague [Fri, 19 Sep 2014 21:27:02 +0000 (21:27 +0000)]

am 545c313a: am 94cd6522: am 19942a17: Merge "implement new trash icon, plus some asset cleanup" into ub-camera-glacier

* commit '545c313a87e04b6a66888359144dbe91e7e62311':
implement new trash icon, plus some asset cleanup

commit | commitdiff | tree

Alan Newberger [Fri, 19 Sep 2014 21:14:45 +0000 (21:14 +0000)]

am 40b52050: am e684ea54: Merge "Fix CameraSettingsActivityHelper" into ub-camera-glacier

* commit '40b52050078c664295b7bb830110587e64119bbb':
Fix CameraSettingsActivityHelper

commit | commitdiff | tree

Spike Sprague [Fri, 19 Sep 2014 21:14:44 +0000 (21:14 +0000)]

am 94cd6522: am 19942a17: Merge "implement new trash icon, plus some asset cleanup" into ub-camera-glacier

* commit '94cd65226208eed1b9f350d0b8f5e8b82fa39290':
implement new trash icon, plus some asset cleanup

commit | commitdiff | tree

Alan Newberger [Fri, 19 Sep 2014 21:03:32 +0000 (21:03 +0000)]

am e684ea54: Merge "Fix CameraSettingsActivityHelper" into ub-camera-glacier

* commit 'e684ea54121ef885a0aa84cd3bea50c5a345d55e':
Fix CameraSettingsActivityHelper

commit | commitdiff | tree

Spike Sprague [Fri, 19 Sep 2014 21:03:31 +0000 (21:03 +0000)]

am 19942a17: Merge "implement new trash icon, plus some asset cleanup" into ub-camera-glacier

* commit '19942a171844d6bd361026a6b8df2eebaa0661db':
implement new trash icon, plus some asset cleanup

commit | commitdiff | tree

Alan Newberger [Fri, 19 Sep 2014 20:59:46 +0000 (20:59 +0000)]

Merge "Fix CameraSettingsActivityHelper" into ub-camera-glacier

commit | commitdiff | tree

Spike Sprague [Fri, 19 Sep 2014 20:54:55 +0000 (20:54 +0000)]

Merge "implement new trash icon, plus some asset cleanup" into ub-camera-glacier

commit | commitdiff | tree

Spike Sprague [Fri, 19 Sep 2014 20:08:23 +0000 (20:08 +0000)]

am 028374b4: am 7a133b82: am baae9e84: am 8bbb5122: Merge "add null check to updateCameraParametersPreferences to apease the monkey" into ub-camera-glacier

* commit '028374b4a75decc2a31740dabcfc338fd74d2b54':
add null check to updateCameraParametersPreferences to apease the monkey

commit | commitdiff | tree

Spike Sprague [Fri, 19 Sep 2014 19:57:07 +0000 (19:57 +0000)]

am 7a133b82: am baae9e84: am 8bbb5122: Merge "add null check to updateCameraParametersPreferences to apease the monkey" into ub-camera-glacier

* commit '7a133b82a571188d56a4aa8b7773af5dffa11f6f':
add null check to updateCameraParametersPreferences to apease the monkey

commit | commitdiff | tree

Spike Sprague [Fri, 19 Sep 2014 19:32:08 +0000 (19:32 +0000)]

am baae9e84: am 8bbb5122: Merge "add null check to updateCameraParametersPreferences to apease the monkey" into ub-camera-glacier

* commit 'baae9e8478990258edc7e6d014a68e0796859de9':
add null check to updateCameraParametersPreferences to apease the monkey

commit | commitdiff | tree

Spike Sprague [Fri, 19 Sep 2014 18:30:27 +0000 (18:30 +0000)]

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

commit | commitdiff | tree

Spike Sprague [Fri, 19 Sep 2014 18:22:56 +0000 (18:22 +0000)]

Merge "add null check to updateCameraParametersPreferences to apease the monkey" into ub-camera-glacier

commit | commitdiff | tree

Spike Sprague [Fri, 19 Sep 2014 18:18:46 +0000 (11:18 -0700)]

add null check to updateCameraParametersPreferences to apease the monkey

bug: 17580046
Change-Id: I4a109c1134684f6d5b2dafdb138137ef36f208f0

commit | commitdiff | tree

Spike Sprague [Fri, 19 Sep 2014 08:41:49 +0000 (08:41 +0000)]

am a87a589c: am 3c1f4c48: am 476a9e24: am 963775c3: portability layer doesn\'t work well with startPreviewWithCallback() here\'s a dirty dirty workaround.

* commit 'a87a589c25dd95d4606ac6dba5f38aee11c0c2b2':
portability layer doesn't work well with startPreviewWithCallback() here's a dirty dirty workaround.

commit | commitdiff | tree

Spike Sprague [Fri, 19 Sep 2014 06:48:59 +0000 (06:48 +0000)]

am 3c1f4c48: am 476a9e24: am 963775c3: portability layer doesn\'t work well with startPreviewWithCallback() here\'s a dirty dirty workaround.

* commit '3c1f4c48c69d8946d2ff65bf4b30e48e8124fded':
portability layer doesn't work well with startPreviewWithCallback() here's a dirty dirty workaround.

commit | commitdiff | tree

Spike Sprague [Fri, 19 Sep 2014 06:38:51 +0000 (06:38 +0000)]

am 476a9e24: am 963775c3: portability layer doesn\'t work well with startPreviewWithCallback() here\'s a dirty dirty workaround.

* commit '476a9e2490d91a125fc608d4e4b4b31768b65ee7':
portability layer doesn't work well with startPreviewWithCallback() here's a dirty dirty workaround.

commit | commitdiff | tree

Spike Sprague [Fri, 19 Sep 2014 06:19:18 +0000 (06:19 +0000)]

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.

commit | commitdiff | tree

Spike Sprague [Fri, 19 Sep 2014 02:44:07 +0000 (19:44 -0700)]

portability layer doesn't work well with startPreviewWithCallback()
here's a dirty dirty workaround.

bug: 17576554
Change-Id: Ief40b65ce49712153f6ef604a3513348e493d4d9

commit | commitdiff | tree

Spike Sprague [Thu, 18 Sep 2014 20:44:08 +0000 (20:44 +0000)]

am 3194f409: am f18e95bc: am af25fb04: am 3c3b31df: mode switch jank fixes

* commit '3194f4099bd441629242d52a6ff9f1974cf9cce2':
mode switch jank fixes

commit | commitdiff | tree

Spike Sprague [Thu, 18 Sep 2014 20:34:07 +0000 (20:34 +0000)]

am f18e95bc: am af25fb04: am 3c3b31df: mode switch jank fixes

* commit 'f18e95bc5548f9c05e4debd47d43cc9d2be0655d':
mode switch jank fixes

commit | commitdiff | tree

Spike Sprague [Thu, 18 Sep 2014 20:20:46 +0000 (20:20 +0000)]

am af25fb04: am 3c3b31df: mode switch jank fixes

* commit 'af25fb04968d9212ec47367f6ba78ee20ca76d05':
mode switch jank fixes

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Spike Sprague [Thu, 18 Sep 2014 17:52:35 +0000 (10:52 -0700)]

implement new trash icon, plus some asset cleanup

bug: 17566685
Change-Id: Ia7b55ad3b6fed939c19abcde12cbf34726ba919c

commit | commitdiff | tree

Jiawen Chen [Wed, 17 Sep 2014 00:05:37 +0000 (17:05 -0700)]

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

commit | commitdiff | tree

Baligh Uddin [Wed, 17 Sep 2014 04:45:54 +0000 (21:45 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Wed, 17 Sep 2014 04:43:27 +0000 (21:43 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Alan Newberger [Wed, 17 Sep 2014 03:54:56 +0000 (20:54 -0700)]

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

commit | commitdiff | tree

Baligh Uddin [Tue, 16 Sep 2014 17:06:23 +0000 (17:06 +0000)]

am d40843f2: (-s ours) am 56d1c6bd: (-s ours) am 9a275f5e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

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

commit | commitdiff | tree

Puneet Lall [Tue, 16 Sep 2014 17:06:22 +0000 (17:06 +0000)]

am dfa43009: am b99765c2: am 0d7a8c08: am 6f1dfe69: Merge "Don\'t set mCameraAppUI to null in onDestroy" into ub-camera-glacier

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

commit | commitdiff | tree

Spike Sprague [Tue, 16 Sep 2014 17:06:22 +0000 (17:06 +0000)]

am d9532ea7: am 778c50fc: am ad1462a9: am a16219d5: set proper alpha on shutter button on mode switch, eliminates a janky alpha flash

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

commit | commitdiff | tree

Baligh Uddin [Tue, 16 Sep 2014 16:50:34 +0000 (16:50 +0000)]

am 56d1c6bd: (-s ours) am 9a275f5e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '56d1c6bdbf75d851078a08b755d7895c70b6b053':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Puneet Lall [Tue, 16 Sep 2014 16:46:45 +0000 (16:46 +0000)]

am b99765c2: am 0d7a8c08: am 6f1dfe69: Merge "Don\'t set mCameraAppUI to null in onDestroy" into ub-camera-glacier

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

commit | commitdiff | tree

Spike Sprague [Tue, 16 Sep 2014 16:46:44 +0000 (16:46 +0000)]

am 778c50fc: am ad1462a9: am a16219d5: set proper alpha on shutter button on mode switch, eliminates a janky alpha flash

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

commit | commitdiff | tree

Baligh Uddin [Tue, 16 Sep 2014 15:32:08 +0000 (15:32 +0000)]

am 9a275f5e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

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

commit | commitdiff | tree

Baligh Uddin [Tue, 16 Sep 2014 15:20:49 +0000 (15:20 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-dev

commit | commitdiff | tree

Puneet Lall [Tue, 16 Sep 2014 08:36:05 +0000 (08:36 +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

commit | commitdiff | tree

Spike Sprague [Tue, 16 Sep 2014 08:32:02 +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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Puneet Lall [Sat, 13 Sep 2014 03:31:27 +0000 (03:31 +0000)]

am a072e605: am 7aa59807: am 5c56b2c4: am 70a96525: Don\'t send redundant requests to start the preview

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

commit | commitdiff | tree

Alan Newberger [Fri, 12 Sep 2014 23:10:15 +0000 (23:10 +0000)]

am 4a3de2cf: am 5677bb5e: am 3c324d34: am 486ba1da: Revert layout change for Camera

* commit '4a3de2cfd992bfee6d44fb88bd1cdcc293e8e39f':
Revert layout change for Camera

commit | commitdiff | tree

Alan Newberger [Fri, 12 Sep 2014 23:10:10 +0000 (23:10 +0000)]

am de156744: am 30969a92: am 4a7668d7: am ca5173d8: Move launcher icons to mipmap

* commit 'de156744855520e0187f978cfb95bc879547bfb0':
Move launcher icons to mipmap

commit | commitdiff | tree

Alan Newberger [Fri, 12 Sep 2014 23:06:13 +0000 (23:06 +0000)]

am 1da8d800: am 5e8d579a: am 1bbdb135: am 45f316bc: Establish synchronous camera closing when app utilizes API1/API2

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

commit | commitdiff | tree

Baligh Uddin [Fri, 12 Sep 2014 23:06:12 +0000 (23:06 +0000)]

am 25361e3f: (-s ours) am 522466e6: (-s ours) am f2382657: (-s ours) am 0c5fc1d3: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier

* commit '25361e3f3451bd92daed383fc8338f807cb862d7':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Fri, 12 Sep 2014 23:06:12 +0000 (23:06 +0000)]

am 0f1acda2: (-s ours) am 03b392d9: (-s ours) am 91225f8b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

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

commit | commitdiff | tree

Andy Huibers [Fri, 12 Sep 2014 23:06:11 +0000 (23:06 +0000)]

am 29eae70b: am 02a24bc0: am d3db7916: am e6ebf3d7: If we are using CaptureModule for Gcam only, turn off flash.

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

commit | commitdiff | tree

Alan Newberger [Fri, 12 Sep 2014 23:06:11 +0000 (23:06 +0000)]

am 74b1d995: am 893acd56: am 11d3405c: am 0c9af933: Merge "Revert "Delay PhotoModule preview cover removal to address jank"" into ub-camera-glacier

* commit '74b1d99566bac77d698c19d5a7b5e9017df2867e':
Revert "Delay PhotoModule preview cover removal to address jank"

commit | commitdiff | tree

Alan Newberger [Fri, 12 Sep 2014 23:06:10 +0000 (23:06 +0000)]

am 168ca8e3: am c0e5cc1e: am 73d569d4: am 7351415d: Reset aspect ratio on pause

* commit '168ca8e31f6ad8e10797fca5d9bce75e13784b11':
Reset aspect ratio on pause

commit | commitdiff | tree

Spike Sprague [Fri, 12 Sep 2014 23:06:10 +0000 (23:06 +0000)]

am 925b1a0c: am cfaa646d: am ac1dd2f6: am 87a2300f: Merge "workaround fix" into ub-camera-glacier

* commit '925b1a0c718fbba459cc9c4d494613c718ee0225':
workaround fix

commit | commitdiff | tree

Alan Newberger [Fri, 12 Sep 2014 23:06:09 +0000 (23:06 +0000)]

am 219d86fa: am 3861e387: am 3d330a60: am 3096e672: Merge "Delay PhotoModule preview cover removal to address jank" into ub-camera-glacier

* commit '219d86faf1f03d0614d73c8a0e3ca334e4c22a9b':
Delay PhotoModule preview cover removal to address jank

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Puneet Lall [Fri, 12 Sep 2014 19:19:44 +0000 (19:19 +0000)]

am 7aa59807: am 5c56b2c4: am 70a96525: Don\'t send redundant requests to start the preview

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

commit | commitdiff | tree

Puneet Lall [Fri, 12 Sep 2014 18:59:58 +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

commit | commitdiff | tree

Alan Newberger [Fri, 12 Sep 2014 18:56:29 +0000 (18:56 +0000)]

am 5677bb5e: am 3c324d34: am 486ba1da: Revert layout change for Camera

* commit '5677bb5e9602de252f51687397fec4345638e7f9':
Revert layout change for Camera

commit | commitdiff | tree

Alan Newberger [Fri, 12 Sep 2014 18:56:28 +0000 (18:56 +0000)]

am 30969a92: am 4a7668d7: am ca5173d8: Move launcher icons to mipmap

* commit '30969a926cfecacb6ef151a6adf90f6ea2fb1a5a':
Move launcher icons to mipmap

commit | commitdiff | tree

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

commit | commitdiff | tree

Alan Newberger [Fri, 12 Sep 2014 10:38:13 +0000 (10:38 +0000)]

am 5e8d579a: am 1bbdb135: am 45f316bc: Establish synchronous camera closing when app utilizes API1/API2

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

commit | commitdiff | tree

Baligh Uddin [Fri, 12 Sep 2014 10:38:12 +0000 (10:38 +0000)]

am 522466e6: (-s ours) am f2382657: (-s ours) am 0c5fc1d3: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier

* commit '522466e6a32a83b81d988e14c6ddb8b0a37f19ad':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Fri, 12 Sep 2014 10:38:12 +0000 (10:38 +0000)]

am 03b392d9: (-s ours) am 91225f8b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '03b392d9ba5423c0b77e2f872dad5e8ede9086ae':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Andy Huibers [Fri, 12 Sep 2014 10:38:11 +0000 (10:38 +0000)]

am 02a24bc0: am d3db7916: am e6ebf3d7: If we are using CaptureModule for Gcam only, turn off flash.

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

commit | commitdiff | tree

Alan Newberger [Fri, 12 Sep 2014 10:38:10 +0000 (10:38 +0000)]

am 893acd56: am 11d3405c: am 0c9af933: Merge "Revert "Delay PhotoModule preview cover removal to address jank"" into ub-camera-glacier

* commit '893acd56c4a2e55f9c533bce80cc1f1eb19ee171':
Revert "Delay PhotoModule preview cover removal to address jank"

commit | commitdiff | tree

Alan Newberger [Fri, 12 Sep 2014 10:38:10 +0000 (10:38 +0000)]

am c0e5cc1e: am 73d569d4: am 7351415d: Reset aspect ratio on pause

* commit 'c0e5cc1eb3dbde021713c8d78b3ff039d8d4bd15':
Reset aspect ratio on pause

commit | commitdiff | tree

Spike Sprague [Fri, 12 Sep 2014 10:38:09 +0000 (10:38 +0000)]

am cfaa646d: am ac1dd2f6: am 87a2300f: Merge "workaround fix" into ub-camera-glacier

* commit 'cfaa646d2c3b3cf45df6faf7354b9bf461935fbe':
workaround fix

commit | commitdiff | tree

Alan Newberger [Fri, 12 Sep 2014 10:38:09 +0000 (10:38 +0000)]

am 3861e387: am 3d330a60: am 3096e672: Merge "Delay PhotoModule preview cover removal to address jank" into ub-camera-glacier

* commit '3861e38769d06057910a2219562916e172d8caef':
Delay PhotoModule preview cover removal to address jank

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

Alan Newberger [Fri, 12 Sep 2014 07:26:55 +0000 (07:26 +0000)]

am 3c324d34: am 486ba1da: Revert layout change for Camera

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

commit | commitdiff | tree

Alan Newberger [Fri, 12 Sep 2014 07:26:54 +0000 (07:26 +0000)]

am 4a7668d7: am ca5173d8: Move launcher icons to mipmap

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Alan Newberger [Thu, 11 Sep 2014 21:39:22 +0000 (14:39 -0700)]

Move launcher icons to mipmap

Bug: 17457682
Change-Id: I6a626c8547f3eea8a06fc47fc70c1a587767b040

packages/apps/Camera2

RSS Atom

About OSDN

Find Software

Develop Software

Help