OSDN Git Service

android-x86/packages-apps-Camera2.git
10 years agoam 1e5baa47: am 0f7d5488: Revert fixed focus area in CAF mode
Michael Kolb [Tue, 3 Dec 2013 18:13:28 +0000 (10:13 -0800)]
am 1e5baa47: am 0f7d5488: Revert fixed focus area in CAF mode

* commit '1e5baa473c233f7b4bd1568d5047c20533e4ce59':
  Revert fixed focus area in CAF mode

10 years agoam 0f7d5488: Revert fixed focus area in CAF mode
Michael Kolb [Tue, 3 Dec 2013 18:10:46 +0000 (10:10 -0800)]
am 0f7d5488: Revert fixed focus area in CAF mode

* commit '0f7d5488d33988c1ee3636fe3a7d6472bed84f00':
  Revert fixed focus area in CAF mode

10 years agoRevert fixed focus area in CAF mode
Michael Kolb [Thu, 11 Jul 2013 20:48:15 +0000 (13:48 -0700)]
Revert fixed focus area in CAF mode

  Bug: 9306098

This doesn't set the faces as focus/exp areas yet, but resets the focus area to null
in CAF mode to let the HAL decide focus/exp area.

Cherrypick of Bryce CL into Carlsbad.

Change-Id: I38e31937f64ecdb23d6c79f96040c46652d1d7d0

Conflicts:
src/com/android/camera/FocusOverlayManager.java

10 years agoam a3b92891: am 0d5505dd: Merge "Add another HTC picture resolution" into gb-ub-photo...
Alan Newberger [Tue, 3 Dec 2013 17:35:47 +0000 (09:35 -0800)]
am a3b92891: am 0d5505dd: Merge "Add another HTC picture resolution" into gb-ub-photos-carlsbad

* commit 'a3b928919285fbe31a1201cb0b56336a3909cb4f':
  Add another HTC picture resolution

10 years agoam 0d5505dd: Merge "Add another HTC picture resolution" into gb-ub-photos-carlsbad
Alan Newberger [Tue, 3 Dec 2013 17:31:25 +0000 (09:31 -0800)]
am 0d5505dd: Merge "Add another HTC picture resolution" into gb-ub-photos-carlsbad

* commit '0d5505dd1a3bf297677161c4c6608c783d7a2b68':
  Add another HTC picture resolution

10 years agoMerge "Add another HTC picture resolution" into gb-ub-photos-carlsbad
Alan Newberger [Tue, 3 Dec 2013 17:27:25 +0000 (17:27 +0000)]
Merge "Add another HTC picture resolution" into gb-ub-photos-carlsbad

10 years agoAdd another HTC picture resolution
Michael Kolb [Wed, 12 Jun 2013 18:57:45 +0000 (11:57 -0700)]
Add another HTC picture resolution

patching into Carlsbad branch from Bryce

  Bug: 9370319

Change-Id: I9b2c45b98c7075fda7289707f1e290fcefc084cc

Conflicts:
res/values/strings.xml

10 years agoam 8850f6d8: am 7993f452: Always set focus mode first before applying scene mode
Michael Kolb [Mon, 2 Dec 2013 23:54:53 +0000 (15:54 -0800)]
am 8850f6d8: am 7993f452: Always set focus mode first before applying scene mode

* commit '8850f6d8bf69f6415e7e38448f8ef33824ac67cf':
  Always set focus mode first before applying scene mode

10 years agoam 7993f452: Always set focus mode first before applying scene mode
Michael Kolb [Mon, 2 Dec 2013 23:52:44 +0000 (15:52 -0800)]
am 7993f452: Always set focus mode first before applying scene mode

* commit '7993f4521011869a794da69e4d0057fe3b0886c3':
  Always set focus mode first before applying scene mode

10 years agoAlways set focus mode first before applying scene mode
Michael Kolb [Fri, 12 Jul 2013 18:36:47 +0000 (11:36 -0700)]
Always set focus mode first before applying scene mode

cherrypick from Bryce branch

  Bug: 9577903
  Bug: 11777611

Change-Id: I2c300e443a47c7bc0c20f6aaec6f6e4b6c238880

10 years agoam 3a46bed6: am 88f9b3e7: Reduce logging of flattened Preferences
Seth Raphael [Thu, 28 Nov 2013 01:43:36 +0000 (17:43 -0800)]
am 3a46bed6: am 88f9b3e7: Reduce logging of flattened Preferences

* commit '3a46bed61f9b64d2b252909563caecfd811dd691':
  Reduce logging of flattened Preferences

