OSDN Git Service

android-x86/packages-apps-Gallery2.git
11 years agoam 99baf613: refactor quality to be int
John Hoford [Tue, 12 Feb 2013 20:15:44 +0000 (12:15 -0800)]
am 99baf613: refactor quality to be int

# Via John Hoford
* commit '99baf61387ab1ef15bb9db5fa3b2b55591e87059':
  refactor quality to be int

11 years agorefactor quality to be int
John Hoford [Tue, 12 Feb 2013 19:55:50 +0000 (11:55 -0800)]
refactor quality to be int

Change-Id: I0470abdbe75cf48c5228e80b9dc060ae6f3d8bbd

11 years agoam b01a3282: Add reset bitmap for RS filters
nicolasroard [Tue, 12 Feb 2013 18:52:57 +0000 (10:52 -0800)]
am b01a3282: Add reset bitmap for RS filters

# Via nicolasroard
* commit 'b01a32825018cfb79f2c965c1c3e3e25b5131229':
  Add reset bitmap for RS filters

11 years agoAdd reset bitmap for RS filters
nicolasroard [Tue, 12 Feb 2013 18:47:34 +0000 (10:47 -0800)]
Add reset bitmap for RS filters

Change-Id: I34e28ca72d13f9b5f8054d8a2c07cfffca4e85c6

11 years agoam 4a3c526c: Update thumbnails when the geometry changes
nicolasroard [Tue, 12 Feb 2013 18:30:38 +0000 (10:30 -0800)]
am 4a3c526c: Update thumbnails when the geometry changes

# Via nicolasroard
* commit '4a3c526cd15979fbbd46c51dbf508747914f683f':
  Update thumbnails when the geometry changes

11 years agoUpdate thumbnails when the geometry changes
nicolasroard [Tue, 12 Feb 2013 18:26:29 +0000 (10:26 -0800)]
Update thumbnails when the geometry changes

Change-Id: I44d70839efb7e00edfb1e6c1f73296beab09783c

11 years agoam 263eb844: Merge "Generate thumbnails asynchronously" into gb-ub-photos-bryce
nicolasroard [Tue, 12 Feb 2013 17:29:17 +0000 (09:29 -0800)]
am 263eb844: Merge "Generate thumbnails asynchronously" into gb-ub-photos-bryce

# Via Android (Google) Code Review (1) and nicolasroard (1)
* commit '263eb84489462e5792406710ddb1a9772135b4e9':
  Generate thumbnails asynchronously

11 years agoMerge "Generate thumbnails asynchronously" into gb-ub-photos-bryce
nicolasroard [Tue, 12 Feb 2013 17:27:44 +0000 (17:27 +0000)]
Merge "Generate thumbnails asynchronously" into gb-ub-photos-bryce

11 years agoam c364d9f2: remove animations if before Jelly Bean
John Hoford [Tue, 12 Feb 2013 17:21:07 +0000 (09:21 -0800)]
am c364d9f2: remove animations if before Jelly Bean

# Via John Hoford
* commit 'c364d9f2de28f79c636fcb145c355da52f52b7ad':
  remove animations if before Jelly Bean

11 years agoGenerate thumbnails asynchronously
nicolasroard [Tue, 12 Feb 2013 17:13:15 +0000 (09:13 -0800)]
Generate thumbnails asynchronously

Change-Id: I6a2520fc869280a2a7be9c9b5673e17038964a02

11 years agoremove animations if before Jelly Bean
John Hoford [Tue, 12 Feb 2013 17:05:39 +0000 (09:05 -0800)]
remove animations if before Jelly Bean

Change-Id: Ifb60390f513f60af2875cbc2218fdc185752e9b2

11 years agoam e2c4d033: fixes the draw and clean up the UI
John Hoford [Tue, 12 Feb 2013 15:38:25 +0000 (07:38 -0800)]
am e2c4d033: fixes the draw and clean up the UI

# Via John Hoford
* commit 'e2c4d033de164d886af9d242d8672570730580d6':
  fixes the draw and clean up the UI

