OSDN Git Service
Spike Sprague [Fri, 15 May 2015 17:18:01 +0000 (17:18 +0000)]
am
5cef93f1: am
dd19c33c: Merge "fixing mode -> color mapping" into ub-camera-glacier
* commit '
5cef93f14acf2c774c94ecaf27f01d3e7db29352':
Sascha Haeberling [Fri, 15 May 2015 17:17:54 +0000 (17:17 +0000)]
am
8fe7329a: am
f15d63e8: Make sure to set an audio source using MediaRecorder.
* commit '
8fe7329a586c319951d3ad3403b32a1d57d3e32e':
Spike Sprague [Fri, 15 May 2015 17:17:48 +0000 (17:17 +0000)]
am
95a374bb: am
17038432: Merge "clean out timelapse stuff from codebase" into ub-camera-glacier
* commit '
95a374bb3994efa616638a213037aac0744222ef':
Alan Newberger [Fri, 15 May 2015 17:17:44 +0000 (17:17 +0000)]
am
a68baf9d: am
39529585: Route switch preferences through SettingManager
* commit '
a68baf9d2f88b38b48cdcb2b6a49a3c7c067c76f':
Sascha Haeberling [Fri, 15 May 2015 17:17:36 +0000 (17:17 +0000)]
am
f6c64f1d: am
71ae986c: resolved conflicts for merge of
dcea7639 to ub-camera-glacier
* commit '
f6c64f1de59e6cf62403b9649c743996f1662a86':
Spike Sprague [Fri, 15 May 2015 17:17:23 +0000 (17:17 +0000)]
Sascha Haeberling [Fri, 15 May 2015 17:17:11 +0000 (17:17 +0000)]
am
be2a587c: am
78683612: Store temp session data in \'cache\' directory, not data.
* commit '
be2a587ce10d57191c81c55c20bae15fc7a6757a':
Sascha Haeberling [Fri, 15 May 2015 17:16:58 +0000 (17:16 +0000)]
am
6d1cf304: am
ca82f50d: Don\'t try to show storage hint if activity is no longer running.
* commit '
6d1cf304e750bde3d104d8502f5631817cdc2953':
Sascha Haeberling [Fri, 15 May 2015 17:16:40 +0000 (17:16 +0000)]
am
53fa8a31: am
a899a5a5: am
3c6de14b: Work in #onPictureTaken will be on a forked, so no need to fork the call.
* commit '
53fa8a31a254c350b3d527034d9e3bb381265d21':
Sascha Haeberling [Fri, 15 May 2015 17:16:28 +0000 (17:16 +0000)]
am
db5564e5: am
27450ecc: Don\'t crash if filename could not be found for ID.
* commit '
db5564e51f92e121dcbe1a78d75deaa3c733b32c':
Sascha Haeberling [Fri, 15 May 2015 17:16:17 +0000 (17:16 +0000)]
Sol Boucher [Fri, 15 May 2015 17:16:02 +0000 (17:16 +0000)]
am
ee189bcb: am
3755aefa: Merge "Eliminate unnecessary context in FragmentActivity constructor" into ub-camera-glacier
* commit '
ee189bcb6ea8cb55c77c398b289ae3c59574e15e':
Sol Boucher [Fri, 15 May 2015 17:15:50 +0000 (17:15 +0000)]
am
526b012a: am
c8f40886: Merge "Make app build against updated frameworks/ex portability library" into ub-camera-glacier
* commit '
526b012aaf4336cecc669f50e368b91b1d91a5c6':
Sam Judd [Fri, 15 May 2015 17:15:38 +0000 (17:15 +0000)]
Spike Sprague [Fri, 15 May 2015 17:15:17 +0000 (17:15 +0000)]
am
dd061446: am
10a16544: am
1d1af906: Merge "previous CL ag/496035 disabled shutter button clicks during shimmy, scaling back a11y disabling on shutter button" into ub-camera-fishlake
* commit '
dd061446cbb0cd8dff676ad4b7bf151ff23ec6ce':
Spike Sprague [Fri, 15 May 2015 17:14:52 +0000 (17:14 +0000)]
am
01f7813d: am
d921ee08: am
04ebcbba: make ProgressOverlay obey left and top of its bounding Rect
* commit '
01f7813da3407cc7f44886343d3b7e37c365ab0b':
Spike Sprague [Fri, 15 May 2015 17:14:13 +0000 (17:14 +0000)]
am
036c09a8: am
a59e9fc9: am
90defd62: Merge "disable shutter button when mode list is open" into ub-camera-fishlake
* commit '
036c09a87160246404e910e2a274a82848eb7da5':
Sascha Haeberling [Fri, 15 May 2015 17:13:48 +0000 (17:13 +0000)]
am
4509eef0: am
c78ffd70: resolved conflicts for merge of
ff899495 to ub-camera-glacier
* commit '
4509eef06d18a8514f318f7671e332aadb5374f0':
Sam Judd [Fri, 15 May 2015 17:13:19 +0000 (17:13 +0000)]
am
1611f497: am
336e533e: am
950fb6b8: Merge "Ensure photosphere/pano thumbs are always shown." into ub-camera-fishlake
* commit '
1611f497989f4daf748539fc6a4c43df272c5f6f':
Spike Sprague [Fri, 15 May 2015 17:13:00 +0000 (17:13 +0000)]
am
ead2117f: am
6d427e30: am
1e89c919: Merge "disable talkback a11y navigation on mode list during shimmy" into ub-camera-fishlake
* commit '
ead2117f8e596bf38aa5cc77b030a6f808813d49':
Baligh Uddin [Fri, 15 May 2015 17:12:36 +0000 (17:12 +0000)]
am
89181f43: (-s ours) am
7e329db9: (-s ours) am
3c866166: (-s ours) am
c0f06431: (-s ours) am
cb0f330b: (-s ours) Import translations. DO NOT MERGE
* commit '
89181f43dc11cd49206ff37d0e0c2a30202bd886':
Baligh Uddin [Fri, 15 May 2015 17:12:17 +0000 (17:12 +0000)]
am
00e78fdf: (-s ours) am
1b00c5da: (-s ours) am
aca13396: (-s ours) am
2ee019be: (-s ours) Import translations. DO NOT MERGE
* commit '
00e78fdfb7eb0c69a51bb311bf604bae94fca84d':
Baligh Uddin [Fri, 15 May 2015 17:11:50 +0000 (17:11 +0000)]
am
2802ea25: (-s ours) am
025a5b22: (-s ours) am
e6828fb6: (-s ours) Import translations. DO NOT MERGE
* commit '
2802ea2599b96675f386e28f648d94e40e5a0c60':
Baligh Uddin [Fri, 15 May 2015 17:11:32 +0000 (17:11 +0000)]
am
90155f6d: (-s ours) am
7558467a: (-s ours) Import translations. DO NOT MERGE
* commit '
90155f6d0bc0cc80b7b027ee62ebf1013c9cd149':
Baligh Uddin [Fri, 15 May 2015 17:11:15 +0000 (17:11 +0000)]
am
a7ddfe90: (-s ours) Import translations. DO NOT MERGE
* commit '
a7ddfe905160e797a67e3cde420f910e5fc0bc61':
Import translations. DO NOT MERGE
Erin Dahlgren [Fri, 15 May 2015 17:11:04 +0000 (17:11 +0000)]
am
543baf11: am
e81455fa: Change HDR plus flash default to off.
* commit '
543baf11fcdaa40e5b808f3691057cb5e460cad1':
Spike Sprague [Fri, 15 May 2015 17:10:54 +0000 (17:10 +0000)]
am
2babf19c: am
5f828150: am
02b9b9af: move intent review image view to proper spot in view hierachy
* commit '
2babf19ce24447b2ca461d9a8ea5dbb0a21f41b7':
Sascha Häberling [Fri, 15 May 2015 17:10:43 +0000 (17:10 +0000)]
am
7589b952: am
70310d79: am
d2922674: Merge "Pass the real file length to MediaStore." into ub-camera-fishlake
* commit '
7589b952e988d7c73465cdf66740bf6b6e7352bf':
Doris Liu [Fri, 15 May 2015 17:10:33 +0000 (17:10 +0000)]
am
3dbf4ddf: am
2b21a99b: (-s ours) am
af374822: (-s ours) Merge "DO NOT MERGE Revert "Remove workaround for K-MR1 that registers redundant preview callbacks"" into ub-camera-fishlake
* commit '
3dbf4ddfbeac7af07799b572fc25e073b94eccfc':
Sascha Haeberling [Fri, 15 May 2015 17:10:24 +0000 (17:10 +0000)]
am
dfed4714: am
6f283264: am
aa52b3d2: Prevent crash for when newData cannot be found.
* commit '
dfed47148d98815a9c1b75ace5d233ac571d887c':
Sascha Haeberling [Fri, 15 May 2015 17:10:13 +0000 (17:10 +0000)]
am
184fde34: am
7629fbf9: am
b46c1855: New blue for clings and tutorials graphics
* commit '
184fde347d760c058584ba2f3e1cf4af594c759f':
Spike Sprague [Fri, 15 May 2015 17:09:51 +0000 (17:09 +0000)]
am
e42d3d4c: am
8d92caac: am
9f3d01d9: volume button cancels ongoing countdown prevent volume button from doing anything during intent capture review
* commit '
e42d3d4cc1b39d01a093691d1a5d0f731b1c4811':
Andy Huibers [Fri, 15 May 2015 17:09:26 +0000 (17:09 +0000)]
am
aac4c714: am
6a8321ca: am
0b3f9d51: Clean up foregrounding stats so that they are balanced with backgrounding stats.
* commit '
aac4c714ad7ca6f65445c9f430c6693e4317cc67':
Baligh Uddin [Fri, 15 May 2015 17:09:03 +0000 (17:09 +0000)]
am
64902de0: (-s ours) am
e568ae9d: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
* commit '
64902de02230c626b8e2b919f920e4908c79828a':
Geoff Mendal [Thu, 14 May 2015 03:50:31 +0000 (03:50 +0000)]
am
dd044ddb: (-s ours) Import translations. DO NOT MERGE
* commit '
dd044ddbc8f9ab3970f3b066bab29a1e3954de00':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 14 May 2015 03:39:43 +0000 (20:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0dcf363579e411bb5aef5974f2dd4923d4865a78
Auto-generated-cl: translation import
Geoff Mendal [Wed, 22 Apr 2015 14:23:08 +0000 (07:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6daa637a6a0003dd1eb99ae4f2e88c6f4bc8db9a
Auto-generated-cl: translation import
Geoff Mendal [Sat, 18 Apr 2015 03:10:56 +0000 (20:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia9a8b8da5efa281afab9c56c498015f8ae5e4539
Auto-generated-cl: translation import
Geoff Mendal [Wed, 8 Apr 2015 12:36:04 +0000 (05:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1638540ca2170f545f32cf3f8a6acba8a45eed75
Auto-generated-cl: translation import
Alex Klyubin [Thu, 2 Apr 2015 19:40:54 +0000 (12:40 -0700)]
Declare that Camera2 does not use cleartext network traffic.
This declares to the platform and tools that this app does not use
cleartext network traffic. The platform and tools will be blocking
(on best effort basis) attempts to use such traffic by this app.
For example, attempts to use HTTP (rather than HTTPS) will be blocked.
Bug:
19215516
Change-Id: Icaad30144192b13df87726445e19c37e0fd824bf
Geoff Mendal [Mon, 30 Mar 2015 12:27:42 +0000 (05:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic0ec16a70f3a459175f5d06902c16e39a4c6f3a9
Auto-generated-cl: translation import
Geoff Mendal [Fri, 27 Mar 2015 22:16:13 +0000 (15:16 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3f638a70211e60ea731ca24dec0d3358df2e461e
Auto-generated-cl: translation import
Geoff Mendal [Sat, 21 Mar 2015 07:13:16 +0000 (00:13 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3c48e28f7992c0ba1577b2e4d60a3ed2da3ae80d
Auto-generated-cl: translation import
Geoff Mendal [Wed, 18 Mar 2015 13:02:42 +0000 (06:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: I55ecffbca5fb21a46d1eeda4cf78441cd3871daf
Auto-generated-cl: translation import
Geoff Mendal [Fri, 27 Feb 2015 16:47:48 +0000 (16:47 +0000)]
am
d4fcb351: (-s ours) am
182c13c6: (-s ours) Import translations. DO NOT MERGE
* commit '
d4fcb351790bd69f09dc7109598eeccc9cbf9722':
Import translations. DO NOT MERGE
Geoff Mendal [Fri, 27 Feb 2015 16:39:50 +0000 (16:39 +0000)]
am
182c13c6: (-s ours) Import translations. DO NOT MERGE
* commit '
182c13c6767a1513ef998559bed684cbefc8e2c9':
Import translations. DO NOT MERGE
Geoff Mendal [Fri, 27 Feb 2015 01:44:44 +0000 (17:44 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5c3699b9217bfa4356e94fcf69cd74f40b0c2b52
Auto-generated-cl: translation import
Geoff Mendal [Mon, 23 Feb 2015 14:04:59 +0000 (06:04 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3afef572387842129ff5a99995e9292882d26ece
Auto-generated-cl: translation import
Narayan Kamath [Fri, 13 Feb 2015 10:46:48 +0000 (10:46 +0000)]
Add an explicit dependency on org.apache.http.legacy.
bug:
18027885
Change-Id: I94b14450807bdad2153078ac9a800863acf3177d
Geoff Mendal [Fri, 13 Feb 2015 01:21:16 +0000 (01:21 +0000)]
am
b87c7f22: (-s ours) am
fe4cb0e6: (-s ours) Import translations. DO NOT MERGE
* commit '
b87c7f22b5e494afe6896931f23335c7de293352':
Import translations. DO NOT MERGE
Geoff Mendal [Fri, 13 Feb 2015 01:14:55 +0000 (01:14 +0000)]
am
fe4cb0e6: (-s ours) Import translations. DO NOT MERGE
* commit '
fe4cb0e6f2845e88b4d909bc240b135bf05a910b':
Import translations. DO NOT MERGE
Geoff Mendal [Fri, 13 Feb 2015 00:53:24 +0000 (16:53 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id44efe2fd9c5b7fe3f98a7ff5c9b384d78b1b8be
Auto-generated-cl: translation import
Neil Fuller [Thu, 12 Feb 2015 19:30:34 +0000 (19:30 +0000)]
am
50c8fe9b: am
6bd9d6cb: Merge "Remove additional dependencies on FloatMath"
* commit '
50c8fe9b7cadf48338e71fc4a5682ba9ec076bb2':
Remove additional dependencies on FloatMath
Neil Fuller [Thu, 12 Feb 2015 17:42:43 +0000 (17:42 +0000)]
am
6bd9d6cb: Merge "Remove additional dependencies on FloatMath"
* commit '
6bd9d6cbf53f07e4ea0455d9125ddd2a2ae8b6a1':
Remove additional dependencies on FloatMath
Neil Fuller [Thu, 12 Feb 2015 10:03:44 +0000 (10:03 +0000)]
Merge "Remove additional dependencies on FloatMath"
Sascha Haeberling [Tue, 28 Oct 2014 17:18:31 +0000 (10:18 -0700)]
Remove additional dependencies on FloatMath
See frameworks/base commit
33253a4baa6279f81a73425b49dfb6abe5f5416e
for details.
Bug: https://code.google.com/p/android/issues/detail?id=36199
(cherry-picked from commit
1332fc023ea9941ff4afac0a43d13930d5b59771)
Change-Id: Idc988340bfda1030a0d3461016cf592050417389
Geoff Mendal [Mon, 2 Feb 2015 15:15:33 +0000 (07:15 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ifa64b280d99c32f5ade8442db541e237109cae95
Auto-generated-cl: translation import
Geoff Mendal [Mon, 19 Jan 2015 17:16:10 +0000 (09:16 -0800)]
Import translations. DO NOT MERGE
Change-Id: I192c17e266944cba08e062ecd291e6d139461961
Auto-generated-cl: translation import
Geoff Mendal [Wed, 14 Jan 2015 15:36:45 +0000 (07:36 -0800)]
Import translations. DO NOT MERGE
Change-Id: I52476dd1aa23937b316b105075fb771020351796
Auto-generated-cl: translation import
Baligh Uddin [Mon, 22 Dec 2014 18:09:40 +0000 (10:09 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3052b4c23d79c1a768011fd5c49904a896c7c8c1
Auto-generated-cl: translation import
Geoff Mendal [Mon, 15 Dec 2014 14:49:46 +0000 (06:49 -0800)]
Import translations. DO NOT MERGE
Change-Id: I62152f8e6276d0c2f7f37a2888b225793065f7f7
Auto-generated-cl: translation import
Geoff Mendal [Mon, 8 Dec 2014 20:15:38 +0000 (12:15 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia95123f33dc8869e69b4b3e92523697d0f50b67f
Auto-generated-cl: translation import
Geoff Mendal [Wed, 26 Nov 2014 14:57:20 +0000 (06:57 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3de383ec886b063b307b75aef057547e60689945
Auto-generated-cl: translation import
Geoff Mendal [Mon, 24 Nov 2014 15:09:28 +0000 (07:09 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id17d2fde0913ca354da4bd6eedfa34d9c21044bd
Auto-generated-cl: translation import
Geoff Mendal [Wed, 19 Nov 2014 14:36:02 +0000 (06:36 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2e1828d9441e71a14227c0bdd12bdae31c3ecac2
Auto-generated-cl: translation import
Geoff Mendal [Mon, 17 Nov 2014 14:40:43 +0000 (06:40 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3a5e24362b8267881312a266c32b7ce0f28adc30
Auto-generated-cl: translation import
Dan Sandler [Sat, 15 Nov 2014 16:42:01 +0000 (16:42 +0000)]
am
793ab5bf: am
fa47b949: am
9149a9b6: Merge "Vector version of camera preview graphic." into lmp-mr1-dev
* commit '
793ab5bf002940885ae7b0be2c3ddd59103cac49':
Vector version of camera preview graphic.
Dan Sandler [Sat, 15 Nov 2014 16:42:00 +0000 (16:42 +0000)]
am
6942b796: am
180c7904: am
005533a9: Merge "Trim transparent pixels off camera preview bitmaps." into lmp-mr1-dev
* commit '
6942b796aac2b7adcb03bfe4f192fe2f6e08e156':
Trim transparent pixels off camera preview bitmaps.
Dan Sandler [Sat, 15 Nov 2014 16:32:17 +0000 (16:32 +0000)]
am
fa47b949: am
9149a9b6: Merge "Vector version of camera preview graphic." into lmp-mr1-dev
* commit '
fa47b94911982e6f04354cd395b1251043f3a42c':
Vector version of camera preview graphic.
Dan Sandler [Sat, 15 Nov 2014 16:32:16 +0000 (16:32 +0000)]
am
180c7904: am
005533a9: Merge "Trim transparent pixels off camera preview bitmaps." into lmp-mr1-dev
* commit '
180c790421d67744db71ff2bf310eb21d5a3326e':
Trim transparent pixels off camera preview bitmaps.
Dan Sandler [Fri, 14 Nov 2014 20:16:29 +0000 (20:16 +0000)]
am
9149a9b6: Merge "Vector version of camera preview graphic." into lmp-mr1-dev
* commit '
9149a9b657a66c786e2325678e948817c43b1c4c':
Vector version of camera preview graphic.
Dan Sandler [Fri, 14 Nov 2014 20:16:28 +0000 (20:16 +0000)]
am
005533a9: Merge "Trim transparent pixels off camera preview bitmaps." into lmp-mr1-dev
* commit '
005533a92a3b56ef8bceb456063ed0ac12c767cf':
Trim transparent pixels off camera preview bitmaps.
Dan Sandler [Fri, 14 Nov 2014 20:09:01 +0000 (20:09 +0000)]
Merge "Vector version of camera preview graphic." into lmp-mr1-dev
Dan Sandler [Fri, 14 Nov 2014 20:08:57 +0000 (20:08 +0000)]
Merge "Trim transparent pixels off camera preview bitmaps." into lmp-mr1-dev
Dan Sandler [Fri, 14 Nov 2014 15:39:49 +0000 (10:39 -0500)]
Vector version of camera preview graphic.
Even less RAM required to hang onto this in the lockscreen.
Bug:
18369196
Change-Id: I7ed5ad098b77c96b40d0b76e4a20a7fea12e362a
Dan Sandler [Fri, 14 Nov 2014 15:02:13 +0000 (10:02 -0500)]
Trim transparent pixels off camera preview bitmaps.
Since SysUI holds these bitmaps in memory for jank-free
drawing, these pixels are just wasted RAM. Since the
transition code assumes uniform square bitmaps, these are
all 64x64dp, which is still a teensy bit wasteful but much
better than before (144x144dp).
Bug:
18369196
Change-Id: Idf10b2048190ac44eff3e5da467149c460067347
Qiwen Zhao [Wed, 12 Nov 2014 23:10:27 +0000 (15:10 -0800)]
reset to
e75230e with history.
Alan Newberger [Wed, 12 Nov 2014 22:52:32 +0000 (22:52 +0000)]
am
437a1869: Use NEW_DOCUMENT vs NEW_TASK when starting Activities from Camera
* commit '
437a186929173ad576e0eac04bd5b79939816158':
Use NEW_DOCUMENT vs NEW_TASK when starting Activities from Camera
Alan Newberger [Wed, 12 Nov 2014 22:52:31 +0000 (22:52 +0000)]
am
5c9d7f34: Fix error in settings key from refactor
* commit '
5c9d7f34039ac96b3a136ccd6b16162e3b220848':
Fix error in settings key from refactor
Alan Newberger [Wed, 12 Nov 2014 22:52:29 +0000 (22:52 +0000)]
am
5db8e20d: Only allow one draw call pending at a time
* commit '
5db8e20db77bf86eba25ec713c76da783dd98b19':
Only allow one draw call pending at a time
Senpo Hu [Wed, 12 Nov 2014 22:52:28 +0000 (22:52 +0000)]
am
31d816f6: Merge "Stability: call stopPreview() before switching off video module." into ub-camera-glacier
* commit '
31d816f64eebfd24e662ff21f611a70b957d4859':
Stability: call stopPreview() before switching off video module.
Spike Sprague [Wed, 12 Nov 2014 22:52:26 +0000 (22:52 +0000)]
am
c19d97b3: Let VideoModule override default mode options enable/disable
* commit '
c19d97b385261312399b67b538f8faa074314beb':
Let VideoModule override default mode options enable/disable
Puneet Lall [Wed, 12 Nov 2014 22:52:24 +0000 (22:52 +0000)]
am
7c703ced: Cleanup: Move api check to ApiHelper
* commit '
7c703ced0248d6a368a216e9d7699ab8e9565415':
Cleanup: Move api check to ApiHelper
Spike Sprague [Wed, 12 Nov 2014 22:52:22 +0000 (22:52 +0000)]
am
2d512cc6: Merge "for intent capture and pano, fix the redo/ok/cancel button sizes so touch ripples show up right." into ub-camera-glacier
* commit '
2d512cc688a6e46bb8b34e293e87d2f0088a1abb':
for intent capture and pano, fix the redo/ok/cancel button sizes so touch ripples show up right.
Spike Sprague [Wed, 12 Nov 2014 22:52:19 +0000 (22:52 +0000)]
am
5ea5dc09: Merge "tweaking peephole animation time from 350 to 500, per in-person request" into ub-camera-glacier
* commit '
5ea5dc090151f857ba3787e8c29d1269e3dd6da4':
tweaking peephole animation time from 350 to 500, per in-person request
Alan Newberger [Wed, 12 Nov 2014 22:52:17 +0000 (22:52 +0000)]
am
535eed78: Merge "Avoid building filmstrip item data if activity is destroyed" into ub-camera-glacier
* commit '
535eed78310ff5774f544c8c8bb584585304e7ec':
Avoid building filmstrip item data if activity is destroyed
Spike Sprague [Wed, 12 Nov 2014 22:52:14 +0000 (22:52 +0000)]
am
56afe395: Merge "new share icon" into ub-camera-glacier
* commit '
56afe3958ddc1b0880c7f4cbb8604caca0a32469':
new share icon
Alan Newberger [Wed, 12 Nov 2014 22:52:12 +0000 (22:52 +0000)]
am
a530b688: Merge "WIP: Add recursive thumbnail call to LocalMediaData" into ub-camera-glacier
* commit '
a530b688ce6e5b61e7cea8dc500fd2642ccdb82c':
WIP: Add recursive thumbnail call to LocalMediaData
Qiwen Zhao [Wed, 12 Nov 2014 22:34:44 +0000 (14:34 -0800)]
reset to
ea0e399 with history.
Qiwen Zhao [Wed, 12 Nov 2014 22:29:19 +0000 (14:29 -0800)]
Merge branch 'lmp-mr1-ub-dev' of persistent-https://googleplex-android.git.corp.google.com/platform/packages/apps/Camera2 into lmp-mr1-ub-dev
Shaohan Zou [Wed, 5 Nov 2014 23:28:10 +0000 (15:28 -0800)]
Fix camera latency test
b/
18239042
Change-Id: Ia59b4c10551038bf2cbe9b9770f21c63f49731f3
Qiwen Zhao [Wed, 12 Nov 2014 21:45:06 +0000 (13:45 -0800)]
reset to
8dd164a with history.
Shaohan Zou [Thu, 6 Nov 2014 02:17:05 +0000 (02:17 +0000)]
am
6a6fddf8: am
3f57f7a9: am
6e1f4125: Fix camera latency test b/
18239042
* commit '
6a6fddf8e3c32d956d4c176b1216365fdb2f0d81':
Fix camera latency test b/
18239042
Shaohan Zou [Thu, 6 Nov 2014 01:59:38 +0000 (01:59 +0000)]
am
3f57f7a9: am
6e1f4125: Fix camera latency test b/
18239042
* commit '
3f57f7a95e6f82bcb30df5bfc2870aa022fa4a17':
Fix camera latency test b/
18239042
Shaohan Zou [Thu, 6 Nov 2014 01:39:43 +0000 (01:39 +0000)]
am
6e1f4125: Fix camera latency test b/
18239042
* commit '
6e1f41253728e6870de800f88b5aa2cfde60ee8b':
Fix camera latency test b/
18239042
Shaohan Zou [Wed, 5 Nov 2014 23:28:10 +0000 (15:28 -0800)]
Fix camera latency test
b/
18239042
Change-Id: Ia59b4c10551038bf2cbe9b9770f21c63f49731f3
Alan Newberger [Tue, 4 Nov 2014 22:30:39 +0000 (22:30 +0000)]
Merge "Relax aspect ratio matching tolerance for devices with 1.347 ratios" into ub-camera-glacier
Alan Newberger [Tue, 4 Nov 2014 22:21:33 +0000 (14:21 -0800)]
Relax aspect ratio matching tolerance for devices with 1.347 ratios
Our .01 tolerance omits valid 4:3 previews when the image capture is
more than 0.01 over true 4:3. Relax matching in Glacier just for
affected builds.
Bug:
18241645
Change-Id: I5868bc9535e4c9bb886f0de0daf0e83cd2f4dc78
Alan Newberger [Tue, 4 Nov 2014 06:44:14 +0000 (22:44 -0800)]
move size parameter setting before other settings
Update picture size before applying parameters prior to starting preview.
This is required to avoid a 640x480 default picture stream on the Nexus 4
which is causing lowered preview frame rates (for unknown reasons).
Bug:
18227551
Change-Id: I2b7648146ff57d5a7d78a22f884643c6d62497e6
Baligh Uddin [Fri, 31 Oct 2014 17:21:16 +0000 (17:21 +0000)]
am
bef77cbb: (-s ours) am
6871a7ea: (-s ours) Import translations. DO NOT MERGE
* commit '
bef77cbbf6ae879613a98db21385fa2d43c9ce20':
Import translations. DO NOT MERGE
OSDN Git Service
