OSDN Git Service

android-x86/packages-apps-Gallery2.git
10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 23 Sep 2013 21:25:26 +0000 (14:25 -0700)]
Import translations. DO NOT MERGE

Change-Id: I1d89de4d8f7d7e6ed9d7864df5029296f06a641d
Auto-generated-cl: translation import

10 years agoam a3cd56cc: am 635faca5: am aff375e3: Merge "Fix crash / jank / presets add" into...
nicolasroard [Sat, 21 Sep 2013 02:06:30 +0000 (19:06 -0700)]
am a3cd56cc: am 635faca5: am aff375e3: Merge "Fix crash / jank / presets add" into gb-ub-photos-carlsbad

* commit 'a3cd56cc31f76b68832952671a59accecc9b3aa3':
  Fix crash / jank / presets add

10 years agoam 635faca5: am aff375e3: Merge "Fix crash / jank / presets add" into gb-ub-photos...
nicolasroard [Sat, 21 Sep 2013 02:01:27 +0000 (19:01 -0700)]
am 635faca5: am aff375e3: Merge "Fix crash / jank / presets add" into gb-ub-photos-carlsbad

* commit '635faca5953f313a1fb0fd1cd62e65699e3c565b':
  Fix crash / jank / presets add

10 years agoam aff375e3: Merge "Fix crash / jank / presets add" into gb-ub-photos-carlsbad
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

10 years agoMerge "Fix crash / jank / presets add" into gb-ub-photos-carlsbad
nicolasroard [Sat, 21 Sep 2013 01:57:15 +0000 (01:57 +0000)]
Merge "Fix crash / jank / presets add" into gb-ub-photos-carlsbad

10 years agoFix crash / jank / presets add
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

10 years agoam bde2f28f: am a7056872: am a552bfde: clarify strings
John Hoford [Sat, 21 Sep 2013 00:45:27 +0000 (17:45 -0700)]
am bde2f28f: am a7056872: am a552bfde: clarify strings

* commit 'bde2f28f3fb428d23a28bce8f27f11f708d7febd':
  clarify strings

10 years agoam a7056872: am a552bfde: clarify strings
John Hoford [Sat, 21 Sep 2013 00:42:45 +0000 (17:42 -0700)]
am a7056872: am a552bfde: clarify strings

* commit 'a70568725849c15cd8532199b0e4b8677efdbf67':
  clarify strings

10 years agoam a552bfde: clarify strings
John Hoford [Sat, 21 Sep 2013 00:38:34 +0000 (17:38 -0700)]
am a552bfde: clarify strings

* commit 'a552bfdede68643270e72f6ca65cb0cde16f2c7f':
  clarify strings

10 years agoclarify 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

10 years agoam a7590adf: am eef0ca49: am e56abc70: prevent editing of GIF
John Hoford [Fri, 20 Sep 2013 23:30:03 +0000 (16:30 -0700)]
am a7590adf: am eef0ca49: am e56abc70: prevent editing of GIF

* commit 'a7590adf06343851e7fb8c62764a292228123c7c':
  prevent editing of GIF

10 years agoam eef0ca49: am e56abc70: prevent editing of GIF
John Hoford [Fri, 20 Sep 2013 23:27:39 +0000 (16:27 -0700)]
am eef0ca49: am e56abc70: prevent editing of GIF

* commit 'eef0ca494583fe37504d12efe4b8f1c7d6ccb8bd':
  prevent editing of GIF

10 years agoam e56abc70: prevent editing of GIF
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

10 years agoprevent 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

10 years agoam abe4e6ed: am 7599aaad: am c491ad2b: remove print for video
John Hoford [Fri, 20 Sep 2013 21:22:08 +0000 (14:22 -0700)]
am abe4e6ed: am 7599aaad: am c491ad2b: remove print for video

* commit 'abe4e6ede28c11d339668fb8039cf5d2020e77eb':
  remove print for video

10 years agoam 7599aaad: am c491ad2b: remove print for video
John Hoford [Fri, 20 Sep 2013 21:18:40 +0000 (14:18 -0700)]
am 7599aaad: am c491ad2b: remove print for video