11 years agofixes the draw and clean up the UI
John Hoford [Tue, 12 Feb 2013 04:55:45 +0000 (20:55 -0800)]
fixes the draw and clean up the UI

Change-Id: Ia52dfc3ec407c307612dcfc91fb61a1fb89e32ec

11 years agoam 4b2933f8: Merge "Adding support for ICS" into gb-ub-photos-bryce
nicolasroard [Tue, 12 Feb 2013 02:25:50 +0000 (18:25 -0800)]
am 4b2933f8: Merge "Adding support for ICS" into gb-ub-photos-bryce

# Via Android (Google) Code Review (1) and nicolasroard (1)
* commit '4b2933f87acaebc29556cbab244b56840a90425d':
  Adding support for ICS

11 years agoMerge "Adding support for ICS" into gb-ub-photos-bryce
nicolasroard [Tue, 12 Feb 2013 02:24:34 +0000 (02:24 +0000)]
Merge "Adding support for ICS" into gb-ub-photos-bryce

11 years agoAdding support for ICS
nicolasroard [Tue, 12 Feb 2013 02:15:15 +0000 (18:15 -0800)]
Adding support for ICS

Change-Id: I550d461b08a4cc5ceb3cdefd82301d5986325184

11 years agoam 431f45e1: Merge "fix red eye to use the new system" into gb-ub-photos-bryce
John Hoford [Tue, 12 Feb 2013 01:49:27 +0000 (17:49 -0800)]
am 431f45e1: Merge "fix red eye to use the new system" into gb-ub-photos-bryce

# Via Android (Google) Code Review (1) and John Hoford (1)
* commit '431f45e14bbfabdd43ba70de47451cc07ab4c949':
  fix red eye to use the new system

11 years agoMerge "fix red eye to use the new system" into gb-ub-photos-bryce
John Hoford [Tue, 12 Feb 2013 01:47:42 +0000 (01:47 +0000)]
Merge "fix red eye to use the new system" into gb-ub-photos-bryce

11 years agoam 46dcad6e: Merge "Switch to GalleryGoogle as default provider for RS files (from...
Stephen Hines [Tue, 12 Feb 2013 01:29:12 +0000 (17:29 -0800)]
am 46dcad6e: Merge "Switch to GalleryGoogle as default provider for RS files (from Gallery2)." into gb-ub-photos-bryce

# Via Android (Google) Code Review (1) and Stephen Hines (1)
* commit '46dcad6e7c0178f58696feb25cdbfc4ce4cbf235':
  Switch to GalleryGoogle as default provider for RS files (from Gallery2).

11 years agoMerge "Switch to GalleryGoogle as default provider for RS files (from Gallery2)....
Stephen Hines [Tue, 12 Feb 2013 01:25:31 +0000 (01:25 +0000)]
Merge "Switch to GalleryGoogle as default provider for RS files (from Gallery2)." into gb-ub-photos-bryce

11 years agofix red eye to use the new system
John Hoford [Sat, 9 Feb 2013 01:30:53 +0000 (17:30 -0800)]
fix red eye to use the new system

Change-Id: If79106dc3144cce374afd410f5f859692e564b83

11 years agoam 32ee1acb: Merge "Only create one RS context." into gb-ub-photos-bryce
Tim Murray [Mon, 11 Feb 2013 23:54:28 +0000 (15:54 -0800)]
am 32ee1acb: Merge "Only create one RS context." into gb-ub-photos-bryce

# Via Android (Google) Code Review (1) and Tim Murray (1)
* commit '32ee1acbd9f9ab0db382f0947a1ca1f3dfe52059':
  Only create one RS context.

11 years agoam 31e52aae: Move useFilterRepresentation to PanelController
nicolasroard [Mon, 11 Feb 2013 23:54:27 +0000 (15:54 -0800)]
am 31e52aae: Move useFilterRepresentation to PanelController

# Via nicolasroard
* commit '31e52aae5eeefd8383cb238e7dd3047e883968ef':
  Move useFilterRepresentation to PanelController

