OSDN Git Service
Baligh Uddin [Mon, 22 Apr 2013 21:54:25 +0000 (14:54 -0700)]
am
6fe2995e: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
6fe2995e44f38e7393ca4c12e5af5bf5b02d6297':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 22 Apr 2013 21:54:03 +0000 (21:54 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Mon, 22 Apr 2013 21:53:06 +0000 (21:53 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Mon, 22 Apr 2013 21:52:51 +0000 (21:52 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Ruben Brunk [Mon, 22 Apr 2013 18:58:30 +0000 (11:58 -0700)]
am
9c48a6c3: Fixes build. Removes dead code.
* commit '
9c48a6c30b2d663d382a8a4bc1c61ea75dfe46a1':
Fixes build. Removes dead code.
Ruben Brunk [Mon, 22 Apr 2013 18:45:06 +0000 (11:45 -0700)]
Fixes build. Removes dead code.
Change-Id: Ieef56407304254235295d81e09e55f1cd69b87cb
Baligh Uddin [Mon, 22 Apr 2013 18:32:21 +0000 (11:32 -0700)]
Import translations. DO NOT MERGE
Change-Id: I48df56ff30fe3834e152f051ac9ee30c36e69a15
Auto-generated-cl: translation import
Ruben Brunk [Mon, 22 Apr 2013 18:32:20 +0000 (11:32 -0700)]
am
1365eec6: Merge "Fix orientation changes for wallpaper setter." into gb-ub-photos-bryce
* commit '
1365eec634694796c1e3432abff54dd658bd4641':
Fix orientation changes for wallpaper setter.
Ruben Brunk [Mon, 22 Apr 2013 18:32:19 +0000 (11:32 -0700)]
am
4a6dc2b1: Merge "Reenables crop aspect ratio menu." into gb-ub-photos-bryce
* commit '
4a6dc2b147af34ab4545f6f647b4038c64fc80d0':
Reenables crop aspect ratio menu.
Ruben Brunk [Mon, 22 Apr 2013 18:32:01 +0000 (18:32 +0000)]
Merge "Fix orientation changes for wallpaper setter." into gb-ub-photos-bryce
Ruben Brunk [Mon, 22 Apr 2013 18:31:33 +0000 (18:31 +0000)]
Merge "Reenables crop aspect ratio menu." into gb-ub-photos-bryce
Baligh Uddin [Mon, 22 Apr 2013 18:30:26 +0000 (11:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: I53e202c86e4d6850682879ca557129a8aa74f61b
Auto-generated-cl: translation import
Baligh Uddin [Mon, 22 Apr 2013 18:29:49 +0000 (11:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5792f361b2f301c4acf5ef80fd33d149acc081dd
Auto-generated-cl: translation import
Ruben Brunk [Mon, 22 Apr 2013 17:53:08 +0000 (10:53 -0700)]
Fix orientation changes for wallpaper setter.
Bug:
8670036
Change-Id: I44932bcc8cd8b89686186e42fa1eb2644af87b47
Michael Kolb [Mon, 22 Apr 2013 17:33:06 +0000 (10:33 -0700)]
am
608f7c98: Merge "More menu fixes" into gb-ub-photos-bryce
* commit '
608f7c9843f48aeccc1678622dc3327958150c31':
More menu fixes
Michael Kolb [Mon, 22 Apr 2013 17:31:50 +0000 (17:31 +0000)]
Merge "More menu fixes" into gb-ub-photos-bryce
Michael Kolb [Fri, 19 Apr 2013 23:21:24 +0000 (16:21 -0700)]
More menu fixes
Bug:
8660834
Add label dropshadow, reposition fixed menu
Adjust dead zone and angle
Change-Id: I7d62c03bcdcdec6268ef805f56114327f471b6d7
Doris Liu [Mon, 22 Apr 2013 17:16:54 +0000 (10:16 -0700)]
am
d6e6533a: Merge "Fix for camera switcher hard to hit" into gb-ub-photos-bryce
* commit '
d6e6533a054ea526021c3331a18f93a618442f13':
Fix for camera switcher hard to hit
Doris Liu [Mon, 22 Apr 2013 17:13:45 +0000 (10:13 -0700)]
am
ed689873: Merge "Fix camera buttons showing up at wrong position" into gb-ub-photos-bryce
* commit '
ed689873c9da338859dc8858c08afa4fa31578f2':
Fix camera buttons showing up at wrong position
Bobby Georgescu [Mon, 22 Apr 2013 17:13:44 +0000 (10:13 -0700)]
am
ca6f04e2: Remove dead code
* commit '
ca6f04e27bbcab953bd3f9dcf50476a1c4b70aac':
Remove dead code
Doris Liu [Mon, 22 Apr 2013 17:13:22 +0000 (17:13 +0000)]
Merge "Fix for camera switcher hard to hit" into gb-ub-photos-bryce
Doris Liu [Mon, 22 Apr 2013 17:13:05 +0000 (17:13 +0000)]
Merge "Fix camera buttons showing up at wrong position" into gb-ub-photos-bryce
Doris Liu [Sat, 20 Apr 2013 21:12:53 +0000 (14:12 -0700)]
Fix for camera switcher hard to hit
Bug:
8667079
Change-Id: I9d40617f4e3bcfcd810223d818b212d335c80707
Ruben Brunk [Sat, 20 Apr 2013 00:00:51 +0000 (17:00 -0700)]
Reenables crop aspect ratio menu.
Bug:
8471812
Change-Id: I50044f4c787ba326e24f67c5370e1f8a220eb005
Doris Liu [Sat, 20 Apr 2013 18:30:35 +0000 (11:30 -0700)]
Fix camera buttons showing up at wrong position
Bug:
8607034
Change-Id: Ia796a9f5e56fd0566e2f4853ec48b9371e8134e2
Bobby Georgescu [Sat, 20 Apr 2013 17:26:15 +0000 (10:26 -0700)]
Remove dead code
Bug:
8672542
Change-Id: Ia6046b17f8ae77ffe6b8090b5fbd1dda2bc0327e
nicolasroard [Sat, 20 Apr 2013 05:29:49 +0000 (22:29 -0700)]
Nicolas Roard [Sat, 20 Apr 2013 05:29:48 +0000 (22:29 -0700)]
am
bb894c4f: Merge "String updates." into gb-ub-photos-bryce
* commit '
bb894c4f321b27ede8e97c42117973376bbaf32f':
String updates.
Michael Kolb [Sat, 20 Apr 2013 05:29:47 +0000 (22:29 -0700)]
am
237216ee: Rename scenemode AUTO to NONE
* commit '
237216eeba5c05d63aa075ac8dc4af423044f302':
Rename scenemode AUTO to NONE
Ruben Brunk [Sat, 20 Apr 2013 05:29:47 +0000 (22:29 -0700)]
am
f53eea80: Merge "Ensure consistent image thumbnail handling." into gb-ub-photos-bryce
* commit '
f53eea80c773a1686631f9e2ec6edab23c8944b5':
Ensure consistent image thumbnail handling.
Ruben Brunk [Sat, 20 Apr 2013 05:29:46 +0000 (22:29 -0700)]
am
afc46d5a: Merge "Fix saved video timestamps." into gb-ub-photos-bryce
* commit '
afc46d5a608ccfc1f370cc705e0c27eb0b678ded':
Fix saved video timestamps.
Chad Jones [Sat, 20 Apr 2013 04:17:52 +0000 (21:17 -0700)]
Merge commit '
91d26f6c' into jb-mr2-dev
nicolasroard [Sat, 20 Apr 2013 00:15:51 +0000 (17:15 -0700)]
Strings update
bug:
8664728
Change-Id: I8844ebb6557bbc5e8ea31277f164fdb61afadfd9
Nicolas Roard [Sat, 20 Apr 2013 00:13:11 +0000 (00:13 +0000)]
Merge "String updates." into gb-ub-photos-bryce
Ruben Brunk [Sat, 20 Apr 2013 00:03:05 +0000 (17:03 -0700)]
String updates.
Bug:
8664728
Change-Id: Idc23ab0d75a9f1656c5e38a0b0e318a63d6875b5
Michael Kolb [Fri, 19 Apr 2013 23:23:28 +0000 (16:23 -0700)]
Rename scenemode AUTO to NONE
Bug:
8660834
Change-Id: Ia2900821c5983d3e4fe3a6aeab720f2070c7ebfa
Ruben Brunk [Fri, 19 Apr 2013 22:54:43 +0000 (22:54 +0000)]
Merge "Ensure consistent image thumbnail handling." into gb-ub-photos-bryce
Ruben Brunk [Fri, 19 Apr 2013 22:43:05 +0000 (22:43 +0000)]
Merge "Fix saved video timestamps." into gb-ub-photos-bryce
Ruben Brunk [Fri, 19 Apr 2013 22:41:28 +0000 (15:41 -0700)]
Ensure consistent image thumbnail handling.
Bug:
7192433
Change-Id: Ie86ade06b7234681a0d955a87cacfb337bc39145
Ruben Brunk [Fri, 19 Apr 2013 22:27:57 +0000 (15:27 -0700)]
Fix saved video timestamps.
Bug:
8002939
Change-Id: I771b2b4082acd19bbf9b52c65f51da9489827c18
John Hoford [Fri, 19 Apr 2013 01:43:29 +0000 (18:43 -0700)]
tiny planet fix
bug:
8323524
Change-Id: I39283face7079574dbe25e797323a84141930f9a
John Reck [Fri, 19 Apr 2013 21:51:57 +0000 (21:51 +0000)]
Merge "Remove photos from gallery2 manifest" into gb-ub-photos-bryce
Michael Kolb [Fri, 19 Apr 2013 21:15:07 +0000 (14:15 -0700)]
am
beba6b1c: Merge "Fix labels" into gb-ub-photos-bryce
* commit '
beba6b1c36f79aded98f71dbf45454dd947ce7b8':
Fix labels
John Reck [Fri, 19 Apr 2013 17:04:12 +0000 (10:04 -0700)]
Remove photos from gallery2 manifest
Bug:
8659787
Change-Id: I72c85db38b3f7409a2ce84b2a6a7b7ccab41a351
Michael Kolb [Fri, 19 Apr 2013 21:11:59 +0000 (21:11 +0000)]
Merge "Fix labels" into gb-ub-photos-bryce
Michael Kolb [Fri, 19 Apr 2013 21:04:01 +0000 (14:04 -0700)]
Fix labels
Bug:
8660834
Change-Id: I92efdfb136fd57fabe30547f6cd1eb8abf94bf1a
Angus Kong [Fri, 19 Apr 2013 21:04:00 +0000 (14:04 -0700)]
am
935d4c80: Merge "Make MediaSaveService destroyed after unbound." into gb-ub-photos-bryce
* commit '
935d4c8037d7b5f56e4dea1c96bd8f4b68cb6236':
Make MediaSaveService destroyed after unbound.
Angus Kong [Fri, 19 Apr 2013 21:03:59 +0000 (14:03 -0700)]
am
ca3875b2: Merge "Save video using MediaSaveService." into gb-ub-photos-bryce
* commit '
ca3875b21375defd0d42c57c05994cd67f0d59cd':
Save video using MediaSaveService.
Angus Kong [Fri, 19 Apr 2013 21:01:35 +0000 (21:01 +0000)]
Merge "Make MediaSaveService destroyed after unbound." into gb-ub-photos-bryce
Angus Kong [Fri, 19 Apr 2013 21:01:15 +0000 (21:01 +0000)]
Merge "Save video using MediaSaveService." into gb-ub-photos-bryce
Bobby Georgescu [Fri, 19 Apr 2013 19:47:41 +0000 (12:47 -0700)]
am
faf2f040: Fix multi selection issue
* commit '
faf2f040f38532213fa237cf45c9794cf1a85859':
Fix multi selection issue
Angus Kong [Wed, 17 Apr 2013 22:37:07 +0000 (15:37 -0700)]
Save video using MediaSaveService.
bug:
8511719
Change-Id: I3fc5054bf7661953181b27e66cc70ba95082d36c
Angus Kong [Fri, 19 Apr 2013 19:28:58 +0000 (12:28 -0700)]
Make MediaSaveService destroyed after unbound.
bug:
8528779
Change-Id: I1e6b78d5603b10cde3399969cd7a8cc19655051b
Bobby Georgescu [Fri, 19 Apr 2013 18:27:29 +0000 (11:27 -0700)]
Fix multi selection issue
Bug:
8663155
Change-Id: Ic6aa98c04b5134df9deb1b14736e614bf1618f03
Michael Kolb [Fri, 19 Apr 2013 17:38:00 +0000 (10:38 -0700)]
am
32049103: Merge "Lock camera orientation using FW API" into gb-ub-photos-bryce
* commit '
32049103305c99e8be1f7af3e46933277e02a7c3':
Lock camera orientation using FW API
Michael Kolb [Fri, 19 Apr 2013 17:34:08 +0000 (17:34 +0000)]
Merge "Lock camera orientation using FW API" into gb-ub-photos-bryce
Angus Kong [Fri, 19 Apr 2013 17:27:38 +0000 (10:27 -0700)]
am
45826e18: Merge "Pass the camera to recorders after all is set." into gb-ub-photos-bryce
* commit '
45826e188598cd6171fc0ec3112e2fbf52fbc952':
Pass the camera to recorders after all is set.
Angus Kong [Fri, 19 Apr 2013 17:25:58 +0000 (17:25 +0000)]
Merge "Pass the camera to recorders after all is set." into gb-ub-photos-bryce
Doris Liu [Fri, 19 Apr 2013 17:20:32 +0000 (10:20 -0700)]
am
b1051814: Merge "Fix memory leak in pie controller" into gb-ub-photos-bryce
* commit '
b10518142bb84abe2ffe1bd3aa10ff4ee7982370':
Fix memory leak in pie controller
Doris Liu [Fri, 19 Apr 2013 17:20:31 +0000 (10:20 -0700)]
am
14fe2887: Merge "Allow swiping to filmstrip from blocker bar" into gb-ub-photos-bryce
* commit '
14fe288784c574c84edbf84306329dc8b70d8b4d':
Allow swiping to filmstrip from blocker bar
Doris Liu [Fri, 19 Apr 2013 17:17:59 +0000 (17:17 +0000)]
Merge "Fix memory leak in pie controller" into gb-ub-photos-bryce
Doris Liu [Fri, 19 Apr 2013 17:17:44 +0000 (17:17 +0000)]
Merge "Allow swiping to filmstrip from blocker bar" into gb-ub-photos-bryce
Michael Kolb [Fri, 19 Apr 2013 17:11:24 +0000 (10:11 -0700)]
am
a7e098c8: Merge "Drop in new assets of correct size" into gb-ub-photos-bryce
* commit '
a7e098c8e798160fdc2410867ec7eba325b7cd96':
Drop in new assets of correct size
Michael Kolb [Fri, 19 Apr 2013 17:09:40 +0000 (17:09 +0000)]
Merge "Drop in new assets of correct size" into gb-ub-photos-bryce
Michael Kolb [Fri, 19 Apr 2013 15:56:07 +0000 (08:56 -0700)]
Drop in new assets of correct size
Bug:
8640131
Change-Id: Iefcff08ae190c07700b5526a6847b664fe1b51a7
Ruben Brunk [Fri, 19 Apr 2013 03:20:19 +0000 (20:20 -0700)]
am
316af8dd: Merge "Fix crop activity aspect ratio and orientation handling." into gb-ub-photos-bryce
* commit '
316af8dd675d777f4bd9512b8af5391c7c89363f':
Fix crop activity aspect ratio and orientation handling.
Ruben Brunk [Fri, 19 Apr 2013 03:16:53 +0000 (03:16 +0000)]
Merge "Fix crop activity aspect ratio and orientation handling." into gb-ub-photos-bryce
John Hoford [Fri, 19 Apr 2013 01:44:01 +0000 (18:44 -0700)]
am
a1939d22: Merge "fixed borders issues" into gb-ub-photos-bryce
* commit '
a1939d22f631ddcb7e942cc0ad2ffa7ef78b763f':
fixed borders issues
John Hoford [Fri, 19 Apr 2013 01:41:44 +0000 (01:41 +0000)]
Merge "fixed borders issues" into gb-ub-photos-bryce
Doris Liu [Fri, 19 Apr 2013 00:14:51 +0000 (17:14 -0700)]
Fix memory leak in pie controller
Bug:
7622218
Change-Id: Iaab96008a4f4b506bb0be98f489af9120d607251
Ruben Brunk [Thu, 18 Apr 2013 23:22:27 +0000 (16:22 -0700)]
Fix crop activity aspect ratio and orientation handling.
Bug:
8659064
Bug:
8647628
Change-Id: I3e4293cc3bba7d55334acb396e20a23cc92f8f82
Flavio Lerda [Thu, 18 Apr 2013 23:00:40 +0000 (16:00 -0700)]
am
ed2f1790: Merge "Remove unused imports." into gb-ub-photos-bryce
* commit '
ed2f17903bbbca08ac98af4aa6c1dd9d22504a1d':
Remove unused imports.
Angus Kong [Thu, 18 Apr 2013 22:57:08 +0000 (15:57 -0700)]
Pass the camera to recorders after all is set.
bug:
8049369
Change-Id: I5cd658e78905a7b41f97ee0cce820f0c8bc99dd5
Flavio Lerda [Thu, 18 Apr 2013 22:57:36 +0000 (22:57 +0000)]
Merge "Remove unused imports." into gb-ub-photos-bryce
Flavio Lerda [Thu, 18 Apr 2013 21:51:46 +0000 (22:51 +0100)]
Remove unused imports.
This is follow-up on the previous fix for b/
8433834, addressing reviewer
comments.
Bug:
8433834
Change-Id: I06f466704175a62d8febc5be471a2ca1f50e898d
Michael Kolb [Thu, 18 Apr 2013 22:20:30 +0000 (15:20 -0700)]
am
5b083f89: Add more menu options/icons
* commit '
5b083f89c9c87f8e19e0942d1d7c2de623e527be':
Add more menu options/icons
Michael Kolb [Thu, 18 Apr 2013 19:31:10 +0000 (12:31 -0700)]
Add more menu options/icons
Bug:
8640131
Added location and scene mode to secondary menu
Updated HDR icons
Change-Id: I5bed39a2ec037aecf67702d88f738befe61846d4
George Mount [Thu, 18 Apr 2013 21:23:11 +0000 (14:23 -0700)]
am
b726c83a: Merge "Change labels so that it doesn\'t clash with PanoUiLib." into gb-ub-photos-bryce
* commit '
b726c83ab60b0ec8e93cad9724857999b3bb8ec5':
Change labels so that it doesn't clash with PanoUiLib.
George Mount [Thu, 18 Apr 2013 21:20:31 +0000 (21:20 +0000)]
Merge "Change labels so that it doesn't clash with PanoUiLib." into gb-ub-photos-bryce
Doris Liu [Tue, 16 Apr 2013 16:50:56 +0000 (09:50 -0700)]
Allow swiping to filmstrip from blocker bar
Bug:
8607910
Change-Id: I69bfcf8d95d6071be7d65fbf433916740cbb655c
John Hoford [Thu, 18 Apr 2013 03:40:25 +0000 (20:40 -0700)]
fixed borders issues
bug:
8315216
Change-Id: I04d62984c70e7e514b8625e6a4b5ed9395137471
Ruben Brunk [Thu, 18 Apr 2013 18:40:49 +0000 (11:40 -0700)]
am
c3178ca4: Gallery crop uses new activity. Fixed image quality.
* commit '
c3178ca4daf7ed570f3432f3433959c208ecc105':
Gallery crop uses new activity. Fixed image quality.
Ruben Brunk [Tue, 16 Apr 2013 23:17:45 +0000 (16:17 -0700)]
Gallery crop uses new activity. Fixed image quality.
Bug:
8639287
Bug:
8617799
Bug:
8600483
Bug:
8586301
Bug:
8526929
Bug:
8181859
Bug:
7561681
Change-Id: Ib275b970931dd324e93d1629be75e5309c9dcb4e
George Mount [Thu, 18 Apr 2013 17:15:40 +0000 (10:15 -0700)]
Change labels so that it doesn't clash with PanoUiLib.
Bug
8401273
PanoUiLib is required for all Gallery Wolfie UI.
Change-Id: Icd58c5f4c03945c29f6bf3be286d2321abf2f63a
Baligh Uddin [Thu, 18 Apr 2013 14:41:32 +0000 (07:41 -0700)]
am
c54e3418: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
c54e3418578d1419ff3370fa4ee38bdd43397ce1':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 18 Apr 2013 14:41:31 +0000 (07:41 -0700)]
am
df9e8b91: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
df9e8b91919a3b0b2097dc63f708854d20183a16':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 18 Apr 2013 14:40:06 +0000 (14:40 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Thu, 18 Apr 2013 14:39:53 +0000 (14:39 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Thu, 18 Apr 2013 14:39:04 +0000 (14:39 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Thu, 18 Apr 2013 14:38:29 +0000 (14:38 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Flavio Lerda [Thu, 18 Apr 2013 13:22:14 +0000 (06:22 -0700)]
am
47f28614: Merge "Usage statistics for sharing." into gb-ub-photos-bryce
* commit '
47f28614605a19726d2ab81b90333ba718223b72':
Usage statistics for sharing.
Flavio Lerda [Thu, 18 Apr 2013 13:19:39 +0000 (13:19 +0000)]
Merge "Usage statistics for sharing." into gb-ub-photos-bryce
Ruben Brunk [Thu, 18 Apr 2013 02:51:45 +0000 (19:51 -0700)]
am
61f3f111: Remove call to superclass onTouch in curves.
* commit '
61f3f1113a5b4f8583fd9fcae4d24734617cae21':
Remove call to superclass onTouch in curves.
Ruben Brunk [Thu, 18 Apr 2013 01:55:53 +0000 (18:55 -0700)]
Remove call to superclass onTouch in curves.
Bug:
8523301
Change-Id: I0102a228c2d1b3199412c9897a9f1abdb4bcb41f
Ruben Brunk [Thu, 18 Apr 2013 01:52:20 +0000 (18:52 -0700)]
am
869cb048: Merge "Remove redeye filter." into gb-ub-photos-bryce
* commit '
869cb0484c1c9e77d089abe198817709d3e89eb9':
Remove redeye filter.
Sascha Haeberling [Thu, 18 Apr 2013 01:52:19 +0000 (18:52 -0700)]
am
49ee213f: Merge "Add method for returning SoundPool audio type." into gb-ub-photos-bryce
* commit '
49ee213fbb0f3434002693889bdae3e7c0d5b378':
Add method for returning SoundPool audio type.
Ruben Brunk [Thu, 18 Apr 2013 01:49:53 +0000 (01:49 +0000)]
Merge "Remove redeye filter." into gb-ub-photos-bryce
Sascha Haeberling [Thu, 18 Apr 2013 01:48:34 +0000 (01:48 +0000)]
Merge "Add method for returning SoundPool audio type." into gb-ub-photos-bryce
Ruben Brunk [Thu, 18 Apr 2013 01:39:27 +0000 (18:39 -0700)]
Remove redeye filter.
Bug:
8609003
Change-Id: I7f10e928fa775e5186146f06877dda34b3df699a
John Hoford [Thu, 18 Apr 2013 00:39:47 +0000 (17:39 -0700)]
am
12cd0222: Merge "improve pinch to zoom behavior" into gb-ub-photos-bryce
* commit '
12cd022273f14a64d9cdf79aa6a27feb099b9107':
improve pinch to zoom behavior
OSDN Git Service