10 years agoam 88f9b3e7: Reduce logging of flattened Preferences
Seth Raphael [Thu, 28 Nov 2013 01:40:56 +0000 (17:40 -0800)]
am 88f9b3e7: Reduce logging of flattened Preferences

* commit '88f9b3e75c313d181c49ac644930627c40b2138d':
  Reduce logging of flattened Preferences

10 years agoReduce logging of flattened Preferences
Seth Raphael [Wed, 27 Nov 2013 22:29:24 +0000 (14:29 -0800)]
Reduce logging of flattened Preferences

Bug: 11901390

Change-Id: I9f2e27e769fd745be01bb2c12a7f07b45aa0b905

10 years agoam 3e44cad5: (-s ours) am adf70222: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 25 Nov 2013 21:11:21 +0000 (13:11 -0800)]
am 3e44cad5: (-s ours) am adf70222: (-s ours) Import translations. DO NOT MERGE

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

10 years agoam adf70222: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 25 Nov 2013 21:08:34 +0000 (13:08 -0800)]
am adf70222: (-s ours) Import translations. DO NOT MERGE

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

10 years agoam 7191c955: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 25 Nov 2013 21:02:53 +0000 (13:02 -0800)]
am 7191c955: (-s ours) Import translations. DO NOT MERGE

* commit '7191c9558e22e81bdbaf34411bebe92d32eacfbb':
  Import translations. DO NOT MERGE

10 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 25 Nov 2013 19:54:26 +0000 (11:54 -0800)]
Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 25 Nov 2013 19:53:21 +0000 (11:53 -0800)]
Import translations. DO NOT MERGE

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

10 years agoam 98578f40: (-s ours) am 18eb2e4e: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Fri, 22 Nov 2013 01:30:10 +0000 (17:30 -0800)]
am 98578f40: (-s ours) am 18eb2e4e: (-s ours) Import translations. DO NOT MERGE

* commit '98578f40ad99bf6ed2c094f7eccb5682e51b71af':
  Import translations. DO NOT MERGE

10 years agoam 18eb2e4e: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Fri, 22 Nov 2013 01:23:51 +0000 (17:23 -0800)]
am 18eb2e4e: (-s ours) Import translations. DO NOT MERGE

* commit '18eb2e4e7f35a5dfbeea6e3c64b612769bb31293':
  Import translations. DO NOT MERGE

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 22 Nov 2013 00:41:27 +0000 (16:41 -0800)]
Import translations. DO NOT MERGE

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

10 years agoam ae13f34c: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Wed, 20 Nov 2013 21:15:26 +0000 (13:15 -0800)]
am ae13f34c: (-s ours) Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 20 Nov 2013 19:53:49 +0000 (11:53 -0800)]
Import translations. DO NOT MERGE

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

10 years agoam 6cff6768: am 7dc6e97c: Delay onResume tasks to speed up lockscreen onResume->onPau...
Andy Huibers [Wed, 20 Nov 2013 06:50:55 +0000 (22:50 -0800)]
am 6cff6768: am 7dc6e97c: Delay onResume tasks to speed up lockscreen onResume->onPause->onResume launch sequence.

* commit '6cff67680ec985520b1a4e8fd5ddaa5f682f303d':
  Delay onResume tasks to speed up lockscreen onResume->onPause->onResume launch sequence.

10 years agoam 7dc6e97c: Delay onResume tasks to speed up lockscreen onResume->onPause->onResume...
Andy Huibers [Wed, 20 Nov 2013 06:48:14 +0000 (22:48 -0800)]
am 7dc6e97c: Delay onResume tasks to speed up lockscreen onResume->onPause->onResume launch sequence.

* commit '7dc6e97c508125b94fffc15c4a8f0b6c989f396c':
  Delay onResume tasks to speed up lockscreen onResume->onPause->onResume launch sequence.

10 years agoDelay onResume tasks to speed up lockscreen
Andy Huibers [Tue, 19 Nov 2013 23:10:04 +0000 (15:10 -0800)]
Delay onResume tasks to speed up lockscreen
onResume->onPause->onResume launch sequence.

Bug: 11773268

Change-Id: Iea7702a0141a390e1e9b50c738f6269c03dabcc3