11 years agoMerge "Only create one RS context." into gb-ub-photos-bryce
Tim Murray [Mon, 11 Feb 2013 23:49:57 +0000 (23:49 +0000)]
Merge "Only create one RS context." into gb-ub-photos-bryce

11 years agoMove useFilterRepresentation to PanelController
nicolasroard [Mon, 11 Feb 2013 23:44:04 +0000 (15:44 -0800)]
Move useFilterRepresentation to PanelController

Change-Id: I8abd9b2bd1b808df6a84e334b6eaa36b1c16750d

11 years agoOnly create one RS context.
Tim Murray [Mon, 11 Feb 2013 23:29:20 +0000 (15:29 -0800)]
Only create one RS context.

Change-Id: I527da839142cd2e48fb81e8cb02b43f6f87147d6

11 years agoam 2d5cc151: Merge "Cleaning filters" into gb-ub-photos-bryce
nicolasroard [Mon, 11 Feb 2013 22:31:35 +0000 (14:31 -0800)]
am 2d5cc151: Merge "Cleaning filters" into gb-ub-photos-bryce

# Via Android (Google) Code Review (1) and nicolasroard (1)
* commit '2d5cc15139b6509d0328411fbed2f000b8c6343a':
  Cleaning filters

11 years agoMerge "Cleaning filters" into gb-ub-photos-bryce
nicolasroard [Mon, 11 Feb 2013 22:30:48 +0000 (22:30 +0000)]
Merge "Cleaning filters" into gb-ub-photos-bryce

11 years agoCleaning filters
nicolasroard [Mon, 11 Feb 2013 17:55:33 +0000 (09:55 -0800)]
Cleaning filters

Change-Id: I413b935f90cebdab37d3db73d7fcb0fe77a64579

11 years agoam 61b332d8: Merge "Lock focus during countdown" into gb-ub-photos-bryce
Doris Liu [Mon, 11 Feb 2013 21:41:16 +0000 (13:41 -0800)]
am 61b332d8: Merge "Lock focus during countdown" into gb-ub-photos-bryce

# Via Android (Google) Code Review (1) and Doris Liu (1)
* commit '61b332d8fbed8772d01a08db82d0dc388b649013':
  Lock focus during countdown

11 years agoMerge "Lock focus during countdown" into gb-ub-photos-bryce
Doris Liu [Mon, 11 Feb 2013 21:39:41 +0000 (21:39 +0000)]
Merge "Lock focus during countdown" into gb-ub-photos-bryce

11 years agoam 401756be: Merge "Fix camera setting icons appearing in wrong place" into gb-ub...
Doris Liu [Mon, 11 Feb 2013 21:35:06 +0000 (13:35 -0800)]
am 401756be: Merge "Fix camera setting icons appearing in wrong place" into gb-ub-photos-bryce

# Via Android (Google) Code Review (1) and Doris Liu (1)
* commit '401756be3f741a0ac9255f103b07ccc645ff2252':
  Fix camera setting icons appearing in wrong place

11 years agoMerge "Fix camera setting icons appearing in wrong place" into gb-ub-photos-bryce
Doris Liu [Mon, 11 Feb 2013 21:33:29 +0000 (21:33 +0000)]
Merge "Fix camera setting icons appearing in wrong place" into gb-ub-photos-bryce

11 years agoSwitch to GalleryGoogle as default provider for RS files (from Gallery2).
Stephen Hines [Fri, 8 Feb 2013 02:41:27 +0000 (18:41 -0800)]
Switch to GalleryGoogle as default provider for RS files (from Gallery2).

Bug: 8138884
Change-Id: Ib2484852f0fa4299f6d0797838420493ce2607a0

11 years agoam cef6ad5d: Move filter type to representations
nicolasroard [Sat, 9 Feb 2013 02:19:24 +0000 (18:19 -0800)]
am cef6ad5d: Move filter type to representations

# Via nicolasroard
* commit 'cef6ad5d4a60a6e2960f7f72de624d5e60b3908a':
  Move filter type to representations