* commit '7599aaad4b43fec4fac1a09e5a6e085d86e4bf2a':
  remove print for video

10 years agoam c491ad2b: remove print for video
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

10 years agoremove 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

10 years agoam 99a532f2: am 1940b05c: am 36a1262a: Merge "Fix string capitalization" into gb...
John Hoford [Fri, 20 Sep 2013 18:22:12 +0000 (11:22 -0700)]
am 99a532f2: am 1940b05c: am 36a1262a: Merge "Fix string capitalization" into gb-ub-photos-carlsbad

* commit '99a532f2ca0efb43e1023d56f2329655e47ba476':
  Fix string capitalization

10 years agoam 343d8d6a: am e4a1c7ca: am 76ef9162: Merge "fix grid drawing bug in ImageStraighten...
John Hoford [Fri, 20 Sep 2013 18:22:11 +0000 (11:22 -0700)]
am 343d8d6a: am e4a1c7ca: am 76ef9162: Merge "fix grid drawing bug in ImageStraighten" into gb-ub-photos-carlsbad

* commit '343d8d6ad10652163c07b801cb02da12d3f493d0':
  fix grid drawing bug in ImageStraighten

10 years agoam aa16cb42: am c3ad457f: Update Gallery due to API changes.
Svetoslav Ganov [Fri, 20 Sep 2013 18:21:08 +0000 (11:21 -0700)]
am aa16cb42: am c3ad457f: Update Gallery due to API changes.

* commit 'aa16cb42e1882938bd8f34472e96ccac6c0275c8':
  Update Gallery due to API changes.

10 years agoam fd3e5e68: am c12bb313: am 6904a72d: Merge "Use the same taskAffinity for trampolin...
Mangesh Ghiware [Fri, 20 Sep 2013 18:20:28 +0000 (11:20 -0700)]
am fd3e5e68: am c12bb313: am 6904a72d: Merge "Use the same taskAffinity for trampoline as Camera" into gb-ub-photos-carlsbad

* commit 'fd3e5e687e93fca4d81a9036388d6bf19c875703':
  Use the same taskAffinity for trampoline as Camera

10 years agoam d858450e: (-s ours) am 8b22f385: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Fri, 20 Sep 2013 16:59:03 +0000 (09:59 -0700)]
am d858450e: (-s ours) am 8b22f385: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit 'd858450ec341a859244e6f8bc46bcd59d5f89a82':
  Import translations. DO NOT MERGE

10 years agoam 6edca9a6: am 1c30f5dc: am 962cf04c: change the max print resolution
John Hoford [Fri, 20 Sep 2013 16:58:10 +0000 (09:58 -0700)]
am 6edca9a6: am 1c30f5dc: am 962cf04c: change the max print resolution

* commit '6edca9a69d1bc918f5d23efe6138e0345267757c':
  change the max print resolution

10 years agoam 1940b05c: am 36a1262a: Merge "Fix string capitalization" into gb-ub-photos-carlsbad
John Hoford [Fri, 20 Sep 2013 16:31:30 +0000 (09:31 -0700)]
am 1940b05c: am 36a1262a: Merge "Fix string capitalization" into gb-ub-photos-carlsbad

* commit '1940b05cbba9a7ed0b2bfed50f052fa64c45e70c':
  Fix string capitalization

10 years agoam e4a1c7ca: am 76ef9162: Merge "fix grid drawing bug in ImageStraighten" into gb...
John Hoford [Fri, 20 Sep 2013 16:31:30 +0000 (09:31 -0700)]
am e4a1c7ca: am 76ef9162: Merge "fix grid drawing bug in ImageStraighten" into gb-ub-photos-carlsbad

* commit 'e4a1c7caa23d77b56dca5be6325c5dcebf628543':
  fix grid drawing bug in ImageStraighten

10 years agoam 36a1262a: Merge "Fix string capitalization" into gb-ub-photos-carlsbad
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

10 years agoam 76ef9162: Merge "fix grid drawing bug in ImageStraighten" into gb-ub-photos-carlsbad
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

