OSDN Git Service

android-x86/packages-apps-Gallery2.git
11 years agoam ee413a73: am 20667d21: Fix problem with state panel navigation
nicolasroard [Wed, 14 Aug 2013 23:55:29 +0000 (16:55 -0700)]
am ee413a73: am 20667d21: Fix problem with state panel navigation

* commit 'ee413a7348e1c6b18fbfca102b209d717fe12a32':
  Fix problem with state panel navigation

11 years agoam 20667d21: Fix problem with state panel navigation
nicolasroard [Wed, 14 Aug 2013 23:53:50 +0000 (16:53 -0700)]
am 20667d21: Fix problem with state panel navigation

* commit '20667d21eac2074b0e265d8839539bd9cfec9f92':
  Fix problem with state panel navigation

11 years agoFix problem with state panel navigation
nicolasroard [Wed, 14 Aug 2013 23:43:07 +0000 (16:43 -0700)]
Fix problem with state panel navigation

Change-Id: Ia117bb087ca27cfe439bd39b1cd40ab33f4def4e

11 years agoam 17050af6: am e19cb872: fix tiny planet launch
John Hoford [Wed, 14 Aug 2013 23:13:42 +0000 (16:13 -0700)]
am 17050af6: am e19cb872: fix tiny planet launch

* commit '17050af6156f92ce88f27c4d3e280978ee77f59a':
  fix tiny planet launch

11 years agoam e19cb872: fix tiny planet launch
John Hoford [Wed, 14 Aug 2013 23:10:31 +0000 (16:10 -0700)]
am e19cb872: fix tiny planet launch

* commit 'e19cb8725655869092a73bed24a66395dd89013c':
  fix tiny planet launch

11 years agofix tiny planet launch
John Hoford [Wed, 14 Aug 2013 22:49:29 +0000 (15:49 -0700)]
fix tiny planet launch

bug:8732041
Change-Id: Id874e7e6f9ebc13f740e924e532512e7aadb26dd

11 years agoam bcc179e5: am df33ed22: Merge "Fix layout in editor panels in landscape" into gb...
nicolasroard [Wed, 14 Aug 2013 22:34:43 +0000 (15:34 -0700)]
am bcc179e5: am df33ed22: Merge "Fix layout in editor panels in landscape" into gb-ub-photos-carlsbad

* commit 'bcc179e56872f553d3833342b91a46ad8c10903e':
  Fix layout in editor panels in landscape

11 years agoam df33ed22: Merge "Fix layout in editor panels in landscape" into gb-ub-photos-carlsbad
nicolasroard [Wed, 14 Aug 2013 22:33:20 +0000 (15:33 -0700)]
am df33ed22: Merge "Fix layout in editor panels in landscape" into gb-ub-photos-carlsbad

* commit 'df33ed22a313c8f9dac95b947511ee0677d52dbf':
  Fix layout in editor panels in landscape

11 years agoMerge "Fix layout in editor panels in landscape" into gb-ub-photos-carlsbad
nicolasroard [Wed, 14 Aug 2013 22:29:58 +0000 (22:29 +0000)]
Merge "Fix layout in editor panels in landscape" into gb-ub-photos-carlsbad

11 years agoFix layout in editor panels in landscape
nicolasroard [Wed, 14 Aug 2013 22:28:43 +0000 (15:28 -0700)]
Fix layout in editor panels in landscape

Change-Id: Id20dc27591f4e2acfd9ced934b02be8916379347

11 years agoam 1b227549: am 3e3e9e21: fix vignette dragged off screen
John Hoford [Wed, 14 Aug 2013 22:04:20 +0000 (15:04 -0700)]
am 1b227549: am 3e3e9e21: fix vignette dragged off screen

* commit '1b227549d52b7d5dca014dd00fb13dcafc2ada27':
  fix vignette dragged off screen

11 years agoam 3e3e9e21: fix vignette dragged off screen
John Hoford [Wed, 14 Aug 2013 22:00:58 +0000 (15:00 -0700)]
am 3e3e9e21: fix vignette dragged off screen

* commit '3e3e9e219a76e8ef4fb56b8ef4c6e0bac06c6cd1':
  fix vignette dragged off screen

11 years agofix vignette dragged off screen
John Hoford [Wed, 14 Aug 2013 21:49:36 +0000 (14:49 -0700)]
fix vignette dragged off screen