11 years agoMove filter type to representations
nicolasroard [Sat, 9 Feb 2013 02:13:24 +0000 (18:13 -0800)]
Move filter type to representations

Change-Id: I2d49447c57f4ff49001d27cdfa6482ca320c7a8b

11 years agoam 50ffa175: Fix crash when reset
nicolasroard [Sat, 9 Feb 2013 01:51:56 +0000 (17:51 -0800)]
am 50ffa175: Fix crash when reset

# Via nicolasroard
* commit '50ffa17594ab620b62db0cbb98d0b3a0fb4ac4fc':
  Fix crash when reset

11 years agoFix crash when reset
nicolasroard [Sat, 9 Feb 2013 01:48:54 +0000 (17:48 -0800)]
Fix crash when reset

Change-Id: Ibab01c4e218e30f3f4a67665d99dbc14bdc7d8ea

11 years agoam 4aabe9d1: Merge "Fix loading screen" into gb-ub-photos-bryce
nicolasroard [Sat, 9 Feb 2013 01:05:26 +0000 (17:05 -0800)]
am 4aabe9d1: Merge "Fix loading screen" into gb-ub-photos-bryce

# Via Android (Google) Code Review (1) and nicolasroard (1)
* commit '4aabe9d1793ba797324cd7507f8d239d06fb547d':
  Fix loading screen

11 years agoMerge "Fix loading screen" into gb-ub-photos-bryce
nicolasroard [Sat, 9 Feb 2013 01:03:37 +0000 (01:03 +0000)]
Merge "Fix loading screen" into gb-ub-photos-bryce

11 years agoFix camera setting icons appearing in wrong place
Doris Liu [Sat, 9 Feb 2013 01:00:46 +0000 (17:00 -0800)]
Fix camera setting icons appearing in wrong place

Bug: 7956904
Change-Id: I1b2d3fef8d82a3efeb0caa5130ce3dbb6808af70

11 years agoFix loading screen
nicolasroard [Sat, 9 Feb 2013 01:00:42 +0000 (17:00 -0800)]
Fix loading screen

Change-Id: Id41c4c93782bea7f11d75f0ddcdd4529f4fc9758

11 years agoam 44a499a6: Fix tiny planet to work with the new framework
John Hoford [Sat, 9 Feb 2013 00:21:51 +0000 (16:21 -0800)]
am 44a499a6: Fix tiny planet to work with the new framework

# Via John Hoford
* commit '44a499a64158cd5a12f8e44655f82b68c33bf3b2':
  Fix tiny planet to work with the new framework

11 years agoFix tiny planet to work with the new framework
John Hoford [Fri, 8 Feb 2013 01:39:06 +0000 (17:39 -0800)]
Fix tiny planet to work with the new framework

Change-Id: I57e87ade6f2cfdfee1b237cdfdf5914244ee98aa

11 years agoam 8029c856: remove slider from FX and Border UI
John Hoford [Fri, 8 Feb 2013 22:59:54 +0000 (14:59 -0800)]
am 8029c856: remove slider from FX and Border UI

# Via John Hoford
* commit '8029c8567a162eb66fe54255bdeae264d594278d':
  remove slider from FX and Border UI

11 years agoam 6d088c52: Merge "Fix leaks / init" into gb-ub-photos-bryce
nicolasroard [Fri, 8 Feb 2013 22:54:44 +0000 (14:54 -0800)]
am 6d088c52: Merge "Fix leaks / init" into gb-ub-photos-bryce

# Via Android (Google) Code Review (1) and nicolasroard (1)
* commit '6d088c527485fb098833f8868a93bacd7d372443':
  Fix leaks / init

11 years agoremove slider from FX and Border UI
John Hoford [Fri, 8 Feb 2013 22:37:35 +0000 (14:37 -0800)]
remove slider from FX and Border UI

Change-Id: Ic1c38734c4351ab0150b90d5d4fc575cce9db9e9