10 years agoMerge "Fix string capitalization" into gb-ub-photos-carlsbad
John Hoford [Fri, 20 Sep 2013 16:24:21 +0000 (16:24 +0000)]
Merge "Fix string capitalization" into gb-ub-photos-carlsbad

10 years agoMerge "fix grid drawing bug in ImageStraighten" 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

10 years agoFix string capitalization
John Hoford [Fri, 20 Sep 2013 16:00:06 +0000 (09:00 -0700)]
Fix string capitalization

bug:10487803
Change-Id: I16c18388ac47851f3fffcca8be13eb77b60ddbfb

10 years agofix grid drawing bug in ImageStraighten
John Hoford [Fri, 20 Sep 2013 14:41:52 +0000 (07:41 -0700)]
fix grid drawing bug in ImageStraighten

Change-Id: I4fec941385dd819afc30922823a087cd9962824b

10 years agoam c3ad457f: Update Gallery due to API changes.
Svetoslav Ganov [Fri, 20 Sep 2013 01:28:14 +0000 (18:28 -0700)]
am c3ad457f: Update Gallery due to API changes.

* commit 'c3ad457f84686754d8e7a6f78907a9b82391b00f':
  Update Gallery due to API changes.

10 years agoUpdate 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

10 years agoam c12bb313: am 6904a72d: Merge "Use the same taskAffinity for trampoline as Camera...
Mangesh Ghiware [Thu, 19 Sep 2013 23:46:15 +0000 (16:46 -0700)]
am c12bb313: am 6904a72d: Merge "Use the same taskAffinity for trampoline as Camera" into gb-ub-photos-carlsbad

* commit 'c12bb31340542493e0083f999fe687acf938f09c':
  Use the same taskAffinity for trampoline as Camera

10 years agoam 6904a72d: Merge "Use the same taskAffinity for trampoline as Camera" into gb-ub...
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

10 years agoMerge "Use the same taskAffinity for trampoline as Camera" into gb-ub-photos-carlsbad
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

10 years agoUse the same taskAffinity for trampoline as Camera
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

10 years agoam 8b22f385: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 19 Sep 2013 21:38:46 +0000 (14:38 -0700)]
am 8b22f385: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '8b22f385a5ac36cdf16494679b8535c9393eb6ec':
  Import translations. DO NOT MERGE

10 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 19 Sep 2013 21:34:27 +0000 (21:34 +0000)]
Merge "Import translations. DO NOT MERGE"

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 19 Sep 2013 21:34:23 +0000 (21:34 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 19 Sep 2013 21:33:27 +0000 (21:33 +0000)]
Merge "Import translations. DO NOT MERGE"

10 years agoam 1c30f5dc: am 962cf04c: change the max print resolution
John Hoford [Thu, 19 Sep 2013 19:28:57 +0000 (12:28 -0700)]
am 1c30f5dc: am 962cf04c: change the max print resolution

* commit '1c30f5dc1334af8b68c0a5ecd15b5c7528f81cc5':
  change the max print resolution

10 years agoam 962cf04c: change the max print resolution
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

10 years agochange 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

10 years agoam 3d715974: am 317ab571: am cdd4b82b: remove analytics
John Hoford [Thu, 19 Sep 2013 17:16:52 +0000 (10:16 -0700)]
am 3d715974: am 317ab571: am cdd4b82b: remove analytics

* commit '3d715974f12c238b4f67a2a6ebfa4259634f041c':
  remove analytics

10 years agoam 317ab571: am cdd4b82b: remove analytics
John Hoford [Thu, 19 Sep 2013 17:14:23 +0000 (10:14 -0700)]
am 317ab571: am cdd4b82b: remove analytics

* commit '317ab571bca79f0a1da3748d6824342216cfdb27':
  remove analytics

10 years agoam cdd4b82b: remove analytics
John Hoford [Thu, 19 Sep 2013 17:09:27 +0000 (10:09 -0700)]
am cdd4b82b: remove analytics

* commit 'cdd4b82b85f5e134b3357e75d735c5faeada70c9':
  remove analytics

10 years agoremove analytics
John Hoford [Thu, 19 Sep 2013 16:48:37 +0000 (09:48 -0700)]
remove analytics