bug:9471206
Change-Id: I4a64db869f05521fb4e1f32fffe67757c0e74348

11 years agoam b8c93dd6: am a044ee97: Merge "fix RGB text" into gb-ub-photos-carlsbad
John Hoford [Wed, 14 Aug 2013 21:31:00 +0000 (14:31 -0700)]
am b8c93dd6: am a044ee97: Merge "fix RGB text" into gb-ub-photos-carlsbad

* commit 'b8c93dd67f72123aaf14ddc21fff07c831860bdd':
  fix RGB text

11 years agoam a044ee97: Merge "fix RGB text" into gb-ub-photos-carlsbad
John Hoford [Wed, 14 Aug 2013 21:28:42 +0000 (14:28 -0700)]
am a044ee97: Merge "fix RGB text" into gb-ub-photos-carlsbad

* commit 'a044ee9746c40ec003ba5a96bea91abd7cee2bb5':
  fix RGB text

11 years agoam e6259159: am 9530962f: Fix spacing in saturation panel
nicolasroard [Wed, 14 Aug 2013 21:27:34 +0000 (14:27 -0700)]
am e6259159: am 9530962f: Fix spacing in saturation panel

* commit 'e625915993e917246ebbfcf168d392e5bd0159a1':
  Fix spacing in saturation panel

11 years agoMerge "fix RGB text" into gb-ub-photos-carlsbad
John Hoford [Wed, 14 Aug 2013 21:25:18 +0000 (21:25 +0000)]
Merge "fix RGB text" into gb-ub-photos-carlsbad

11 years agoam 9530962f: Fix spacing in saturation panel
nicolasroard [Wed, 14 Aug 2013 21:22:35 +0000 (14:22 -0700)]
am 9530962f: Fix spacing in saturation panel

* commit '9530962f09e4ef5cefd81cb3cbc5cff2a6e5b818':
  Fix spacing in saturation panel

11 years agofix RGB text
John Hoford [Wed, 14 Aug 2013 21:21:31 +0000 (14:21 -0700)]
fix RGB text

bug:9471079
Change-Id: Ifaf893e7ed518a9efc81b2f968fd411b9d35f7a8

11 years agoFix spacing in saturation panel
nicolasroard [Wed, 14 Aug 2013 21:18:45 +0000 (14:18 -0700)]
Fix spacing in saturation panel

Change-Id: I405874cd7c5cf2d6a203125bc4ea978f0e49be38

11 years agoam a4cdeaaa: am f4d211d8: Fix graphics glitch in IconView
nicolasroard [Wed, 14 Aug 2013 20:52:06 +0000 (13:52 -0700)]
am a4cdeaaa: am f4d211d8: Fix graphics glitch in IconView

* commit 'a4cdeaaab16a18606df3b4269880e9a3254f7bd5':
  Fix graphics glitch in IconView

11 years agoam f4d211d8: Fix graphics glitch in IconView
nicolasroard [Wed, 14 Aug 2013 20:49:25 +0000 (13:49 -0700)]
am f4d211d8: Fix graphics glitch in IconView

* commit 'f4d211d89a3a054dbabc5d5d6c636013ba063e26':
  Fix graphics glitch in IconView

11 years agoFix graphics glitch in IconView
nicolasroard [Wed, 14 Aug 2013 20:46:00 +0000 (13:46 -0700)]
Fix graphics glitch in IconView

Change-Id: I46e501755cdd271f41f9fbf558d7939dd34d9c46

11 years agoam 8f4d94a7: am 5d1cf1f9: Add close button to info panel
John Hoford [Wed, 14 Aug 2013 19:23:16 +0000 (12:23 -0700)]
am 8f4d94a7: am 5d1cf1f9: Add close button to info panel

* commit '8f4d94a71aed19513028599c8316e2b3ede34354':
  Add close button to info panel

11 years agoam 5d1cf1f9: Add close button to info panel
John Hoford [Wed, 14 Aug 2013 19:20:39 +0000 (12:20 -0700)]
am 5d1cf1f9: Add close button to info panel

* commit '5d1cf1f9c8c6359905988e096b50f07ce326df21':
  Add close button to info panel

11 years agoAdd close button to info panel
John Hoford [Wed, 14 Aug 2013 19:14:54 +0000 (12:14 -0700)]
Add close button to info panel

Change-Id: Iba4c64af4e37bc3d03cc3cb1ee371158d210c5f8

