OSDN Git Service

android-x86/packages-apps-Camera2.git
10 years agoam 7bbe169b: Merge "Add new strings for timely translation" into ub-camera-everglades
Doris Liu [Sat, 10 May 2014 00:41:08 +0000 (00:41 +0000)]
am 7bbe169b: Merge "Add new strings for timely translation" into ub-camera-everglades

* commit '7bbe169bc1013c27f804783913394c3c30a25e3c':
  Add new strings for timely translation

10 years agoam 21478465: Merge "String modifications for Everglades" into ub-camera-everglades
Alan Newberger [Sat, 10 May 2014 00:41:08 +0000 (00:41 +0000)]
am 21478465: Merge "String modifications for Everglades" into ub-camera-everglades

* commit '214784657958ca2235d424f337055a69f27221ef':
  String modifications for Everglades

10 years agoMerge "Add new strings for timely translation" into ub-camera-everglades
Doris Liu [Sat, 10 May 2014 00:36:13 +0000 (00:36 +0000)]
Merge "Add new strings for timely translation" into ub-camera-everglades

10 years agoam 71fa0ba6: Merge "filmstrip accessibility" into ub-camera-everglades
Spike Sprague [Sat, 10 May 2014 00:34:53 +0000 (00:34 +0000)]
am 71fa0ba6: Merge "filmstrip accessibility" into ub-camera-everglades

* commit '71fa0ba6a52abd71bd8c56526cbd3f9a07cf3537':
  filmstrip accessibility

10 years agoMerge "String modifications for Everglades" into ub-camera-everglades
Alan Newberger [Sat, 10 May 2014 00:34:53 +0000 (00:34 +0000)]
Merge "String modifications for Everglades" into ub-camera-everglades

10 years agoMerge "filmstrip accessibility" into ub-camera-everglades
Spike Sprague [Sat, 10 May 2014 00:30:12 +0000 (00:30 +0000)]
Merge "filmstrip accessibility" into ub-camera-everglades

10 years agoam abe3cdf1: Merge "CL for string translation" into ub-camera-everglades
Spike Sprague [Sat, 10 May 2014 00:27:42 +0000 (00:27 +0000)]
am abe3cdf1: Merge "CL for string translation" into ub-camera-everglades

* commit 'abe3cdf17c70bd5fb1f27444ea28865ebab15f47':
  CL for string translation

10 years agoAdd new strings for timely translation
Doris Liu [Sat, 10 May 2014 00:27:35 +0000 (17:27 -0700)]
Add new strings for timely translation

Change-Id: I41e9f3332f412c077656fc235a26be96bd442101

10 years agoString modifications for Everglades
Alan Newberger [Sat, 10 May 2014 00:27:13 +0000 (17:27 -0700)]
String modifications for Everglades

Modifications as specfied in the following bugs. Also modded licences and
feedback to use sentence casing.

Bug: 14254875
Bug: 14254738
Change-Id: I7d8446ac5dc0ef593938a38bedd841219b8716a8

10 years agoMerge "CL for string translation" into ub-camera-everglades
Spike Sprague [Sat, 10 May 2014 00:23:39 +0000 (00:23 +0000)]
Merge "CL for string translation" into ub-camera-everglades

10 years agofilmstrip accessibility
Spike Sprague [Mon, 5 May 2014 22:52:39 +0000 (15:52 -0700)]
filmstrip accessibility

add support for ACTION_SCROLL_BACKWARD/FORWARD events

note: to test this do this
1) turn on talkback
2) launch camera, get into filmstrip
3a) trigger FORWARD event with a left->right->left swipe
3b) trigger BACKWARD event with a right->left->right swipe

bug: 14108635
Change-Id: Iabe2d13c6ed96163a5b9139b6674b3457dd1abc1

10 years agoCL for string translation
Spike Sprague [Sat, 10 May 2014 00:04:20 +0000 (17:04 -0700)]
CL for string translation

Change-Id: Icb44757c1e4c0d7c67dea26868b8c201dddd381b

10 years agoam 6b8d928e: am 1b0fb15d: Do not scale down preview when preview asp is close to...
Doris Liu [Thu, 8 May 2014 18:53:46 +0000 (18:53 +0000)]
am 6b8d928e: am 1b0fb15d: Do not scale down preview when preview asp is close to screen asp.