bug:9467671
Change-Id: I0d0cfc31e152605c42313db5f6603dbccf76fd82

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 19 Sep 2013 10:26:47 +0000 (03:26 -0700)]
Import translations. DO NOT MERGE

Change-Id: I3e70670597846305c3789be9bdfc8046693191da
Auto-generated-cl: translation import

10 years agoImport translations. DO NOT MERGE
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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 19 Sep 2013 10:21:52 +0000 (03:21 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ie4116da00f3a9fba42365afc9064de51ebf98df4
Auto-generated-cl: translation import

10 years agoam 99d3506c: am b3d3894e: am 9029a469: fix grad filter brightness value stuck at...
John Hoford [Wed, 18 Sep 2013 17:23:31 +0000 (10:23 -0700)]
am 99d3506c: am b3d3894e: am 9029a469: fix grad filter brightness value stuck at -100

* commit '99d3506cdfce8d13e4e0c0d1b6ec1e15c2ff765a':
  fix grad filter brightness value stuck at -100

10 years agoam b3d3894e: am 9029a469: fix grad filter brightness value stuck at -100
John Hoford [Wed, 18 Sep 2013 17:20:55 +0000 (10:20 -0700)]
am b3d3894e: am 9029a469: fix grad filter brightness value stuck at -100

* commit 'b3d3894e65b7d7acc93ee1315ef0634e8e5919b4':
  fix grad filter brightness value stuck at -100

10 years agoam 9029a469: fix grad filter brightness value stuck at -100
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

10 years agofix 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

10 years agoam a56c88cd: am a2ab33fb: am b17765a3: fix bug in saving preset
John Hoford [Tue, 17 Sep 2013 23:48:41 +0000 (16:48 -0700)]
am a56c88cd: am a2ab33fb: am b17765a3: fix bug in saving preset

* commit 'a56c88cd1caa8c48a99f32b30bfac513425895d9':
  fix bug in saving preset

10 years agoam a2ab33fb: am b17765a3: fix bug in saving preset
John Hoford [Tue, 17 Sep 2013 23:46:30 +0000 (16:46 -0700)]
am a2ab33fb: am b17765a3: fix bug in saving preset

* commit 'a2ab33fb7d5f78e80c83013d8fd409a45a5d7093':
  fix bug in saving preset

10 years agoam b17765a3: fix bug in saving preset
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

10 years agofix 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

10 years agoam a29dfc6f: am 70163eaf: am b867739b: display menu indicator in crop
John Hoford [Tue, 17 Sep 2013 22:54:55 +0000 (15:54 -0700)]
am a29dfc6f: am 70163eaf: am b867739b: display menu indicator in crop

* commit 'a29dfc6fdcbc19a6cccfe9cab39d5f2f5f304313':
  display menu indicator in crop

10 years agoam 70163eaf: am b867739b: display menu indicator in crop
John Hoford [Tue, 17 Sep 2013 22:52:13 +0000 (15:52 -0700)]
am 70163eaf: am b867739b: display menu indicator in crop

* commit '70163eafd4bf4483a2bc0f60dd6aa1f63dcc990f':
  display menu indicator in crop

10 years agoam b867739b: display menu indicator in crop
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

10 years agodisplay 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

10 years agoam 95c90c80: am 7f7949e4: am 35e91fcc: clean up translation issues
John Hoford [Tue, 17 Sep 2013 21:06:17 +0000 (14:06 -0700)]
am 95c90c80: am 7f7949e4: am 35e91fcc: clean up translation issues

* commit '95c90c80e3abade985dad0a2a9f81a2a5292f218':
  clean up translation issues

10 years agoam 7f7949e4: am 35e91fcc: clean up translation issues
John Hoford [Tue, 17 Sep 2013 21:03:11 +0000 (14:03 -0700)]
am 7f7949e4: am 35e91fcc: clean up translation issues

* commit '7f7949e4ff7087cff731b5431675d197f98631cb':
  clean up translation issues

10 years agoam 35e91fcc: clean up translation issues
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

10 years agoclean 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

10 years agoam 41a83100: am 4f6cab7f: am 8a0072e5: remove translation in jason encoding
John Hoford [Tue, 17 Sep 2013 20:08:27 +0000 (13:08 -0700)]
am 41a83100: am 4f6cab7f: am 8a0072e5: remove translation in jason encoding

* commit '41a8310028ee3e2d4138dc49b2b12fbd169b5e60':
  remove translation in jason encoding

10 years agoam 4f6cab7f: am 8a0072e5: remove translation in jason encoding
John Hoford [Tue, 17 Sep 2013 20:03:31 +0000 (13:03 -0700)]
am 4f6cab7f: am 8a0072e5: remove translation in jason encoding

* commit '4f6cab7f8d0605342675035cdfd53c1bcc3a0f9b':
  remove translation in jason encoding

10 years agoam 8a0072e5: remove translation in jason encoding
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

10 years agoremove 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

10 years agoam a87d19ad: am 3edaea1a: am 6aea6b7f: Fix ImagePreset handling
nicolasroard [Tue, 17 Sep 2013 18:01:34 +0000 (11:01 -0700)]
am a87d19ad: am 3edaea1a: am 6aea6b7f: Fix ImagePreset handling

* commit 'a87d19ad88e003e899f0c12adf62a04d10d144ba':
  Fix ImagePreset handling

10 years agoam 4218ba1e: am a72c56fb: am ef8d4d2c: Use edge glow instead of snap back
nicolasroard [Tue, 17 Sep 2013 18:01:34 +0000 (11:01 -0700)]
am 4218ba1e: am a72c56fb: am ef8d4d2c: Use edge glow instead of snap back

* commit '4218ba1e44b620c7b854809ab6cb4ccb68f2000d':
  Use edge glow instead of snap back

10 years agoam 3edaea1a: am 6aea6b7f: Fix ImagePreset handling
nicolasroard [Tue, 17 Sep 2013 17:58:36 +0000 (10:58 -0700)]
am 3edaea1a: am 6aea6b7f: Fix ImagePreset handling

* commit '3edaea1aaad846fc2fcd25e88c11563f0f8dbb35':
  Fix ImagePreset handling

10 years agoam a72c56fb: am ef8d4d2c: Use edge glow instead of snap back
nicolasroard [Tue, 17 Sep 2013 17:58:36 +0000 (10:58 -0700)]
am a72c56fb: am ef8d4d2c: Use edge glow instead of snap back

* commit 'a72c56fbb7b7c0fc8e4e13bb015d67adb37c07db':
  Use edge glow instead of snap back

10 years agoam 6aea6b7f: Fix ImagePreset handling
nicolasroard [Tue, 17 Sep 2013 17:53:44 +0000 (10:53 -0700)]
am 6aea6b7f: Fix ImagePreset handling

* commit '6aea6b7f4014968fc414554c1530b16437364c80':
  Fix ImagePreset handling

10 years agoam ef8d4d2c: Use edge glow instead of snap back
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

10 years agoFix ImagePreset handling
nicolasroard [Tue, 17 Sep 2013 16:06:57 +0000 (09:06 -0700)]
Fix ImagePreset handling

- fix border ordering
- fix Fx apply

Change-Id: Icf407431a77e150d255d416b983dacb8df5f73fb

10 years agoUse edge glow instead of snap back
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

10 years agoam 024e3ab4: (-s ours) am 37a6c20e: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Tue, 17 Sep 2013 04:27:27 +0000 (21:27 -0700)]
am 024e3ab4: (-s ours) am 37a6c20e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '024e3ab4b9ca4a66955f1304bea25e5de591fc9a':
  Import translations. DO NOT MERGE