10 years agoam 9b75b682: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Mon, 18 Nov 2013 20:42:11 +0000 (12:42 -0800)]
am 9b75b682: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Mon, 18 Nov 2013 20:39:38 +0000 (20:39 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoam a390c5b4: am 3bf1cda5: gcam: Clean up placeholders, and add deletion robustness.
Ruben Brunk [Mon, 18 Nov 2013 19:47:52 +0000 (11:47 -0800)]
am a390c5b4: am 3bf1cda5: gcam: Clean up placeholders, and add deletion robustness.

* commit 'a390c5b4388d5280a29e24c88470621b1c3b2992':
  gcam: Clean up placeholders, and add deletion robustness.

10 years agoam 3bf1cda5: gcam: Clean up placeholders, and add deletion robustness.
Ruben Brunk [Mon, 18 Nov 2013 19:44:31 +0000 (11:44 -0800)]
am 3bf1cda5: gcam: Clean up placeholders, and add deletion robustness.

* commit '3bf1cda53ebd85152fa9eed3ea8c9652a944df9b':
  gcam: Clean up placeholders, and add deletion robustness.

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 18 Nov 2013 19:30:01 +0000 (11:30 -0800)]
Import translations. DO NOT MERGE

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

10 years agogcam: Clean up placeholders, and add deletion robustness.
Ruben Brunk [Fri, 15 Nov 2013 23:30:47 +0000 (15:30 -0800)]
gcam: Clean up placeholders, and add deletion robustness.

Bug: 11708734
Change-Id: I8a017a382f12165be27afbf78e733bcc1fc0ef6f

10 years agoam 1a1e24f0: am 9db4ac80: Merge "Fix issue of focus indicator staying on without...
Sascha Haeberling [Thu, 14 Nov 2013 03:26:19 +0000 (19:26 -0800)]
am 1a1e24f0: am 9db4ac80: Merge "Fix issue of focus indicator staying on without being hidden" into gb-ub-photos-carlsbad

* commit '1a1e24f095e8f232406d334d6c3e0cbb8f41aae5':
  Fix issue of focus indicator staying on without being hidden

10 years agoam 9db4ac80: Merge "Fix issue of focus indicator staying on without being hidden...
Sascha Haeberling [Thu, 14 Nov 2013 03:24:01 +0000 (19:24 -0800)]
am 9db4ac80: Merge "Fix issue of focus indicator staying on without being hidden" into gb-ub-photos-carlsbad

* commit '9db4ac802c6f635bdc56c69f20be08e054ba2926':
  Fix issue of focus indicator staying on without being hidden

10 years agoMerge "Fix issue of focus indicator staying on without being hidden" into gb-ub-photo...
Sascha Haeberling [Thu, 14 Nov 2013 03:22:15 +0000 (03:22 +0000)]
Merge "Fix issue of focus indicator staying on without being hidden" into gb-ub-photos-carlsbad

10 years agoFix issue of focus indicator staying on without being hidden
Sascha Haeberling [Thu, 14 Nov 2013 03:04:21 +0000 (19:04 -0800)]
Fix issue of focus indicator staying on without being hidden

  Bug: 11505806

A mix up in the previous 100% CL caused this. This CL here also
makes it more robust by making the 100% extra time time-based instead
of frame-based.

Change-Id: I52c53d4b5816570c2c805e0e8ff193de684f2a64

10 years agoam e8bab2cd: am fc7b8341: Ensure view size gets updated after phone decors change.
Doris Liu [Thu, 14 Nov 2013 02:19:25 +0000 (18:19 -0800)]
am e8bab2cd: am fc7b8341: Ensure view size gets updated after phone decors change.

* commit 'e8bab2cda4916da1a721ba67154e99a74e27aacc':
  Ensure view size gets updated after phone decors change.

10 years agoam fc7b8341: Ensure view size gets updated after phone decors change.
Doris Liu [Thu, 14 Nov 2013 02:14:40 +0000 (18:14 -0800)]
am fc7b8341: Ensure view size gets updated after phone decors change.

* commit 'fc7b834155f3a15939b0dcfaf7140a9da21b876c':
  Ensure view size gets updated after phone decors change.

10 years agoEnsure view size gets updated after phone decors change.
Doris Liu [Thu, 14 Nov 2013 01:59:24 +0000 (17:59 -0800)]
Ensure view size gets updated after phone decors change.

Bug: 11661906
Change-Id: I63234a94b5a0bbd0cc6aa62ccd2642de09208403

10 years agoam aa08cd8f: merge in release branch changes (no-op).
Ed Heyl [Wed, 13 Nov 2013 23:26:53 +0000 (15:26 -0800)]
am aa08cd8f: merge in release branch changes (no-op).