* commit '6b8d928e3b52c319a7b321638edb72cd58d31ff9':
  Do not scale down preview when preview asp is close to screen asp.

10 years agoam 1b0fb15d: Do not scale down preview when preview asp is close to screen asp.
Doris Liu [Thu, 8 May 2014 18:48:56 +0000 (18:48 +0000)]
am 1b0fb15d: Do not scale down preview when preview asp is close to screen asp.

* commit '1b0fb15dcb5388ec07a382536d188461bc2d74da':
  Do not scale down preview when preview asp is close to screen asp.

10 years agoDo not scale down preview when preview asp is close to screen asp.
Doris Liu [Thu, 8 May 2014 17:26:25 +0000 (10:26 -0700)]
Do not scale down preview when preview asp is close to screen asp.

The logic for transforming preview when preview aspect ratio
is greater than 14/9 is brought back to achieve the same behavior
for preview positioning as we did in Denali release.

Bug: 14626812
Change-Id: Ife38efc342cd218aca7d9473ede4db92daebcf54

10 years agoam 7658b354: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-everg...
Baligh Uddin [Thu, 8 May 2014 14:52:16 +0000 (14:52 +0000)]
am 7658b354: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-everglades

* commit '7658b354a4172e137f13460e5910bf3101fb60ec':
  Import translations. DO NOT MERGE

