OSDN Git Service

android-x86/packages-apps-Camera2.git
10 years agoMerge "Add wide angle and fish eye capture modes. bug: 14883143" into ub-camera...
Scott Ettinger [Tue, 13 May 2014 16:12:34 +0000 (16:12 +0000)]
Merge "Add wide angle and fish eye capture modes.   bug: 14883143" into ub-camera-everglades

10 years agoAdd wide angle and fish eye capture modes.
Scott Ettinger [Tue, 13 May 2014 04:43:54 +0000 (21:43 -0700)]
Add wide angle and fish eye capture modes.
  bug: 14883143

Change-Id: I57d1257652b3d6d9a2d7a05abea7a45337ec6a03

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

10 years agoMerge "Localize aspect ratios in settings summaries" into ub-camera-everglades
Seth Raphael [Mon, 12 May 2014 22:10:10 +0000 (22:10 +0000)]
Merge "Localize aspect ratios in settings summaries" into ub-camera-everglades

10 years agoMerge "Add new string for describing resolutions." into ub-camera-everglades
Seth Raphael [Mon, 12 May 2014 22:09:31 +0000 (22:09 +0000)]
Merge "Add new string for describing resolutions." into ub-camera-everglades

10 years agoMerge "Do not mutate the List of Sizes passed to helpers" into ub-camera-everglades
Seth Raphael [Mon, 12 May 2014 21:19:22 +0000 (21:19 +0000)]
Merge "Do not mutate the List of Sizes passed to helpers" into ub-camera-everglades

10 years agoLocalize aspect ratios in settings summaries
Seth Raphael [Mon, 12 May 2014 21:17:49 +0000 (14:17 -0700)]
Localize aspect ratios in settings summaries

Bug: 14496248
Change-Id: I392dc627d09a09980d450ad1dfc93d0e4e5a237c

10 years agoAdd new string for describing resolutions.
Seth Raphael [Mon, 12 May 2014 21:14:50 +0000 (14:14 -0700)]
Add new string for describing resolutions.

Now it includes aspect ratios as well as
megapixels

Bug: 14496248

Change-Id: I797cda0def8ba06b1a8c2098beaf94c875a90896

10 years agoMerge "new pano icons preliminary support for wide-angle and fisheye pano modes"...
Spike Sprague [Mon, 12 May 2014 21:03:13 +0000 (21:03 +0000)]
Merge "new pano icons preliminary support for wide-angle and fisheye pano modes" into ub-camera-everglades

10 years agonew pano icons
Spike Sprague [Thu, 8 May 2014 00:20:07 +0000 (17:20 -0700)]
new pano icons
preliminary support for wide-angle and fisheye pano modes

Change-Id: I6cb6c62f7f1f1f3a9943501e2de0ba9d718540dd

10 years agoDo not mutate the List of Sizes passed to helpers
Seth Raphael [Mon, 12 May 2014 19:20:27 +0000 (12:20 -0700)]
Do not mutate the List of Sizes passed to helpers

This was causing a bug by removing resolutions
from a list that was being reused other places.

Bug: 14826712

Change-Id: Iaab3bd279b7c517f2a51e582bc4047ef97192122

10 years agoMerge "Don't use stale parameters for capabilities." into ub-camera-everglades
Sascha Haeberling [Mon, 12 May 2014 20:12:58 +0000 (20:12 +0000)]
Merge "Don't use stale parameters for capabilities." into ub-camera-everglades

10 years agoDon't use stale parameters for capabilities.
Sascha Haeberling [Mon, 12 May 2014 19:58:02 +0000 (12:58 -0700)]
Don't use stale parameters for capabilities.

  Bug: 14823111

Change-Id: I524de9a6dd774c3aa8b6c47092657d66447565bc

10 years agoMerge "Do not display large 16x9 option on N5 front cam" into ub-camera-everglades
Seth Raphael [Mon, 12 May 2014 19:56:54 +0000 (19:56 +0000)]
Merge "Do not display large 16x9 option on N5 front cam" into ub-camera-everglades

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 12 May 2014 19:43:56 +0000 (12:43 -0700)]
Import translations. DO NOT MERGE

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

10 years agoadded '+' to ImageView id
Alan Newberger [Mon, 12 May 2014 19:42:54 +0000 (12:42 -0700)]
added '+' to ImageView id

in landscape counterpart this id is already marked with '+', looks
like a longstanding omission that is now causing build errors on master.

Change-Id: Iecd8c69346d396449fe1b90a5d74ccb31cf9ea3e

10 years agoDo not display large 16x9 option on N5 front cam
Seth Raphael [Mon, 12 May 2014 19:02:47 +0000 (12:02 -0700)]
Do not display large 16x9 option on N5 front cam

It was erroneously added to the list of supported
resolutions for the Nexus 5 front facing camera

Bug: 14819623

Change-Id: I4481c68a473cb790fa67a9648e80302f19bf3065