* commit 'aa08cd8f3c6fa652fa7a5fdb904e620dbf60f043':
  Add logging to various actions
  Ensure mOpenCameraThread has been setup before dereferencing.

10 years agomerge in release branch changes (no-op).
Ed Heyl [Wed, 13 Nov 2013 23:19:24 +0000 (15:19 -0800)]
merge in release branch changes (no-op).

10 years agoam e04f9709: am ff3a994a: Merge "Show the 100% state of the progress at least one...
Sascha Haeberling [Wed, 13 Nov 2013 20:11:37 +0000 (12:11 -0800)]
am e04f9709: am ff3a994a: Merge "Show the 100% state of the progress at least one frame." into gb-ub-photos-carlsbad

* commit 'e04f97097f78f821d6453d77f74307a8ee95e73f':
  Show the 100% state of the progress at least one frame.

10 years agoam ff3a994a: Merge "Show the 100% state of the progress at least one frame." into...
Sascha Haeberling [Wed, 13 Nov 2013 20:06:59 +0000 (12:06 -0800)]
am ff3a994a: Merge "Show the 100% state of the progress at least one frame." into gb-ub-photos-carlsbad

* commit 'ff3a994a2f33c493024b82023bfa910686c4d1de':
  Show the 100% state of the progress at least one frame.

10 years agoMerge "Show the 100% state of the progress at least one frame." into gb-ub-photos...
Sascha Haeberling [Wed, 13 Nov 2013 19:31:08 +0000 (19:31 +0000)]
Merge "Show the 100% state of the progress at least one frame." into gb-ub-photos-carlsbad

10 years agoam 79da4498: am 9c861f7a: Merge "Add parameters and deduplicate parameter changes...
Seth Raphael [Wed, 13 Nov 2013 17:45:31 +0000 (09:45 -0800)]
am 79da4498: am 9c861f7a: Merge "Add parameters and deduplicate parameter changes" into gb-ub-photos-carlsbad

* commit '79da449899dca5588301ce674951ba0552094d02':
  Add parameters and deduplicate parameter changes

10 years agoam 9c861f7a: Merge "Add parameters and deduplicate parameter changes" into gb-ub...
Seth Raphael [Wed, 13 Nov 2013 17:42:13 +0000 (09:42 -0800)]
am 9c861f7a: Merge "Add parameters and deduplicate parameter changes" into gb-ub-photos-carlsbad

* commit '9c861f7a5a033275729e69116d980ec0a0aacc35':
  Add parameters and deduplicate parameter changes

10 years agoMerge "Add parameters and deduplicate parameter changes" into gb-ub-photos-carlsbad
Seth Raphael [Wed, 13 Nov 2013 17:37:43 +0000 (17:37 +0000)]
Merge "Add parameters and deduplicate parameter changes" into gb-ub-photos-carlsbad

10 years agoShow the 100% state of the progress at least one frame.
Sascha Haeberling [Tue, 12 Nov 2013 23:16:08 +0000 (15:16 -0800)]
Show the 100% state of the progress at least one frame.

  Bug: 11505806

Change-Id: I5fe8456ff93cd50da53e022ac2cf2dd9ac633b2f

10 years agomerge in klp-mr1-release history after reset to klp-dev
The Android Automerger [Wed, 13 Nov 2013 01:24:44 +0000 (17:24 -0800)]
merge in klp-mr1-release history after reset to klp-dev

10 years agoAdd parameters and deduplicate parameter changes
Seth Raphael [Tue, 12 Nov 2013 19:21:17 +0000 (11:21 -0800)]
Add parameters and deduplicate parameter changes

Bug: 11646117
Change-Id: If52182a856d7ee8143a351c7f79a76d13840c61e

10 years agoam 03cb9721: am cc70702c: Revert parallel opening camera in photo mode.
Erin Dahlgren [Tue, 12 Nov 2013 21:34:05 +0000 (13:34 -0800)]
am 03cb9721: am cc70702c: Revert parallel opening camera in photo mode.

* commit '03cb97219c10790eb0eeb37b8d0867a1798da8f7':
  Revert parallel opening camera in photo mode.

10 years agoam cc70702c: Revert parallel opening camera in photo mode.
Erin Dahlgren [Tue, 12 Nov 2013 21:32:13 +0000 (13:32 -0800)]
am cc70702c: Revert parallel opening camera in photo mode.

* commit 'cc70702cc06d98f011f0d9e80b2afa12e6762c8a':
  Revert parallel opening camera in photo mode.