10 years agoMerge "Import translations. DO NOT MERGE" into ub-camera-everglades
Baligh Uddin [Thu, 8 May 2014 14:48:28 +0000 (14:48 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-everglades

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 8 May 2014 01:52:58 +0000 (18:52 -0700)]
Import translations. DO NOT MERGE

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

10 years agoam 1dad685a: Merge "First Step: CameraCapabilities intead of Parameter" into ub-camer...
Angus Kong [Wed, 7 May 2014 21:21:37 +0000 (21:21 +0000)]
am 1dad685a: Merge "First Step: CameraCapabilities intead of Parameter" into ub-camera-everglades

* commit '1dad685ad3a16136b0b2108e566535c460f2a965':
  First Step: CameraCapabilities intead of Parameter

10 years agoMerge "First Step: CameraCapabilities intead of Parameter" into ub-camera-everglades
Angus Kong [Wed, 7 May 2014 21:15:14 +0000 (21:15 +0000)]
Merge "First Step: CameraCapabilities intead of Parameter" into ub-camera-everglades

10 years agoam f8fc8d74: Merge "Add cropping for nexus 5 to support 16:9 sizes." into ub-camera...
Angus Kong [Wed, 7 May 2014 20:20:22 +0000 (20:20 +0000)]
am f8fc8d74: Merge "Add cropping for nexus 5 to support 16:9 sizes." into ub-camera-everglades

* commit 'f8fc8d7451b54790740b63c759a869dd8fd22c0c':
  Add cropping for nexus 5 to support 16:9 sizes.

10 years agoMerge "Add cropping for nexus 5 to support 16:9 sizes." into ub-camera-everglades
Angus Kong [Wed, 7 May 2014 20:18:24 +0000 (20:18 +0000)]
Merge "Add cropping for nexus 5 to support 16:9 sizes." into ub-camera-everglades

10 years agoFirst Step: CameraCapabilities intead of Parameter
Angus Kong [Tue, 22 Apr 2014 23:39:42 +0000 (16:39 -0700)]
First Step: CameraCapabilities intead of Parameter

To get rid of Camera.Parameters, we need to provide our own interfaces.
Camera.Parameters actually consists of 2 parts: capabilities and settings. We'll
provide two interfaces and will just use Camera.Parameters inside of
CameraManager implementations.

Change-Id: I53922b6d740835412d74365374a6a0382129564e

10 years agoAdd cropping for nexus 5 to support 16:9 sizes.
Angus Kong [Tue, 6 May 2014 21:45:59 +0000 (14:45 -0700)]
Add cropping for nexus 5 to support 16:9 sizes.

Based on Seth's proposal of faking a new resolution setting.

Improvements made:
1. Move the cropping to a background thread.
2. Refactored to start the preview early to avoid jankness from waiting for the
   cropping.
3. Fix the wrong width and hight in EXIF. The original logic is to use width and
   height from the camera parameters. Now this is not true anymore.
4. Add check for Nexus 5 for the support to take effect.

Change-Id: I37515fc394b31539644a33b6d32840baf205e15c

10 years agoam 1a2fb901: Merge "Use last still camera for INTENT_ACTION_STILL_IMAGE_CAMERA" into...
Doris Liu [Wed, 7 May 2014 02:34:37 +0000 (02:34 +0000)]
am 1a2fb901: Merge "Use last still camera for INTENT_ACTION_STILL_IMAGE_CAMERA" into ub-camera-everglades

* commit '1a2fb9018bb839185a0fae352d72d5ea18aa3c3f':
  Use last still camera for INTENT_ACTION_STILL_IMAGE_CAMERA

10 years agoMerge "Use last still camera for INTENT_ACTION_STILL_IMAGE_CAMERA" into ub-camera...
Doris Liu [Wed, 7 May 2014 02:31:03 +0000 (02:31 +0000)]
Merge "Use last still camera for INTENT_ACTION_STILL_IMAGE_CAMERA" into ub-camera-everglades

10 years agoam 08d63f0f: Merge "Move share evaluation into ReleaseDialogHelper" into ub-camera...
Alan Newberger [Wed, 7 May 2014 00:18:45 +0000 (00:18 +0000)]
am 08d63f0f: Merge "Move share evaluation into ReleaseDialogHelper" into ub-camera-everglades

* commit '08d63f0f77aa9b70fa5ba39da2e776fe091dc0bf':
  Move share evaluation into ReleaseDialogHelper

10 years agoMerge "Move share evaluation into ReleaseDialogHelper" into ub-camera-everglades
Alan Newberger [Wed, 7 May 2014 00:15:37 +0000 (00:15 +0000)]
Merge "Move share evaluation into ReleaseDialogHelper" into ub-camera-everglades

10 years agoMove share evaluation into ReleaseDialogHelper
Alan Newberger [Tue, 6 May 2014 23:47:34 +0000 (16:47 -0700)]
Move share evaluation into ReleaseDialogHelper

Now delegating to ReleaseDialogHelper the evaluation whether it
should be shown on share.

Bug: 14592653
Change-Id: I9ffc82511237d3a4ff6349feffb068520e4baa9f

10 years agoam 46acdc54: moved set exposure limits code into an enabled check
Spike Sprague [Tue, 6 May 2014 23:06:13 +0000 (23:06 +0000)]
am 46acdc54: moved set exposure limits code into an enabled check

* commit '46acdc5401956ee4951d25d047ae892b78c13d86':
  moved set exposure limits code into an enabled check

10 years agomoved set exposure limits code into an enabled check
Spike Sprague [Tue, 6 May 2014 20:55:38 +0000 (13:55 -0700)]
moved set exposure limits code into an enabled check

bug: 14462164

Change-Id: Ia75449e92ffb46c8f19326828c81c40c053e7ad0

10 years agoUse last still camera for INTENT_ACTION_STILL_IMAGE_CAMERA
Doris Liu [Tue, 6 May 2014 18:11:26 +0000 (11:11 -0700)]
Use last still camera for INTENT_ACTION_STILL_IMAGE_CAMERA

Bug: 14496045
Change-Id: I96eafa829fafe935880d16239420412d04fe2b3b

10 years agoam 49cee87a: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-everg...
Baligh Uddin [Tue, 6 May 2014 14:54:13 +0000 (14:54 +0000)]
am 49cee87a: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-everglades

* commit '49cee87a04dd5f78bf7016043f5ba4ba787e53f3':
  Import translations. DO NOT MERGE

10 years agoMerge "Import translations. DO NOT MERGE" into ub-camera-everglades
Baligh Uddin [Tue, 6 May 2014 14:52:14 +0000 (14:52 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-everglades

10 years agoam 0c8b9b92: Merge "change exposure comp and pano orientation to use the new RadioOpt...
Spike Sprague [Tue, 6 May 2014 01:14:01 +0000 (01:14 +0000)]
am 0c8b9b92: Merge "change exposure comp and pano orientation to use the new RadioOptions" into ub-camera-everglades

* commit '0c8b9b92d6dc075430199b00e8c8b15b7232deca':
  change exposure comp and pano orientation to use the new RadioOptions

10 years agoMerge "change exposure comp and pano orientation to use the new RadioOptions" into...
Spike Sprague [Tue, 6 May 2014 01:11:07 +0000 (01:11 +0000)]
Merge "change exposure comp and pano orientation to use the new RadioOptions" into ub-camera-everglades

10 years agochange exposure comp and pano orientation to
Spike Sprague [Wed, 23 Apr 2014 01:04:05 +0000 (18:04 -0700)]
change exposure comp and pano orientation to
use the new RadioOptions

bug: 13780101

Change-Id: Ie7b12199a96272827cc381560a5b801f87a5b81a

10 years agoam 8888e16a: Merge "Cancel onResumeTask when the app is paused." into ub-camera-everg...
Angus Kong [Mon, 5 May 2014 22:54:57 +0000 (22:54 +0000)]
am 8888e16a: Merge "Cancel onResumeTask when the app is paused." into ub-camera-everglades

* commit '8888e16a42e0b5a260917e0bb77ba69b9eb81a72':
  Cancel onResumeTask when the app is paused.

10 years agoMerge "Cancel onResumeTask when the app is paused." into ub-camera-everglades
Angus Kong [Mon, 5 May 2014 22:52:10 +0000 (22:52 +0000)]
Merge "Cancel onResumeTask when the app is paused." into ub-camera-everglades

10 years agoCancel onResumeTask when the app is paused.
Angus Kong [Wed, 30 Apr 2014 22:03:33 +0000 (15:03 -0700)]
Cancel onResumeTask when the app is paused.

Also change the camera closing conditions to force close all camera before
killing the handler thread.

bug:14190951
bug:14441425

Change-Id: Ic752b0678530b34eb3710bd7796cb17d15452013

10 years agoam eec46c2a: Merge "Support for rotation lock in video recording hints" into ub-camer...
Doris Liu [Mon, 5 May 2014 22:22:44 +0000 (22:22 +0000)]
am eec46c2a: Merge "Support for rotation lock in video recording hints" into ub-camera-everglades

* commit 'eec46c2ab3536159d9446b5731a26eb47155e3c7':
  Support for rotation lock in video recording hints

10 years agoMerge "Support for rotation lock in video recording hints" into ub-camera-everglades
Doris Liu [Mon, 5 May 2014 22:19:44 +0000 (22:19 +0000)]
Merge "Support for rotation lock in video recording hints" into ub-camera-everglades

10 years agoSupport for rotation lock in video recording hints
Doris Liu [Mon, 5 May 2014 21:10:34 +0000 (14:10 -0700)]
Support for rotation lock in video recording hints

Bug: 13545160
Change-Id: I73c20e5a6701cc9b89ce6871b6541320fe7317e1

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 5 May 2014 20:30:06 +0000 (13:30 -0700)]
Import translations. DO NOT MERGE

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

10 years agoam d634bf63: Make ModeOptionsOverlay sizing a little more robust
Spike Sprague [Mon, 5 May 2014 20:28:50 +0000 (20:28 +0000)]
am d634bf63: Make ModeOptionsOverlay sizing a little more robust

* commit 'd634bf630b64a938d785366fd6af26136ab04ae7':
  Make ModeOptionsOverlay sizing a little more robust

10 years agoMake ModeOptionsOverlay sizing a little more robust
Spike Sprague [Mon, 5 May 2014 17:51:45 +0000 (10:51 -0700)]
Make ModeOptionsOverlay sizing a little more robust

bug: 13352479
bug: 14414850

Change-Id: I27c6515d79db8df630f5a5ddfac6345005926931

10 years agoam b19eaa0b: Allow multiple aspect ratios to be set for the resolution setting.
Seth Raphael [Fri, 2 May 2014 22:58:00 +0000 (22:58 +0000)]
am b19eaa0b: Allow multiple aspect ratios to be set for the resolution setting.

* commit 'b19eaa0bb37a1252015eafd3e965a011e6e98727':
  Allow multiple aspect ratios to be set for the resolution setting.

10 years agoAllow multiple aspect ratios to be set for the
Seth Raphael [Fri, 2 May 2014 20:34:36 +0000 (13:34 -0700)]
Allow multiple aspect ratios to be set for the
resolution setting.

Bug: 13328191
Change-Id: Ie067d18b70bc1ae84dc284f881b7f6030f6a6622

10 years agoam 74d4ecff: am d80cd803: Merge "Fix rounding error" into gb-ub-photos-denali
Doris Liu [Thu, 1 May 2014 23:49:29 +0000 (23:49 +0000)]
am 74d4ecff: am d80cd803: Merge "Fix rounding error" into gb-ub-photos-denali

* commit '74d4ecffbb932dbdfb54f1cb521108ee51ef28a0':
  Fix rounding error

10 years agoam d80cd803: Merge "Fix rounding error" into gb-ub-photos-denali
Doris Liu [Thu, 1 May 2014 23:47:48 +0000 (23:47 +0000)]
am d80cd803: Merge "Fix rounding error" into gb-ub-photos-denali

* commit 'd80cd80371540af0bc44245bdee330a8f32647f3':
  Fix rounding error

10 years agoMerge "Fix rounding error" into gb-ub-photos-denali
Doris Liu [Thu, 1 May 2014 23:45:09 +0000 (23:45 +0000)]
Merge "Fix rounding error" into gb-ub-photos-denali

10 years agoFix rounding error
Doris Liu [Thu, 1 May 2014 23:09:36 +0000 (16:09 -0700)]
Fix rounding error

Bug: 14446168
Change-Id: Ic3fc882eab96f4d6e94fdb25928c362e5b33153f

10 years agoam 61069613: (-s ours) am 3385c6e6: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Thu, 1 May 2014 16:36:46 +0000 (16:36 +0000)]
am 61069613: (-s ours) am 3385c6e6: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali

* commit '61069613a1fc2d9fb2a2df6ad5ad6739169f4030':
  Import translations. DO NOT MERGE

10 years agoam b51d4e9d: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-everg...
Baligh Uddin [Thu, 1 May 2014 16:33:38 +0000 (16:33 +0000)]
am b51d4e9d: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-everglades

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

10 years agoam 3385c6e6: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Thu, 1 May 2014 16:33:34 +0000 (16:33 +0000)]
am 3385c6e6: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali

* commit '3385c6e6b4e6849d256ee2fe173d9b22169416d7':
  Import translations. DO NOT MERGE

10 years agoMerge "Import translations. DO NOT MERGE" into ub-camera-everglades
Baligh Uddin [Thu, 1 May 2014 16:31:11 +0000 (16:31 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-everglades

10 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
Baligh Uddin [Thu, 1 May 2014 16:31:07 +0000 (16:31 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali

10 years agoam f3da6cf0: am 92537afd: Merge "Preload metadata for new videos." into gb-ub-photos...
Angus Kong [Wed, 30 Apr 2014 23:29:14 +0000 (23:29 +0000)]
am f3da6cf0: am 92537afd: Merge "Preload metadata for new videos." into gb-ub-photos-denali

* commit 'f3da6cf0b26be00afe43323b7fac74a317d0f5f5':
  Preload metadata for new videos.

10 years agoam 92537afd: Merge "Preload metadata for new videos." into gb-ub-photos-denali
Angus Kong [Wed, 30 Apr 2014 23:27:30 +0000 (23:27 +0000)]
am 92537afd: Merge "Preload metadata for new videos." into gb-ub-photos-denali

* commit '92537afd29b1dd756e73c0bb58249521a6f65624':
  Preload metadata for new videos.

10 years agoMerge "Preload metadata for new videos." into gb-ub-photos-denali
Angus Kong [Wed, 30 Apr 2014 23:24:25 +0000 (23:24 +0000)]
Merge "Preload metadata for new videos." into gb-ub-photos-denali

10 years agoam e5a7c3cb: am 39f1c22b: Merge "Fix storage warning hint crash" into gb-ub-photos...
Alan Newberger [Wed, 30 Apr 2014 23:21:06 +0000 (23:21 +0000)]
am e5a7c3cb: am 39f1c22b: Merge "Fix storage warning hint crash" into gb-ub-photos-denali

* commit 'e5a7c3cbb3aa2f0d28dba21579b530bdfe1331fe':
  Fix storage warning hint crash

10 years agoam 39f1c22b: Merge "Fix storage warning hint crash" into gb-ub-photos-denali
Alan Newberger [Wed, 30 Apr 2014 23:19:21 +0000 (23:19 +0000)]
am 39f1c22b: Merge "Fix storage warning hint crash" into gb-ub-photos-denali

* commit '39f1c22bbe02a5d8edaa1e0ba60e49ed27215e4b':
  Fix storage warning hint crash

10 years agoMerge "Fix storage warning hint crash" into gb-ub-photos-denali
Alan Newberger [Wed, 30 Apr 2014 23:16:36 +0000 (23:16 +0000)]
Merge "Fix storage warning hint crash" into gb-ub-photos-denali

10 years agoFix storage warning hint crash
Alan Newberger [Wed, 30 Apr 2014 22:36:50 +0000 (15:36 -0700)]
Fix storage warning hint crash

We rarely hit this warning, but indications are that it crashes 100%. This is an old
class, not even sure why we're using it vs a Toast, but for now fixing the existing
implementation. OnScreenHint accepted a context but attempted to add views which
requires an Activity. Likely started failing when we used to in practice pass Activity
contexts but converted to Application contexts. I have converted OnScreenHint to require
an Activity. We have one device afflicted by this 100% which I used to test, and it now
works with this CL and shows a storage warning.

Bug: 14134552
Change-Id: I1d8a7a7dce799c81c821b9974e8d8d62c6daab39

10 years agoam 8dfa3c7d: am efcc8f0c: Merge "Log warning when video snapshot is requested on...
Doris Liu [Wed, 30 Apr 2014 21:26:21 +0000 (21:26 +0000)]
am 8dfa3c7d: am efcc8f0c: Merge "Log warning when video snapshot is requested on devices not supporting it" into gb-ub-photos-denali

* commit '8dfa3c7d5d676590e4f4f200805fe711b88fef8c':
  Log warning when video snapshot is requested on devices not supporting it

10 years agoam efcc8f0c: Merge "Log warning when video snapshot is requested on devices not suppo...
Doris Liu [Wed, 30 Apr 2014 21:23:48 +0000 (21:23 +0000)]
am efcc8f0c: Merge "Log warning when video snapshot is requested on devices not supporting it" into gb-ub-photos-denali

* commit 'efcc8f0c67340ce2ad7d1477cbb7d33e6b7ea73f':
  Log warning when video snapshot is requested on devices not supporting it

10 years agoMerge "Log warning when video snapshot is requested on devices not supporting it...
Doris Liu [Wed, 30 Apr 2014 21:21:58 +0000 (21:21 +0000)]
Merge "Log warning when video snapshot is requested on devices not supporting it" into gb-ub-photos-denali

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 30 Apr 2014 20:18:34 +0000 (13:18 -0700)]
Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 30 Apr 2014 20:16:58 +0000 (13:16 -0700)]
Import translations. DO NOT MERGE

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

10 years agoPreload metadata for new videos.
Angus Kong [Wed, 30 Apr 2014 18:26:21 +0000 (11:26 -0700)]
Preload metadata for new videos.

bug:14279339
Change-Id: I4733199fecc45b24abc41a241fdb5af3421f5652

10 years agoLog warning when video snapshot is requested on devices not supporting it
Doris Liu [Wed, 30 Apr 2014 01:15:55 +0000 (18:15 -0700)]
Log warning when video snapshot is requested on devices not supporting it

Bug: 14413599
Change-Id: I483c3a02f39ca84f4d4a6d36f832e47276d70a38

10 years agoam 48a38062: build broke, here\'s a fix
Spike Sprague [Wed, 30 Apr 2014 01:07:47 +0000 (01:07 +0000)]
am 48a38062: build broke, here\'s a fix

* commit '48a380627793dfc11070505d5493bd8eb948969e':
  build broke, here's a fix

10 years agobuild broke, here's a fix
Spike Sprague [Wed, 30 Apr 2014 01:04:02 +0000 (18:04 -0700)]
build broke, here's a fix

Change-Id: Ifc2399e9c971aa9eb278b0b0b5c2cf4aac82509e

10 years agoam 6db1236e: resolved conflicts for merge of e903ae3f to ub-camera-everglades
Spike Sprague [Wed, 30 Apr 2014 00:54:38 +0000 (00:54 +0000)]
am 6db1236e: resolved conflicts for merge of e903ae3f to ub-camera-everglades

* commit '6db1236ecd6b33b4fd1042570cc0d725634a5276':
  fix free space calculation / querying timing problem

10 years agoresolved conflicts for merge of e903ae3f to ub-camera-everglades
Spike Sprague [Wed, 30 Apr 2014 00:46:01 +0000 (17:46 -0700)]
resolved conflicts for merge of e903ae3f to ub-camera-everglades

Change-Id: Ic0ea3fdfd5bad7ea3a576c3bc1ab7fddd7b557bc

10 years agoMerge "fix free space calculation / querying timing problem" into gb-ub-photos-denali
Spike Sprague [Wed, 30 Apr 2014 00:35:40 +0000 (00:35 +0000)]
Merge "fix free space calculation / querying timing problem" into gb-ub-photos-denali

10 years agofix free space calculation / querying timing problem
Spike Sprague [Sat, 26 Apr 2014 00:24:32 +0000 (17:24 -0700)]
fix free space calculation / querying timing problem

also, be (a little) more agressive about updating
available storage space so app generally has the most
up-to-date space calculation more often

bug: 14275001
Change-Id: I1aa91419be017f1248bb4b3b0aa805bd4e1b05c6

10 years agoam 85cb6f2c: am 7f714038: Merge "Fix abrupt opacity change in mode switcher when...
Doris Liu [Tue, 29 Apr 2014 23:01:50 +0000 (23:01 +0000)]
am 85cb6f2c: am 7f714038: Merge "Fix abrupt opacity change in mode switcher when a mode is selected" into gb-ub-photos-denali

* commit '85cb6f2cbf4d3506a3cf423941f0e25f41f0b280':
  Fix abrupt opacity change in mode switcher when a mode is selected

10 years agoam 7f714038: Merge "Fix abrupt opacity change in mode switcher when a mode is selecte...
Doris Liu [Tue, 29 Apr 2014 22:59:02 +0000 (22:59 +0000)]
am 7f714038: Merge "Fix abrupt opacity change in mode switcher when a mode is selected" into gb-ub-photos-denali

* commit '7f7140385c9a3811328fea3ca1c915809132fe6f':
  Fix abrupt opacity change in mode switcher when a mode is selected

10 years agoMerge "Fix abrupt opacity change in mode switcher when a mode is selected" into gb...
Doris Liu [Tue, 29 Apr 2014 22:57:03 +0000 (22:57 +0000)]
Merge "Fix abrupt opacity change in mode switcher when a mode is selected" into gb-ub-photos-denali

10 years agoam 472e1ab8: Merge "Add affordance to toggle mode switcher and filmstrip for accessib...
Doris Liu [Tue, 29 Apr 2014 22:48:42 +0000 (22:48 +0000)]
am 472e1ab8: Merge "Add affordance to toggle mode switcher and filmstrip for accessiblity" into ub-camera-everglades

* commit '472e1ab8f5486ff40a9e8b1cb3da141ac63aaa7c':
  Add affordance to toggle mode switcher and filmstrip for accessiblity

10 years agoMerge "Add affordance to toggle mode switcher and filmstrip for accessiblity" into...
Doris Liu [Tue, 29 Apr 2014 22:46:51 +0000 (22:46 +0000)]
Merge "Add affordance to toggle mode switcher and filmstrip for accessiblity" into ub-camera-everglades

10 years agoAdd affordance to toggle mode switcher and filmstrip for accessiblity
Doris Liu [Tue, 29 Apr 2014 05:36:08 +0000 (22:36 -0700)]
Add affordance to toggle mode switcher and filmstrip for accessiblity

Bug: 14109115
Bug: 14106588
Change-Id: Ie5eea0f942739f2f0a1088ba7d568189bfe02b6b

10 years agoFix abrupt opacity change in mode switcher when a mode is selected
Doris Liu [Tue, 29 Apr 2014 22:00:30 +0000 (15:00 -0700)]
Fix abrupt opacity change in mode switcher when a mode is selected

Bug: 14408761
Change-Id: Icb526fd30fe764322f0fd6158b4d47eb0540bb30

10 years agoam 477d260a: (-s ours) am 5a3e74eb: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Tue, 29 Apr 2014 21:13:29 +0000 (21:13 +0000)]
am 477d260a: (-s ours) am 5a3e74eb: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali

* commit '477d260a9d5dd5287406c7f417cd5ef3aaa21d18':
  Import translations. DO NOT MERGE

10 years agoam 5a3e74eb: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Tue, 29 Apr 2014 21:12:14 +0000 (21:12 +0000)]
am 5a3e74eb: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali

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

