OSDN Git Service
Andy Huibers [Tue, 13 May 2014 21:42:49 +0000 (21:42 +0000)]
am
e10f6cff: Merge "Logging for Everglades release." into ub-camera-everglades
* commit '
e10f6cff785050b251cfbd851160a89b68d6b781':
Logging for Everglades release.
Andy Huibers [Tue, 13 May 2014 21:38:46 +0000 (21:38 +0000)]
Merge "Logging for Everglades release." into ub-camera-everglades
Angus Kong [Tue, 13 May 2014 21:22:24 +0000 (21:22 +0000)]
am
cc3b010b: Merge "Handle error getting camera info." into ub-camera-everglades
* commit '
cc3b010bafb3a2aa027ef27bd8d53a8398e132df':
Handle error getting camera info.
Angus Kong [Tue, 13 May 2014 21:19:44 +0000 (21:19 +0000)]
Merge "Handle error getting camera info." into ub-camera-everglades
Angus Kong [Mon, 12 May 2014 22:31:35 +0000 (15:31 -0700)]
Handle error getting camera info.
bug:
13877028
Change-Id: Iff0353738de3290244092076b2f955f0d7d57408
Sascha Haeberling [Tue, 13 May 2014 20:46:13 +0000 (20:46 +0000)]
am
910c1a94: Add custom share and edit intent chooser titles.
* commit '
910c1a94340163181a35bb60cd347ffbed0fbbf1':
Add custom share and edit intent chooser titles.
Sascha Haeberling [Tue, 13 May 2014 20:36:44 +0000 (13:36 -0700)]
Add custom share and edit intent chooser titles.
Bug:
14834379
Change-Id: I4534a8129ebc540c86d022d758aabfa0c8fbf23a
Sascha Haeberling [Tue, 13 May 2014 20:08:46 +0000 (20:08 +0000)]
am
08f6a7f5: Merge "Fix wrongly placed null check to prevent app crashes." into ub-camera-everglades
* commit '
08f6a7f5c693c3e3de02a8285efd5b7af323b574':
Fix wrongly placed null check to prevent app crashes.
Sascha Haeberling [Tue, 13 May 2014 20:04:19 +0000 (20:04 +0000)]
Merge "Fix wrongly placed null check to prevent app crashes." into ub-camera-everglades
Alan Newberger [Tue, 13 May 2014 18:49:16 +0000 (18:49 +0000)]
am
5126895d: am
1e73e7a0: added \'+\' to ImageView id
* commit '
5126895d96decd8d0a1918dc34799349bbed8b59':
added '+' to ImageView id
Alan Newberger [Tue, 13 May 2014 18:46:57 +0000 (18:46 +0000)]
am
1e73e7a0: added \'+\' to ImageView id
* commit '
1e73e7a05ea4a6f199482e5b64ac729665e2c8b7':
added '+' to ImageView id
Spike Sprague [Tue, 13 May 2014 18:16:00 +0000 (18:16 +0000)]
am
e541dc2d: fix pano buttons order in landscape orientation
* commit '
e541dc2d520aae8d45f3c605c3d732e33dd3b616':
fix pano buttons order in landscape orientation
Spike Sprague [Tue, 13 May 2014 17:57:53 +0000 (10:57 -0700)]
fix pano buttons order in landscape orientation
bug:
14886267
Change-Id: I111f24cb1f4f8a07bb96de8c36edeebeba80526a
Andy Huibers [Mon, 12 May 2014 21:44:13 +0000 (14:44 -0700)]
Logging for Everglades release.
Bug:
14364757
Change-Id: Ic29b41e7385378e022e388a02af7e4842e7ab9b5
Sascha Haeberling [Tue, 13 May 2014 16:22:45 +0000 (09:22 -0700)]
Fix wrongly placed null check to prevent app crashes.
Bug:
13923937
Change-Id: I2a144ba5d7057acb6f49d624695293fd39ed366a
Scott Ettinger [Tue, 13 May 2014 16:16:15 +0000 (16:16 +0000)]
am
0be183b3: Merge "Add wide angle and fish eye capture modes. bug:
14883143" into ub-camera-everglades
* commit '
0be183b3a0297ea40cb3415d291c142002facafa':
Add wide angle and fish eye capture modes. bug:
14883143
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
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
Baligh Uddin [Tue, 13 May 2014 15:58:01 +0000 (15:58 +0000)]
am
14e881aa: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
* commit '
14e881aa7e7b741342c0afea4c07eba29270b73f':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 13 May 2014 15:53:31 +0000 (15:53 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
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
(cherry picked from commit
2b39b3eea496c968b68b108ccafcc2455a942668)
Seth Raphael [Mon, 12 May 2014 22:12:42 +0000 (22:12 +0000)]
am
0b7f494a: Merge "Localize aspect ratios in settings summaries" into ub-camera-everglades
* commit '
0b7f494a6fb9bc861bdad529bf07618e63093fa9':
Localize aspect ratios in settings summaries
Seth Raphael [Mon, 12 May 2014 22:12:42 +0000 (22:12 +0000)]
am
d63b0fce: Merge "Add new string for describing resolutions." into ub-camera-everglades
* commit '
d63b0fce3b8bb993dba76c08a53d923b25f853ff':
Add new string for describing resolutions.
Seth Raphael [Mon, 12 May 2014 22:10:10 +0000 (22:10 +0000)]
Merge "Localize aspect ratios in settings summaries" 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
Seth Raphael [Mon, 12 May 2014 21:22:24 +0000 (21:22 +0000)]
am
5fc3c7a0: Merge "Do not mutate the List of Sizes passed to helpers" into ub-camera-everglades
* commit '
5fc3c7a0f577419bbf0ef32dc43f6cf9c13d2999':
Do not mutate the List of Sizes passed to helpers
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
Seth Raphael [Mon, 12 May 2014 21:17:49 +0000 (14:17 -0700)]
Localize aspect ratios in settings summaries
Bug:
14496248
Change-Id: I392dc627d09a09980d450ad1dfc93d0e4e5a237c
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
Spike Sprague [Mon, 12 May 2014 21:06:13 +0000 (21:06 +0000)]
am
92c4a17d: Merge "new pano icons preliminary support for wide-angle and fisheye pano modes" into ub-camera-everglades
* commit '
92c4a17d580fdbebac0c07d90ec52d6024de86ae':
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
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
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
Sascha Haeberling [Mon, 12 May 2014 20:15:59 +0000 (20:15 +0000)]
am
80670484: Merge "Don\'t use stale parameters for capabilities." into ub-camera-everglades
* commit '
80670484772338535c41346a405fb49989095692':
Don't use stale parameters for capabilities.
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
Seth Raphael [Mon, 12 May 2014 19:59:50 +0000 (19:59 +0000)]
am
cbe717f3: Merge "Do not display large 16x9 option on N5 front cam" into ub-camera-everglades
* commit '
cbe717f3d0dd3fcb4627827a1833f1aa8129b8f3':
Do not display large 16x9 option on N5 front cam
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
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
Alan Newberger [Mon, 12 May 2014 19:50:39 +0000 (19:50 +0000)]
am
2b39b3ee: added \'+\' to ImageView id
* commit '
2b39b3eea496c968b68b108ccafcc2455a942668':
added '+' to ImageView id
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
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
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
Spike Sprague [Sat, 10 May 2014 00:44:21 +0000 (00:44 +0000)]
am
66f5c1aa: Merge "add content descriptions for exposure comp buttons." into ub-camera-everglades
* commit '
66f5c1aaf06950be74f59a0f52c2cb53a69b4208':
add content descriptions for exposure comp buttons.
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
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
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
Doris Liu [Sat, 10 May 2014 00:36:13 +0000 (00:36 +0000)]
Merge "Add new strings for timely translation" 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
Alan Newberger [Sat, 10 May 2014 00:34:53 +0000 (00:34 +0000)]
Merge "String modifications for Everglades" into ub-camera-everglades
Spike Sprague [Sat, 10 May 2014 00:30:12 +0000 (00:30 +0000)]
Merge "filmstrip accessibility" 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
Doris Liu [Sat, 10 May 2014 00:27:35 +0000 (17:27 -0700)]
Add new strings for timely translation
Change-Id: I41e9f3332f412c077656fc235a26be96bd442101
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
Spike Sprague [Sat, 10 May 2014 00:23:39 +0000 (00:23 +0000)]
Merge "CL for string translation" into ub-camera-everglades
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
Spike Sprague [Sat, 10 May 2014 00:04:20 +0000 (17:04 -0700)]
CL for string translation
Change-Id: Icb44757c1e4c0d7c67dea26868b8c201dddd381b
Spike Sprague [Fri, 9 May 2014 23:03:42 +0000 (16:03 -0700)]
add content descriptions for exposure comp buttons.
Change-Id: Ie37e49f913574f76de1b6c39c5207411fe1ab255
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.
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.
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
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
Baligh Uddin [Thu, 8 May 2014 14:48:28 +0000 (14:48 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
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
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
Angus Kong [Wed, 7 May 2014 21:15:14 +0000 (21:15 +0000)]
Merge "First Step: CameraCapabilities intead of Parameter" into ub-camera-everglades
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.
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
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
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
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
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
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
Alan Newberger [Wed, 7 May 2014 00:15:37 +0000 (00:15 +0000)]
Merge "Move share evaluation into ReleaseDialogHelper" into ub-camera-everglades
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
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
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
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
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
Baligh Uddin [Tue, 6 May 2014 14:52:14 +0000 (14:52 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
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
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
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
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.
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
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
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
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
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
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
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
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
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.
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
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
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
Doris Liu [Thu, 1 May 2014 23:45:09 +0000 (23:45 +0000)]
Merge "Fix rounding error" into gb-ub-photos-denali
Doris Liu [Thu, 1 May 2014 23:09:36 +0000 (16:09 -0700)]
Fix rounding error
Bug:
14446168
Change-Id: Ic3fc882eab96f4d6e94fdb25928c362e5b33153f
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
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
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