10 years agoMerge "add content descriptions for exposure comp buttons." into ub-camera-everglades
Spike Sprague [Sat, 10 May 2014 00:40:08 +0000 (00:40 +0000)]
Merge "add content descriptions for exposure comp buttons." into ub-camera-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 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 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 agoadd content descriptions for exposure comp buttons.
Spike Sprague [Fri, 9 May 2014 23:03:42 +0000 (16:03 -0700)]
add content descriptions for exposure comp buttons.

Change-Id: Ie37e49f913574f76de1b6c39c5207411fe1ab255

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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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

10 years agoam a8e77ab8: (-s ours) Merge "DO NOT MERGE - Shutter button left handed support"...
Doris Liu [Mon, 28 Apr 2014 13:27:23 +0000 (13:27 +0000)]
am a8e77ab8: (-s ours) Merge "DO NOT MERGE - Shutter button left handed support" into gb-ub-photos-denali

* commit 'a8e77ab86849156ea91758d1c1128f57ac5b7d21':
  DO NOT MERGE - Shutter button left handed support

10 years agoam e5ba601d: Merge "Bring back video snapshot" into gb-ub-photos-denali
Doris Liu [Mon, 28 Apr 2014 13:27:23 +0000 (13:27 +0000)]
am e5ba601d: Merge "Bring back video snapshot" into gb-ub-photos-denali

* commit 'e5ba601d4e3aa9419886e2ea4b3b2e5ba3d3e2e7':
  Bring back video snapshot

10 years agoam df8a3327: Avoid duplicate entries in the resolutions list.
Sascha Haeberling [Mon, 28 Apr 2014 13:27:22 +0000 (13:27 +0000)]
am df8a3327: Avoid duplicate entries in the resolutions list.

* commit 'df8a332710bbb1f2beee90b2b91f706c49ef5701':
  Avoid duplicate entries in the resolutions list.

10 years agoam 837d8524: Properly remove the settings for an unavailable camera.
Sascha Haeberling [Mon, 28 Apr 2014 13:27:22 +0000 (13:27 +0000)]
am 837d8524: Properly remove the settings for an unavailable camera.

* commit '837d8524a35731ce01e2a69fde846edc21b94071':
  Properly remove the settings for an unavailable camera.

10 years agoam 8afc8e2e: (-s ours) DO NOT MERGE - Refactor preview position logic
Doris Liu [Mon, 28 Apr 2014 13:27:21 +0000 (13:27 +0000)]
am 8afc8e2e: (-s ours) DO NOT MERGE - Refactor preview position logic

* commit '8afc8e2eaaa4fdeef3cf9060cc69613d37804f56':
  DO NOT MERGE - Refactor preview position logic

10 years agoMerge "DO NOT MERGE - Shutter button left handed support" into gb-ub-photos-denali
Doris Liu [Sat, 26 Apr 2014 01:30:39 +0000 (01:30 +0000)]
Merge "DO NOT MERGE - Shutter button left handed support" into gb-ub-photos-denali

10 years agoMerge "Bring back video snapshot" into gb-ub-photos-denali
Doris Liu [Sat, 26 Apr 2014 01:11:20 +0000 (01:11 +0000)]
Merge "Bring back video snapshot" into gb-ub-photos-denali

10 years agoBring back video snapshot
Doris Liu [Sat, 26 Apr 2014 00:35:27 +0000 (17:35 -0700)]
Bring back video snapshot

Bug: 14220490
Change-Id: Ibf20d169aae9de4eb9c1e2151d9c7335bcf7b3a3

10 years agoDO NOT MERGE - Shutter button left handed support
Doris Liu [Tue, 22 Apr 2014 21:47:49 +0000 (14:47 -0700)]
DO NOT MERGE - Shutter button left handed support

Bug: 12823819
Change-Id: I77bdbf17557bdd9f545b98bab58acce68d01b51d
(cherry picked from commit 344320c90639f823451ddac42e8f39b74727787c)

10 years agoAvoid duplicate entries in the resolutions list.
Sascha Haeberling [Fri, 25 Apr 2014 20:04:41 +0000 (13:04 -0700)]
Avoid duplicate entries in the resolutions list.

  Bug: 14277230

Dup entries indicate that a camera doesn't support at least three entries.

Change-Id: Id3c18664637ba9cf80edada924695737863cf3a7

10 years agoShutter button left handed support
Doris Liu [Tue, 22 Apr 2014 21:47:49 +0000 (14:47 -0700)]
Shutter button left handed support

Bug: 12823819
Change-Id: I77bdbf17557bdd9f545b98bab58acce68d01b51d

10 years agoUse Point to back up util.Size.
Angus Kong [Thu, 24 Apr 2014 22:46:52 +0000 (15:46 -0700)]
Use Point to back up util.Size.

Change-Id: I125d290ee94c9acadf77c50c6c9c0b9b24df4a88

10 years agoProperly remove the settings for an unavailable camera.
Sascha Haeberling [Thu, 24 Apr 2014 21:26:28 +0000 (14:26 -0700)]
Properly remove the settings for an unavailable camera.

  Bug: 14108948

Change-Id: I34222ab976a481e8e28ed0bbc8b773dd3d49e8bb