11 years agoam 7ee450bc: am 3130144b: Center add button text in landscape
nicolasroard [Wed, 14 Aug 2013 19:10:14 +0000 (12:10 -0700)]
am 7ee450bc: am 3130144b: Center add button text in landscape

* commit '7ee450bc29bb3f9e17c5013f9e22e8f19171505c':
  Center add button text in landscape

11 years agoam fb734bd7: am 89c60a9d: Fix for state panel not appearing
nicolasroard [Wed, 14 Aug 2013 19:10:10 +0000 (12:10 -0700)]
am fb734bd7: am 89c60a9d: Fix for state panel not appearing

* commit 'fb734bd7c587dd34d7aaa51f0c029605ea8bc73a':
  Fix for state panel not appearing

11 years agoam 3c97f2ae: am 9737f3a1: Fix swiping in categories in landscape mode
nicolasroard [Wed, 14 Aug 2013 19:10:09 +0000 (12:10 -0700)]
am 3c97f2ae: am 9737f3a1: Fix swiping in categories in landscape mode

* commit '3c97f2aeb2b57909d62a4ba684c91309cb53f661':
  Fix swiping in categories in landscape mode

11 years agoam 8e9ed815: am 134aebe4: Fix for add button in version panel
nicolasroard [Wed, 14 Aug 2013 19:10:05 +0000 (12:10 -0700)]
am 8e9ed815: am 134aebe4: Fix for add button in version panel

* commit '8e9ed815af429594fbd78b79f1c83d7fbd1c8290':
  Fix for add button in version panel

11 years agoam 67b858a3: am 1603c965: Merge "Fix add button size and placement in looks" into...
nicolasroard [Wed, 14 Aug 2013 19:10:03 +0000 (12:10 -0700)]
am 67b858a3: am 1603c965: Merge "Fix add button size and placement in looks" into gb-ub-photos-carlsbad

* commit '67b858a373b2d09943ec0e87a1fe3c4a4ddd381c':
  Fix add button size and placement in looks

11 years agoam 3130144b: Center add button text in landscape
nicolasroard [Wed, 14 Aug 2013 18:40:46 +0000 (11:40 -0700)]
am 3130144b: Center add button text in landscape

* commit '3130144bcd9403153b9385f9b91d4262d626a113':
  Center add button text in landscape

11 years agoCenter add button text in landscape
nicolasroard [Wed, 14 Aug 2013 18:36:46 +0000 (11:36 -0700)]
Center add button text in landscape

Change-Id: I33a66ce0607cb3832d6373e64e92204e8dc52d92

11 years agoam 89c60a9d: Fix for state panel not appearing
nicolasroard [Wed, 14 Aug 2013 18:32:38 +0000 (11:32 -0700)]
am 89c60a9d: Fix for state panel not appearing

* commit '89c60a9d0be113585799dd903fc005b315251314':
  Fix for state panel not appearing

11 years agoFix for state panel not appearing
nicolasroard [Wed, 14 Aug 2013 18:29:44 +0000 (11:29 -0700)]
Fix for state panel not appearing

Change-Id: I687e2d744a6cd8a914344718c6292e1597679422

11 years agoam 9737f3a1: Fix swiping in categories in landscape mode
nicolasroard [Wed, 14 Aug 2013 18:20:19 +0000 (11:20 -0700)]
am 9737f3a1: Fix swiping in categories in landscape mode

* commit '9737f3a18a8c302160e213afa30a4db710e41fb6':
  Fix swiping in categories in landscape mode

11 years agoFix swiping in categories in landscape mode
nicolasroard [Wed, 14 Aug 2013 18:14:47 +0000 (11:14 -0700)]
Fix swiping in categories in landscape mode

Change-Id: I58ecb212792e3e8432791ee29f8a0ef26a819362

11 years agoam 134aebe4: Fix for add button in version panel
nicolasroard [Wed, 14 Aug 2013 18:08:59 +0000 (11:08 -0700)]
am 134aebe4: Fix for add button in version panel

* commit '134aebe4f265767ecb18f375316c8090dfe5a51d':
  Fix for add button in version panel

11 years agoFix for add button in version panel
nicolasroard [Wed, 14 Aug 2013 17:53:11 +0000 (10:53 -0700)]
Fix for add button in version panel

Change-Id: I7c1b3869214264d8be3c271e54d8860290bde89f