11 years agoMerge "Fix leaks / init" into gb-ub-photos-bryce
nicolasroard [Fri, 8 Feb 2013 22:52:55 +0000 (22:52 +0000)]
Merge "Fix leaks / init" into gb-ub-photos-bryce

11 years agoFix leaks / init
nicolasroard [Fri, 8 Feb 2013 22:06:33 +0000 (14:06 -0800)]
Fix leaks / init

Change-Id: I5befdc24cc89cdcfb73ee4d13f076b1c4a585cf6

11 years agoam 2db8b143: Change transition from Gallery to Filtershow
Bobby Georgescu [Fri, 8 Feb 2013 22:13:16 +0000 (14:13 -0800)]
am 2db8b143: Change transition from Gallery to Filtershow

# Via Bobby Georgescu
* commit '2db8b143cdcdecd81916c09e19e4c65e582dccf5':
  Change transition from Gallery to Filtershow

11 years agoChange transition from Gallery to Filtershow
Bobby Georgescu [Fri, 8 Feb 2013 21:53:17 +0000 (13:53 -0800)]
Change transition from Gallery to Filtershow

Bug: 8163894
Change-Id: Iaed600df39a88b176cb8ed3316d187c26c6b7961

11 years agoam 7d9a6595: Merge "Replace background getDrawable calls to avoid ANR" into gb-ub...
Bobby Georgescu [Fri, 8 Feb 2013 20:51:37 +0000 (12:51 -0800)]
am 7d9a6595: Merge "Replace background getDrawable calls to avoid ANR" into gb-ub-photos-bryce

# Via Android (Google) Code Review (1) and Bobby Georgescu (1)
* commit '7d9a6595aa72a9e3a563bfb7cfbbfabca9602dbb':
  Replace background getDrawable calls to avoid ANR

11 years agoMerge "Replace background getDrawable calls to avoid ANR" into gb-ub-photos-bryce
Bobby Georgescu [Fri, 8 Feb 2013 20:50:03 +0000 (20:50 +0000)]
Merge "Replace background getDrawable calls to avoid ANR" into gb-ub-photos-bryce

11 years agoam 61f29adf: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Fri, 8 Feb 2013 19:34:40 +0000 (11:34 -0800)]
am 61f29adf: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

# Via Android (Google) Code Review (1) and Baligh Uddin (1)
* commit '61f29adfafdf44027761c2eec414ef212dd7e661':
  Import translations. DO NOT MERGE

11 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Fri, 8 Feb 2013 19:31:27 +0000 (19:31 +0000)]
Merge "Import translations. DO NOT MERGE"

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Fri, 8 Feb 2013 19:31:11 +0000 (19:31 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

11 years agoReplace background getDrawable calls to avoid ANR
Bobby Georgescu [Fri, 8 Feb 2013 19:27:10 +0000 (11:27 -0800)]
Replace background getDrawable calls to avoid ANR

Bug: 8148243
Change-Id: I0b94c647bd39b2aabd9cd5316a82b3ef3573b710

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 8 Feb 2013 19:21:16 +0000 (11:21 -0800)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 8 Feb 2013 19:20:47 +0000 (11:20 -0800)]
Import translations. DO NOT MERGE

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

11 years agoam 856acb65: Cleanup
nicolasroard [Fri, 8 Feb 2013 19:02:06 +0000 (11:02 -0800)]
am 856acb65: Cleanup

# Via nicolasroard
* commit '856acb652fad51d650723a890cac08c536363fcd':
  Cleanup

11 years agoCleanup
nicolasroard [Fri, 8 Feb 2013 18:36:00 +0000 (10:36 -0800)]
Cleanup

Change-Id: I30ccd935876a8cbf580d06c037b4bc7f86dafa42

11 years agoam bfcc645d: Merge "Fix borders" into gb-ub-photos-bryce
nicolasroard [Fri, 8 Feb 2013 03:21:18 +0000 (19:21 -0800)]
am bfcc645d: Merge "Fix borders" into gb-ub-photos-bryce

# Via Android (Google) Code Review (1) and nicolasroard (1)
* commit 'bfcc645d66addf77c49148da957f06e611a82fa9':
  Fix borders