10 years agoRevert parallel opening camera in photo mode.
Erin Dahlgren [Tue, 12 Nov 2013 17:39:08 +0000 (09:39 -0800)]
Revert parallel opening camera in photo mode.

Reverts:
* ag/386409
* ag/386206
* ag/385573

Bug: 11598948
Bug: 11625767
Bug: 11627454
Bug: 11255097
Change-Id: Iad28e32dbcbbce42d9ee261c961cdd5a7712ede5

10 years agoam 9b9b0db9: am a7c84bac: Merge "Close mode menus if another control is touched"...
Andy Huibers [Tue, 12 Nov 2013 19:16:58 +0000 (11:16 -0800)]
am 9b9b0db9: am a7c84bac: Merge "Close mode menus if another control is touched" into gb-ub-photos-carlsbad

* commit '9b9b0db9445a0258b77339de49170e2fc5d48048':
  Close mode menus if another control is touched

10 years agoam a7c84bac: Merge "Close mode menus if another control is touched" into gb-ub-photos...
Andy Huibers [Tue, 12 Nov 2013 19:14:39 +0000 (11:14 -0800)]
am a7c84bac: Merge "Close mode menus if another control is touched" into gb-ub-photos-carlsbad

* commit 'a7c84bacfd76e5e865655bd5a9b248d64f970af1':
  Close mode menus if another control is touched

10 years agoMerge "Close mode menus if another control is touched" into gb-ub-photos-carlsbad
Andy Huibers [Tue, 12 Nov 2013 19:10:38 +0000 (19:10 +0000)]
Merge "Close mode menus if another control is touched" into gb-ub-photos-carlsbad

10 years agoam ad98a63f: am aae09fb1: Merge "Differentiate the InProgressData from the normal...
ztenghui [Tue, 12 Nov 2013 18:17:28 +0000 (10:17 -0800)]
am ad98a63f: am aae09fb1: Merge "Differentiate the InProgressData from the normal PhotoData." into gb-ub-photos-carlsbad

* commit 'ad98a63ff063eecc69d552606cb066b7a863e6ac':
  Differentiate the InProgressData from the normal PhotoData.

10 years agoam aae09fb1: Merge "Differentiate the InProgressData from the normal PhotoData."...
ztenghui [Tue, 12 Nov 2013 18:14:56 +0000 (10:14 -0800)]
am aae09fb1: Merge "Differentiate the InProgressData from the normal PhotoData." into gb-ub-photos-carlsbad

* commit 'aae09fb1ab292932504233da4be5181ce74db763':
  Differentiate the InProgressData from the normal PhotoData.

10 years agoMerge "Differentiate the InProgressData from the normal PhotoData." into gb-ub-photos...
ztenghui [Tue, 12 Nov 2013 18:12:34 +0000 (18:12 +0000)]
Merge "Differentiate the InProgressData from the normal PhotoData." into gb-ub-photos-carlsbad

10 years agoam fe9fef97: am baffb73c: Start gcam module directly when handling capture intent.
Ruben Brunk [Tue, 12 Nov 2013 18:05:35 +0000 (10:05 -0800)]
am fe9fef97: am baffb73c: Start gcam module directly when handling capture intent.

* commit 'fe9fef97a9c7479611ac2f4b347ec092b555cf07':
  Start gcam module directly when handling capture intent.

10 years agoam baffb73c: Start gcam module directly when handling capture intent.
Ruben Brunk [Tue, 12 Nov 2013 18:00:25 +0000 (10:00 -0800)]
am baffb73c: Start gcam module directly when handling capture intent.

* commit 'baffb73ca83d9d81c379f9f3b9f46cdac7355a0d':
  Start gcam module directly when handling capture intent.

10 years agoDifferentiate the InProgressData from the normal PhotoData.
ztenghui [Tue, 12 Nov 2013 17:57:14 +0000 (09:57 -0800)]
Differentiate the InProgressData from the normal PhotoData.

When we load from MediaStore, we should differentiate the data still in
progress, e.g. HDR+, which should show the progress bar and hide the action bar
items.

bug:11634500
bug:11598186
Change-Id: I8179d39747218c8768977d5b3ce71eadbdfb8b58

10 years agoClose mode menus if another control is touched
Andy Huibers [Tue, 12 Nov 2013 06:30:49 +0000 (22:30 -0800)]
Close mode menus if another control is touched

Bug: 11598901
Bug: 11635865
Change-Id: I9c6237bacef9a28de1fa238e1e7378a57abfc573

