OSDN Git Service
Doris Liu [Wed, 30 Apr 2014 18:14:42 +0000 (18:14 +0000)]
am
9fb17011: (-s ours) am
867c6364: am
4e90efbc: am
c502bc9d: Correct sample factor for rotated images in zoom view
* commit '
9fb17011a40e71543775b3a951a4d983da9a125c':
ztenghui [Wed, 30 Apr 2014 18:14:42 +0000 (18:14 +0000)]
am
2225732d: (-s ours) am
aaad00a7: am
6cd0dfeb: am
73809edd: Merge "Keep the ImageData size info consistent with MediaStore and Exif" into gb-ub-photos-carlsbad
* commit '
2225732d02a73df625f4641c19a14ddc09f37c61':
Sascha Haeberling [Wed, 30 Apr 2014 18:14:42 +0000 (18:14 +0000)]
am
a16cc411: (-s ours) am
5dce0fee: am
d820c0c6: am
2a2f33fe: (-s ours) Fix missing filtershow string. DO NOT MERGE
* commit '
a16cc41137119819847b7095c0446d96201e2d8c':
Baligh Uddin [Wed, 30 Apr 2014 18:14:42 +0000 (18:14 +0000)]
am
494c02aa: (-s ours) am
8f850b1b: am
eb418dba: Merge "Revert "Remove translated filtershow_strings.xml files."" into klp-dev
* commit '
494c02aabeafeab31d7e4f325f68ffd6a2765574':
Baligh Uddin [Wed, 30 Apr 2014 18:14:41 +0000 (18:14 +0000)]
am
3e322d6e: (-s ours) am
1bb8a000: am
591fbff2: Merge "Remove translated filtershow_strings.xml files." into klp-dev
* commit '
3e322d6ec7b6fc8286441bb3bcfc0455ed609daa':
Sascha Haeberling [Wed, 30 Apr 2014 18:14:41 +0000 (18:14 +0000)]
am
e6e00e74: (-s ours) am
5eaa6237: am
b439aa31: am
4de78806: Revert CL that added broadcast receivers for shutter control.
* commit '
e6e00e74536115db5707c9c0488f1f8c891f3d34':
Baligh Uddin [Wed, 30 Apr 2014 18:14:41 +0000 (18:14 +0000)]
am
f5b77cb7: (-s ours) am
afcf9bbd: am
e5b45eaf: (-s ours) Merge "Build broken." into klp-dev
* commit '
f5b77cb72f028b663ea3117c9e3185a76658f049':
Baligh Uddin [Wed, 30 Apr 2014 18:14:41 +0000 (18:14 +0000)]
am
6137316b: (-s ours) am
bf33451e: (-s ours) Merge "Build broken Revert "Import translations. DO NOT MERGE"" into klp-ub-dev
* commit '
6137316bb6e5b727a63ff4505828d3334aa8d4b7':
Build broken Revert "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 30 Apr 2014 18:14:41 +0000 (18:14 +0000)]
am
2c5ad7cc: (-s ours) am
4bb6f6e2: (-s ours) am
57913c82: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
2c5ad7cc54e89cbb29f43ea503e371c7d66195d8':
Baligh Uddin [Wed, 30 Apr 2014 18:14:40 +0000 (18:14 +0000)]
am
7ef6f5be: (-s ours) am
47becad6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
* commit '
7ef6f5be7aa363b5200b9e4ec9405a8752e31ee7':
Import translations. DO NOT MERGE
ztenghui [Wed, 30 Apr 2014 18:14:40 +0000 (18:14 +0000)]
am
82d2091c: (-s ours) am
d094939d: am
e0c413ca: am
4ab4879e: Don\'t show the option for Gcam when using front camera.
* commit '
82d2091c5d6796cd461eb8d0748f338872760040':
Sascha Haeberling [Wed, 30 Apr 2014 18:14:40 +0000 (18:14 +0000)]
Doris Liu [Wed, 30 Apr 2014 18:14:40 +0000 (18:14 +0000)]
am
2294bfcc: (-s ours) am
5e233f82: am
309cd179: am
b0fbd543: Merge "Prevent picture taking via volumn key in filmstrip mode" into gb-ub-photos-carlsbad
* commit '
2294bfccdf07dc5c641a13b3c6d653d4dcc0412b':
Sascha Haeberling [Wed, 30 Apr 2014 18:14:40 +0000 (18:14 +0000)]
am
e65a190d: (-s ours) am
2e2467c3: am
7c1ae08c: am
7ba4a88e: Merge "Sync Camera2 permissions to GoogleCamera permissions." into gb-ub-photos-carlsbad
* commit '
e65a190d2635c8a5c7ce8fd1b4b14f33bbbe5cc1':
Erin Dahlgren [Wed, 30 Apr 2014 18:14:40 +0000 (18:14 +0000)]
am
6f10aec6: (-s ours) am
f56cc71e: am
88b31b09: am
77dd1493: Merge "Make space for photosphere rendering text" into gb-ub-photos-carlsbad
* commit '
6f10aec6765021e7c022880786e3a24339b116f9':
Sascha Haeberling [Wed, 30 Apr 2014 18:14:40 +0000 (18:14 +0000)]
am
205c049c: (-s ours) am
67747e3d: am
6b879500: am
238799e9: Merge "Change icons and code from HQ to HDR+ mode." into gb-ub-photos-carlsbad
* commit '
205c049ced1184fe4b28b52cf9c39c3a9bd2f59a':
Angus Kong [Wed, 30 Apr 2014 18:14:40 +0000 (18:14 +0000)]
am
e3903c3b: (-s ours) am
2e63f2e6: am
5f16c140: am
5bca6f4c: Merge "Don\'t allow actions on items in progress." into gb-ub-photos-carlsbad
* commit '
e3903c3b848309747b433f14b67894364f4ec591':
Doris Liu [Wed, 30 Apr 2014 18:14:40 +0000 (18:14 +0000)]
am
e288dff3: (-s ours) am
37c96ec8: am
67510532: am
930b9b41: Merge "Leave ROI not set except in tap-to-focus scenario" into gb-ub-photos-carlsbad
* commit '
e288dff3f14ba19dc3c259b25e82e0385201b73c':
Kevin Gabayan [Wed, 30 Apr 2014 18:14:39 +0000 (18:14 +0000)]
am
24e76b0a: (-s ours) am
c421586c: am
5ed30cb7: am
68fc363b: Merge "Camera2 icon update for all resolutions." into gb-ub-photos-carlsbad
* commit '
24e76b0a5070fb993f13ee91e9cbddc6a8dcbb6a':
Sascha Haeberling [Wed, 30 Apr 2014 18:14:39 +0000 (18:14 +0000)]
am
83f9b837: (-s ours) am
3c3c63ea: am
644c534f: am
623b74b6: Add HDR+ mode strings (to replace HQ mode)
* commit '
83f9b8371d7b863ca05e5db91fa611ceee2e3d71':
Sascha Haeberling [Wed, 30 Apr 2014 18:14:39 +0000 (18:14 +0000)]
am
23b0a3f2: (-s ours) am
98461dca: am
8a605fad: am
3393a627: Merge "Add missing crop message." into gb-ub-photos-carlsbad
* commit '
23b0a3f21f748494717c991da6412900d3c56135':
ztenghui [Wed, 30 Apr 2014 18:14:39 +0000 (18:14 +0000)]
am
44c32d17: (-s ours) am
27408847: am
9a09d511: am
4c0aede4: Merge "Only show delete action when in secure camera mode." into gb-ub-photos-carlsbad
* commit '
44c32d1710482fd45aacfd077d206ad2de1df588':
ztenghui [Wed, 30 Apr 2014 18:14:39 +0000 (18:14 +0000)]
am
092b7e31: (-s ours) am
d915fa04: am
cd324a25: am
9ac97492: Merge "Show the delete button if there is room in action bar." into gb-ub-photos-carlsbad
* commit '
092b7e316290d7ffbc4cc7d59ba426d85b502717':
Mangesh Ghiware [Wed, 30 Apr 2014 18:14:39 +0000 (18:14 +0000)]
am
baa0e6a4: (-s ours) am
ac63f9c4: am
893981de: am
4f563f1d: Merge "Exit Camera on Up button if no APP_GALLERY handler found." into gb-ub-photos-carlsbad
* commit '
baa0e6a41872a36b9bf967fd445f65d8ddbc8f82':
Baligh Uddin [Wed, 30 Apr 2014 18:14:39 +0000 (18:14 +0000)]
am
6e5ae500: (-s ours) am
b5cdb04a: (-s ours) am
8bab49cd: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
6e5ae5008b647d996be7688db9a974ea00dd0be9':
Sascha Haeberling [Wed, 30 Apr 2014 18:14:39 +0000 (18:14 +0000)]
am
d7b30dd2: (-s ours) am
81fa3622: am
f8b53c38: am
c60e2b09: Merge "Increase char limit for camera timer sound message." into gb-ub-photos-carlsbad
* commit '
d7b30dd25a10169440241bb6c8053dfdc3023d1f':
Erin Dahlgren [Wed, 30 Apr 2014 18:14:39 +0000 (18:14 +0000)]
am
f0b608be: (-s ours) am
826b0631: am
03b10508: am
cf7babd5: Merge "Reads PhotoSphere metadata once fully loaded so that PhotoSphere viewer icon is visible." into gb-ub-photos-carlsbad
* commit '
f0b608be5bfd03200f32bb11cf0db999a3282417':
Angus Kong [Wed, 30 Apr 2014 18:14:38 +0000 (18:14 +0000)]
am
8c0263e2: (-s ours) am
81f859df: am
632afc19: am
45f5976f: Merge "Make scroll animation smoother." into gb-ub-photos-carlsbad
* commit '
8c0263e2b28973ba6a09ebc6dd8d8f2055202fda':
Sascha Haeberling [Wed, 30 Apr 2014 18:14:38 +0000 (18:14 +0000)]
am
4f4e12c6: (-s ours) am
3c45c0c0: am
b8968f2c: am
706c985f: Merge "Deactivate the backup agent in Camera2" into gb-ub-photos-carlsbad
* commit '
4f4e12c6cabe33152c6f974f8168e9f76d842c65':
Sascha Haeberling [Wed, 30 Apr 2014 18:14:38 +0000 (18:14 +0000)]
am
cf087b41: (-s ours) am
5a55e6b8: am
607bb9a2: am
72a83bc2: Merge "Add content description to post-capture thumbnail." into gb-ub-photos-carlsbad
* commit '
cf087b416532547626ec193b920757d5095ce0ac':
Erin Dahlgren [Wed, 30 Apr 2014 18:14:38 +0000 (18:14 +0000)]
am
5974e522: (-s ours) am
b7633573: am
852853c8: am
6416ba8a: Merge "Fix FilmStrip crash by checking if photos are present before updating action bar" into gb-ub-photos-carlsbad
* commit '
5974e5221e3bf63358e6b42a9085ccc0b0f36b85':
Doris Liu [Wed, 30 Apr 2014 18:14:38 +0000 (18:14 +0000)]
am
45385a9f: (-s ours) am
c4810a33: am
148b65b0: am
1f69e36b: A workaround for crash in zoom view
* commit '
45385a9f3225e8e1504aa0fa4cefd84a5bc77104':
Angus Kong [Wed, 30 Apr 2014 18:14:38 +0000 (18:14 +0000)]
am
ee5aa8f1: (-s ours) am
ee7f3963: am
9baebd5d: am
7fc104e4: Prevent NPE in gesture handling.
* commit '
ee5aa8f11fdf08b28dcd935e8288a881f6703586':
Doris Liu [Wed, 30 Apr 2014 18:14:38 +0000 (18:14 +0000)]
am
58af6bfd: (-s ours) am
6f2be56c: am
5eb88117: am
e2d59dcc: Merge "Double tap to full screen from filmstrip" into gb-ub-photos-carlsbad
* commit '
58af6bfdf86cbe797630b0cb9f1055369b01a103':
Erin Dahlgren [Wed, 30 Apr 2014 18:14:38 +0000 (18:14 +0000)]
am
791efd67: (-s ours) am
ee8d0e11: am
ed3a34fb: am
ad3003bb: Merge "Updates newly centered photos in FilmStrip after a delete." into gb-ub-photos-carlsbad
* commit '
791efd67fcf00f4d1ab15153403908fe6813d99f':
Baligh Uddin [Wed, 30 Apr 2014 18:14:38 +0000 (18:14 +0000)]
am
e096cec4: (-s ours) am
bcdea4ae: (-s ours) am
16376616: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
e096cec4964acb5e82cd63df90d7c56c29008ac4':
Angus Kong [Wed, 30 Apr 2014 18:14:37 +0000 (18:14 +0000)]
am
37123ea0: (-s ours) am
85be0ac8: am
a1cb57be: Merge "Don\'t adjust the position while scrolling." into gb-ub-photos-carlsbad
* commit '
37123ea0a142e378e9c9033e99c0bf4e7e9cdf4a':
Sascha Haeberling [Wed, 30 Apr 2014 18:14:37 +0000 (18:14 +0000)]
am
4b5dd651: (-s ours) am
7334597f: am
4d21fc2e: Merge "Show status bar in filmstrip mode" into gb-ub-photos-carlsbad
* commit '
4b5dd6514f5ef3026a325cfdb9d43b575c781df7':
ztenghui [Wed, 30 Apr 2014 18:14:37 +0000 (18:14 +0000)]
am
954be135: (-s ours) am
293cf7e4: am
4feabff8: Fix MediaStore correction code.
* commit '
954be1350bfadaa45035880a817f2723e8a3585a':
Sascha Haeberling [Wed, 30 Apr 2014 18:14:37 +0000 (18:14 +0000)]
am
2ef69c96: (-s ours) am
9c9244fc: am
c4aa7c0e: Change crop label to avoid aapt dump badging from failing.
* commit '
2ef69c967b91fd3c12ab56f6e06ae392ae231a89':
Alan Newberger [Wed, 30 Apr 2014 18:14:37 +0000 (18:14 +0000)]
am
d0a03f32: (-s ours) am
f390ec0c: am
fb344efd: Temporary removal of resize code to evaluate GCam image bug
* commit '
d0a03f3293fe83c0bc3aa8d91ea17961baab0729':
Sascha Haeberling [Wed, 30 Apr 2014 18:14:37 +0000 (18:14 +0000)]
am
604c0289: (-s ours) am
70d6ff76: am
ac5cb243: Merge "Add basic EXIF to the tiny planet so that rotate succeeds." into gb-ub-photos-carlsbad
* commit '
604c02890925d5ad1086fe211c47f595c2647c81':
ztenghui [Wed, 30 Apr 2014 18:14:37 +0000 (18:14 +0000)]
am
a6491129: (-s ours) am
d200ce9a: am
b7be228d: Fix incorrect width and height from MediaStore.
* commit '
a64911292be4e18c0c435b6914c777136b496045':
Angus Kong [Wed, 30 Apr 2014 18:14:37 +0000 (18:14 +0000)]
am
bbe03add: (-s ours) am
5475e801: am
9ba47bf4: Merge "Restore HQ preference in GCam module." into gb-ub-photos-carlsbad
* commit '
bbe03addaa5f2f8f2388b14ffadc0124bcd59c24':
ztenghui [Wed, 30 Apr 2014 18:14:37 +0000 (18:14 +0000)]
am
603b1711: (-s ours) am
2b0ce26b: am
af41aaa4: Don\'t update the width and height in MediaStore after rotation
* commit '
603b1711e6876e07a8be49d68c98c29db7ce2574':
Sascha Haeberling [Wed, 30 Apr 2014 18:14:37 +0000 (18:14 +0000)]
am
20afca67: (-s ours) am
2062cfd4: am
3cde3ece: Merge "Add orientation information to the details dialog." into gb-ub-photos-carlsbad
* commit '
20afca67e42ecc153c977e1d333c02b6f673be96':
Doris Liu [Wed, 30 Apr 2014 18:14:36 +0000 (18:14 +0000)]
am
3c0a09f1: (-s ours) am
2b72f33b: am
2b86d873: Fix memory leak of context in LocalMediaObserver
* commit '
3c0a09f1c6ff14b3879808dc5cbe10440324d7b3':
Seth Raphael [Wed, 30 Apr 2014 18:14:36 +0000 (18:14 +0000)]
am
dce17630: (-s ours) am
f86bdf5a: am
66788094: Remove PopupManager to remove a memory leak
* commit '
dce17630b7c839854cb4a2a590ffe882fcbf69a6':
Sascha Haeberling [Wed, 30 Apr 2014 18:14:36 +0000 (18:14 +0000)]
am
a0403285: (-s ours) am
baa3fc46: am
67685a78: Add HQ icon indicator support.
* commit '
a04032858eddcba24566e95d97c525c7ec677c53':
Doris Liu [Wed, 30 Apr 2014 18:14:36 +0000 (18:14 +0000)]
am
ef5b92a1: (-s ours) am
91e8fe94: am
f5fc8d67: Merge "Finalize deletion when app exits and for last photo" into gb-ub-photos-carlsbad
* commit '
ef5b92a1c79ae383664468f179e6dbd1ed72c7bf':
Doris Liu [Wed, 30 Apr 2014 18:14:36 +0000 (18:14 +0000)]
am
07e242de: (-s ours) am
c2441f77: am
2ba03263: Make ROI size 1/8 of longer edge of the image
* commit '
07e242deb71cdd7e536671cd1ae0b634e1fbf1e7':
Mangesh Ghiware [Wed, 30 Apr 2014 18:14:36 +0000 (18:14 +0000)]
am
67cf6167: (-s ours) am
61ea6472: am
22236064: Merge "Use Camcorder label and icon for video camera activity." into gb-ub-photos-carlsbad
* commit '
67cf6167e63df664260f12a91321a04e6abc9d5f':
Baligh Uddin [Wed, 30 Apr 2014 18:14:36 +0000 (18:14 +0000)]
am
9b5e3ede: (-s ours) am
d859daee: (-s ours) am
192686cf: (-s ours) Import translations. DO NOT MERGE
* commit '
9b5e3edebf62c7cd86e681ae874cc77949079517':
Sascha Haeberling [Wed, 30 Apr 2014 18:14:36 +0000 (18:14 +0000)]
am
6e7d944d: (-s ours) am
b80c1e77: am
15ccccf6: Merge "Fix the checks for when to remove the HDR/HQ icons from the pie menu." into gb-ub-photos-carlsbad
* commit '
6e7d944d87c995091e193108a3fab0950a6825fc':
Angus Kong [Wed, 30 Apr 2014 18:14:36 +0000 (18:14 +0000)]
am
b714e5f9: (-s ours) am
e8e2011d: am
c9c15044: Merge "Checks for low storage in wide-angle pano mode." into gb-ub-photos-carlsbad
* commit '
b714e5f93fe89ea7a82b2c0d78f8a35e6081ded6':
Doris Liu [Wed, 30 Apr 2014 18:14:35 +0000 (18:14 +0000)]
am
39ce8333: (-s ours) am
e8cb214b: am
0537d4f7: Merge "Increase ROI size to 1/8 of the image width" into gb-ub-photos-carlsbad
* commit '
39ce8333a33269e0ae59f01c3249cd6132fe1387':
Baligh Uddin [Wed, 30 Apr 2014 18:14:35 +0000 (18:14 +0000)]
am
83ec031a: (-s ours) am
71c85612: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
83ec031aa42c499255ccaf4ba683ed353ef9fa7a':
Angus Kong [Wed, 30 Apr 2014 18:14:35 +0000 (18:14 +0000)]
am
ceff97a0: (-s ours) am
2ba69209: am
b998a491: Enlarge the native buffer of wide-angle-pano.
* commit '
ceff97a001250fe4a7ea7bd084dc2aefcc4c8497':
Ruben Brunk [Wed, 30 Apr 2014 18:14:35 +0000 (18:14 +0000)]
am
6df4dbae: (-s ours) am
acc3396d: am
be7dc627: Fix HQ mode change to allow return to regular photo mode.
* commit '
6df4dbaee8cea8feec8781eeefc855641d435f0b':
Sascha Haeberling [Wed, 30 Apr 2014 18:14:35 +0000 (18:14 +0000)]
am
d7e3a64e: (-s ours) am
531e36df: am
98f38bb0: Add HQ option and use it to switch to GCam.
* commit '
d7e3a64e12cc9aaa9cde2f8416d2510e62924ce5':
Ruben Brunk [Wed, 30 Apr 2014 18:14:35 +0000 (18:14 +0000)]
am
80842c45: (-s ours) am
7086b298: am
4601f5d9: Enable gcam as HDR pie menu option.
* commit '
80842c4529cccfd07a75e6a48f013a7795c5c392':
Kevin Gabayan [Wed, 30 Apr 2014 18:14:35 +0000 (18:14 +0000)]
am
3ad20d14: (-s ours) am
37f7a3ef: am
e0bf566d: Merge "Removed unused assets from Camera2 Bug:
10493013 Change-Id: Id07878cbe1a89e0aaeb70942e0f4ca39cd4a3399" into gb-ub-photos-carlsbad
* commit '
3ad20d142f2901ab1b7a07050eb1c8ab6283d02f':
Sascha Haeberling [Wed, 30 Apr 2014 18:14:35 +0000 (18:14 +0000)]
am
fcdd3a0a: (-s ours) am
38bddcc4: am
601d8041: Don\'t expose the Camera crop intent.
* commit '
fcdd3a0a7e36d18e5ff47c46766187a6bf67b7fd':
Baligh Uddin [Wed, 30 Apr 2014 18:14:35 +0000 (18:14 +0000)]
am
18cc8cfa: (-s ours) am
f1b81feb: (-s ours) am
e5d39a52: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
* commit '
18cc8cfa592708c34d7f037cbb54949e9dc6f75a':
Baligh Uddin [Wed, 30 Apr 2014 18:14:34 +0000 (18:14 +0000)]
am
d4fb8e12: (-s ours) am
e78ca833: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
d4fb8e12f84305fe8dc17017a697431593c77143':
Mindy Pereira [Wed, 30 Apr 2014 18:14:34 +0000 (18:14 +0000)]
Sascha Haeberling [Wed, 30 Apr 2014 18:14:34 +0000 (18:14 +0000)]
am
79da0775: (-s ours) am
8c17960b: am
4863db01: Remove hideybars from Camera.
* commit '
79da0775133b804eeb595177d36436443af737eb':
Doris Liu [Wed, 30 Apr 2014 18:14:34 +0000 (18:14 +0000)]
am
7a550178: (-s ours) am
5c1c3b38: am
3180ac90: Merge "Fix SRI UX issues and improve UI efficiency" into gb-ub-photos-carlsbad
* commit '
7a5501780604953a7d7d509f689d4698d100179c':
Angus Kong [Wed, 30 Apr 2014 18:14:34 +0000 (18:14 +0000)]
am
e1fc04ba: (-s ours) am
ee011517: am
c74825b1: Merge "Allow user to tap on lock icon from secure camera." into gb-ub-photos-carlsbad
* commit '
e1fc04babedcb425e8e9c329d18b833846225a37':
Kevin Gabayan [Wed, 30 Apr 2014 18:14:34 +0000 (18:14 +0000)]
am
e8f235d6: (-s ours) am
a014398a: am
d897d5c9: Merge "192x192 icon added to mipmap-xxxhdpi." into gb-ub-photos-carlsbad
* commit '
e8f235d6947f82d4a13cfa9db3804c832938eab5':
Sascha Haeberling [Wed, 30 Apr 2014 18:14:34 +0000 (18:14 +0000)]
am
abe1edec: (-s ours) am
2377df9a: am
8fed926c: Merge "Localize the numbers in the time laps popup." into gb-ub-photos-carlsbad
* commit '
abe1edecfaf06120b2c503f4566922762a580982':
ztenghui [Wed, 30 Apr 2014 18:14:34 +0000 (18:14 +0000)]
am
da361548: (-s ours) am
f58ec27a: am
4c478ffe: Merge "Sort and select the preview fps range for still image." into gb-ub-photos-carlsbad
* commit '
da361548de0084d362a8a0ad4b3269632eff049e':
Ruben Brunk [Wed, 30 Apr 2014 18:14:34 +0000 (18:14 +0000)]
am
aeeb5145: (-s ours) am
a69f785c: am
283beaf6: Fix build: Don\'t build GCam for non-arm targets
* commit '
aeeb5145d01d4d17f01854f4ccc4340f0c96a7e1':
Angus Kong [Wed, 30 Apr 2014 18:14:33 +0000 (18:14 +0000)]
am
8831725c: (-s ours) am
4d017ab2: am
b21215a1: Improve the animation to filmstrip.
* commit '
8831725ce91d172b3331d339d1aa71189ce7fe2e':
Doris Liu [Wed, 30 Apr 2014 18:14:33 +0000 (18:14 +0000)]
am
3c60ff75: (-s ours) am
00258a68: am
aa874428: Hide action bar after a timeout
* commit '
3c60ff751c1d2ada3848fea911f01fecef1daad7':
Angus Kong [Wed, 30 Apr 2014 18:14:33 +0000 (18:14 +0000)]
am
98795bed: (-s ours) am
cb736218: am
cdbba4c8: Merge "Refine Filmstrip gesture/position handling." into gb-ub-photos-carlsbad
* commit '
98795bed91ab0340cbdabd917a4e619384e31d2b':
Baligh Uddin [Wed, 30 Apr 2014 18:14:33 +0000 (18:14 +0000)]
am
a09cda9b: (-s ours) am
1106268f: (-s ours) am
4821c541: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
* commit '
a09cda9b0b52ed01f616f9a3d33782edd29d6341':
Baligh Uddin [Wed, 30 Apr 2014 18:14:33 +0000 (18:14 +0000)]
am
11db9bd4: (-s ours) am
3aac79f2: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
11db9bd48b5390e8b741ca1d77d19d0fe0f496cf':
Ruben Brunk [Wed, 30 Apr 2014 18:14:33 +0000 (18:14 +0000)]
am
9403e4dc: (-s ours) am
75ad0584: am
30a21ea3: Merge "Fix drawable location." into gb-ub-photos-carlsbad
* commit '
9403e4dcb724fe9ee07625cba9339e769f71a7e2':
nicolasroard [Wed, 30 Apr 2014 18:14:33 +0000 (18:14 +0000)]
ztenghui [Wed, 30 Apr 2014 18:14:33 +0000 (18:14 +0000)]
am
79c8a1f0: (-s ours) am
9e7cb170: am
064d6000: Use contentObserver to refresh the data when dirty.
* commit '
79c8a1f0e1b97ac111d7b23daf476482e14f0d7d':
Mangesh Ghiware [Wed, 30 Apr 2014 18:14:33 +0000 (18:14 +0000)]
am
a6b977b3: (-s ours) am
7806200a: am
a5682ab0: Bring back NFC beam support to filmstrip
* commit '
a6b977b3600570f3e92a3677c628659bfa6db508':
Ruben Brunk [Wed, 30 Apr 2014 18:14:32 +0000 (18:14 +0000)]
am
cf3b5668: (-s ours) am
e784eb4b: am
0374e092: Merge "Adding gcam module to Camera2 app." into gb-ub-photos-carlsbad
* commit '
cf3b56681622e19a9876803dd6133e146f78bb25':
Mangesh Ghiware [Wed, 30 Apr 2014 18:14:32 +0000 (18:14 +0000)]
am
e3568c49: (-s ours) am
247fa7b9: am
9426a38c: Merge "Make Up button in filmstrip go to Gallery." into gb-ub-photos-carlsbad
* commit '
e3568c49558fb8cda93fd9f9995dcfaba07acf23':
Sascha Haeberling [Wed, 30 Apr 2014 18:14:32 +0000 (18:14 +0000)]
am
53192fde: (-s ours) am
485f95e4: am
b2d70d5b: Fix various message issues
* commit '
53192fdeb65c84bd69996f53130409fea0b98779':
Sascha Haeberling [Wed, 30 Apr 2014 18:14:32 +0000 (18:14 +0000)]
am
4911e6eb: (-s ours) am
f0ec22b7: am
638e6f06: Clean up ApiHelper and remove unused code paths.
* commit '
4911e6eb754ace87120d7e4a739e2e79350779b8':
Sascha Haeberling [Wed, 30 Apr 2014 18:14:32 +0000 (18:14 +0000)]
am
1847b431: (-s ours) am
18dcbd5d: am
4ed20592: Adding Hideybar support for K and up.
* commit '
1847b431dc8fb24e1c8ae65997b82387f08f7057':
ztenghui [Wed, 30 Apr 2014 18:14:32 +0000 (18:14 +0000)]
am
2c5114b8: (-s ours) am
eb0c0d3c: am
e1f0f4f1: Merge "Delete the captured video if cancel in review." into gb-ub-photos-carlsbad
* commit '
2c5114b81ea373227f9dce4bb4747ba13824d900':
Sascha Haeberling [Wed, 30 Apr 2014 18:14:32 +0000 (18:14 +0000)]
am
1ec6a26f: (-s ours) am
c008cf33: am
15125661: Fall back to Photo module if stores index is illegal.
* commit '
1ec6a26f79e19b3672182a7a16d9cc3ffa5d648d':
Sascha Haeberling [Wed, 30 Apr 2014 18:14:32 +0000 (18:14 +0000)]
am
a3ffd99c: (-s ours) am
bfb14b9c: am
483d25a2: Merge "Don\'t crash the app if camera is not available." into gb-ub-photos-carlsbad
* commit '
a3ffd99c264b60dc5389217b23f5895a9bbf639c':
Sascha Haeberling [Wed, 30 Apr 2014 18:14:32 +0000 (18:14 +0000)]
am
86bdf145: (-s ours) am
e7c77157: am
4ee4d99c: Merge "Adding a simple done handler interface." into gb-ub-photos-carlsbad
* commit '
86bdf1459770a56f642e0e4b08bdbd574d342770':
Doris Liu [Wed, 30 Apr 2014 18:14:32 +0000 (18:14 +0000)]
am
63349606: (-s ours) am
1b3ffde9: am
9c0492a6: Merge "Fix camera controls rotation for secure camera" into gb-ub-photos-carlsbad
* commit '
63349606f71e617dae25958ba92455d62d64c028':
Angus Kong [Wed, 30 Apr 2014 18:14:31 +0000 (18:14 +0000)]
am
1e1dd300: (-s ours) am
7315a189: am
c2497d0a: Merge "Show dialog when camera device is not connected." into gb-ub-photos-carlsbad
* commit '
1e1dd300c5e31bfcef1f4d281f3fa88bed97f96d':
ztenghui [Wed, 30 Apr 2014 18:14:31 +0000 (18:14 +0000)]
am
bd3e1882: (-s ours) am
a4c33574: am
828c9190: Merge "Use a new Intent to work around issues in framework" into gb-ub-photos-carlsbad
* commit '
bd3e1882df98ff32e1263a382b0d8164a7b97a73':
Baligh Uddin [Wed, 30 Apr 2014 18:14:31 +0000 (18:14 +0000)]
am
468592c2: (-s ours) am
d313b92c: (-s ours) am
53304d69: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
* commit '
468592c24df7f395b4a38589cb70a0f750afb6d6':
Baligh Uddin [Wed, 30 Apr 2014 18:14:31 +0000 (18:14 +0000)]
am
5c00ae40: (-s ours) am
f72f347c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
5c00ae404603943a5756e855e49f5e4d3d9271d8':
Doris Liu [Wed, 30 Apr 2014 18:14:31 +0000 (18:14 +0000)]
am
3bb7bf70: (-s ours) am
987a17d0: am
2065e606: Merge "Fix zoom for images with orientation tag" into gb-ub-photos-carlsbad
* commit '
3bb7bf702ee3c68b0ddd7ba6cd92ed4e95c9a76c':
Angus Kong [Wed, 30 Apr 2014 18:14:31 +0000 (18:14 +0000)]
am
64e8a35d: (-s ours) am
1dffcefa: am
5bee41c6: Merge "Set correct alpha for views in filmstrip." into gb-ub-photos-carlsbad
* commit '
64e8a35d11e650e45420fed7bbe3c63a48aaa6f1':
Sascha Haeberling [Wed, 30 Apr 2014 18:14:31 +0000 (18:14 +0000)]
Doris Liu [Wed, 30 Apr 2014 18:14:31 +0000 (18:14 +0000)]
am
970235ac: (-s ours) am
9ca0842a: am
d688c0c3: Merge "Fix flicker when zooming images smaller than screen" into gb-ub-photos-carlsbad
* commit '
970235aca30ec9a2d3fcb356bf6fe3e0e76b291d':