11 years agoam 1603c965: Merge "Fix add button size and placement in looks" into gb-ub-photos...
nicolasroard [Wed, 14 Aug 2013 17:53:51 +0000 (10:53 -0700)]
am 1603c965: Merge "Fix add button size and placement in looks" into gb-ub-photos-carlsbad

* commit '1603c9657a6355ce2c720463483c3a744c27005e':
  Fix add button size and placement in looks

11 years agoMerge "Fix add button size and placement in looks" into gb-ub-photos-carlsbad
nicolasroard [Wed, 14 Aug 2013 17:49:21 +0000 (17:49 +0000)]
Merge "Fix add button size and placement in looks" into gb-ub-photos-carlsbad

11 years agoFix add button size and placement in looks
nicolasroard [Wed, 14 Aug 2013 17:48:21 +0000 (10:48 -0700)]
Fix add button size and placement in looks

Change-Id: I5c7fd0f460de222e76228ea3da9703d4b579aeca

11 years agoam 4a39e49a: am cd29fd9e: Merge "Fix refresh of looks panel" into gb-ub-photos-carlsbad
nicolasroard [Wed, 14 Aug 2013 17:42:45 +0000 (10:42 -0700)]
am 4a39e49a: am cd29fd9e: Merge "Fix refresh of looks panel" into gb-ub-photos-carlsbad

* commit '4a39e49a90d93a2d6924a6096a5220863dd9f56b':
  Fix refresh of looks panel

11 years agoam 9c370716: am 2d16b225: Merge "Add a trampoline activity to launch new Camera"...
Mangesh Ghiware [Wed, 14 Aug 2013 17:42:44 +0000 (10:42 -0700)]
am 9c370716: am 2d16b225: Merge "Add a trampoline activity to launch new Camera" into gb-ub-photos-carlsbad

* commit '9c370716eabed079c471b90f3c4e4383854156da':
  Add a trampoline activity to launch new Camera

11 years agoam cd29fd9e: Merge "Fix refresh of looks panel" into gb-ub-photos-carlsbad
nicolasroard [Wed, 14 Aug 2013 17:37:42 +0000 (10:37 -0700)]
am cd29fd9e: Merge "Fix refresh of looks panel" into gb-ub-photos-carlsbad

* commit 'cd29fd9e74482c51d7db109e5b1d0cf60f7fe3b5':
  Fix refresh of looks panel

11 years agoam 2d16b225: Merge "Add a trampoline activity to launch new Camera" into gb-ub-photos...
Mangesh Ghiware [Wed, 14 Aug 2013 17:37:41 +0000 (10:37 -0700)]
am 2d16b225: Merge "Add a trampoline activity to launch new Camera" into gb-ub-photos-carlsbad

* commit '2d16b22570ae4ad9c2dc4c3230cc9894eb5bf1a2':
  Add a trampoline activity to launch new Camera

11 years agoMerge "Fix refresh of looks panel" into gb-ub-photos-carlsbad
nicolasroard [Wed, 14 Aug 2013 17:35:21 +0000 (17:35 +0000)]
Merge "Fix refresh of looks panel" into gb-ub-photos-carlsbad

11 years agoMerge "Add a trampoline activity to launch new Camera" into gb-ub-photos-carlsbad
Mangesh Ghiware [Wed, 14 Aug 2013 17:34:31 +0000 (17:34 +0000)]
Merge "Add a trampoline activity to launch new Camera" into gb-ub-photos-carlsbad

11 years agoFix refresh of looks panel
nicolasroard [Wed, 14 Aug 2013 17:34:08 +0000 (10:34 -0700)]
Fix refresh of looks panel

Change-Id: Ib38b3aefc8ca9891251458b03587ffa5e41bfbe6

11 years agoam 6d999bed: am 99c1eeb3: Merge "fix tablet ui" into gb-ub-photos-carlsbad
John Hoford [Wed, 14 Aug 2013 17:21:57 +0000 (10:21 -0700)]
am 6d999bed: am 99c1eeb3: Merge "fix tablet ui" into gb-ub-photos-carlsbad

* commit '6d999bedeba820b7d200cc2f285380b5a7ee1a98':
  fix tablet ui

11 years agoam 99c1eeb3: Merge "fix tablet ui" into gb-ub-photos-carlsbad
John Hoford [Wed, 14 Aug 2013 17:20:26 +0000 (10:20 -0700)]
am 99c1eeb3: Merge "fix tablet ui" into gb-ub-photos-carlsbad