10 years agoStart gcam module directly when handling capture intent.
Ruben Brunk [Mon, 11 Nov 2013 22:13:59 +0000 (14:13 -0800)]
Start gcam module directly when handling capture intent.

Bug: 11609971

- Prior behavior for capture intents when in HDR+ mode was
  to resume into the PhotoModule and switch to the GcamModule.
  Following this change, we resume directly into the GcamModule.

- Fixes the bad lockscreen behavior caused by the sequence:
  onResume->switch to GcamModule(queue GcamModule onPause and onResume)->
  onPause->onResume, where handler queuing order could get in a
  state where the GcamModule onResume is called twice in a row,
  resulting in duplicate requests being queued for each capture.

Change-Id: Ibd632d74836224288270f5342e45e523e25ca429

10 years agoam 292e119c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Mon, 11 Nov 2013 22:44:42 +0000 (14:44 -0800)]
am 292e119c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '292e119c14c936c35478aad1d386a2ef5b8a0827':
  Import translations. DO NOT MERGE

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Mon, 11 Nov 2013 22:42:39 +0000 (22:42 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 11 Nov 2013 19:04:17 +0000 (11:04 -0800)]
Import translations. DO NOT MERGE

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

10 years agomerge in klp-mr1-release history after reset to klp-dev
The Android Automerger [Mon, 11 Nov 2013 18:50:34 +0000 (10:50 -0800)]
merge in klp-mr1-release history after reset to klp-dev

10 years agoam d12bbb8a: am 6a42c3ae: Add a null check to fix NPE
ztenghui [Mon, 11 Nov 2013 17:00:01 +0000 (09:00 -0800)]
am d12bbb8a: am 6a42c3ae: Add a null check to fix NPE

* commit 'd12bbb8a7ba13fb9e743b62fc9d9779517b8d43e':
  Add a null check to fix NPE

10 years agoam 6a42c3ae: Add a null check to fix NPE
ztenghui [Mon, 11 Nov 2013 16:56:45 +0000 (08:56 -0800)]
am 6a42c3ae: Add a null check to fix NPE

* commit '6a42c3ae157c4495db56541ef87f6ee56b5d10b3':
  Add a null check to fix NPE

10 years agoAdd a null check to fix NPE
ztenghui [Sat, 9 Nov 2013 01:17:52 +0000 (17:17 -0800)]
Add a null check to fix NPE

bug: 11594111
Change-Id: Ica2ffe315c4e4eaa818aa609d9600d5e67e54b3b

10 years agoAdd logging to various actions
Seth Raphael [Tue, 5 Nov 2013 18:12:36 +0000 (10:12 -0800)]
Add logging to various actions

Bug: 11514148

Change-Id: Ib31a74a6badc4dcdeaa316e032f4aef17edd06b2

10 years agoEnsure mOpenCameraThread has been setup before dereferencing.
Ruben Brunk [Fri, 8 Nov 2013 02:12:41 +0000 (18:12 -0800)]
Ensure mOpenCameraThread has been setup before dereferencing.

Bug: 11579062
Change-Id: Iabccdbfd3468eaa47115de1dbcafa7f9e456603b

10 years agoam 2b5aa3e3: merge in release branch changes (no-op).
Ed Heyl [Fri, 8 Nov 2013 21:31:34 +0000 (13:31 -0800)]
am 2b5aa3e3: merge in release branch changes (no-op).

* commit '2b5aa3e38b55f28ea1c5f619b921a7470cc926a0':
  Add GCam progress indicator.
  hide preview cover on arrival of new preview data if hidden
  Fix photo mode is getting stuck in a single CameraState.
  Show chooser on EDIT intents that have no activity for action.
  Parallelize opening the camera with view handling in photo mode.
  Decouple the visibility check for system UI from action bar
  Don't crash Photo Sphere on back button press in filmstrip.
  Check for media service being present before capture.

10 years agomerge in release branch changes (no-op).
Ed Heyl [Fri, 8 Nov 2013 21:23:51 +0000 (13:23 -0800)]
merge in release branch changes (no-op).

10 years agoam 05f23b7d: am cbd8267e: Add logging to various actions
Seth Raphael [Fri, 8 Nov 2013 03:56:17 +0000 (19:56 -0800)]
am 05f23b7d: am cbd8267e: Add logging to various actions

* commit '05f23b7d90bbe6161da8759f707a5d271a9d9f70':
  Add logging to various actions

10 years agoam cbd8267e: Add logging to various actions
Seth Raphael [Fri, 8 Nov 2013 03:54:16 +0000 (19:54 -0800)]
am cbd8267e: Add logging to various actions

