OSDN Git Service
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)]
Mangesh Ghiware [Wed, 30 Apr 2014 18:14:27 +0000 (18:14 +0000)]
am
56b63cdc: (-s ours) am
631c94a8: am
33035c19: Bring back \'share 360 photosphere\' to filmstrip
* commit '
56b63cdc4a85c919bdf939c218cb5c48fb79bafc':
Doris Liu [Wed, 30 Apr 2014 18:14:27 +0000 (18:14 +0000)]
am
06618394: (-s ours) am
194d84f1: am
121022cb: Double tap to zoom all the way in and out
* commit '
0661839460fe24bbead112bc22acd68e2a32cc90':
Baligh Uddin [Wed, 30 Apr 2014 18:14:27 +0000 (18:14 +0000)]
am
98680095: (-s ours) am
0ab8fabb: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
98680095aa996ffd2633ae1ab1a4bb7b237ce4ce':
Baligh Uddin [Wed, 30 Apr 2014 18:14:26 +0000 (18:14 +0000)]
am
659ea14a: (-s ours) am
fb56e3fe: (-s ours) am
7ff7b04d: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
* commit '
659ea14a2d84b369f717d802e206027ed76d8a70':
Sascha Haeberling [Wed, 30 Apr 2014 18:14:26 +0000 (18:14 +0000)]
am
d6e28ae1: (-s ours) am
52a0a4f0: am
26145e56: Use app_name label now that we have the correct translations.
* commit '
d6e28ae1ee307ddaf0e52deb24db101e3592948e':
ztenghui [Wed, 30 Apr 2014 18:14:26 +0000 (18:14 +0000)]
am
c346b81b: (-s ours) am
6d7237f2: am
269c824d: Merge "Don\'t show the action bar in the capture intent." into gb-ub-photos-carlsbad
* commit '
c346b81bc0263206a41020f699a1a6e213b9d665':
ztenghui [Wed, 30 Apr 2014 18:14:26 +0000 (18:14 +0000)]
am
549ac4b8: (-s ours) am
1247a8bc: am
2c3d9a58: Don\'t show action bar when in camera preview.
* commit '
549ac4b834781db9623a3debe01596a34adb6de6':
Baligh Uddin [Wed, 30 Apr 2014 18:14:26 +0000 (18:14 +0000)]
am
52790c96: (-s ours) am
95dd838a: (-s ours) am
5457782d: (-s ours) Import translations. DO NOT MERGE
* commit '
52790c9686ee475bbd8a1b3c0d11f5c2de60bb7b':
Sascha Haeberling [Wed, 30 Apr 2014 18:14:26 +0000 (18:14 +0000)]
am
d9746979: (-s ours) am
cb46d560: am
1d9a8d7a: Rename renering message from panorama to photo sphere.
* commit '
d974697911011ae8ff9fff59cbebc9a112698698':
Doris Liu [Wed, 30 Apr 2014 18:14:26 +0000 (18:14 +0000)]
am
5f296514: (-s ours) am
14f85082: am
0dff7ce1: Merge "Reset zoom view when user exits app or rotate device" into gb-ub-photos-carlsbad
* commit '
5f29651483526014b1c1a441ec17e1c0d7bd7cce':
Angus Kong [Wed, 30 Apr 2014 18:14:26 +0000 (18:14 +0000)]
am
0a21bf1a: (-s ours) am
6e9cfebc: am
b2f0968c: Merge "Make the preview thumbnail clicable after scaling." into gb-ub-photos-carlsbad
* commit '
0a21bf1a54f1f27df4849cd17174ec655ed988d7':
Sascha Haeberling [Wed, 30 Apr 2014 18:14:26 +0000 (18:14 +0000)]
am
466054a3: (-s ours) am
0ee2d8c1: am
72a57ddf: Merge "Automatic versioning for Camera." into gb-ub-photos-carlsbad
* commit '
466054a39b32b9049a65823a28d48e5876e824f6':
Doris Liu [Wed, 30 Apr 2014 18:14:26 +0000 (18:14 +0000)]
am
ee357766: (-s ours) am
f55555e0: am
750e73c4: Merge "Measure all children to ensure correct layout position" into gb-ub-photos-carlsbad
* commit '
ee3577666dd1918d3200087ae10b185221677d9b':
Angus Kong [Wed, 30 Apr 2014 18:14:25 +0000 (18:14 +0000)]
am
9f3f0fa0: (-s ours) am
a5624237: am
8d2c6b83: Merge "Skip bitmaps with 0 dimension." into gb-ub-photos-carlsbad
* commit '
9f3f0fa035288787d7f64e110704080dc89688a9':
Alan Newberger [Wed, 30 Apr 2014 18:14:25 +0000 (18:14 +0000)]
am
8f32473b: (-s ours) am
5fff50b6: am
5f6b50de: Add back button handlng to CameraActivity.
* commit '
8f32473baf3655681d40ea649a1172e0104bb1a4':
Alan Newberger [Wed, 30 Apr 2014 18:14:25 +0000 (18:14 +0000)]
am
fc207c7a: (-s ours) am
0b51d31c: am
2581af9b: Merge "add up button support for filmstrip" into gb-ub-photos-carlsbad
* commit '
fc207c7ae2becc4cd02a8a51088396205efa8743':
Sascha Haeberling [Wed, 30 Apr 2014 18:14:25 +0000 (18:14 +0000)]
am
951b41ac: (-s ours) am
c36e3561: am
1b44336b: Merge "Let the Camera app remember which mode it was started in last." into gb-ub-photos-carlsbad
* commit '
951b41ac7087997c088dc43f69d088601ee592c6':
Baligh Uddin [Wed, 30 Apr 2014 18:14:25 +0000 (18:14 +0000)]
am
9726d282: (-s ours) am
5c285d9c: (-s ours) am
6447ef1e: (-s ours) Import translations. DO NOT MERGE
* commit '
9726d2824862ee28a4db72953fd5d181ab81017f':
Doris Liu [Wed, 30 Apr 2014 18:14:25 +0000 (18:14 +0000)]
am
43b75343: (-s ours) am
d24a8d30: am
b3d4d8e5: Merge "Fix gap between camera controls and nav bar" into gb-ub-photos-carlsbad
* commit '
43b75343803de33c55706d136c250532ba39814c':
Sascha Haeberling [Wed, 30 Apr 2014 18:14:25 +0000 (18:14 +0000)]
am
7c7cf256: (-s ours) am
4feab753: am
c09c5f03: Merge "Fix of memory issues with bitmaps in filmstrip." into gb-ub-photos-carlsbad
* commit '
7c7cf256269343e3b3e10575b601b59fa760e457':
Sascha Haeberling [Wed, 30 Apr 2014 18:14:25 +0000 (18:14 +0000)]
am
863fd808: (-s ours) am
3a5c8362: am
f3d3a5c6: Merge "Disable shutter button while picture is being taken." into gb-ub-photos-carlsbad
* commit '
863fd8089276f355014550546821903fec4c73d7':
Doris Liu [Wed, 30 Apr 2014 18:14:25 +0000 (18:14 +0000)]
Doris Liu [Wed, 30 Apr 2014 18:14:24 +0000 (18:14 +0000)]
am
e914c060: (-s ours) am
734c25b9: am
0df03318: Merge "Flip capture thumb when using front facing camera" into gb-ub-photos-carlsbad
* commit '
e914c060fa847b24c9a5a2b4fd7a14093984b926':
ztenghui [Wed, 30 Apr 2014 18:14:24 +0000 (18:14 +0000)]
am
268e1ad7: (-s ours) am
72b0220a: am
2d1c49c2: Merge "Add rotate support in Film Strip" into gb-ub-photos-carlsbad
* commit '
268e1ad75e3c46d30b51087cc57851c37d6f2580':
Tenghui Zhu [Wed, 30 Apr 2014 18:14:24 +0000 (18:14 +0000)]
am
4b422b02: (-s ours) am
659df48f: am
09d5983d: Merge "Revert "Add rotate support in Film Strip"" into gb-ub-photos-carlsbad
* commit '
4b422b02b0cd3eb639cd8da9d80cc6119b805f4e':
ztenghui [Wed, 30 Apr 2014 18:14:24 +0000 (18:14 +0000)]
am
d5f7d83c: (-s ours) am
7cd724ae: am
80e2e1ec: Merge "Add rotate support in Film Strip" into gb-ub-photos-carlsbad
* commit '
d5f7d83c1bb4e8585c93b81c36d7e324fcbb4112':
Sascha Haeberling [Wed, 30 Apr 2014 18:14:24 +0000 (18:14 +0000)]
am
558c58da: (-s ours) am
f4d1ee6e: am
7446e9fd: Use the well-translated camera_label instead of app_name.
* commit '
558c58dae93a13d24ceedea26f8e0ee1c52fe6b7':
Mangesh Ghiware [Wed, 30 Apr 2014 18:14:24 +0000 (18:14 +0000)]
am
f66afcb9: (-s ours) am
accdf4ca: am
18d1d26a: Merge "Bring back Share to filmstrip" into gb-ub-photos-carlsbad
* commit '
f66afcb9b503805f143065e2068ebc8563c7c2fa':
Sascha Haeberling [Wed, 30 Apr 2014 18:14:23 +0000 (18:14 +0000)]
am
92581f9c: (-s ours) am
8ada875a: am
00279bbc: Merge "Remove RefocusHelper." into gb-ub-photos-carlsbad
* commit '
92581f9cd82646c919cba83b3cf3338a8bed94de':
Sascha Haeberling [Wed, 30 Apr 2014 18:14:23 +0000 (18:14 +0000)]
am
174ebdd4: (-s ours) am
5d26fdfd: am
143eb46b: Merge "Remove Refocus string and icon" into gb-ub-photos-carlsbad
* commit '
174ebdd46e809eff1697b88bf29c99f95fd5b4b6':
Yu Shan Emily Lau [Wed, 30 Apr 2014 18:14:23 +0000 (18:14 +0000)]
am
48f94999: (-s ours) am
1cc08fea: Merge "Adding back the camera tests to KLP-DEV after sorting them out in UB." into klp-dev
* commit '
48f9499953cc0b24a04c815a46d67b0ed8099d54':