OSDN Git Service
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':
Sascha Haeberling [Wed, 30 Apr 2014 18:14:31 +0000 (18:14 +0000)]
am
9602d9e1: (-s ours) am
f546cdbd: am
c2915695: Avoid expensive O(n) main-thread operation when adding Photo Sphere.
* commit '
9602d9e1c62773107ec0d68bc2f4b540bdde38c7':
Baligh Uddin [Wed, 30 Apr 2014 18:14:30 +0000 (18:14 +0000)]
am
9bb3e1e5: (-s ours) am
0f9a86d8: (-s ours) am
d095b79d: (-s ours) Import translations. DO NOT MERGE
* commit '
9bb3e1e52676f524c17ce0aae0ad6ebd6f0ab5ed':
Baligh Uddin [Wed, 30 Apr 2014 18:14:30 +0000 (18:14 +0000)]
am
317a468d: (-s ours) am
d5fc134e: (-s ours) Import translations. DO NOT MERGE
* commit '
317a468d799fdc1d69eb3e50441d18d6944f93b9':
Angus Kong [Wed, 30 Apr 2014 18:14:30 +0000 (18:14 +0000)]
am
064bcdae: (-s ours) am
14bbdd6a: am
44974d4b: Don\'t show menu/indicators in wide-angle mode.
* commit '
064bcdae140ebfca3ddb8f205a6200ee404468e7':
Sascha Haeberling [Wed, 30 Apr 2014 18:14:30 +0000 (18:14 +0000)]
am
e30684d9: (-s ours) am
51da31a9: am
7e1e10f3: Merge "Fix potential deadlock while rendering the preview." into gb-ub-photos-carlsbad
* commit '
e30684d94fa6717675d78427ef31ea503c653ec2':
Angus Kong [Wed, 30 Apr 2014 18:14:30 +0000 (18:14 +0000)]
am
d831b816: (-s ours) am
b3804596: am
a29e0bfc: Merge "Always leave full-screen when swip from camera." into gb-ub-photos-carlsbad
* commit '
d831b816e557a217ec3f2bebb284b7a670c19f1d':
Angus Kong [Wed, 30 Apr 2014 18:14:30 +0000 (18:14 +0000)]
am
395505df: (-s ours) am
caaffcc7: am
539b9eec: Merge "Avoid flickering after swipe to delete." into gb-ub-photos-carlsbad
* commit '
395505df7aedde20d9f733201329181adbba8377':
ztenghui [Wed, 30 Apr 2014 18:14:30 +0000 (18:14 +0000)]
am
2907cb9d: (-s ours) am
755b36ac: am
a7035394: Merge "Fix crash due to a hole in setDataSource." into gb-ub-photos-carlsbad
* commit '
2907cb9d667734cf8579518530e3693de3d326b9':
Sascha Haeberling [Wed, 30 Apr 2014 18:14:30 +0000 (18:14 +0000)]
am
fe0ad8e0: (-s ours) am
c54135c8: am
1e689c25: Fix DeadLock in TinyPlanet.
* commit '
fe0ad8e0ca8a97124de56c0d61b5b2b0d2a8e910':
Sascha Haeberling [Wed, 30 Apr 2014 18:14:30 +0000 (18:14 +0000)]
am
b922e919: (-s ours) am
144ef251: am
a5a08d76: Bring back tiny planet to the Camera filmstrip
* commit '
b922e919fb53b5db1942990701857fecb97ae28c':
Doris Liu [Wed, 30 Apr 2014 18:14:30 +0000 (18:14 +0000)]
am
b5c99151: (-s ours) am
da414423: am
742cd5b1: Keep undo bar around until there is user interaciton
* commit '
b5c991511c043bee7c2f85062133bec14d55e08d':
ztenghui [Wed, 30 Apr 2014 18:14:29 +0000 (18:14 +0000)]
am
9c52461d: (-s ours) am
99ba10e0: am
a29a0ad0: Merge "When current data is preview, don\'t show the action bar." into gb-ub-photos-carlsbad
* commit '
9c52461daaa17250d3de2e0eade9a65a6941e63a':
Baligh Uddin [Wed, 30 Apr 2014 18:14:29 +0000 (18:14 +0000)]
am
9768be7a: (-s ours) am
4988cf65: (-s ours) am
d1b0801a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
* commit '
9768be7af47e89bebc28f97ee6bc1a9401f83b8d':
Baligh Uddin [Wed, 30 Apr 2014 18:14:29 +0000 (18:14 +0000)]
am
98c35e8c: (-s ours) am
11311445: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
98c35e8c2966170856463fe2931aba31d6b715f6':
Doris Liu [Wed, 30 Apr 2014 18:14:29 +0000 (18:14 +0000)]
am
2031c48d: (-s ours) am
c9293ebd: am
36e56fba: Show captured image rather than frozen preview for capture intent
* commit '
2031c48d687e74fa9a1adde74ee5016449243bd5':
ztenghui [Wed, 30 Apr 2014 18:14:29 +0000 (18:14 +0000)]
am
fedfb465: (-s ours) am
c6cc7335: am
7b265a6b: Fix the flash mode transition in video mode
* commit '
fedfb465bb28fd41c2ba1f25b5dc2f002e03d723':
Angus Kong [Wed, 30 Apr 2014 18:14:29 +0000 (18:14 +0000)]
am
6fd118b2: (-s ours) am
2e36dff3: am
20703f72: Merge "Flinging back should stop at the first photo first." into gb-ub-photos-carlsbad
* commit '
6fd118b2d6134337bd1801cf8cf08ac8e209cd74':
Doris Liu [Wed, 30 Apr 2014 18:14:29 +0000 (18:14 +0000)]
am
a2a5570a: (-s ours) am
005fbbbc: am
e1d5ba4f: Hide zoom view when going to full screen
* commit '
a2a5570a8012287ae0528ec505ceea9a327f6b82':
Baligh Uddin [Wed, 30 Apr 2014 18:14:29 +0000 (18:14 +0000)]
am
1b6b0f8d: (-s ours) am
eff820b2: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
1b6b0f8d24c354427e3f68dfa8fe46aaefab35c5':
Baligh Uddin [Wed, 30 Apr 2014 18:14:29 +0000 (18:14 +0000)]
am
b9cbdd9c: (-s ours) am
359f2552: (-s ours) am
44c02874: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
* commit '
b9cbdd9c55c75160d03a18d05a21dcb87d4e58ff':
Angus Kong [Wed, 30 Apr 2014 18:14:28 +0000 (18:14 +0000)]
am
21fb09d3: (-s ours) am
7f9cd2a5: am
6aae9177: Merge "Fix images being off-center in filmstrip." into gb-ub-photos-carlsbad
* commit '
21fb09d385d6fb5cbc4d3d3194f2cb3fbee4913b':
Doris Liu [Wed, 30 Apr 2014 18:14:28 +0000 (18:14 +0000)]
am
870067e8: (-s ours) am
66cfdf11: am
e074fcbd: Merge "Hide zoom view when back is pressed" into gb-ub-photos-carlsbad
* commit '
870067e87e6d2d9a827196bdd0eb645b7c4ba1cb':
Sascha Haeberling [Wed, 30 Apr 2014 18:14:28 +0000 (18:14 +0000)]
am
e1a9e908: (-s ours) am
db0ea490: am
f8b877c2: Update indicators at the right time to show the correct state.
* commit '
e1a9e9083cc1edfb810550c739de640f9bb90b0e':
Sascha Haeberling [Wed, 30 Apr 2014 18:14:28 +0000 (18:14 +0000)]
am
15304725: (-s ours) am
790bc99b: am
b7639c64: Make sure we switch to preview view when resuming.
* commit '
15304725e9ccb6ecd5a9c6e020bcc39cc8356ea2':
ztenghui [Wed, 30 Apr 2014 18:14:28 +0000 (18:14 +0000)]
am
4997b532: (-s ours) am
8455977f: am
08d82bae: Merge "Update the data after edit." into gb-ub-photos-carlsbad
* commit '
4997b532b6c470d16ccc2681b592674119246100':
Angus Kong [Wed, 30 Apr 2014 18:14:28 +0000 (18:14 +0000)]
am
72bc2821: (-s ours) am
31ee75ce: am
a7194601: Disable swipe in capture intent mode.
* commit '
72bc2821eb873f42f68b28daf7519eccc194cb6f':
Angus Kong [Wed, 30 Apr 2014 18:14:28 +0000 (18:14 +0000)]
am
b32a26f7: (-s ours) am
e9dba8ac: am
56ad83f7: Merge "Respect system auto-rotate setting." into gb-ub-photos-carlsbad
* commit '
b32a26f769df19fa27ecebc1469309fa9ca18c30':
Angus Kong [Wed, 30 Apr 2014 18:14:28 +0000 (18:14 +0000)]
am
f322ed79: (-s ours) am
793729a5: am
080f8683: Merge "Improve swipe gesture in filmstrip." into gb-ub-photos-carlsbad
* commit '
f322ed79ebc210abc501c9d39e8eff31339a09c9':
Sascha Haeberling [Wed, 30 Apr 2014 18:14:28 +0000 (18:14 +0000)]
am
6792d81b: (-s ours) am
22610d24: am
5199c207: Set the system UI to low profile when we hide the action bar.
* commit '
6792d81b32998375a91bf4508bf0d62be15171c8':
Sascha Haeberling [Wed, 30 Apr 2014 18:14:28 +0000 (18:14 +0000)]
am
dadcb042: (-s ours) am
5eca5f52: am
cd7b8c13: Re-add a strings that should not have cleaned up.
* commit '
dadcb0422a4bb181b4ea54a8ce395636a2b8b2e8':
Sascha Haeberling [Wed, 30 Apr 2014 18:14:27 +0000 (18:14 +0000)]
Baligh Uddin [Wed, 30 Apr 2014 18:14:27 +0000 (18:14 +0000)]
am
5ea52719: (-s ours) am
7ca24118: (-s ours) am
01f12724: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
* commit '
5ea5271924aab88f789f3708b7a224bee31b4c17':
Baligh Uddin [Wed, 30 Apr 2014 18:14:27 +0000 (18:14 +0000)]
am
7c86cd26: (-s ours) am
8ebeb744: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
7c86cd2607aa06c9b47bfd3e876997977a48d4fd':
Doris Liu [Wed, 30 Apr 2014 18:14:27 +0000 (18:14 +0000)]
am
8f5708b3: (-s ours) am
364295ed: am
fffc6a5a: Merge "Fix black screen in mode switching" into gb-ub-photos-carlsbad
* commit '
8f5708b3471bdad57936b32204981835f1fceec7':
Angus Kong [Wed, 30 Apr 2014 18:14:27 +0000 (18:14 +0000)]
am
4df74700: (-s ours) am
4aac7d25: am
33bb2d47: Merge "Bring back wide angle panorama." into gb-ub-photos-carlsbad
* commit '
4df7470055b9e431987a561e57904848d35dc37a':
Alan Newberger [Wed, 30 Apr 2014 18:14:27 +0000 (18:14 +0000)]
am
a10ab337: (-s ours) am
364f1200: am
1ef76d4c: reintroduce action bar hiding for onDataChanged
* commit '
a10ab337afcbacf31e6d426fe2d1145791a1ce56':
Sascha Haeberling [Wed, 30 Apr 2014 18:14:27 +0000 (18:14 +0000)]