* commit '99c1eeb3929c4faa15e3347a83ce9c4ae6551f0b':
  fix tablet ui

11 years agoam 455b4d7c: am a27067c7: Update strings resources for export dialog
nicolasroard [Wed, 14 Aug 2013 17:18:39 +0000 (10:18 -0700)]
am 455b4d7c: am a27067c7: Update strings resources for export dialog

* commit '455b4d7c47b4cfb5034596005660d213885d8c44':
  Update strings resources for export dialog

11 years agoMerge "fix tablet ui" into gb-ub-photos-carlsbad
John Hoford [Wed, 14 Aug 2013 17:17:25 +0000 (17:17 +0000)]
Merge "fix tablet ui" into gb-ub-photos-carlsbad

11 years agoam a27067c7: Update strings resources for export dialog
nicolasroard [Wed, 14 Aug 2013 17:17:15 +0000 (10:17 -0700)]
am a27067c7: Update strings resources for export dialog

* commit 'a27067c7ec4e08805f7cc1936ae7f5783724dfad':
  Update strings resources for export dialog

11 years agofix tablet ui
John Hoford [Wed, 14 Aug 2013 16:16:15 +0000 (09:16 -0700)]
fix tablet ui

Change-Id: I38aba41e92fdd555391b8ae3ebd65b473bd48366

11 years agoUpdate strings resources for export dialog
nicolasroard [Wed, 14 Aug 2013 17:13:09 +0000 (10:13 -0700)]
Update strings resources for export dialog

Change-Id: Ia1ebe11ba37c7acc7f900eab4a9552ee495c8c7c

11 years agoam 6a9b8b2c: am 0a24e521: Clean up user preset dialog
nicolasroard [Wed, 14 Aug 2013 17:12:14 +0000 (10:12 -0700)]
am 6a9b8b2c: am 0a24e521: Clean up user preset dialog

* commit '6a9b8b2c6ac3c94c5cc9c39251e9b22c57b9b629':
  Clean up user preset dialog

11 years agoam 0a24e521: Clean up user preset dialog
nicolasroard [Wed, 14 Aug 2013 17:08:07 +0000 (10:08 -0700)]
am 0a24e521: Clean up user preset dialog

* commit '0a24e52185c4e88dd52b8e072cf7cd1d04f74b0a':
  Clean up user preset dialog

11 years agoClean up user preset dialog
nicolasroard [Wed, 14 Aug 2013 17:04:37 +0000 (10:04 -0700)]
Clean up user preset dialog

Change-Id: Idefafe3a877e8a0cf25ca955f689818e193fde72

11 years agoAdd a trampoline activity to launch new Camera
Mangesh Ghiware [Wed, 14 Aug 2013 15:44:07 +0000 (08:44 -0700)]
Add a trampoline activity to launch new Camera

This preserves shortcuts, if any, to the Camera activity in the old
package name.

Bug: 10312966
Change-Id: Iffd3d708333515bb3b998faecff360bc01c142d2

11 years agoam 59d0ef1e: am 2e1bc2e3: Fix UI Tablet for saturation panel
nicolasroard [Wed, 14 Aug 2013 16:19:19 +0000 (09:19 -0700)]
am 59d0ef1e: am 2e1bc2e3: Fix UI Tablet for saturation panel

* commit '59d0ef1e099984fbf3a970f1587896c004c299f0':
  Fix UI Tablet for saturation panel

11 years agoam 2e1bc2e3: Fix UI Tablet for saturation panel
nicolasroard [Wed, 14 Aug 2013 16:17:37 +0000 (09:17 -0700)]
am 2e1bc2e3: Fix UI Tablet for saturation panel

* commit '2e1bc2e37f285bfaf302a0533a372d4373474d9c':
  Fix UI Tablet for saturation panel

11 years agoFix UI Tablet for saturation panel
nicolasroard [Wed, 14 Aug 2013 16:02:59 +0000 (09:02 -0700)]
Fix UI Tablet for saturation panel

Change-Id: Id2fffcefc8af3cf8f6ffe2c84447c3f54070f160

11 years agoam e900ebaf: am 55a0279e: Fix for user presets remove menu item add spacer
nicolasroard [Wed, 14 Aug 2013 02:49:42 +0000 (19:49 -0700)]
am e900ebaf: am 55a0279e: Fix for user presets remove menu item add spacer

