OSDN Git Service
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':
Sascha Haeberling [Wed, 30 Apr 2014 18:14:23 +0000 (18:14 +0000)]
am
96fceea0: (-s ours) am
d9114beb: am
3be7f94c: Make parsing integers for details dialog more robust.
* commit '
96fceea07eef796bc6de38da2f5fe033cba236e4':
Angus Kong [Wed, 30 Apr 2014 18:14:23 +0000 (18:14 +0000)]
am
5da48574: (-s ours) am
919284cf: am
80af7dd8: Fix full-screen swipe layout.
* commit '
5da48574eae9856835247d82436230b544ec8975':
Angus Kong [Wed, 30 Apr 2014 18:14:23 +0000 (18:14 +0000)]
am
d1e70234: (-s ours) am
dfb722fd: am
a2818f58: Merge "Bring back undo delete confirmation." into gb-ub-photos-carlsbad
* commit '
d1e70234619067b47367f124f24ddf8241aae33f':
Sascha Haeberling [Wed, 30 Apr 2014 18:14:23 +0000 (18:14 +0000)]
am
651c18fe: (-s ours) am
f2b312dd: am
e2fb9943: Proper I18N of the Details dialog, especially for RTL.
* commit '
651c18fee420b1b5eae1655d43c4b13d6289d1d7':
Sascha Haeberling [Wed, 30 Apr 2014 18:14:23 +0000 (18:14 +0000)]
am
6196fadc: (-s ours) am
779160b3: am
00373f8a: Merge "Speed up filmstrip by not decoding with default 3000px." into gb-ub-photos-carlsbad
* commit '
6196fadc87d07d1269ed121b2423662c6b3eebbf':
Doris Liu [Wed, 30 Apr 2014 18:14:23 +0000 (18:14 +0000)]
am
26a5082d: (-s ours) am
d567d7d5: am
ce2acbcb: Fix preview thumb orientation
* commit '
26a5082dbcf2b324550a0a44c7eb907fff086f67':
Angus Kong [Wed, 30 Apr 2014 18:14:23 +0000 (18:14 +0000)]
am
7b1e22c7: (-s ours) am
0174828e: am
f737ac48: Merge "Add support to "go-to-next" in film strip." into gb-ub-photos-carlsbad
* commit '
7b1e22c7d0083cc6da935f65bbf234b51258db52':
Doris Liu [Wed, 30 Apr 2014 18:14:23 +0000 (18:14 +0000)]
am
9191a598: (-s ours) am
64335cf3: am
56f16746: Merge "Fix video capture animation and video snapshot animation" into gb-ub-photos-carlsbad
* commit '
9191a598d8204d2756cc05564bdd6faeda1cb585':
Angus Kong [Wed, 30 Apr 2014 18:14:22 +0000 (18:14 +0000)]
am
d7f7649a: (-s ours) am
10096771: am
15396ca6: Merge "Fix delete animation in fullscreen mode." into gb-ub-photos-carlsbad
* commit '
d7f7649add68ee85376e3cda81ffa5cf00c2bd7a':
Angus Kong [Wed, 30 Apr 2014 18:14:22 +0000 (18:14 +0000)]
am
963718bf: (-s ours) am
0d9217b4: am
7e374eb0: Stop the MediaSaveService after unbinding.
* commit '
963718bf313e849209f8acb050a58ac8016430d9':
Angus Kong [Wed, 30 Apr 2014 18:14:22 +0000 (18:14 +0000)]
am
d43c559e: (-s ours) am
ef851bf2: am
025136bb: Support filmstrip swipe in full-screen.
* commit '
d43c559eb98bc0c431f5e1db196d2efc51a4dcc7':
Angus Kong [Wed, 30 Apr 2014 18:14:22 +0000 (18:14 +0000)]
am
fffbdc3f: (-s ours) am
78ad4a5a: am
87025351: Merge "Update the final PhotoSphere result correctly." into gb-ub-photos-carlsbad
* commit '
fffbdc3f9b964d7d0414ae0ab811a3aa5bf6ff03':
Doris Liu [Wed, 30 Apr 2014 18:14:22 +0000 (18:14 +0000)]
am
11dbe8af: (-s ours) am
de07dbb6: am
304a6360: Merge "Fix nav bar overlapping camera bottom UI controls" into gb-ub-photos-carlsbad
* commit '
11dbe8af9d5656ae618ebb0c64e4d24321b5e3de':
Sascha Haeberling [Wed, 30 Apr 2014 18:14:22 +0000 (18:14 +0000)]
am
97ff12f9: (-s ours) am
fd791ba4: am
b5ca24e7: Merge "Remove the "button" part of the shutter button description." into gb-ub-photos-carlsbad
* commit '
97ff12f9ec3bef714d0434af5fb1691c65f38f45':
Doris Liu [Wed, 30 Apr 2014 18:14:22 +0000 (18:14 +0000)]
am
00a2e30d: (-s ours) am
2acc6ac5: am
d7e01e25: Merge "Fix video snapshot aspect ratio" into gb-ub-photos-carlsbad
* commit '
00a2e30d5053a76e1b8474e5bbeecfa6ea699f75':
Doris Liu [Wed, 30 Apr 2014 18:14:22 +0000 (18:14 +0000)]
am
a0b114fa: (-s ours) am
b8ff43a2: am
2b18ecec: Merge "Make camera preview full screen" into gb-ub-photos-carlsbad
* commit '
a0b114fa27c91fcf742e68308db179c39c10f914':
Jason Noguchi [Wed, 30 Apr 2014 18:14:22 +0000 (18:14 +0000)]
am
fc30eda1: (-s ours) am
17525fee: am
5ad4114f: (-s ours) Merge "Updating the Camera tests makefile and source to reflect recent split between camera and gallery apps." into gb-ub-photos-carlsbad
* commit '
fc30eda12b5d1a1e0ad073c9137bfeed26540a50':
Doris Liu [Wed, 30 Apr 2014 18:14:21 +0000 (18:14 +0000)]
nicolasroard [Wed, 30 Apr 2014 18:14:21 +0000 (18:14 +0000)]
am
4921b308: (-s ours) am
9fd5ee8a: am
0819304b: Add "set as" capability in Film Strip
* commit '
4921b308d9b40a6f2ba7b3c5a7c1d91bd089cf66':
Sascha Haeberling [Wed, 30 Apr 2014 18:14:21 +0000 (18:14 +0000)]
am
054e5237: (-s ours) am
cf43f817: am
722c8607: Rename accessibility text for Photo Sphere mode from \'new panorama\'.
* commit '
054e5237e9f901f1603c8f59c593b897e8ac7f15':
Angus Kong [Wed, 30 Apr 2014 18:14:21 +0000 (18:14 +0000)]
am
31ffcf37: (-s ours) am
49ab978a: am
b269061d: Merge "Implement deletion in the menu." into gb-ub-photos-carlsbad
* commit '
31ffcf377e348aeaea273f50c691037c140b59ef':
Sascha Haeberling [Wed, 30 Apr 2014 18:14:21 +0000 (18:14 +0000)]
am
08ae9e64: (-s ours) am
32ba33c6: am
b0a5929b: Add video details to the details menu
* commit '
08ae9e647fbc9a35181ed0db5d982cce5791b3f5':
ztenghui [Wed, 30 Apr 2014 18:14:21 +0000 (18:14 +0000)]
am
ac8455c9: (-s ours) am
397586f0: am
99a5ef6f: Merge "Update the action bar style to match Bryce" into gb-ub-photos-carlsbad
* commit '
ac8455c9760ef793303d3f61f86a3cd09f774798':
Sascha Haeberling [Wed, 30 Apr 2014 18:14:21 +0000 (18:14 +0000)]
am
fe0655c5: (-s ours) am
119bd7ec: am
e98a59af: Merge "Don\'t refresh item on resume as it leads to a filmstrip bug." into gb-ub-photos-carlsbad
* commit '
fe0655c5b50b5a3d3036b5f84cdd49445f1db9f7':
Sascha Haeberling [Wed, 30 Apr 2014 18:14:21 +0000 (18:14 +0000)]
am
f39b9612: (-s ours) am
b030d20d: am
58dfa0fb: Merge "Enable switching cameras in video mode." into gb-ub-photos-carlsbad
* commit '
f39b9612dbfdea114c01ad6b3247f9d4378418ff':
Sascha Haeberling [Wed, 30 Apr 2014 18:14:20 +0000 (18:14 +0000)]
am
1b27950b: (-s ours) am
2c9dc8eb: am
88ef7664: Bring back the bottom controls in Filmstrip.
* commit '
1b27950b1f52a70b78372f661e28ee83c9ea91cf':
ztenghui [Wed, 30 Apr 2014 18:14:20 +0000 (18:14 +0000)]
am
45bd3fe4: (-s ours) am
1a7fed5f: am
1571239c: Merge "Add the trim functionality back to FilmStripView" into gb-ub-photos-carlsbad
* commit '
45bd3fe4581677f4da04d4c558930244e60ada25':
Doris Liu [Wed, 30 Apr 2014 18:14:20 +0000 (18:14 +0000)]
am
957da61b: (-s ours) am
c5541a55: am
e9d3428f: Merge "Add image 1:1 support" into gb-ub-photos-carlsbad
* commit '
957da61b9229361723f5df310e758033131519f5':
Mangesh Ghiware [Wed, 30 Apr 2014 18:14:20 +0000 (18:14 +0000)]
am
03ce0b53: (-s ours) am
34a3b7fb: am
856d7ec4: Merge "Add back intent-filter for default category and main action." into gb-ub-photos-carlsbad
* commit '
03ce0b5310ed9edf78bd323ab00f1ed760701421':
Angus Kong [Wed, 30 Apr 2014 18:14:20 +0000 (18:14 +0000)]
am
db109f7c: (-s ours) am
9e06215e: am
4ff5a1ab: Set views in filmstrip invisible when alpha = 0.
* commit '
db109f7c9c058690c556430b2e3a9819b2599e15':
Sascha Haeberling [Wed, 30 Apr 2014 18:14:20 +0000 (18:14 +0000)]
am
df651ff6: (-s ours) am
81d517a4: am
394023fb: Single-tap in fullscreen view toggles ActionBar.
* commit '
df651ff65909e92fdc6b1189d857fe847688dd71':
Sascha Haeberling [Wed, 30 Apr 2014 18:14:20 +0000 (18:14 +0000)]
am
2cd5b165: (-s ours) am
e14044ee: am
fae11a16: Implent show-on-map functionality. Also make sure the show-on-map item is only shown for items with coordinates. and add the coordinate to the details view.
* commit '
2cd5b16540fae98487c639f6d2e84be52561003a':
Sascha Haeberling [Wed, 30 Apr 2014 18:14:20 +0000 (18:14 +0000)]
am
d0fcc1bd: (-s ours) am
ac87189c: am
29a27c76: Merge "Brings back the details menu with most EXIF data in it. Some are still missing and will come back later." into gb-ub-photos-carlsbad
* commit '
d0fcc1bdc9e019179a3b2c69a632cc177e947be9':
Dan Aminzade [Wed, 30 Apr 2014 18:14:19 +0000 (18:14 +0000)]
am
2b3cee71: (-s ours) am
18aafe57: am
fca1c5ec: Defining broadcast intent strings as constants in CameraUtil.java. For now I\'m leaving the definition within the Camera application. If we decide we want to publicize and document these intents as part of the Android API, we cou
* commit '
2b3cee71446e2468b534ac51103732c3d1e137ac':
Angus Kong [Wed, 30 Apr 2014 18:14:19 +0000 (18:14 +0000)]
am
8fc1610d: (-s ours) am
a6e1f342: am
7e1c5fe2: Single tap to full screen mode.
* commit '
8fc1610d1eb6c91cf456bd522407e8cc0a41bf76':
Angus Kong [Wed, 30 Apr 2014 18:14:19 +0000 (18:14 +0000)]
am
c7283d99: (-s ours) am
690eba37: am
0689254e: Merge "Make current view center in filmstrip." into gb-ub-photos-carlsbad
* commit '
c7283d9947482586e2a20b98028e86a4f2035f35':
Dan Aminzade [Wed, 30 Apr 2014 18:14:19 +0000 (18:14 +0000)]
am
139f3abf: (-s ours) am
d0a780dc: am
92ae10ec: Add support for remote shutter control via broadcast intents. Send CAMERA_STOPPED and CAMERA_STARTED intents on pause/resume, to notify Gem to hide and show the camera card, and receive the SHUTTER broadcast intent to trigger the
* commit '
139f3abfa778e1280c5efc2f2b3b47237507b362':
The Android Open Source Project [Wed, 30 Apr 2014 18:14:19 +0000 (18:14 +0000)]
am
845dadec: (-s ours) Reconcile with klp-release - do not merge
* commit '
845dadec2a2cc619d316c44e706b15eba4d75293':