11 years agoMerge "Fix borders" into gb-ub-photos-bryce
nicolasroard [Fri, 8 Feb 2013 03:19:58 +0000 (03:19 +0000)]
Merge "Fix borders" into gb-ub-photos-bryce

11 years agoMerge "Switch to GalleryGoogle as default provider for RS files (from Gallery2)."
Stephen Hines [Fri, 8 Feb 2013 03:02:50 +0000 (03:02 +0000)]
Merge "Switch to GalleryGoogle as default provider for RS files (from Gallery2)."

11 years agoFix borders
nicolasroard [Fri, 8 Feb 2013 02:58:33 +0000 (18:58 -0800)]
Fix borders

Change-Id: Ia77660872f3baf10968e20b5656d97c4fbfc815e

11 years agoSwitch to GalleryGoogle as default provider for RS files (from Gallery2).
Stephen Hines [Fri, 8 Feb 2013 02:41:27 +0000 (18:41 -0800)]
Switch to GalleryGoogle as default provider for RS files (from Gallery2).

Bug: 8138884
Change-Id: Ib2484852f0fa4299f6d0797838420493ce2607a0

11 years agoMerge "Fix build."
Ying Wang [Fri, 8 Feb 2013 01:54:24 +0000 (01:54 +0000)]
Merge "Fix build."

11 years agoFix build.
Ying Wang [Fri, 8 Feb 2013 01:52:38 +0000 (17:52 -0800)]
Fix build.

Change-Id: I1c7e931fb1119dc9c1b207d447320dec3a6d6f6b

11 years agoam 728c036e: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Fri, 8 Feb 2013 01:35:19 +0000 (17:35 -0800)]
am 728c036e: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

# Via Android (Google) Code Review (1) and Baligh Uddin (1)
* commit '728c036e6e137f35f17a084a90f0eb917556c68c':
  Import translations. DO NOT MERGE