10 years agoam 37a6c20e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Tue, 17 Sep 2013 04:22:25 +0000 (21:22 -0700)]
am 37a6c20e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '37a6c20e692a1d4f7bd5e4903ec9869b365f086f':
  Import translations. DO NOT MERGE

10 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 17 Sep 2013 04:18:14 +0000 (04:18 +0000)]
Merge "Import translations. DO NOT MERGE"

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Tue, 17 Sep 2013 04:18:08 +0000 (04:18 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 17 Sep 2013 04:17:57 +0000 (04:17 +0000)]
Merge "Import translations. DO NOT MERGE"

10 years agoam 24d8850e: am 62ab53eb: am 463b918e: Prevent edit during view photo intent
John Hoford [Mon, 16 Sep 2013 23:07:47 +0000 (16:07 -0700)]
am 24d8850e: am 62ab53eb: am 463b918e: Prevent edit during view photo intent

* commit '24d8850ea56e79e7f3e013eb93b324971ed57b27':
  Prevent edit during view photo intent

10 years agoam 62ab53eb: am 463b918e: Prevent edit during view photo intent
John Hoford [Mon, 16 Sep 2013 23:04:47 +0000 (16:04 -0700)]
am 62ab53eb: am 463b918e: Prevent edit during view photo intent

* commit '62ab53ebc53d20b8d0ed661dbb195cc55e8f445a':
  Prevent edit during view photo intent