10 years agoam 192edd1e: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-everg...
Baligh Uddin [Tue, 29 Apr 2014 21:10:17 +0000 (21:10 +0000)]
am 192edd1e: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-everglades

* commit '192edd1e4aa69cfd987cb0d3d836b86c532e1175':
  Import translations. DO NOT MERGE

10 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
Baligh Uddin [Tue, 29 Apr 2014 21:08:33 +0000 (21:08 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali

10 years agoMerge "Import translations. DO NOT MERGE" into ub-camera-everglades
Baligh Uddin [Tue, 29 Apr 2014 21:08:29 +0000 (21:08 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-everglades

10 years agoam 311372eb: am eaaf2930: Add logging for failure conditions.
Andy Huibers [Mon, 28 Apr 2014 23:35:37 +0000 (23:35 +0000)]
am 311372eb: am eaaf2930: Add logging for failure conditions.

* commit '311372eb258ed6f3cf28f092ab529d3ff65020bb':
  Add logging for failure conditions.

10 years agoam eaaf2930: Add logging for failure conditions.
Andy Huibers [Mon, 28 Apr 2014 23:32:18 +0000 (23:32 +0000)]
am eaaf2930: Add logging for failure conditions.

* commit 'eaaf29303c48c2befe216151bf9bedc008a1b616':
  Add logging for failure conditions.

10 years agoAdd logging for failure conditions.
Andy Huibers [Mon, 28 Apr 2014 20:18:31 +0000 (13:18 -0700)]
Add logging for failure conditions.

Bug: 14364757
Change-Id: I252b1d79b94dabdc8960c7e243c50c8d50cb1306

10 years agoam b65117fb: am 1b9d4fb6: Add history info for camera open failure log.
Angus Kong [Mon, 28 Apr 2014 22:09:01 +0000 (22:09 +0000)]
am b65117fb: am 1b9d4fb6: Add history info for camera open failure log.

* commit 'b65117fbce9a0dc6d7568a6b7b802baf5df6ead5':
  Add history info for camera open failure log.

10 years agoam 1b9d4fb6: Add history info for camera open failure log.
Angus Kong [Mon, 28 Apr 2014 22:07:25 +0000 (22:07 +0000)]
am 1b9d4fb6: Add history info for camera open failure log.

* commit '1b9d4fb6f649262e491c0fa743229b4930a87802':
  Add history info for camera open failure log.

10 years agoAdd history info for camera open failure log.
Angus Kong [Fri, 25 Apr 2014 18:41:23 +0000 (11:41 -0700)]
Add history info for camera open failure log.

bug:14365703
Change-Id: I4b2259e12121cac5b8165f5c5dbacf9cb3a936a6

10 years agoam dafb9214: am 51a09680: Notify DataAdapter.Listener the changes of data.
Angus Kong [Mon, 28 Apr 2014 21:44:52 +0000 (21:44 +0000)]
am dafb9214: am 51a09680: Notify DataAdapter.Listener the changes of data.

* commit 'dafb921412409c6884e8f9d44cba3da214489ce7':
  Notify DataAdapter.Listener the changes of data.

10 years agoam 51a09680: Notify DataAdapter.Listener the changes of data.
Angus Kong [Mon, 28 Apr 2014 21:43:11 +0000 (21:43 +0000)]
am 51a09680: Notify DataAdapter.Listener the changes of data.

* commit '51a09680b57aca64db91aaea11c11ca4b86a296b':
  Notify DataAdapter.Listener the changes of data.

10 years agoNotify DataAdapter.Listener the changes of data.
Angus Kong [Mon, 28 Apr 2014 21:37:09 +0000 (14:37 -0700)]
Notify DataAdapter.Listener the changes of data.

The DataAdapter.Listener should be notified the changes of data due to the
metadata change.

bug:14279339
Change-Id: Ia6b7302a6967c10a53557d6953fa7888955e13a0

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 28 Apr 2014 20:02:15 +0000 (13:02 -0700)]
Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 28 Apr 2014 20:00:43 +0000 (13:00 -0700)]
Import translations. DO NOT MERGE

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