11 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Fri, 8 Feb 2013 01:31:26 +0000 (01:31 +0000)]
Merge "Import translations. DO NOT MERGE"

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Fri, 8 Feb 2013 01:31:13 +0000 (01:31 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

11 years agoam 41a03af3: Add todo
nicolasroard [Fri, 8 Feb 2013 01:28:56 +0000 (17:28 -0800)]
am 41a03af3: Add todo

# Via nicolasroard
* commit '41a03af3dec8915b5055570ad0631071346da40f':
  Add todo

11 years agoam 933f357a: Merge "Fix Fx filters" into gb-ub-photos-bryce
nicolasroard [Fri, 8 Feb 2013 01:25:40 +0000 (17:25 -0800)]
am 933f357a: Merge "Fix Fx filters" into gb-ub-photos-bryce

# Via Android (Google) Code Review (1) and nicolasroard (1)
* commit '933f357aeeeba53ed9d3267107ab52dcb4a0fe5f':
  Fix Fx filters

11 years agoAdd todo
nicolasroard [Fri, 8 Feb 2013 01:25:04 +0000 (17:25 -0800)]
Add todo

Change-Id: I54fd72da364337833f80a0f1913beadf2af74277

11 years agoMerge "Fix Fx filters" into gb-ub-photos-bryce
nicolasroard [Fri, 8 Feb 2013 01:23:36 +0000 (01:23 +0000)]
Merge "Fix Fx filters" into gb-ub-photos-bryce

11 years agoFix Fx filters
nicolasroard [Fri, 8 Feb 2013 00:59:29 +0000 (16:59 -0800)]
Fix Fx filters

Change-Id: Id501ec3a7b4880e697e2b90c056a57fb3ec456ea

11 years agoam b3825a60: Merge "fix draw and curves to use FilterRepresentation" into gb-ub-photo...
John Hoford [Thu, 7 Feb 2013 22:46:54 +0000 (14:46 -0800)]
am b3825a60: Merge "fix draw and curves to use FilterRepresentation" into gb-ub-photos-bryce

# Via Android (Google) Code Review (1) and John Hoford (1)
* commit 'b3825a60032bc7b039b1f45fb280ea4c36ead766':
  fix draw and curves to use FilterRepresentation

11 years agoam 1933d8b2: Merge "Remove reference to local libraries. Make CameraTest build agains...
Jason Noguchi [Thu, 7 Feb 2013 22:46:53 +0000 (14:46 -0800)]
am 1933d8b2: Merge "Remove reference to local libraries. Make CameraTest build against the SDK instead." into gb-ub-photos-bryce

# Via Android (Google) Code Review (1) and Jason Noguchi (1)
* commit '1933d8b2cc7c8f0c5fe5282a3cd463cd6c4bf95a':
  Remove reference to local libraries. Make CameraTest build against the SDK instead.

11 years agoMerge "fix draw and curves to use FilterRepresentation" into gb-ub-photos-bryce
John Hoford [Thu, 7 Feb 2013 22:45:00 +0000 (22:45 +0000)]
Merge "fix draw and curves to use FilterRepresentation" into gb-ub-photos-bryce

11 years agoMerge "Remove reference to local libraries. Make CameraTest build against the SDK...
Jason Noguchi [Thu, 7 Feb 2013 22:44:54 +0000 (22:44 +0000)]
Merge "Remove reference to local libraries. Make CameraTest build against the SDK instead." into gb-ub-photos-bryce

11 years agofix draw and curves to use FilterRepresentation
John Hoford [Tue, 5 Feb 2013 17:09:04 +0000 (09:09 -0800)]
fix draw and curves to use FilterRepresentation

Change-Id: I500d9c04ea0e55cbc9b1927dee2f6a19a67d5349

11 years agoLock focus during countdown
Doris Liu [Thu, 7 Feb 2013 22:36:32 +0000 (14:36 -0800)]
Lock focus during countdown

Change-Id: Ia8d4250daa488c35e276218e9fdb8efdf00836c2

11 years agoam 1fe1cc71: Merge "Fix memory leak in ComboPreferences" into gb-ub-photos-bryce
Doris Liu [Thu, 7 Feb 2013 21:53:16 +0000 (13:53 -0800)]
am 1fe1cc71: Merge "Fix memory leak in ComboPreferences" into gb-ub-photos-bryce

# Via Android (Google) Code Review (1) and Doris Liu (1)
* commit '1fe1cc71a06f677e3715a62fd29692fcc7a424aa':
  Fix memory leak in ComboPreferences

11 years agoMerge "Fix memory leak in ComboPreferences" into gb-ub-photos-bryce
Doris Liu [Thu, 7 Feb 2013 21:51:20 +0000 (21:51 +0000)]
Merge "Fix memory leak in ComboPreferences" into gb-ub-photos-bryce

11 years agoFix memory leak in ComboPreferences
Doris Liu [Thu, 7 Feb 2013 20:32:42 +0000 (12:32 -0800)]
Fix memory leak in ComboPreferences

Bug: 8028546

Change-Id: I05246ba6675c62f89b1eaeb90d594dcb9aaf7185

11 years agoRemove reference to local libraries. Make CameraTest build against the SDK instead.
Jason Noguchi [Thu, 7 Feb 2013 02:49:51 +0000 (18:49 -0800)]
Remove reference to local libraries. Make CameraTest build against the SDK instead.

Change-Id: I5885de7f569f4c0e1e5156d8a1634fc13c1b558d

11 years agoam a31f446d: Fix flashing on geometry preview
nicolasroard [Thu, 7 Feb 2013 20:04:13 +0000 (12:04 -0800)]
am a31f446d: Fix flashing on geometry preview

# Via nicolasroard
* commit 'a31f446dca49c0915f8a08456d7bb7abe6f3037d':
  Fix flashing on geometry preview

11 years agoFix flashing on geometry preview
nicolasroard [Thu, 7 Feb 2013 20:01:59 +0000 (12:01 -0800)]
Fix flashing on geometry preview

Change-Id: I0f05d654c1c4373016d2d5766eb983a47fab2780

11 years agoam 00fa330e: Merge "Fix filters only + geometry only rendering" into gb-ub-photos...
nicolasroard [Thu, 7 Feb 2013 19:49:58 +0000 (11:49 -0800)]
am 00fa330e: Merge "Fix filters only + geometry only rendering" into gb-ub-photos-bryce

# Via Android (Google) Code Review (1) and nicolasroard (1)
* commit '00fa330e9497157542e4867ee033badaaf1f224f':
  Fix filters only + geometry only rendering

11 years agoMerge "Fix filters only + geometry only rendering" into gb-ub-photos-bryce
nicolasroard [Thu, 7 Feb 2013 19:47:37 +0000 (19:47 +0000)]
Merge "Fix filters only + geometry only rendering" into gb-ub-photos-bryce

11 years agoFix filters only + geometry only rendering
nicolasroard [Thu, 7 Feb 2013 02:40:09 +0000 (18:40 -0800)]
Fix filters only + geometry only rendering

Change-Id: Id8f0637ae53864488cb931def196ee50ae807f5c

11 years agoam ec43f01d: Merge "Request GALLERY_PROVIDER permission" into gb-ub-photos-bryce
John Reck [Thu, 7 Feb 2013 01:14:41 +0000 (17:14 -0800)]
am ec43f01d: Merge "Request GALLERY_PROVIDER permission" into gb-ub-photos-bryce

# Via Android (Google) Code Review (1) and John Reck (1)
* commit 'ec43f01d751af2010446d83db0db2c0654a21a6e':
  Request GALLERY_PROVIDER permission

11 years agoMerge "Request GALLERY_PROVIDER permission" into gb-ub-photos-bryce
John Reck [Thu, 7 Feb 2013 01:12:36 +0000 (01:12 +0000)]
Merge "Request GALLERY_PROVIDER permission" into gb-ub-photos-bryce

11 years agoMerge "Don't call requestLayout from onLayout"
Marco Nelissen [Wed, 6 Feb 2013 23:58:27 +0000 (23:58 +0000)]
Merge "Don't call requestLayout from onLayout"

11 years agoDon't call requestLayout from onLayout
Marco Nelissen [Wed, 6 Feb 2013 23:35:52 +0000 (15:35 -0800)]
Don't call requestLayout from onLayout

Doing a layout within a layout can lead to various problems, so it should
be avoided. There's some logging that warns of this, which got triggered
by CommonControllerOverlay.
I don't know what problem this code was originally trying to solve, but it
doesn't seem to be necessary anymore. The line in question was originally
introduced in change 209a9163d4e8cee0bfe162ae598ef40e6051479c, in Oct 2011.

Change-Id: I1402a842df59df31b69ad981337ea1c8630103df

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 6 Feb 2013 22:49:53 +0000 (14:49 -0800)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 6 Feb 2013 22:49:30 +0000 (14:49 -0800)]
Import translations. DO NOT MERGE

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

11 years agoRequest GALLERY_PROVIDER permission
John Reck [Wed, 6 Feb 2013 21:18:47 +0000 (13:18 -0800)]
Request GALLERY_PROVIDER permission

 Bug: 8138594

Change-Id: I39f446f8066cf15a62acf3f16c0faa84bc4b71d7

11 years agoam cf0b2aad: Refactor to use direct manipulations of FilterRepresentations.
nicolasroard [Wed, 6 Feb 2013 21:05:25 +0000 (13:05 -0800)]
am cf0b2aad: Refactor to use direct manipulations of FilterRepresentations.

# Via nicolasroard
* commit 'cf0b2aad3bc5d80c51316ae10e1cf2c3476259aa':
  Refactor to use direct manipulations of FilterRepresentations.

11 years agoRefactor to use direct manipulations of FilterRepresentations.
nicolasroard [Wed, 6 Feb 2013 01:09:05 +0000 (17:09 -0800)]
Refactor to use direct manipulations of FilterRepresentations.

Change-Id: If5f92f137283cb126835be004d315942ff95021c