OSDN Git Service
Bobby Georgescu [Mon, 1 Oct 2012 18:18:38 +0000 (11:18 -0700)]
am
320280e4: am
2b49458e: am
699d4d2b: am
207b73ba: Add new gallery assets
* commit '
320280e496bfccaa5b4622c8cc5889590069c73a':
Add new gallery assets
Wu-cheng Li [Mon, 1 Oct 2012 18:18:38 +0000 (11:18 -0700)]
am
c9ddc4bc: am
de161c0c: am
2ef8ea04: am
f6b2ec81: Disable effects recording UI.
* commit '
c9ddc4bc3f1c7d8b3efd04ea7a128c174d0008db':
Disable effects recording UI.
nicolasroard [Mon, 1 Oct 2012 18:18:37 +0000 (11:18 -0700)]
am
6707efea: am
a3336a8a: am
7e035f20: am
0c3203f1: Remove the individual Curves channel filters Reorder the filters
* commit '
6707efea98c8e275df04a4e96f031b7c1c57fb6d':
Remove the individual Curves channel filters Reorder the filters
Dianne Hackborn [Mon, 1 Oct 2012 18:18:36 +0000 (11:18 -0700)]
am
432195cb: am
39f3462e: am
004174de: Merge "Fix issue #
7255954: API Review: rename Dream to DreamService" into jb-mr1-dev
* commit '
432195cb2f2db1eb4b4fa15ce3365a653d5f8b3f':
Fix issue #
7255954: API Review: rename Dream to DreamService
Bobby Georgescu [Mon, 1 Oct 2012 17:15:07 +0000 (10:15 -0700)]
am
2b49458e: am
699d4d2b: am
207b73ba: Add new gallery assets
* commit '
2b49458e03318232eb740d45558e3a82146e0728':
Add new gallery assets
Wu-cheng Li [Mon, 1 Oct 2012 17:14:33 +0000 (10:14 -0700)]
am
de161c0c: am
2ef8ea04: am
f6b2ec81: Disable effects recording UI.
* commit '
de161c0c08d9c756f0c12c3d40cc34a03fc7a883':
Disable effects recording UI.
nicolasroard [Mon, 1 Oct 2012 17:13:40 +0000 (10:13 -0700)]
am
a3336a8a: am
7e035f20: am
0c3203f1: Remove the individual Curves channel filters Reorder the filters
* commit '
a3336a8a566358a02ca68ba8c657b11f05565cdb':
Remove the individual Curves channel filters Reorder the filters
Dianne Hackborn [Mon, 1 Oct 2012 17:13:21 +0000 (10:13 -0700)]
am
39f3462e: am
004174de: Merge "Fix issue #
7255954: API Review: rename Dream to DreamService" into jb-mr1-dev
* commit '
39f3462ea3c4001dc02526a287a6a32eff611421':
Fix issue #
7255954: API Review: rename Dream to DreamService
Bobby Georgescu [Sun, 30 Sep 2012 18:48:59 +0000 (11:48 -0700)]
am
699d4d2b: am
207b73ba: Add new gallery assets
* commit '
699d4d2b1ba647cad60899d72c1cf60a851878de':
Add new gallery assets
Bobby Georgescu [Sun, 30 Sep 2012 18:46:57 +0000 (11:46 -0700)]
am
207b73ba: Add new gallery assets
* commit '
207b73bafea60a79fde5e3323e87441762e4b6ed':
Add new gallery assets
Bobby Georgescu [Sun, 30 Sep 2012 18:35:41 +0000 (11:35 -0700)]
Add new gallery assets
Bug:
7258964
Change-Id: I02600bff90de1f665d6a5958d3235346cbfdaa01
Wu-cheng Li [Sun, 30 Sep 2012 18:23:09 +0000 (11:23 -0700)]
am
2ef8ea04: am
f6b2ec81: Disable effects recording UI.
* commit '
2ef8ea04349def9c6d584ed5853404977ee45936':
Disable effects recording UI.
Wu-cheng Li [Sun, 30 Sep 2012 18:21:16 +0000 (11:21 -0700)]
am
f6b2ec81: Disable effects recording UI.
* commit '
f6b2ec819e28d126f4ccb73d90e899e6fbed969e':
Disable effects recording UI.
Wu-cheng Li [Sun, 30 Sep 2012 15:13:00 +0000 (23:13 +0800)]
Disable effects recording UI.
bug:
7106963
Change-Id: I1c056b30efd9b2d8c976b611ada971a8bff1ad87
nicolasroard [Sat, 29 Sep 2012 01:42:26 +0000 (18:42 -0700)]
am
7e035f20: am
0c3203f1: Remove the individual Curves channel filters Reorder the filters
* commit '
7e035f20c961d2f0dccd48772dee5273e95b9d45':
Remove the individual Curves channel filters Reorder the filters
nicolasroard [Sat, 29 Sep 2012 01:41:03 +0000 (18:41 -0700)]
am
0c3203f1: Remove the individual Curves channel filters Reorder the filters
* commit '
0c3203f1789df3f8bd772dfd655e73b44636b629':
Remove the individual Curves channel filters Reorder the filters
nicolasroard [Sat, 29 Sep 2012 01:26:53 +0000 (18:26 -0700)]
Remove the individual Curves channel filters
Reorder the filters
bug:
7234317
Change-Id: Ia726fa8ea82580c97784eb03d4c6740cf4a603c4
Dianne Hackborn [Sat, 29 Sep 2012 01:19:58 +0000 (18:19 -0700)]
am
004174de: Merge "Fix issue #
7255954: API Review: rename Dream to DreamService" into jb-mr1-dev
* commit '
004174de4aa5b803d1f456cc8e905c9d672c2c4a':
Fix issue #
7255954: API Review: rename Dream to DreamService
Dianne Hackborn [Sat, 29 Sep 2012 01:17:28 +0000 (18:17 -0700)]
Merge "Fix issue #
7255954: API Review: rename Dream to DreamService" into jb-mr1-dev
Dianne Hackborn [Sat, 29 Sep 2012 00:46:45 +0000 (17:46 -0700)]
Fix issue #
7255954: API Review: rename Dream to DreamService
Change-Id: Ie24be85e3bb1d59c266d3fc83d035d162a643252
Jean-Baptiste Queru [Sat, 29 Sep 2012 00:25:41 +0000 (17:25 -0700)]
Jean-Baptiste Queru [Sat, 29 Sep 2012 00:23:42 +0000 (17:23 -0700)]
Merge from jb-mr1-aah-dev
Change-Id: I816c1be115edeeb69a873cb5dd9030732ba6f227
John Hoford [Sat, 29 Sep 2012 00:21:58 +0000 (17:21 -0700)]
am
81384a1d: am
eb9d5d27: am
d42f6c69: Add contrast & brightness filters Added hue fixed contrast Stablized Contrast, Saturation, Tint, Exposure
* commit '
81384a1d78100e9fa5a0e5ac7e52a1da1709dce5':
Add contrast & brightness filters Added hue fixed contrast Stablized Contrast, Saturation, Tint, Exposure
John Hoford [Sat, 29 Sep 2012 00:19:47 +0000 (17:19 -0700)]
am
eb9d5d27: am
d42f6c69: Add contrast & brightness filters Added hue fixed contrast Stablized Contrast, Saturation, Tint, Exposure
* commit '
eb9d5d27df1708c4269612b95ba8b56fb5da5993':
Add contrast & brightness filters Added hue fixed contrast Stablized Contrast, Saturation, Tint, Exposure
John Hoford [Sat, 29 Sep 2012 00:19:46 +0000 (17:19 -0700)]
am
eb9d5d27: am
d42f6c69: Add contrast & brightness filters Added hue fixed contrast Stablized Contrast, Saturation, Tint, Exposure
* commit '
eb9d5d27df1708c4269612b95ba8b56fb5da5993':
Add contrast & brightness filters Added hue fixed contrast Stablized Contrast, Saturation, Tint, Exposure
John Hoford [Sat, 29 Sep 2012 00:17:59 +0000 (17:17 -0700)]
am
d42f6c69: Add contrast & brightness filters Added hue fixed contrast Stablized Contrast, Saturation, Tint, Exposure
* commit '
d42f6c69c5980110c16cd679f914c4e4e7caa29d':
Add contrast & brightness filters Added hue fixed contrast Stablized Contrast, Saturation, Tint, Exposure
Jean-Baptiste Queru [Sat, 29 Sep 2012 00:17:40 +0000 (17:17 -0700)]
Jean-Baptiste Queru [Sat, 29 Sep 2012 00:14:40 +0000 (17:14 -0700)]
Merge from jb-mr1-aah-dev
Change-Id: I032fc74d70985bec8402dbffdd251ded9004db2e
John Hoford [Thu, 27 Sep 2012 23:34:21 +0000 (16:34 -0700)]
Add contrast & brightness filters
Added hue fixed contrast
Stablized Contrast, Saturation, Tint, Exposure
bug:
7234321
Change-Id: Iadd1e3ab215b60f920b718fa56611a07f24effee
nicolasroard [Sat, 29 Sep 2012 00:09:47 +0000 (17:09 -0700)]
am
c92d9de2: am
786fe647: Improve ActionBar - show both undo and redo - add the checkmark with done instead of the up mark
* commit '
c92d9de295efa5e0773aef1642d184e5fe8e8a38':
Improve ActionBar - show both undo and redo - add the checkmark with done instead of the up mark
Bobby Georgescu [Sat, 29 Sep 2012 00:06:44 +0000 (17:06 -0700)]
am
8c35f795: am
d5480bd5: Merge "Debounce after quick fling towards camera but zoom if slow" into gb-ub-photos-arches
* commit '
8c35f7954f4e7aa6c2701fa1131978e6cd5cf79e':
Debounce after quick fling towards camera but zoom if slow
nicolasroard [Fri, 28 Sep 2012 23:22:31 +0000 (16:22 -0700)]
am
700c30f5: am
c92d9de2: am
786fe647: Improve ActionBar - show both undo and redo - add the checkmark with done instead of the up mark
* commit '
700c30f5a64cf7bdf6146e60ff778b6e53ff377b':
Improve ActionBar - show both undo and redo - add the checkmark with done instead of the up mark
nicolasroard [Fri, 28 Sep 2012 23:19:33 +0000 (16:19 -0700)]
am
c92d9de2: am
786fe647: Improve ActionBar - show both undo and redo - add the checkmark with done instead of the up mark
* commit '
c92d9de295efa5e0773aef1642d184e5fe8e8a38':
Improve ActionBar - show both undo and redo - add the checkmark with done instead of the up mark
Bobby Georgescu [Fri, 28 Sep 2012 23:19:26 +0000 (16:19 -0700)]
am
11ce3e85: am
8c35f795: am
d5480bd5: Merge "Debounce after quick fling towards camera but zoom if slow" into gb-ub-photos-arches
* commit '
11ce3e857b62a09fca88726b893c37e9accf89cb':
Debounce after quick fling towards camera but zoom if slow
nicolasroard [Fri, 28 Sep 2012 23:17:27 +0000 (16:17 -0700)]
am
786fe647: Improve ActionBar - show both undo and redo - add the checkmark with done instead of the up mark
* commit '
786fe6476e4ccf4b98489ff69d8ef439533cdc2a':
Improve ActionBar - show both undo and redo - add the checkmark with done instead of the up mark
nicolasroard [Fri, 28 Sep 2012 23:03:21 +0000 (16:03 -0700)]
Improve ActionBar
- show both undo and redo
- add the checkmark with done instead of the up mark
bug:
7233986
Change-Id: I32af8068b08763461b720054f270cb6acabefbbf
Bobby Georgescu [Fri, 28 Sep 2012 22:53:40 +0000 (15:53 -0700)]
am
8c35f795: am
d5480bd5: Merge "Debounce after quick fling towards camera but zoom if slow" into gb-ub-photos-arches
* commit '
8c35f7954f4e7aa6c2701fa1131978e6cd5cf79e':
Debounce after quick fling towards camera but zoom if slow
Jean-Baptiste Queru [Fri, 28 Sep 2012 22:52:23 +0000 (15:52 -0700)]
Bobby Georgescu [Fri, 28 Sep 2012 22:51:00 +0000 (15:51 -0700)]
am
d5480bd5: Merge "Debounce after quick fling towards camera but zoom if slow" into gb-ub-photos-arches
* commit '
d5480bd5a849517106f232326fd2d31b80b72b3f':
Debounce after quick fling towards camera but zoom if slow
Bobby Georgescu [Fri, 28 Sep 2012 22:49:27 +0000 (15:49 -0700)]
Merge "Debounce after quick fling towards camera but zoom if slow" into gb-ub-photos-arches
Bobby Georgescu [Fri, 28 Sep 2012 06:55:44 +0000 (23:55 -0700)]
Debounce after quick fling towards camera but zoom if slow
Bug:
7250026
Bug:
7213802
Change-Id: I3c900813937161744a36015469c70112f2cf356b
Jean-Baptiste Queru [Fri, 28 Sep 2012 21:25:20 +0000 (14:25 -0700)]
Merge from jb-mr1-aah-dev
Change-Id: I5f113bcb65b0e96aaa289d0a42e5b482adeb355e
Mangesh Ghiware [Fri, 28 Sep 2012 21:08:34 +0000 (14:08 -0700)]
am
43a81793: am
639c9c6d: am
f98aafb7: Fix NPE in GalleryActionBar
* commit '
43a81793586a13e2e2e2d15767bd014c30badcb8':
Fix NPE in GalleryActionBar
Mangesh Ghiware [Fri, 28 Sep 2012 21:06:10 +0000 (14:06 -0700)]
am
639c9c6d: am
f98aafb7: Fix NPE in GalleryActionBar
* commit '
639c9c6d767f70ab83fb97b13b108bb1df06cabf':
Fix NPE in GalleryActionBar
Mangesh Ghiware [Fri, 28 Sep 2012 21:05:48 +0000 (14:05 -0700)]
am
639c9c6d: am
f98aafb7: Fix NPE in GalleryActionBar
* commit '
639c9c6d767f70ab83fb97b13b108bb1df06cabf':
Fix NPE in GalleryActionBar
Mangesh Ghiware [Fri, 28 Sep 2012 21:03:58 +0000 (14:03 -0700)]
am
f98aafb7: Fix NPE in GalleryActionBar
* commit '
f98aafb7eb65b889b0f831d607828ca4f8af64b6':
Fix NPE in GalleryActionBar
Jean-Baptiste Queru [Fri, 28 Sep 2012 20:48:33 +0000 (13:48 -0700)]
am
c3977bea: Merge from jb-mr1-aah-dev
* commit '
c3977bea403ab7ab21edd7732d577f7985905d30':
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Mangesh Ghiware [Fri, 28 Sep 2012 20:48:13 +0000 (13:48 -0700)]
Fix NPE in GalleryActionBar
Bug:
7252666
Change-Id: Ide3c8e0d609743b34a3c53f3bb48dbeddb3f98c0
Jean-Baptiste Queru [Fri, 28 Sep 2012 20:46:37 +0000 (13:46 -0700)]
Merge from jb-mr1-aah-dev
Change-Id: I58c766d476ac0bc4d6e7117b41e6fd3246693291
Bart Sears [Fri, 28 Sep 2012 19:49:56 +0000 (12:49 -0700)]
am
70d013fe: am
81286e10: am
5e91df3d: Merge "Add FilterShow and clean up native lib handling" into gb-ub-photos-arches
* commit '
70d013fe3fe087128efefc7fd5ae41e5d9c7bfdd':
Add FilterShow and clean up native lib handling
Bart Sears [Fri, 28 Sep 2012 19:48:45 +0000 (12:48 -0700)]
am
81286e10: am
5e91df3d: Merge "Add FilterShow and clean up native lib handling" into gb-ub-photos-arches
* commit '
81286e102219ce852f4d9ed1cb68b40fc8b1cb41':
Add FilterShow and clean up native lib handling
Bart Sears [Fri, 28 Sep 2012 19:48:00 +0000 (12:48 -0700)]
am
81286e10: am
5e91df3d: Merge "Add FilterShow and clean up native lib handling" into gb-ub-photos-arches
* commit '
81286e102219ce852f4d9ed1cb68b40fc8b1cb41':
Add FilterShow and clean up native lib handling
Bart Sears [Fri, 28 Sep 2012 19:46:33 +0000 (12:46 -0700)]
am
5e91df3d: Merge "Add FilterShow and clean up native lib handling" into gb-ub-photos-arches
* commit '
5e91df3d56be743664c1a4a760f1668ec1de17dd':
Add FilterShow and clean up native lib handling
Bart Sears [Fri, 28 Sep 2012 19:45:02 +0000 (12:45 -0700)]
Merge "Add FilterShow and clean up native lib handling" into gb-ub-photos-arches
nicolasroard [Fri, 28 Sep 2012 18:59:54 +0000 (11:59 -0700)]
am
2af873ee: am
91cb11f2: am
7caab0dc: Change the slider values range to -100 -> 100
* commit '
2af873ee778f32d2118dfaa0b37ff3623104a9cc':
Change the slider values range to -100 -> 100
nicolasroard [Fri, 28 Sep 2012 18:57:48 +0000 (11:57 -0700)]
am
91cb11f2: am
7caab0dc: Change the slider values range to -100 -> 100
* commit '
91cb11f248a10b1b35621d092d9c0418e6867ede':
Change the slider values range to -100 -> 100
nicolasroard [Fri, 28 Sep 2012 18:57:10 +0000 (11:57 -0700)]
am
91cb11f2: am
7caab0dc: Change the slider values range to -100 -> 100
* commit '
91cb11f248a10b1b35621d092d9c0418e6867ede':
Change the slider values range to -100 -> 100
nicolasroard [Fri, 28 Sep 2012 18:56:08 +0000 (11:56 -0700)]
am
7caab0dc: Change the slider values range to -100 -> 100
* commit '
7caab0dc36f69b4c51c39bd191f2df44ea586b70':
Change the slider values range to -100 -> 100
nicolasroard [Fri, 28 Sep 2012 18:46:33 +0000 (11:46 -0700)]
Change the slider values range to -100 -> 100
bug:
7247494
Change-Id: Ie007d93ac5e6c412fb97c1fc8cfb383387cec2a0
Ruben Brunk [Fri, 28 Sep 2012 18:35:14 +0000 (11:35 -0700)]
am
5fd38ec0: am
20ee087f: am
75a93c78: Merge "Fixed behavior for back key when viewing download." into gb-ub-photos-arches
* commit '
5fd38ec03f619c4f8226600f6fce9ea0e481f40a':
Fixed behavior for back key when viewing download.
Ruben Brunk [Fri, 28 Sep 2012 18:33:26 +0000 (11:33 -0700)]
am
20ee087f: am
75a93c78: Merge "Fixed behavior for back key when viewing download." into gb-ub-photos-arches
* commit '
20ee087f90ea1205761f4aa1f27f1914adad6bed':
Fixed behavior for back key when viewing download.
Ruben Brunk [Fri, 28 Sep 2012 18:33:12 +0000 (11:33 -0700)]
am
20ee087f: am
75a93c78: Merge "Fixed behavior for back key when viewing download." into gb-ub-photos-arches
* commit '
20ee087f90ea1205761f4aa1f27f1914adad6bed':
Fixed behavior for back key when viewing download.
Ruben Brunk [Fri, 28 Sep 2012 18:30:56 +0000 (11:30 -0700)]
am
75a93c78: Merge "Fixed behavior for back key when viewing download." into gb-ub-photos-arches
* commit '
75a93c78cd2a09eff08c16c6fee2bf683f483027':
Fixed behavior for back key when viewing download.
Ruben Brunk [Fri, 28 Sep 2012 18:28:33 +0000 (11:28 -0700)]
Merge "Fixed behavior for back key when viewing download." into gb-ub-photos-arches
Bart Sears [Fri, 28 Sep 2012 17:40:05 +0000 (10:40 -0700)]
Add FilterShow and clean up native lib handling
Bug:
7165910
Add libjni_filtershow_filters to Gallery2 so users can edit photos
Bug:
7250099
Remove native libs from the apk in /system/apps
Change-Id: I0a8adacdcb4c349861187e4303d08666e204a266
Teng-Hui Zhu [Fri, 28 Sep 2012 17:16:59 +0000 (10:16 -0700)]
am
2dff1b6c: am
86a69307: am
3e77e84c: Merge "Trimming: Use OnClickListener for saving" into gb-ub-photos-arches
* commit '
2dff1b6c1e4cb38a24ba797305b436c3ab68a1a9':
Trimming: Use OnClickListener for saving
Teng-Hui Zhu [Fri, 28 Sep 2012 17:15:57 +0000 (10:15 -0700)]
am
86a69307: am
3e77e84c: Merge "Trimming: Use OnClickListener for saving" into gb-ub-photos-arches
* commit '
86a693077dbd255939fe0c30edf046acfbff7974':
Trimming: Use OnClickListener for saving
Teng-Hui Zhu [Fri, 28 Sep 2012 17:15:30 +0000 (10:15 -0700)]
am
86a69307: am
3e77e84c: Merge "Trimming: Use OnClickListener for saving" into gb-ub-photos-arches
* commit '
86a693077dbd255939fe0c30edf046acfbff7974':
Trimming: Use OnClickListener for saving
Teng-Hui Zhu [Fri, 28 Sep 2012 17:14:19 +0000 (10:14 -0700)]
am
3e77e84c: Merge "Trimming: Use OnClickListener for saving" into gb-ub-photos-arches
* commit '
3e77e84c66aa5ba2efab7ecc3dd37a03a790af9f':
Trimming: Use OnClickListener for saving
Teng-Hui Zhu [Fri, 28 Sep 2012 17:12:43 +0000 (10:12 -0700)]
Merge "Trimming: Use OnClickListener for saving" into gb-ub-photos-arches
Baligh Uddin [Fri, 28 Sep 2012 16:35:18 +0000 (09:35 -0700)]
am
7c73fe87: (-s ours) am
c697efde: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
7c73fe877cca43ad3ade03735b49d8e3368332d0':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 28 Sep 2012 16:35:16 +0000 (09:35 -0700)]
am
d0154609: (-s ours) am
123f653f: am
f8706c89: (-s ours) Import translations. DO NOT MERGE
* commit '
d015460984f152c7c4ef391ad853094ae74a8023':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 28 Sep 2012 16:33:08 +0000 (09:33 -0700)]
am
c697efde: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
c697efde49a8492555d3d5b4595a9c72d3d7a7b4':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 28 Sep 2012 16:33:07 +0000 (09:33 -0700)]
am
123f653f: (-s ours) am
f8706c89: (-s ours) Import translations. DO NOT MERGE
* commit '
123f653fef5182e4b0b3933a77e15146be6ad82a':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 28 Sep 2012 16:33:01 +0000 (09:33 -0700)]
am
c697efde: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
c697efde49a8492555d3d5b4595a9c72d3d7a7b4':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 28 Sep 2012 16:33:00 +0000 (09:33 -0700)]
am
123f653f: am
f8706c89: (-s ours) Import translations. DO NOT MERGE
* commit '
123f653fef5182e4b0b3933a77e15146be6ad82a':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 28 Sep 2012 16:31:49 +0000 (09:31 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Fri, 28 Sep 2012 16:31:38 +0000 (09:31 -0700)]
am
f8706c89: (-s ours) Import translations. DO NOT MERGE
* commit '
f8706c89cb45b45426f6bad8c593191595b043a2':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 28 Sep 2012 16:30:22 +0000 (09:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: If271c40e7bebe578dfa2c1590b5333ec67bae65e
Auto-generated-cl: translation import
Baligh Uddin [Fri, 28 Sep 2012 16:29:59 +0000 (09:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: I504a35d1c058c82e0598b0ac6bfcb79ecfbc70f8
Auto-generated-cl: translation import
Baligh Uddin [Fri, 28 Sep 2012 16:29:32 +0000 (09:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: I44e46936a99438bdd8b4c0cb70aafb254089ea8d
Auto-generated-cl: translation import
Baligh Uddin [Fri, 28 Sep 2012 16:28:41 +0000 (09:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: I14dfb266d984cb34719216018aecae3d07e79e9f
Auto-generated-cl: translation import
Teng-Hui Zhu [Fri, 28 Sep 2012 16:10:21 +0000 (09:10 -0700)]
Trimming: Use OnClickListener for saving
bug:
7093055
Change-Id: I4b6b408bb051aa1a7fb506f0b5d1db75fe3f1a2f
Bobby Georgescu [Fri, 28 Sep 2012 07:50:06 +0000 (00:50 -0700)]
am
8bde7ba1: am
3235768b: am
c7e3c76d: Show a placeholder when the camera filmstrip is empty
* commit '
8bde7ba1ca46d3d9d2548bcde17e1508882729ac':
Show a placeholder when the camera filmstrip is empty
Bobby Georgescu [Fri, 28 Sep 2012 07:48:55 +0000 (00:48 -0700)]
am
3235768b: am
c7e3c76d: Show a placeholder when the camera filmstrip is empty
* commit '
3235768b6bf413e56fb76b469a7699a1df0107dd':
Show a placeholder when the camera filmstrip is empty
Bobby Georgescu [Fri, 28 Sep 2012 07:48:42 +0000 (00:48 -0700)]
am
3235768b: am
c7e3c76d: Show a placeholder when the camera filmstrip is empty
* commit '
3235768b6bf413e56fb76b469a7699a1df0107dd':
Show a placeholder when the camera filmstrip is empty
Bobby Georgescu [Fri, 28 Sep 2012 07:47:07 +0000 (00:47 -0700)]
am
c7e3c76d: Show a placeholder when the camera filmstrip is empty
* commit '
c7e3c76d6965f520a9651d309052c5f01726cd58':
Show a placeholder when the camera filmstrip is empty
Mangesh Ghiware [Fri, 28 Sep 2012 07:38:28 +0000 (00:38 -0700)]
am
8c3fe294: am
bd1c876a: am
2e8472f3: Merge "Update to sharing panorama" into gb-ub-photos-arches
* commit '
8c3fe294e0de284407e507ab4bf54246a31189ec':
Update to sharing panorama
nicolasroard [Fri, 28 Sep 2012 07:37:25 +0000 (00:37 -0700)]
am
3a3cbbd7: am
625a1ec6: am
5a429e56: Merge "Use an actionbar - move the "show original" button to the bottom left - move the history button to the overflow menu for now - add a reset item in the overflow menu." into gb-ub-photos-arches
* commit '
3a3cbbd70865eff4835af1e668b9c53e8f6914e9':
Use an actionbar - move the "show original" button to the bottom left - move the history button to the overflow menu for now - add a reset item in the overflow menu.
Baligh Uddin [Fri, 28 Sep 2012 07:37:17 +0000 (00:37 -0700)]
am
d916f7de: (-s ours) am
2a4847a6: am
8473d944: (-s ours) Import translations. DO NOT MERGE
* commit '
d916f7de8de3e6233597efc48cfbb8d2b5e2f773':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 28 Sep 2012 07:37:16 +0000 (00:37 -0700)]
am
ac7d9c93: (-s ours) am
00495d88: Import translations. DO NOT MERGE
* commit '
ac7d9c939c6d56e0a81c7e7b65b3ecc4ed308a05':
Import translations. DO NOT MERGE
Bobby Georgescu [Thu, 27 Sep 2012 23:36:03 +0000 (16:36 -0700)]
Show a placeholder when the camera filmstrip is empty
Bug:
7213757
Tapping the placeholder takes the user back to the
full-screen camera capture mode.
Change-Id: I844f789b8e80f34e79f4a9c366c1c244bbf1f2a5
Bobby Georgescu [Fri, 28 Sep 2012 07:37:06 +0000 (00:37 -0700)]
am
976a6076: am
8a7f0bd6: am
624ed9df: Fix up button behavior in camera app
* commit '
976a60766e1cdbf07d308489aa9e7e892787be2b':
Fix up button behavior in camera app
nicolasroard [Fri, 28 Sep 2012 07:35:31 +0000 (00:35 -0700)]
am
ba079a2f: am
56c1aed4: am
863b4e65: We weren\'t applying the parameter on an existing filter
* commit '
ba079a2f8d77bba214ec3da2a40b0dd1028113e1':
We weren't applying the parameter on an existing filter
nicolasroard [Fri, 28 Sep 2012 07:35:24 +0000 (00:35 -0700)]
am
566d8175: am
d019ac64: am
9579b815: Only apply the parameter to the currently edited filter
* commit '
566d81757ffbf97c9c54c5fd9edd3411c1207eef':
Only apply the parameter to the currently edited filter
John Reck [Fri, 28 Sep 2012 07:35:16 +0000 (00:35 -0700)]
am
a30fc48a: am
9ad74d1f: am
98d17b86: Merge "Fix Monkey NPE" into gb-ub-photos-arches
* commit '
a30fc48a05fc89f02540b8406dd258d0c0ec10b2':
Fix Monkey NPE
nicolasroard [Fri, 28 Sep 2012 07:34:59 +0000 (00:34 -0700)]
am
02519387: am
8d7ea82d: am
02f778af: Remove the pie slider, add a linear slider
* commit '
025193871d921c3249f061c188c1004a2ee570aa':
Remove the pie slider, add a linear slider
Teng-Hui Zhu [Fri, 28 Sep 2012 07:34:11 +0000 (00:34 -0700)]
am
d5da6e0a: am
cf5247ae: am
65f1bad3: Merge "Trimming: clean up the UI for trimming." into gb-ub-photos-arches
* commit '
d5da6e0a0e0cee6fbd44d6577b5f5eb206d46169':
Trimming: clean up the UI for trimming.
nicolasroard [Fri, 28 Sep 2012 07:33:55 +0000 (00:33 -0700)]
am
541eaa3d: am
4112a244: am
f37e1e9a: Add the intent filter to start the new editor Set Gallery to identify as needing a largeHeap
* commit '
541eaa3d57af95ebc326c4a5dcdb81a6156b9420':
Add the intent filter to start the new editor Set Gallery to identify as needing a largeHeap
The Android Open Source Project [Fri, 28 Sep 2012 07:33:44 +0000 (00:33 -0700)]
am
bc708a02: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
bc708a022422571d2719e1ecaa7961c20f8337c9':
OSDN Git Service