* commit 'cbd8267ee99e457f72822e8d8187b5e6823104f8':
  Add logging to various actions

10 years agoAdd logging to various actions
Seth Raphael [Tue, 5 Nov 2013 18:12:36 +0000 (10:12 -0800)]
Add logging to various actions

Bug: 11514148

Change-Id: Ib31a74a6badc4dcdeaa316e032f4aef17edd06b2

10 years agoam 56960b7e: am 36d84c1d: Merge "Ensure mOpenCameraThread has been setup before deref...
Ruben Brunk [Fri, 8 Nov 2013 02:36:44 +0000 (18:36 -0800)]
am 56960b7e: am 36d84c1d: Merge "Ensure mOpenCameraThread has been setup before dereferencing." into gb-ub-photos-carlsbad

* commit '56960b7ebee5c4c9493d35b336adb41afb34a2bd':
  Ensure mOpenCameraThread has been setup before dereferencing.

10 years agoam 36d84c1d: Merge "Ensure mOpenCameraThread has been setup before dereferencing...
Ruben Brunk [Fri, 8 Nov 2013 02:34:11 +0000 (18:34 -0800)]
am 36d84c1d: Merge "Ensure mOpenCameraThread has been setup before dereferencing." into gb-ub-photos-carlsbad

* commit '36d84c1d273faf24c6907e173cf95f233db71592':
  Ensure mOpenCameraThread has been setup before dereferencing.

10 years agoMerge "Ensure mOpenCameraThread has been setup before dereferencing." into gb-ub...
Ruben Brunk [Fri, 8 Nov 2013 02:31:54 +0000 (02:31 +0000)]
Merge "Ensure mOpenCameraThread has been setup before dereferencing." into gb-ub-photos-carlsbad

10 years agoEnsure mOpenCameraThread has been setup before dereferencing.
Ruben Brunk [Fri, 8 Nov 2013 02:12:41 +0000 (18:12 -0800)]
Ensure mOpenCameraThread has been setup before dereferencing.

Bug: 11579062
Change-Id: Iabccdbfd3468eaa47115de1dbcafa7f9e456603b

10 years agoAdd GCam progress indicator.
Sascha Haeberling [Thu, 7 Nov 2013 21:43:33 +0000 (13:43 -0800)]
Add GCam progress indicator.

  Bug: 11505806

Change-Id: I823c44b3761bb3c6dce56b1ec1b8d667023da820

10 years agohide preview cover on arrival of new preview data if hidden
Andy Huibers [Wed, 6 Nov 2013 22:37:26 +0000 (14:37 -0800)]
hide preview cover on arrival of new preview data if hidden

Bug: 11433257
Change-Id: I7225ebf1d84bbefd2f952cfa524720a7e76e7181

10 years agoFix photo mode is getting stuck in a single CameraState.
Erin Dahlgren [Thu, 7 Nov 2013 19:55:49 +0000 (11:55 -0800)]
Fix photo mode is getting stuck in a single CameraState.

Bug: 11574716
Change-Id: Ieb3622103798077071bb9350773851b7acbff756

10 years agoShow chooser on EDIT intents that have no activity for action.
Erin Dahlgren [Thu, 7 Nov 2013 19:35:10 +0000 (11:35 -0800)]
Show chooser on EDIT intents that have no activity for action.

Bug: 11571947
Change-Id: I40ef0f9ae6b4567557064d91b9c3942cd524a60b

10 years agoParallelize opening the camera with view handling in photo mode.
Erin Dahlgren [Wed, 6 Nov 2013 19:57:51 +0000 (11:57 -0800)]
Parallelize opening the camera with view handling in photo mode.

Bug: 11255097
Change-Id: I8da16a97ee46555267ae8cfee0e7940d3f53f98f

10 years agoDecouple the visibility check for system UI from action bar
ztenghui [Wed, 6 Nov 2013 22:20:31 +0000 (14:20 -0800)]
Decouple the visibility check for system UI from action bar

And make sure we toggle system UI when reload.

bug:11539377

Change-Id: I4d251557c1d68a173cabb652e0beaa3ee89cb6f0

10 years agoam 0351d05d: am 2b78c0c0: Merge "Add GCam progress indicator." into gb-ub-photos...
Sascha Haeberling [Thu, 7 Nov 2013 23:30:51 +0000 (15:30 -0800)]
am 0351d05d: am 2b78c0c0: Merge "Add GCam progress indicator." into gb-ub-photos-carlsbad