* commit 'e900ebaff73e80b12aa2ed02db98c7585726fd6f':
  Fix for user presets remove menu item add spacer

11 years agoam 55a0279e: Fix for user presets remove menu item add spacer
nicolasroard [Wed, 14 Aug 2013 02:47:09 +0000 (19:47 -0700)]
am 55a0279e: Fix for user presets remove menu item add spacer

* commit '55a0279ee420c649606edd7815403d3ca1820c07':
  Fix for user presets remove menu item add spacer

11 years agoFix for user presets
nicolasroard [Wed, 14 Aug 2013 00:36:00 +0000 (17:36 -0700)]
Fix for user presets
remove menu item
add spacer

Change-Id: I8a83aed6da00c6692f2204fefd17dfff3a599b8d

11 years agoam 2f96b88b: am 665e2582: Merge "add solid round mode to draw" into gb-ub-photos...
John Hoford [Wed, 14 Aug 2013 02:27:54 +0000 (19:27 -0700)]
am 2f96b88b: am 665e2582: Merge "add solid round mode to draw" into gb-ub-photos-carlsbad

* commit '2f96b88b59216be04ec297798415b5850ab179e5':
  add solid round mode to draw

11 years agoam 665e2582: Merge "add solid round mode to draw" into gb-ub-photos-carlsbad
John Hoford [Wed, 14 Aug 2013 02:24:51 +0000 (19:24 -0700)]
am 665e2582: Merge "add solid round mode to draw" into gb-ub-photos-carlsbad

* commit '665e258238b1e1e0a821530416f2f709e61cb155':
  add solid round mode to draw

11 years agoMerge "add solid round mode to draw" into gb-ub-photos-carlsbad
John Hoford [Wed, 14 Aug 2013 02:22:24 +0000 (02:22 +0000)]
Merge "add solid round mode to draw" into gb-ub-photos-carlsbad

11 years agoadd solid round mode to draw
John Hoford [Wed, 14 Aug 2013 02:06:35 +0000 (19:06 -0700)]
add solid round mode to draw

Change-Id: I60249711602fa3aaf2bce0b5035e75f746caa5eb

11 years agoam 59afb28f: am fd55ffec: Fix for translation strings
nicolasroard [Wed, 14 Aug 2013 00:54:21 +0000 (17:54 -0700)]
am 59afb28f: am fd55ffec: Fix for translation strings

* commit '59afb28fece7333ba61bbf1738a70657f3884ef1':
  Fix for translation strings

11 years agoam fd55ffec: Fix for translation strings
nicolasroard [Wed, 14 Aug 2013 00:50:25 +0000 (17:50 -0700)]
am fd55ffec: Fix for translation strings

* commit 'fd55ffec5dbec1d37e4e8b32240bd51c7e85275b':
  Fix for translation strings

11 years agoFix for translation strings
nicolasroard [Wed, 14 Aug 2013 00:36:00 +0000 (17:36 -0700)]
Fix for translation strings

Change-Id: I2c89a377a8a439dd7b77d09a1362c4d6e68752df

11 years agoam 627164c5: am 9977d45f: Merge "Fix tablet UI layout" into gb-ub-photos-carlsbad
nicolasroard [Tue, 13 Aug 2013 23:49:40 +0000 (16:49 -0700)]
am 627164c5: am 9977d45f: Merge "Fix tablet UI layout" into gb-ub-photos-carlsbad

* commit '627164c5d02c33c8a4224d34d0cabcd5c19951a0':
  Fix tablet UI layout

11 years agoam 9977d45f: Merge "Fix tablet UI layout" into gb-ub-photos-carlsbad
nicolasroard [Tue, 13 Aug 2013 23:47:59 +0000 (16:47 -0700)]
am 9977d45f: Merge "Fix tablet UI layout" into gb-ub-photos-carlsbad

* commit '9977d45fcae932581c1788cf3fa96a3f4040a8dc':
  Fix tablet UI layout

11 years agoam 68b65c98: am dbc7f587: Merge "fix draw size and style display" into gb-ub-photos...
John Hoford [Tue, 13 Aug 2013 23:46:07 +0000 (16:46 -0700)]
am 68b65c98: am dbc7f587: Merge "fix draw size and style display" into gb-ub-photos-carlsbad

* commit '68b65c983e31b7a9923abb2eed5e8d736ddf7425':
  fix draw size and style display