10 years agoam 463b918e: Prevent edit during view photo intent
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

10 years agoPrevent 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

10 years agoam 6b2171a7: am 81734418: am 5921b53e: add clear back to draw UI
John Hoford [Mon, 16 Sep 2013 20:31:49 +0000 (13:31 -0700)]
am 6b2171a7: am 81734418: am 5921b53e: add clear back to draw UI

* commit '6b2171a7552108078f54b62a0fb855e1daa86d60':
  add clear back to draw UI

10 years agoam 81734418: am 5921b53e: add clear back to draw UI
John Hoford [Mon, 16 Sep 2013 20:29:02 +0000 (13:29 -0700)]
am 81734418: am 5921b53e: add clear back to draw UI

* commit '8173441875547320cae134d9e2730f20b67ad274':
  add clear back to draw UI

10 years agoam 5921b53e: add clear back to draw UI
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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 16 Sep 2013 19:55:28 +0000 (12:55 -0700)]
Import translations. DO NOT MERGE

Change-Id: I0dcfe0ed41f63bbc7fea918652e7af84f171f232
Auto-generated-cl: translation import

10 years agoImport translations. DO NOT MERGE
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

10 years agoadd clear back to draw UI
John Hoford [Mon, 16 Sep 2013 19:53:57 +0000 (12:53 -0700)]
add clear back to draw UI

Change-Id: I5d000518f5972942ffa5ece1fed7650f435c54aa

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 16 Sep 2013 19:50:28 +0000 (12:50 -0700)]
Import translations. DO NOT MERGE

Change-Id: I596827ac67274fa85aa4bf3c20c3f7da4f6c1a20
Auto-generated-cl: translation import

10 years agoam 2aa6ad8b: am 31586343: am fcdbaf87: Remove Draw tool
nicolasroard [Mon, 16 Sep 2013 17:26:24 +0000 (10:26 -0700)]
am 2aa6ad8b: am 31586343: am fcdbaf87: Remove Draw tool

* commit '2aa6ad8b10773d743fb9e9430f14a87e39fb3973':
  Remove Draw tool

10 years agoam 31586343: am fcdbaf87: Remove Draw tool
nicolasroard [Mon, 16 Sep 2013 17:24:28 +0000 (10:24 -0700)]
am 31586343: am fcdbaf87: Remove Draw tool

* commit '31586343017b4d7baf48fe325f3c8517418e45ff':
  Remove Draw tool

10 years agoam fcdbaf87: Remove Draw tool
nicolasroard [Mon, 16 Sep 2013 17:20:42 +0000 (10:20 -0700)]
am fcdbaf87: Remove Draw tool

* commit 'fcdbaf87020ef96252f57575e5cfc6df11042ab3':
  Remove Draw tool

10 years agoam 9933d149: am 685f2f7d: am 9d36d82f: Merge "Fix flickering while editing" into...
nicolasroard [Mon, 16 Sep 2013 16:58:52 +0000 (09:58 -0700)]
am 9933d149: am 685f2f7d: am 9d36d82f: Merge "Fix flickering while editing" into gb-ub-photos-carlsbad

* commit '9933d1497b4da00904e600c4b0e0017d29e0e5ef':
  Fix flickering while editing