* commit '0351d05de1e9fe9abd97f082f9de940066b0c818':
  Add GCam progress indicator.

10 years agoam 2b78c0c0: Merge "Add GCam progress indicator." into gb-ub-photos-carlsbad
Sascha Haeberling [Thu, 7 Nov 2013 23:29:03 +0000 (15:29 -0800)]
am 2b78c0c0: Merge "Add GCam progress indicator." into gb-ub-photos-carlsbad

* commit '2b78c0c048fe906beaeadeee3e267524c808c340':
  Add GCam progress indicator.

10 years agoMerge "Add GCam progress indicator." into gb-ub-photos-carlsbad
Sascha Haeberling [Thu, 7 Nov 2013 23:26:15 +0000 (23:26 +0000)]
Merge "Add GCam progress indicator." into gb-ub-photos-carlsbad

10 years agoAdd GCam progress indicator.
Sascha Haeberling [Thu, 7 Nov 2013 21:43:33 +0000 (13:43 -0800)]
Add GCam progress indicator.

  Bug: 11505806

Change-Id: I823c44b3761bb3c6dce56b1ec1b8d667023da820

10 years agoam c504af14: am fccf83bd: hide preview cover on arrival of new preview data if hidden
Andy Huibers [Thu, 7 Nov 2013 22:47:55 +0000 (14:47 -0800)]
am c504af14: am fccf83bd: hide preview cover on arrival of new preview data if hidden

* commit 'c504af14a839ee44e84cc7af84b348a80cde97ff':
  hide preview cover on arrival of new preview data if hidden

10 years agoam fccf83bd: hide preview cover on arrival of new preview data if hidden
Andy Huibers [Thu, 7 Nov 2013 22:44:36 +0000 (14:44 -0800)]
am fccf83bd: hide preview cover on arrival of new preview data if hidden

* commit 'fccf83bd342a3a83dc284525488e69f25e4667c4':
  hide preview cover on arrival of new preview data if hidden

10 years agohide preview cover on arrival of new preview data if hidden
Andy Huibers [Wed, 6 Nov 2013 22:37:26 +0000 (14:37 -0800)]
hide preview cover on arrival of new preview data if hidden

Bug: 11433257
Change-Id: I7225ebf1d84bbefd2f952cfa524720a7e76e7181

10 years agoam cbe9fc1f: am 2f878d54: Merge "Fix photo mode is getting stuck in a single CameraSt...
Erin Dahlgren [Thu, 7 Nov 2013 21:34:02 +0000 (13:34 -0800)]
am cbe9fc1f: am 2f878d54: Merge "Fix photo mode is getting stuck in a single CameraState." into gb-ub-photos-carlsbad

* commit 'cbe9fc1fea10a8c98cff2fd5418d50fc765a6235':
  Fix photo mode is getting stuck in a single CameraState.

10 years agoam 2f878d54: Merge "Fix photo mode is getting stuck in a single CameraState." into...
Erin Dahlgren [Thu, 7 Nov 2013 21:29:43 +0000 (13:29 -0800)]
am 2f878d54: Merge "Fix photo mode is getting stuck in a single CameraState." into gb-ub-photos-carlsbad

* commit '2f878d54ecbb62ef09aa2b0152dea983e598724f':
  Fix photo mode is getting stuck in a single CameraState.

10 years agoMerge "Fix photo mode is getting stuck in a single CameraState." into gb-ub-photos...
Erin Dahlgren [Thu, 7 Nov 2013 21:24:34 +0000 (21:24 +0000)]
Merge "Fix photo mode is getting stuck in a single CameraState." into gb-ub-photos-carlsbad

10 years agoam 5a0475e4: am 05a04924: Show chooser on EDIT intents that have no activity for...
Erin Dahlgren [Thu, 7 Nov 2013 21:07:38 +0000 (13:07 -0800)]
am 5a0475e4: am 05a04924: Show chooser on EDIT intents that have no activity for action.

* commit '5a0475e4d7fdc0a1ec3dae3eea3cf8ea2b882fbd':
  Show chooser on EDIT intents that have no activity for action.

10 years agoam 05a04924: Show chooser on EDIT intents that have no activity for action.
Erin Dahlgren [Thu, 7 Nov 2013 21:06:35 +0000 (13:06 -0800)]
am 05a04924: Show chooser on EDIT intents that have no activity for action.

* commit '05a04924312fbcda2161da01e0749eb80c2663d1':
  Show chooser on EDIT intents that have no activity for action.