11 years agoMerge "Fix tablet UI layout" into gb-ub-photos-carlsbad
nicolasroard [Tue, 13 Aug 2013 23:45:17 +0000 (23:45 +0000)]
Merge "Fix tablet UI layout" into gb-ub-photos-carlsbad

11 years agoam dbc7f587: Merge "fix draw size and style display" into gb-ub-photos-carlsbad
John Hoford [Tue, 13 Aug 2013 23:40:51 +0000 (16:40 -0700)]
am dbc7f587: Merge "fix draw size and style display" into gb-ub-photos-carlsbad

* commit 'dbc7f5878da3038fbe96609ad21b5324e9645367':
  fix draw size and style display

11 years agoMerge "fix draw size and style display" into gb-ub-photos-carlsbad
John Hoford [Tue, 13 Aug 2013 23:38:08 +0000 (23:38 +0000)]
Merge "fix draw size and style display" into gb-ub-photos-carlsbad

11 years agoFix tablet UI layout
nicolasroard [Tue, 13 Aug 2013 23:29:11 +0000 (16:29 -0700)]
Fix tablet UI layout

Change-Id: I19a6f6751dd7754e8b0de6eb22a82041b1dff29f

11 years agofix draw size and style display
John Hoford [Tue, 13 Aug 2013 21:00:58 +0000 (14:00 -0700)]
fix draw size and style display

Change-Id: Ia7419e0f03e48fd099b678aa81c351462ee6937a

11 years agoam 0581bac4: am 389e8c88: Remove old video camera icon and label from Gallery
Doris Liu [Tue, 13 Aug 2013 21:03:13 +0000 (14:03 -0700)]
am 0581bac4: am 389e8c88: Remove old video camera icon and label from Gallery

* commit '0581bac494204a2dd5f246872d14691d562faa4b':
  Remove old video camera icon and label from Gallery

11 years agoam 389e8c88: Remove old video camera icon and label from Gallery
Doris Liu [Tue, 13 Aug 2013 21:00:21 +0000 (14:00 -0700)]
am 389e8c88: Remove old video camera icon and label from Gallery

* commit '389e8c887489db88e9324c17e8d29363198e7221':
  Remove old video camera icon and label from Gallery

11 years agoRemove old video camera icon and label from Gallery
Doris Liu [Tue, 13 Aug 2013 19:32:19 +0000 (12:32 -0700)]
Remove old video camera icon and label from Gallery

Bug: 10296343
Change-Id: I677f5b97919ea235ac9148ca92eee2af13bc462e

11 years agoam 9ad51bd2: am c41fdd6f: Merge "Fix icons rendering to be consistent" into gb-ub...
nicolasroard [Tue, 13 Aug 2013 17:46:01 +0000 (10:46 -0700)]
am 9ad51bd2: am c41fdd6f: Merge "Fix icons rendering to be consistent" into gb-ub-photos-carlsbad

* commit '9ad51bd2f4ad081b00281d51e257352bf9378147':
  Fix icons rendering to be consistent

11 years agoam c41fdd6f: Merge "Fix icons rendering to be consistent" into gb-ub-photos-carlsbad
nicolasroard [Tue, 13 Aug 2013 17:39:56 +0000 (10:39 -0700)]
am c41fdd6f: Merge "Fix icons rendering to be consistent" into gb-ub-photos-carlsbad

* commit 'c41fdd6f37df5dbd7f44b1c79cdd6d025937209d':
  Fix icons rendering to be consistent

11 years agoMerge "Fix icons rendering to be consistent" into gb-ub-photos-carlsbad
nicolasroard [Tue, 13 Aug 2013 17:38:12 +0000 (17:38 +0000)]
Merge "Fix icons rendering to be consistent" into gb-ub-photos-carlsbad

11 years agoFix icons rendering to be consistent
nicolasroard [Tue, 13 Aug 2013 17:30:06 +0000 (10:30 -0700)]
Fix icons rendering to be consistent

Change-Id: Ie9384df9a34a39311dfe7ccc1cff1250d2f3918e

11 years agoam c3606508: am 0bdafb19: Merge "add circle brush" into gb-ub-photos-carlsbad
John Hoford [Tue, 13 Aug 2013 16:14:55 +0000 (09:14 -0700)]
am c3606508: am 0bdafb19: Merge "add circle brush" into gb-ub-photos-carlsbad

