OSDN Git Service
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
Baligh Uddin [Fri, 31 Oct 2014 17:13:16 +0000 (17:13 +0000)]
am
6871a7ea: (-s ours) Import translations. DO NOT MERGE
* commit '
6871a7eaf8695f70bb39d7bd78c66b1dcffa6459':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 30 Oct 2014 18:57:34 +0000 (11:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0e5bc66edc17019f34219cfc25061b9332b1e56e
Auto-generated-cl: translation import
Sascha Haeberling [Wed, 29 Oct 2014 19:14:07 +0000 (12:14 -0700)]
Forcefully drop 4k recording from pre-L releases.
Bug:
18172081
Change-Id: I26b09f19757e059d3567b3cb707592696531d0b3
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
Change-Id: I70a3ad8a9264c320b5e2d6a9097a05d473e4fcfa
Sascha Haeberling [Tue, 28 Oct 2014 00:53:12 +0000 (17:53 -0700)]
Fix wear interaction of CaptureModule
Bug:
18121865
- Make sure we announce that the module is exiting.
- Send postview image to wear device.
- Make sure we can take a picture when timer is on.
Change-Id: I1cbc2e9a1725fdd6d8724ce93f547c87eab8b4aa
I-Jong Lin [Mon, 27 Oct 2014 23:17:19 +0000 (23:17 +0000)]
Merge "Volantis Device Identifier Helper" into ub-camera-glacier
I-Jong Lin [Mon, 27 Oct 2014 22:38:32 +0000 (15:38 -0700)]
Volantis Device Identifier Helper
Bug:
17868158
Part of a multi-project commit, along with ag/575889
Adds a helper function to identify when the Android device
is a Nexus 9.
Change-Id: I36c3b6e4472d08d1be7b1197fd62f4766fcc81ed
Spike Sprague [Mon, 27 Oct 2014 21:21:30 +0000 (21:21 +0000)]
Merge "consistent style for titles on user education screens" into ub-camera-glacier
Spike Sprague [Mon, 27 Oct 2014 21:07:14 +0000 (21:07 +0000)]
Merge "Prevent unnecessary setVisibility calls in Filmstrip while zooming" into ub-camera-glacier
Spike Sprague [Mon, 27 Oct 2014 18:58:42 +0000 (11:58 -0700)]
Prevent unnecessary setVisibility calls in Filmstrip while zooming
bug:
18122644
Change-Id: I2681e5f104527553c4f6d71d96c0b659685813fa
Alan Newberger [Mon, 27 Oct 2014 18:29:34 +0000 (11:29 -0700)]
Align id selection from QueryTask to sort order from Media query
In QueryTask we pick the id from the first result and consider it
the max id, yet we query ordered by date taken. On most phones
they're the same but by correcting the query to satisfy the
assumption in QueryTask, we remove costly scenarios where most
photos are reprocessed in LoadNewPhotosTask. One line fix in
LocalMediaData with more verbose logging added in CameraDataAdapter.
Bug:
17437217
Change-Id: Ia643f38d1bfb77ff0beaba989f0effe9a4dec31c
Spike Sprague [Fri, 24 Oct 2014 18:32:06 +0000 (11:32 -0700)]
consistent style for titles on user education screens
bug:
18115448
Change-Id: I9d1caaa0903d6f3c2c47ca3e8457a4f85aad910c
Baligh Uddin [Mon, 27 Oct 2014 05:42:44 +0000 (05:42 +0000)]
am
7c2cbc43: (-s ours) am
2e1d2ed6: (-s ours) am
91bceebd: (-s ours) Import translations. DO NOT MERGE
* commit '
7c2cbc434014cdafd0cfd3c45e6f0949bccdc6c4':
Neil Fuller [Mon, 27 Oct 2014 05:42:43 +0000 (05:42 +0000)]
am
18f6c519: am
49bcaafb: resolved conflicts for merge of
c0dd3adf to lmp-dev-plus-aosp
* commit '
18f6c5193afd753455bec5f4edef43c1e1a99838':
Dianne Hackborn [Mon, 27 Oct 2014 05:42:42 +0000 (05:42 +0000)]
Alan Newberger [Mon, 27 Oct 2014 05:42:42 +0000 (05:42 +0000)]
am
e3d446cd: am
4828ce4c: am
7ba23fed: Fix preference copy migration and incorrect HDR+ sticky bit
* commit '
e3d446cd1aa3434de4b29ea24e24bc75a9e246ab':
Alan Newberger [Mon, 27 Oct 2014 05:42:41 +0000 (05:42 +0000)]
am
570f65dc: am
d4760214: am
0ac0b733: Merge "Fix incorrect key translation in Settings refactor" into lmp-dev
* commit '
570f65dc60163d8cac713ca78bce3e8dacd4354f':
Alan Newberger [Mon, 27 Oct 2014 05:42:40 +0000 (05:42 +0000)]
am
6843a0ad: am
eaed8186: am
d30fdee3: Merge "Trap CameraAgentFactory RTEs during recycle" into lmp-dev
* commit '
6843a0ad7a017c7266152ad9dd0ace17d17fa3d3':
Alan Newberger [Mon, 27 Oct 2014 05:42:40 +0000 (05:42 +0000)]
am
edd29484: am
6ac0378f: am
b0be8f53: Merge "Trap camera close exceptions on pause" into lmp-dev
* commit '
edd29484d0211f20f7b526be78d5379aedd86113':
Alan Newberger [Mon, 27 Oct 2014 05:42:39 +0000 (05:42 +0000)]
am
f035b2de: am
375d5482: am
0021c301: Merge "Avoid porting null keys when copying preferences into new system" into lmp-dev
* commit '
f035b2de27a3bde2a83d240d1976bc4fb8c3d518':
Alan Newberger [Mon, 27 Oct 2014 05:42:38 +0000 (05:42 +0000)]
am
f9888d1d: am
198f078b: am
a9ed2418: Only set preview size before starting preview
* commit '
f9888d1de2d0d0b6f2632af268073cad77248e50':
Alan Newberger [Mon, 27 Oct 2014 05:42:38 +0000 (05:42 +0000)]
am
31642b9c: am
c17b9383: am
e1eb82bc: Use NEW_DOCUMENT vs NEW_TASK when starting Activities from Camera
* commit '
31642b9ce046b646526374a2dbbd947872e6828c':
Alan Newberger [Mon, 27 Oct 2014 05:42:37 +0000 (05:42 +0000)]
am
a3c0f1a4: am
2fc13a0f: am
dae542a3: Fix error in settings key from refactor
* commit '
a3c0f1a48804c23f80b570c18ea6f3c600d0da22':
Alan Newberger [Mon, 27 Oct 2014 05:42:36 +0000 (05:42 +0000)]
am
528024db: am
ff1bfbf5: am
d822d1cf: Only allow one draw call pending at a time
* commit '
528024db3a84deb04f6d128e756c1077a647239e':
Senpo Hu [Mon, 27 Oct 2014 05:42:36 +0000 (05:42 +0000)]
am
876f7108: am
952779b5: am
2499af48: Stability: call stopPreview() before switching off video module.
* commit '
876f71085d4a503d259dc4dc5cf5eaa64348d9dd':
Baligh Uddin [Mon, 27 Oct 2014 05:42:35 +0000 (05:42 +0000)]
am
a4a3b647: (-s ours) am
97750cc8: (-s ours) am
2f727aff: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
a4a3b647921cf595ca57c422d00fd2cbcaf3e247':
Senpo Hu [Mon, 27 Oct 2014 05:42:35 +0000 (05:42 +0000)]
am
0c9822f3: am
fd696d77: am
ed0fea9b: am
2d3475ae: Fix crash in VideoModule - Method called after release()
* commit '
0c9822f377fdb8f1e01375b3535d2dfb77d7c160':
Puneet Lall [Mon, 27 Oct 2014 05:42:34 +0000 (05:42 +0000)]
am
67c78543: am
fe297a35: am
6014e168: am
022ce61e: Synchronize CaptureModule camera open/close operations
* commit '
67c785431164b2afa5ed2750a244436e1da74a03':
Senpo Hu [Mon, 27 Oct 2014 05:42:33 +0000 (05:42 +0000)]
am
2b2c9c29: am
8d5639bf: am
93e01102: am
feb07ea4: Merge "Stability: add null check for all CameraProxy obj references in VideoModule." into ub-camera-glacier
* commit '
2b2c9c2998c86ee284aa597a67d8ccc9df705282':
Andy Huibers [Mon, 27 Oct 2014 05:42:33 +0000 (05:42 +0000)]
am
d5d61e9e: am
556370c3: am
d3a7c5af: am
ad12363e: Revert app workaround for bug
17614203 now that HAL is fixed. This reverts ag/543302.
* commit '
d5d61e9efecb68234b5b216849ec2bed1bbf8a5f':
Alan Newberger [Mon, 27 Oct 2014 05:42:32 +0000 (05:42 +0000)]
am
e8c58ca5: am
6956d11a: am
f379211c: am
47c4474e: Merge "Force filmstrip images to generate in JPEG compression format" into ub-camera-glacier
* commit '
e8c58ca5e95c9e20bf0ff7e6f85229a6f5b4f1b4':
Puneet Lall [Mon, 27 Oct 2014 05:42:31 +0000 (05:42 +0000)]
am
406b3d1f: am
051fddec: am
fc0e5d89: am
4d2f3bf4: Merge "Recreate a OneCameraManager instance for each Activity." into ub-camera-glacier
* commit '
406b3d1fa83f5497e49cc8bc3adaf83cb8154414':
Senpo Hu [Mon, 27 Oct 2014 05:42:31 +0000 (05:42 +0000)]
am
cac9f0a2: am
dbfd18d2: am
437fd924: am
ee3123ba: Stability: add null check for all CameraProxy obj references in PhotoModule.
* commit '
cac9f0a2a52aa9d70ff678204eb8b041b8176618':
Alan Newberger [Mon, 27 Oct 2014 05:42:30 +0000 (05:42 +0000)]
Alan Newberger [Mon, 27 Oct 2014 05:42:29 +0000 (05:42 +0000)]
am
041d20ec: am
87d802c2: am
92db2cb4: am
6b2d1e0b: Merge "Revert temporary session images in filmstrip to RGB_565" into ub-camera-glacier
* commit '
041d20ec22456ac6c525a4f72d3f7707787331eb':
Alan Newberger [Mon, 27 Oct 2014 05:42:29 +0000 (05:42 +0000)]
am
80d6250c: am
45cf7b25: am
af73f898: am
347dccbe: Ensure Camera doesn\'t attempt access of back camera on Nakasi
* commit '
80d6250cabde4dfceac343a7e5e1c43e47246232':
Alan Newberger [Mon, 27 Oct 2014 05:42:28 +0000 (05:42 +0000)]
am
b193c857: am
d6567402: am
9db50c18: am
2631a15a: Don\'t show aspect ratio UI if using API2 portability
* commit '
b193c857c2699319cdacb0e1575c91a416d91fbc':
Spike Sprague [Mon, 27 Oct 2014 05:42:27 +0000 (05:42 +0000)]
am
42a20015: am
10279d29: am
3e8f9db9: am
d8dbf53c: am
eeeed4fa: new sounds for timer ticker and pano / photosphere intermediate captures
* commit '
42a20015c3055afc312f94846d9a43144fc1f860':
Spike Sprague [Mon, 27 Oct 2014 05:42:26 +0000 (05:42 +0000)]
am
19193b9d: am
03a2759c: am
e31c82c2: am
c89420a6: am
7d1fb593: Merge "monkey test NPE fix, another null check on mCameraDevice" into ub-camera-glacier
* commit '
19193b9d4d975d4ad179ab7c8f3411496145a732':
Alan Newberger [Mon, 27 Oct 2014 05:42:26 +0000 (05:42 +0000)]
am
12a535ec: am
78bd5555: am
4c571d7e: am
1db7f286: am
b60af188: Merge "Fix filmstrip item bounds to filmstrip scale" into ub-camera-glacier
* commit '
12a535ec491ec9e20a6825e5e1ef7927fc7aedd1':
Alan Newberger [Mon, 27 Oct 2014 05:42:25 +0000 (05:42 +0000)]
Alan Newberger [Mon, 27 Oct 2014 05:42:24 +0000 (05:42 +0000)]
Alan Newberger [Mon, 27 Oct 2014 05:42:23 +0000 (05:42 +0000)]
am
5677ac23: am
2d4b0949: (-s ours) am
d0927687: (-s ours) Merge "Add scrolling support with a mouse wheel"
* commit '
5677ac239cfab0b0feb959b0fe783048d472796b':
Baligh Uddin [Mon, 27 Oct 2014 05:36:49 +0000 (05:36 +0000)]
am
2e1d2ed6: (-s ours) am
91bceebd: (-s ours) Import translations. DO NOT MERGE
* commit '
2e1d2ed664bf9a0b91424d19d158f1ea2b58c8fd':
Neil Fuller [Mon, 27 Oct 2014 05:36:45 +0000 (05:36 +0000)]
am
49bcaafb: resolved conflicts for merge of
c0dd3adf to lmp-dev-plus-aosp
* commit '
49bcaafb0ac92b2a2ae6b35deb640714b2a02bd9':
Dianne Hackborn [Mon, 27 Oct 2014 05:36:43 +0000 (05:36 +0000)]
Alan Newberger [Mon, 27 Oct 2014 05:36:42 +0000 (05:36 +0000)]
am
4828ce4c: am
7ba23fed: Fix preference copy migration and incorrect HDR+ sticky bit
* commit '
4828ce4cafbc0f56ca8add88938e7094559d8765':
Alan Newberger [Mon, 27 Oct 2014 05:36:41 +0000 (05:36 +0000)]
am
d4760214: am
0ac0b733: Merge "Fix incorrect key translation in Settings refactor" into lmp-dev
* commit '
d47602140064760f5a540bab7335664930b771e3':
Alan Newberger [Mon, 27 Oct 2014 05:36:39 +0000 (05:36 +0000)]
am
eaed8186: am
d30fdee3: Merge "Trap CameraAgentFactory RTEs during recycle" into lmp-dev
* commit '
eaed81862f73ff88ef215779efcbfbaf6782cf0c':
Alan Newberger [Mon, 27 Oct 2014 05:36:38 +0000 (05:36 +0000)]
am
6ac0378f: am
b0be8f53: Merge "Trap camera close exceptions on pause" into lmp-dev
* commit '
6ac0378ffbc78c42c3fb950c663c44d70e3bfdfc':
Alan Newberger [Mon, 27 Oct 2014 05:36:36 +0000 (05:36 +0000)]
am
375d5482: am
0021c301: Merge "Avoid porting null keys when copying preferences into new system" into lmp-dev
* commit '
375d5482b56df31818aa37a41dfb0951c5fb9005':
Alan Newberger [Mon, 27 Oct 2014 05:36:35 +0000 (05:36 +0000)]
am
198f078b: am
a9ed2418: Only set preview size before starting preview
* commit '
198f078b6a57dad83341cac8a254f24422f0cdcd':
Alan Newberger [Mon, 27 Oct 2014 05:36:34 +0000 (05:36 +0000)]
am
c17b9383: am
e1eb82bc: Use NEW_DOCUMENT vs NEW_TASK when starting Activities from Camera
* commit '
c17b9383ba663529c126207c7fdd96bbf2ec618f':
Alan Newberger [Mon, 27 Oct 2014 05:36:32 +0000 (05:36 +0000)]
am
2fc13a0f: am
dae542a3: Fix error in settings key from refactor
* commit '
2fc13a0fd476c0e427c433444486936db6fa3937':
Alan Newberger [Mon, 27 Oct 2014 05:36:31 +0000 (05:36 +0000)]
am
ff1bfbf5: am
d822d1cf: Only allow one draw call pending at a time
* commit '
ff1bfbf59b2259c6904370a146d1c0e83a99fe09':
Senpo Hu [Mon, 27 Oct 2014 05:36:30 +0000 (05:36 +0000)]
am
952779b5: am
2499af48: Stability: call stopPreview() before switching off video module.
* commit '
952779b558cab573da0c2a2943da51df1abbca85':
Baligh Uddin [Mon, 27 Oct 2014 05:36:28 +0000 (05:36 +0000)]
am
97750cc8: (-s ours) am
2f727aff: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
97750cc8eff73e2d3826739894f40950dcd2691f':