OSDN Git Service
Baligh Uddin [Wed, 25 Sep 2013 17:08:44 +0000 (10:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: I988057d68d772903f4a4a209df86a08a03efcb5f
Auto-generated-cl: translation import
Kevin Gabayan [Wed, 25 Sep 2013 01:36:15 +0000 (18:36 -0700)]
am
6053762e: Merge "Remove unused assets in Gallery2." into gb-ub-photos-carlsbad
* commit '
6053762eb9686cf73a32311db46ba51ebcba8db8':
Remove unused assets in Gallery2.
Kevin Gabayan [Wed, 25 Sep 2013 01:34:17 +0000 (01:34 +0000)]
Merge "Remove unused assets in Gallery2." into gb-ub-photos-carlsbad
nicolasroard [Tue, 24 Sep 2013 23:48:28 +0000 (16:48 -0700)]
am
15152c9e: Merge "Fix color panel bgd color" into gb-ub-photos-carlsbad
* commit '
15152c9eec2a110e8ae459b756e694690ad6aca5':
Fix color panel bgd color
nicolasroard [Tue, 24 Sep 2013 23:45:31 +0000 (23:45 +0000)]
Merge "Fix color panel bgd color" into gb-ub-photos-carlsbad
John Hoford [Tue, 24 Sep 2013 23:34:18 +0000 (16:34 -0700)]
am
59e93986: Merge "fix print code to support landscape" into gb-ub-photos-carlsbad
* commit '
59e93986efb957b361a03ad08033f169c958a184':
fix print code to support landscape
John Hoford [Tue, 24 Sep 2013 23:31:43 +0000 (23:31 +0000)]
Merge "fix print code to support landscape" into gb-ub-photos-carlsbad
nicolasroard [Tue, 24 Sep 2013 23:25:43 +0000 (16:25 -0700)]
Fix color panel bgd color
Change-Id: I60b62e520a93b0432eacbf1517f26ae5597bb05d
John Hoford [Tue, 24 Sep 2013 22:14:48 +0000 (15:14 -0700)]
fix print code to support landscape
Change-Id: Ied569232a55ba953da59eeee2c13fc4608430a2d
Baligh Uddin [Tue, 24 Sep 2013 22:00:20 +0000 (22:00 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Tue, 24 Sep 2013 21:57:31 +0000 (21:57 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
nicolasroard [Tue, 24 Sep 2013 21:34:24 +0000 (14:34 -0700)]
am
b6b1d176: Merge "Fix style for crop activity" into gb-ub-photos-carlsbad
* commit '
b6b1d176fb50047a1590f5c601b0c54a6b1db6f8':
Fix style for crop activity
nicolasroard [Tue, 24 Sep 2013 21:31:51 +0000 (21:31 +0000)]
Merge "Fix style for crop activity" into gb-ub-photos-carlsbad
Mindy Pereira [Tue, 24 Sep 2013 21:31:12 +0000 (14:31 -0700)]
am
2aed1baf: De-blue gallery
* commit '
2aed1baf6ea4afa7a78ea24ee822a95d75534b8b':
De-blue gallery
nicolasroard [Tue, 24 Sep 2013 21:20:04 +0000 (14:20 -0700)]
Fix style for crop activity
bug:
10786662
Change-Id: Ie104b8ba2484455ad5cdf90d8c26157480143b0b
Mindy Pereira [Tue, 24 Sep 2013 16:08:06 +0000 (09:08 -0700)]
De-blue gallery
fixes b/
10914665 de-blue gallery
Change-Id: I961d5792a9e1a0187581439fa58e237b4ddeba5b
nicolasroard [Tue, 24 Sep 2013 06:37:28 +0000 (23:37 -0700)]
am
1a65cb12: Merge "Limit string to 25 characters" into gb-ub-photos-carlsbad
* commit '
1a65cb127c8002d8be57e767147d86bd131c556c':
Limit string to 25 characters
nicolasroard [Tue, 24 Sep 2013 06:34:19 +0000 (06:34 +0000)]
Merge "Limit string to 25 characters" into gb-ub-photos-carlsbad
nicolasroard [Tue, 24 Sep 2013 06:34:19 +0000 (23:34 -0700)]
am
8db4f458: Fix export dialog UI
* commit '
8db4f458ac9d28a508471dfb874abbe170a5ac23':
Fix export dialog UI
nicolasroard [Tue, 24 Sep 2013 06:30:36 +0000 (23:30 -0700)]
Limit string to 25 characters
bug:
10889576
Change-Id: Ib314b84d8def7dc1300fc738a1a461d37549d6e1
nicolasroard [Tue, 24 Sep 2013 06:28:11 +0000 (23:28 -0700)]
am
d04aaf62: Merge "Fix crash in caching pipeline" into gb-ub-photos-carlsbad
* commit '
d04aaf626da8aea7f8f18341499e0b51a60e4d32':
Fix crash in caching pipeline
nicolasroard [Tue, 24 Sep 2013 06:28:10 +0000 (23:28 -0700)]
am
26f23e62: Fix crashes after switching languages
* commit '
26f23e62096eb50344815e1b066e9a1efb629bb0':
Fix crashes after switching languages
nicolasroard [Tue, 24 Sep 2013 02:26:20 +0000 (19:26 -0700)]
Fix export dialog UI
bug:
10889576
bug:
10712083
Change-Id: I7921c06365775625a85e3d0a997d844c42586b01
nicolasroard [Tue, 24 Sep 2013 06:26:27 +0000 (06:26 +0000)]
Merge "Fix crash in caching pipeline" into gb-ub-photos-carlsbad
nicolasroard [Tue, 24 Sep 2013 04:42:02 +0000 (21:42 -0700)]
Fix crash in caching pipeline
Geometry filters wrongly collapsed with other filters
bug:
10903204
Change-Id: Iaee3082e605f4cdaba236df014fb41a4975d05d6
nicolasroard [Tue, 24 Sep 2013 01:36:25 +0000 (18:36 -0700)]
Fix crashes after switching languages
bug:
8148068
Change-Id: Icb23c8b221e52fe26981887a0af9857f3d58bf79
Kevin Gabayan [Tue, 24 Sep 2013 00:45:48 +0000 (17:45 -0700)]
Remove unused assets in Gallery2.
Bug:
10493013
Change-Id: I380ab6609b6a606ee5a3e9e13c8272a4e5c20cbe
nicolasroard [Mon, 23 Sep 2013 23:21:32 +0000 (16:21 -0700)]
am
105fbcf3: Fix issues with RTL support
* commit '
105fbcf3289491aa4f590057e304fee33f1c88ca':
Fix issues with RTL support
nicolasroard [Mon, 23 Sep 2013 23:12:10 +0000 (16:12 -0700)]
Fix issues with RTL support
bug:
8148068
Change-Id: I869e1a90686c46f8076a66f94040ad03c7c6ca10
Baligh Uddin [Mon, 23 Sep 2013 21:24:40 +0000 (14:24 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7cfedb32eb13682f0ac8353b9040519ba9b3c242
Auto-generated-cl: translation import
Baligh Uddin [Mon, 23 Sep 2013 21:17:52 +0000 (14:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I719035e302198e02614d075af433a5bf94a7abda
Auto-generated-cl: translation import
nicolasroard [Mon, 23 Sep 2013 20:51:12 +0000 (13:51 -0700)]
am
eccdc428: Merge "Fix animation in tablet" into gb-ub-photos-carlsbad
* commit '
eccdc4285476c98bff3dc5bde113b7f855b18346':
Fix animation in tablet
nicolasroard [Mon, 23 Sep 2013 20:48:12 +0000 (20:48 +0000)]
Merge "Fix animation in tablet" into gb-ub-photos-carlsbad
nicolasroard [Mon, 23 Sep 2013 20:43:23 +0000 (13:43 -0700)]
Fix animation in tablet
- fix anim in tablet
- fix double-tap timings
- re-add draw in AOSP
Change-Id: I53be8f348ed7927812afa8a4ba84841e4b9d3f4f
Mangesh Ghiware [Mon, 23 Sep 2013 18:37:50 +0000 (11:37 -0700)]
am
889b1b25: Merge "Add (back) receiver to disable camera." into gb-ub-photos-carlsbad
* commit '
889b1b25b9928624ea1ca51cba51642d5cf4044d':
Add (back) receiver to disable camera.
Mangesh Ghiware [Mon, 23 Sep 2013 18:34:52 +0000 (18:34 +0000)]
Merge "Add (back) receiver to disable camera." into gb-ub-photos-carlsbad
nicolasroard [Mon, 23 Sep 2013 18:34:25 +0000 (11:34 -0700)]
nicolasroard [Sat, 21 Sep 2013 02:00:33 +0000 (19:00 -0700)]
Fix reset
bug:
10788166
Change-Id: I989c2caef8ccf4ff7ca84545aed35941248f8034
Svetoslav Ganov [Mon, 23 Sep 2013 18:30:11 +0000 (11:30 -0700)]
am
3dcb77a2: Update Gallery due to API changes.
* commit '
3dcb77a23d80046aa0c9af9ec32394432031d417':
Update Gallery due to API changes.
Svetoslav Ganov [Thu, 19 Sep 2013 17:04:54 +0000 (10:04 -0700)]
Update Gallery due to API changes.
bug:
10461180
Change-Id: I1c92871ef97b61920410d12d71ac2620ee502b24
Mangesh Ghiware [Sun, 22 Sep 2013 20:00:24 +0000 (13:00 -0700)]
Add (back) receiver to disable camera.
Bug:
10411981
Change-Id: Icff31d2da466746ef6b00d4be32e92067cebd1f1
nicolasroard [Sat, 21 Sep 2013 01:59:05 +0000 (18:59 -0700)]
am
aff375e3: Merge "Fix crash / jank / presets add" into gb-ub-photos-carlsbad
* commit '
aff375e3d13c6e593414399e7374ead96b5e43b9':
Fix crash / jank / presets add
nicolasroard [Sat, 21 Sep 2013 01:57:15 +0000 (01:57 +0000)]
Merge "Fix crash / jank / presets add" into gb-ub-photos-carlsbad
nicolasroard [Sat, 21 Sep 2013 01:49:41 +0000 (18:49 -0700)]
Fix crash / jank / presets add
- don't cache immutable bitmaps
- fix junk in anims/zoom/constrain
- fix edge glow when moving
- fix double-tap zoom
- fix presets / user presets adds
- fix state panel names for geometry ops
bug:
10803026
Change-Id: I9328d7005d3ecee3566c104c3392de9325c50b74
John Hoford [Sat, 21 Sep 2013 00:38:34 +0000 (17:38 -0700)]
am
a552bfde: clarify strings
* commit '
a552bfdede68643270e72f6ca65cb0cde16f2c7f':
clarify strings
John Hoford [Sat, 21 Sep 2013 00:28:18 +0000 (17:28 -0700)]
clarify strings
bug:
10602303
bug:
10558554
bug:
10489263
Change-Id: I4cabada74244d535eb023e52a36bca0897fb75fe
John Hoford [Fri, 20 Sep 2013 23:24:58 +0000 (16:24 -0700)]
am
e56abc70: prevent editing of GIF
* commit '
e56abc7049e35f705161086fe51d0ecdbf451b8b':
prevent editing of GIF
John Hoford [Fri, 20 Sep 2013 22:14:51 +0000 (15:14 -0700)]
prevent editing of GIF
bug:
10642974
Change-Id: Ic61da19f6106c9d42c5b39ae9cc0cf0765f6d1ae
John Hoford [Fri, 20 Sep 2013 21:13:47 +0000 (14:13 -0700)]
am
c491ad2b: remove print for video
* commit '
c491ad2b7630eed7cf43ef0c1064bd4fe42e06a1':
remove print for video
John Hoford [Fri, 20 Sep 2013 20:50:37 +0000 (13:50 -0700)]
remove print for video
bug:
10455873
Change-Id: I8f62881b95ad8cd3fff73452eb7d91b05b1ddd8d
John Hoford [Fri, 20 Sep 2013 16:27:20 +0000 (09:27 -0700)]
am
36a1262a: Merge "Fix string capitalization" into gb-ub-photos-carlsbad
* commit '
36a1262a0138c64b56595b1209bac92d00211f51':
Fix string capitalization
John Hoford [Fri, 20 Sep 2013 16:27:19 +0000 (09:27 -0700)]
am
76ef9162: Merge "fix grid drawing bug in ImageStraighten" into gb-ub-photos-carlsbad
* commit '
76ef9162b8323a6a48e339895cbd8d428a74a230':
fix grid drawing bug in ImageStraighten
John Hoford [Fri, 20 Sep 2013 16:24:21 +0000 (16:24 +0000)]
Merge "Fix string capitalization" into gb-ub-photos-carlsbad
John Hoford [Fri, 20 Sep 2013 16:24:08 +0000 (16:24 +0000)]
Merge "fix grid drawing bug in ImageStraighten" into gb-ub-photos-carlsbad
John Hoford [Fri, 20 Sep 2013 16:00:06 +0000 (09:00 -0700)]
Fix string capitalization
bug:
10487803
Change-Id: I16c18388ac47851f3fffcca8be13eb77b60ddbfb
John Hoford [Fri, 20 Sep 2013 14:41:52 +0000 (07:41 -0700)]
fix grid drawing bug in ImageStraighten
Change-Id: I4fec941385dd819afc30922823a087cd9962824b
Svetoslav Ganov [Thu, 19 Sep 2013 17:04:54 +0000 (10:04 -0700)]
Update Gallery due to API changes.
bug:
10461180
Change-Id: I1c92871ef97b61920410d12d71ac2620ee502b24
Mangesh Ghiware [Thu, 19 Sep 2013 23:44:13 +0000 (16:44 -0700)]
am
6904a72d: Merge "Use the same taskAffinity for trampoline as Camera" into gb-ub-photos-carlsbad
* commit '
6904a72d84d6662c00be83186468600f84448590':
Use the same taskAffinity for trampoline as Camera
Mangesh Ghiware [Thu, 19 Sep 2013 23:42:02 +0000 (23:42 +0000)]
Merge "Use the same taskAffinity for trampoline as Camera" into gb-ub-photos-carlsbad
Mangesh Ghiware [Thu, 19 Sep 2013 22:56:15 +0000 (15:56 -0700)]
Use the same taskAffinity for trampoline as Camera
Bug:
10842131
Change-Id: I2bf6961d7c411dc95e9b9589d9ec71ee34b3011f
Baligh Uddin [Thu, 19 Sep 2013 21:34:23 +0000 (21:34 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
John Hoford [Thu, 19 Sep 2013 19:25:41 +0000 (12:25 -0700)]
am
962cf04c: change the max print resolution
* commit '
962cf04c60249c2d116f9ee07e747180bee46014':
change the max print resolution
John Hoford [Thu, 19 Sep 2013 19:04:41 +0000 (12:04 -0700)]
change the max print resolution
Change-Id: Ie2cc1c3f40675ae163438c9b09f26e4ac1881367
John Hoford [Thu, 19 Sep 2013 17:09:27 +0000 (10:09 -0700)]
am
cdd4b82b: remove analytics
* commit '
cdd4b82b85f5e134b3357e75d735c5faeada70c9':
remove analytics
John Hoford [Thu, 19 Sep 2013 16:48:37 +0000 (09:48 -0700)]
remove analytics
bug:
9467671
Change-Id: I0d0cfc31e152605c42313db5f6603dbccf76fd82
Baligh Uddin [Thu, 19 Sep 2013 10:26:12 +0000 (03:26 -0700)]
Import translations. DO NOT MERGE
Change-Id: Icfe62e061cfb39b257f80aee1605601f3d57ebed
Auto-generated-cl: translation import
John Hoford [Wed, 18 Sep 2013 17:19:08 +0000 (10:19 -0700)]
am
9029a469: fix grad filter brightness value stuck at -100
* commit '
9029a469b47605420454e0c74d46adeccf4ef94a':
fix grad filter brightness value stuck at -100
John Hoford [Wed, 18 Sep 2013 17:02:53 +0000 (10:02 -0700)]
fix grad filter brightness value stuck at -100
Change-Id: I8e0fa1e0b9537fc530fecb78aac019c220af7ae2
John Hoford [Tue, 17 Sep 2013 23:44:34 +0000 (16:44 -0700)]
am
b17765a3: fix bug in saving preset
* commit '
b17765a3e9ead269493d7a851a21af3622931c40':
fix bug in saving preset
John Hoford [Tue, 17 Sep 2013 23:31:27 +0000 (16:31 -0700)]
fix bug in saving preset
bug introduced in CL 361110
Change-Id: I8fd283859d0f0f6a4b9e06e95c533b68085c156a
John Hoford [Tue, 17 Sep 2013 22:49:59 +0000 (15:49 -0700)]
am
b867739b: display menu indicator in crop
* commit '
b867739b4b748fd702b693843220e7691c2e5979':
display menu indicator in crop
John Hoford [Tue, 17 Sep 2013 22:42:08 +0000 (15:42 -0700)]
display menu indicator in crop
Change-Id: I3ecde3c5e01ace32347e216f2eeb50643e1d9019
John Hoford [Tue, 17 Sep 2013 21:01:22 +0000 (14:01 -0700)]
am
35e91fcc: clean up translation issues
* commit '
35e91fcc4143cb1aaaa99a098512bdccb8b27646':
clean up translation issues
John Hoford [Tue, 17 Sep 2013 20:24:35 +0000 (13:24 -0700)]
clean up translation issues
bug:
10319758
bug:
10320401
bug:
10317664
Change-Id: Idef2803093382a75d348fe8b5077bb0d6c9ff6b4
John Hoford [Tue, 17 Sep 2013 19:58:03 +0000 (12:58 -0700)]
am
8a0072e5: remove translation in jason encoding
* commit '
8a0072e519157b976d7d1fd34ca2aa1c849a983b':
remove translation in jason encoding
John Hoford [Tue, 17 Sep 2013 18:13:48 +0000 (11:13 -0700)]
remove translation in jason encoding
Change-Id: I26c1ae312b3ba71efc40fe0675f53d6b2c377bed
nicolasroard [Tue, 17 Sep 2013 17:53:44 +0000 (10:53 -0700)]
am
6aea6b7f: Fix ImagePreset handling
* commit '
6aea6b7f4014968fc414554c1530b16437364c80':
Fix ImagePreset handling
nicolasroard [Tue, 17 Sep 2013 17:53:43 +0000 (10:53 -0700)]
am
ef8d4d2c: Use edge glow instead of snap back
* commit '
ef8d4d2cfbd1ee16d5646a9460a56302d06a0784':
Use edge glow instead of snap back
nicolasroard [Tue, 17 Sep 2013 16:06:57 +0000 (09:06 -0700)]
Fix ImagePreset handling
- fix border ordering
- fix Fx apply
Change-Id: Icf407431a77e150d255d416b983dacb8df5f73fb
nicolasroard [Tue, 17 Sep 2013 07:51:20 +0000 (00:51 -0700)]
Use edge glow instead of snap back
Follow UX guidelines.
Change-Id: Id81d6622e174c8bb2ac53d8b04023070368d945d
Baligh Uddin [Tue, 17 Sep 2013 04:18:08 +0000 (04:18 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
John Hoford [Mon, 16 Sep 2013 23:02:16 +0000 (16:02 -0700)]
am
463b918e: Prevent edit during view photo intent
* commit '
463b918edda204f1563dc2e27976cafa6af9a769':
Prevent edit during view photo intent
John Hoford [Mon, 16 Sep 2013 22:51:02 +0000 (15:51 -0700)]
Prevent edit during view photo intent
bug:
9862016
Change-Id: I58e64765630f686f49836dbfb7a7447910e714ef
John Hoford [Mon, 16 Sep 2013 20:24:39 +0000 (13:24 -0700)]
am
5921b53e: add clear back to draw UI
* commit '
5921b53e411a1ee5de8daea34fda90c2ada31974':
add clear back to draw UI
Baligh Uddin [Mon, 16 Sep 2013 19:54:47 +0000 (12:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib7ab8c9bda8305be3d050b9fd47a644bcd43afb1
Auto-generated-cl: translation import
John Hoford [Mon, 16 Sep 2013 19:53:57 +0000 (12:53 -0700)]
add clear back to draw UI
Change-Id: I5d000518f5972942ffa5ece1fed7650f435c54aa
nicolasroard [Mon, 16 Sep 2013 17:20:42 +0000 (10:20 -0700)]
am
fcdbaf87: Remove Draw tool
* commit '
fcdbaf87020ef96252f57575e5cfc6df11042ab3':
Remove Draw tool
nicolasroard [Mon, 16 Sep 2013 16:51:44 +0000 (09:51 -0700)]
Remove Draw tool
bug:
10734199
Change-Id: I36f6f63a12b79e6faba8c31f1f90ee13a220e8af
nicolasroard [Mon, 16 Sep 2013 16:52:31 +0000 (09:52 -0700)]
am
9d36d82f: Merge "Fix flickering while editing" into gb-ub-photos-carlsbad
* commit '
9d36d82ff910478a06d186ea7f0eb643ea342551':
Fix flickering while editing
nicolasroard [Mon, 16 Sep 2013 16:49:23 +0000 (16:49 +0000)]
Merge "Fix flickering while editing" into gb-ub-photos-carlsbad
nicolasroard [Mon, 16 Sep 2013 16:33:57 +0000 (09:33 -0700)]
Fix flickering while editing
Change-Id: Ic06e0c59059d97f8dd7c150d22746c1f90d7bed1
Svetoslav [Sun, 15 Sep 2013 19:08:46 +0000 (12:08 -0700)]
am
f818028e: (-s ours) Merge "DO NOT MERGE Cherry-pick:Update Gallery due to API change." into gb-ub-photos-carlsbad
* commit '
f818028e5c78d85bdacd06a6161543d13b42da45':
DO NOT MERGE Cherry-pick:Update Gallery due to API change.
Svetoslav [Sun, 15 Sep 2013 19:07:07 +0000 (19:07 +0000)]
Merge "DO NOT MERGE Cherry-pick:Update Gallery due to API change." into gb-ub-photos-carlsbad
Baligh Uddin [Sun, 15 Sep 2013 04:24:00 +0000 (21:24 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1382bbaf9477eb0834aeac655f9d5f4f44d60af7
Auto-generated-cl: translation import
Baligh Uddin [Sat, 14 Sep 2013 20:01:47 +0000 (20:01 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sat, 14 Sep 2013 07:44:03 +0000 (00:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: I80dd494cfba2f90ddd98891be2514e7c3f3d96be
Auto-generated-cl: translation import
John Hoford [Sat, 14 Sep 2013 03:36:20 +0000 (20:36 -0700)]
am
a085f59b: Merge "removed spinner stuck on screen behind image" into gb-ub-photos-carlsbad
* commit '
a085f59b0d36825afd98e6448a5013e5ae73af2a':
removed spinner stuck on screen behind image
nicolasroard [Sat, 14 Sep 2013 03:36:19 +0000 (20:36 -0700)]
am
e30a1cc2: Fix show original
* commit '
e30a1cc28e6724d54ba5b20e73d303e734c05559':
Fix show original
John Hoford [Sat, 14 Sep 2013 03:35:27 +0000 (03:35 +0000)]
Merge "removed spinner stuck on screen behind image" into gb-ub-photos-carlsbad
John Hoford [Fri, 13 Sep 2013 23:02:09 +0000 (16:02 -0700)]
removed spinner stuck on screen behind image
Change-Id: I71b2743147244c0fbfe352979c84677ac8ef3fb6
OSDN Git Service