* commit 'c3606508cecf94cfde3f1a927ab926f414b83ac0':
  add circle brush

11 years agoam 0bdafb19: Merge "add circle brush" into gb-ub-photos-carlsbad
John Hoford [Tue, 13 Aug 2013 16:12:33 +0000 (09:12 -0700)]
am 0bdafb19: Merge "add circle brush" into gb-ub-photos-carlsbad

* commit '0bdafb193e49e2b89eeb9f4c197bbc60635c6419':
  add circle brush

11 years agoMerge "add circle brush" into gb-ub-photos-carlsbad
John Hoford [Tue, 13 Aug 2013 16:09:29 +0000 (16:09 +0000)]
Merge "add circle brush" into gb-ub-photos-carlsbad

11 years agoam 4c89ec75: am 1b02bf12: (-s ours) DO NOT MERGE Fix build break by not redefining...
Stephen Hines [Tue, 13 Aug 2013 04:51:33 +0000 (21:51 -0700)]
am 4c89ec75: am 1b02bf12: (-s ours) DO NOT MERGE Fix build break by not redefining LOCAL_SHARED_LIBRARIES.

* commit '4c89ec75151c28a905602b79f125583eba6edcd5':
  DO NOT MERGE Fix build break by not redefining LOCAL_SHARED_LIBRARIES.

11 years agoam 1b02bf12: (-s ours) DO NOT MERGE Fix build break by not redefining LOCAL_SHARED_LI...
Stephen Hines [Tue, 13 Aug 2013 04:49:45 +0000 (21:49 -0700)]
am 1b02bf12: (-s ours) DO NOT MERGE Fix build break by not redefining LOCAL_SHARED_LIBRARIES.

* commit '1b02bf1271af9d0f90e07ef2dd57fffd246f3b37':
  DO NOT MERGE Fix build break by not redefining LOCAL_SHARED_LIBRARIES.

11 years agoDO NOT MERGE Fix build break by not redefining LOCAL_SHARED_LIBRARIES.
Stephen Hines [Tue, 13 Aug 2013 03:50:55 +0000 (20:50 -0700)]
DO NOT MERGE Fix build break by not redefining LOCAL_SHARED_LIBRARIES.

Change-Id: I3f063cc9688fce7d22805d4dda512d486d0c1218

11 years agoam 366c2ed3: Remove the unused libcutils.
Ying Wang [Tue, 13 Aug 2013 04:05:06 +0000 (21:05 -0700)]
am 366c2ed3: Remove the unused libcutils.

* commit '366c2ed307e91ad1fa22554cff3a95c50c12402e':
  Remove the unused libcutils.

11 years agoRemove the unused libcutils.
Ying Wang [Tue, 13 Aug 2013 03:51:28 +0000 (20:51 -0700)]
Remove the unused libcutils.

Change-Id: I91b3143f0959e194b71c66ef79f37c35f7a29499

11 years agoam c20802f0: Remove all the tests from Gallery2 until we have them sorted out.
Sascha Haeberling [Tue, 13 Aug 2013 02:34:15 +0000 (19:34 -0700)]
am c20802f0: Remove all the tests from Gallery2 until we have them sorted out.

* commit 'c20802f0342125eea7d50cb313678faf5e16ca0e':
  Remove all the tests from Gallery2 until we have them sorted out.

11 years agoRemove all the tests from Gallery2 until we have them sorted out.
Sascha Haeberling [Tue, 13 Aug 2013 02:19:32 +0000 (19:19 -0700)]
Remove all the tests from Gallery2 until we have them sorted out.

Change-Id: I72e3f0ce477f0b0d5bca1f53feba21b6aa77e315

11 years agoMerge remote-tracking branch 'origin/klp-dev-plus-aosp' into klp-dev-plus-aosp
Qiwen Zhao [Tue, 13 Aug 2013 01:13:13 +0000 (18:13 -0700)]
Merge remote-tracking branch 'origin/klp-dev-plus-aosp' into klp-dev-plus-aosp

11 years agoam 95599b51: am 77306b68: am 4772792d: Bump up the version number to 1.1.40010
Bart Sears [Tue, 13 Aug 2013 01:11:19 +0000 (18:11 -0700)]
am 95599b51: am 77306b68: am 4772792d: Bump up the version number to 1.1.40010

* commit '95599b519feaa601acfcefa2fa2183610bf87ce7':