OSDN Git Service

android-x86/packages-apps-Gallery2.git
11 years agoam 5fac0735: am 7e3756f1: Merge "Refactor fragment/activity coupling in new Gallery...
Bobby Georgescu [Wed, 20 Mar 2013 21:14:41 +0000 (21:14 +0000)]
am 5fac0735: am 7e3756f1: Merge "Refactor fragment/activity coupling in new Gallery" into gb-ub-photos-bryce

* commit '5fac07357ce9a97000b4bb636445112aa1fa6171':
  Refactor fragment/activity coupling in new Gallery

11 years agoam 7e3756f1: Merge "Refactor fragment/activity coupling in new Gallery" into gb-ub...
Bobby Georgescu [Wed, 20 Mar 2013 21:11:40 +0000 (14:11 -0700)]
am 7e3756f1: Merge "Refactor fragment/activity coupling in new Gallery" into gb-ub-photos-bryce

* commit '7e3756f133965651434f581255646da497b90a51':
  Refactor fragment/activity coupling in new Gallery

11 years agoMerge "Refactor fragment/activity coupling in new Gallery" into gb-ub-photos-bryce
Bobby Georgescu [Wed, 20 Mar 2013 21:10:23 +0000 (21:10 +0000)]
Merge "Refactor fragment/activity coupling in new Gallery" into gb-ub-photos-bryce

11 years agoRefactor fragment/activity coupling in new Gallery
Bobby Georgescu [Wed, 20 Mar 2013 19:03:17 +0000 (12:03 -0700)]
Refactor fragment/activity coupling in new Gallery

Change-Id: I7cc54b352197e1975cff286f4add7d0f42637841

11 years agoam aec00599: am 89afc6b9: (-s ours) Merge "Import translations. DO NOT MERGE" into...
Baligh Uddin [Wed, 20 Mar 2013 19:56:59 +0000 (19:56 +0000)]
am aec00599: am 89afc6b9: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

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

11 years agoam aa30f02c: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Wed, 20 Mar 2013 19:56:57 +0000 (19:56 +0000)]
am aa30f02c: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

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

11 years agoam 89afc6b9: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Wed, 20 Mar 2013 19:55:10 +0000 (12:55 -0700)]
am 89afc6b9: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '89afc6b96d924499e44417ddae197372915b6465':
  Import translations. DO NOT MERGE

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Wed, 20 Mar 2013 19:53:55 +0000 (19:53 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Wed, 20 Mar 2013 19:53:34 +0000 (19:53 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 20 Mar 2013 18:30:57 +0000 (11:30 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 20 Mar 2013 18:30:10 +0000 (11:30 -0700)]
Import translations. DO NOT MERGE

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

11 years agoam def1e4ae: am 2ddedb86: Merge "Refactor the pipeline - add a CachingPipeline class...
nicolasroard [Wed, 20 Mar 2013 17:35:49 +0000 (17:35 +0000)]
am def1e4ae: am 2ddedb86: Merge "Refactor the pipeline - add a CachingPipeline class - FilteringPipeline only deals with communication - fix large critical sections performance issues - improves stability" into gb-ub-photos-bryce

* commit 'def1e4aebf67193e0187fb591a2c0458f72b60c9':
  Refactor the pipeline - add a CachingPipeline class - FilteringPipeline only deals with communication - fix large critical sections performance issues - improves stability

11 years agoam 2ddedb86: Merge "Refactor the pipeline - add a CachingPipeline class - FilteringPi...
nicolasroard [Wed, 20 Mar 2013 17:26:34 +0000 (10:26 -0700)]
am 2ddedb86: Merge "Refactor the pipeline - add a CachingPipeline class - FilteringPipeline only deals with communication - fix large critical sections performance issues - improves stability" into gb-ub-photos-bryce

* commit '2ddedb8630e6c2324c41d12509d893c4ec3744f2':
  Refactor the pipeline - add a CachingPipeline class - FilteringPipeline only deals with communication - fix large critical sections performance issues - improves stability

11 years agoMerge "Refactor the pipeline - add a CachingPipeline class - FilteringPipeline only...
nicolasroard [Wed, 20 Mar 2013 17:25:25 +0000 (17:25 +0000)]
Merge "Refactor the pipeline - add a CachingPipeline class - FilteringPipeline only deals with communication - fix large critical sections performance issues - improves stability" into gb-ub-photos-bryce

11 years agoRefactor the pipeline
nicolasroard [Wed, 20 Mar 2013 15:41:34 +0000 (08:41 -0700)]
Refactor the pipeline
- add a CachingPipeline class
- FilteringPipeline only deals with communication
- fix large critical sections performance issues
- improves stability

bug:8418537

Change-Id: Id18edf71b2e2aec19a8b25fcce711c4acbb1a724

11 years agoReconcile with jb-mr2-release - do not merge
The Android Open Source Project [Wed, 20 Mar 2013 16:32:48 +0000 (09:32 -0700)]
Reconcile with jb-mr2-release - do not merge

Change-Id: Id9603d15a01a36a07a95a23336e62a6b2c58bc16

11 years agomerge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Wed, 20 Mar 2013 12:56:09 +0000 (05:56 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev

11 years agoam 26bf2194: am 00551024: Method added to load scaled resource (with only alpha channel).
Victor Doba [Wed, 20 Mar 2013 10:30:38 +0000 (10:30 +0000)]
am 26bf2194: am 00551024: Method added to load scaled resource (with only alpha channel).

* commit '26bf21943edfa94dd9d0d7f6c0dbcc1ed05b5289':
  Method added to load scaled resource (with only alpha channel).

11 years agoam 00551024: Method added to load scaled resource (with only alpha channel).
Victor Doba [Wed, 20 Mar 2013 10:28:14 +0000 (03:28 -0700)]
am 00551024: Method added to load scaled resource (with only alpha channel).

* commit '0055102404c767af2cd5fabf70acbc8317e33fe3':
  Method added to load scaled resource (with only alpha channel).

11 years agoMethod added to load scaled resource (with only alpha channel).
Victor Doba [Wed, 20 Mar 2013 10:24:21 +0000 (11:24 +0100)]
Method added to load scaled resource (with only alpha channel).

Change-Id: I1b9a58e0fd4c33c9748ad03f53d635c426a5102c

11 years agoam 91adfa42: am 39c14cee: Merge "Bump up the version number to 1.1.40005" into gb...
Bart Sears [Wed, 20 Mar 2013 03:59:17 +0000 (03:59 +0000)]
am 91adfa42: am 39c14cee: Merge "Bump up the version number to 1.1.40005" into gb-ub-photos-bryce

* commit '91adfa42485f6724a2dc60db0ba09fd2739b8cc6':
  Bump up the version number to 1.1.40005

11 years agoam 39c14cee: Merge "Bump up the version number to 1.1.40005" into gb-ub-photos-bryce
Bart Sears [Wed, 20 Mar 2013 03:56:04 +0000 (20:56 -0700)]
am 39c14cee: Merge "Bump up the version number to 1.1.40005" into gb-ub-photos-bryce

* commit '39c14cee9cc748a932d78fb9d430effa12027f7b':
  Bump up the version number to 1.1.40005

11 years agoMerge "Bump up the version number to 1.1.40005" into gb-ub-photos-bryce
Bart Sears [Wed, 20 Mar 2013 03:55:02 +0000 (03:55 +0000)]
Merge "Bump up the version number to 1.1.40005" into gb-ub-photos-bryce

11 years agoam e9fce93e: am 269d2c86: Add accessor for filters to the source bitmap passed to...
nicolasroard [Wed, 20 Mar 2013 03:52:41 +0000 (03:52 +0000)]
am e9fce93e: am 269d2c86: Add accessor for filters to the source bitmap passed to apply()

* commit 'e9fce93e9db512be5da55731dec51c3d7154890f':
  Add accessor for filters to the source bitmap passed to apply()

11 years agoam 269d2c86: Add accessor for filters to the source bitmap passed to apply()
nicolasroard [Wed, 20 Mar 2013 03:50:54 +0000 (20:50 -0700)]
am 269d2c86: Add accessor for filters to the source bitmap passed to apply()

* commit '269d2c8602e8893b0bf399324b2072783ba0f37c':
  Add accessor for filters to the source bitmap passed to apply()

11 years agoAdd accessor for filters to the source bitmap passed to apply()
nicolasroard [Wed, 20 Mar 2013 03:13:33 +0000 (20:13 -0700)]
Add accessor for filters to the source bitmap passed to apply()

Change-Id: I2900c5b799592c388daa9049093ef8c80fa4f5c6

11 years agoam c8e5be66: am 8898eaab: Fixed onDestroy ordering for RS context.
Ruben Brunk [Wed, 20 Mar 2013 00:13:00 +0000 (00:13 +0000)]
am c8e5be66: am 8898eaab: Fixed onDestroy ordering for RS context.

* commit 'c8e5be6690e11fde21f288d22653a46bef56d013':
  Fixed onDestroy ordering for RS context.

11 years agoam 8898eaab: Fixed onDestroy ordering for RS context.
Ruben Brunk [Wed, 20 Mar 2013 00:11:46 +0000 (17:11 -0700)]
am 8898eaab: Fixed onDestroy ordering for RS context.

* commit '8898eaabfa0cdf70e00078d2dea810f9aab4dfd1':
  Fixed onDestroy ordering for RS context.

11 years agoFixed onDestroy ordering for RS context.
Ruben Brunk [Tue, 19 Mar 2013 23:39:24 +0000 (16:39 -0700)]
Fixed onDestroy ordering for RS context.

Bug: 8420637
Change-Id: Iddceaa3aefd3d905bbc7435350b768d10215b1d8

11 years agoam f0e726c5: am 33fca9ef: Fix some startup issues, performance issues on ICS
nicolasroard [Tue, 19 Mar 2013 22:13:29 +0000 (22:13 +0000)]
am f0e726c5: am 33fca9ef: Fix some startup issues, performance issues on ICS

* commit 'f0e726c539b4f9193a7764a881809c00433a26c4':
  Fix some startup issues, performance issues on ICS

11 years agoam 33fca9ef: Fix some startup issues, performance issues on ICS
nicolasroard [Tue, 19 Mar 2013 22:11:48 +0000 (15:11 -0700)]
am 33fca9ef: Fix some startup issues, performance issues on ICS

* commit '33fca9ef7f89b60e3b1a361fdf5fc597b3994e74':
  Fix some startup issues, performance issues on ICS

11 years agoFix some startup issues, performance issues on ICS
nicolasroard [Tue, 19 Mar 2013 21:46:17 +0000 (14:46 -0700)]
Fix some startup issues, performance issues on ICS

Change-Id: Iccbcc5a78bf4feb5614e1c420022ef8440606baf

11 years agoam bb547e5e: am 94660ff8: Merge "Add album viewing to new Gallery" into gb-ub-photos...
Bobby Georgescu [Tue, 19 Mar 2013 18:42:53 +0000 (18:42 +0000)]
am bb547e5e: am 94660ff8: Merge "Add album viewing to new Gallery" into gb-ub-photos-bryce

* commit 'bb547e5efc0aaca5c2035a20639980a376b9a1a4':
  Add album viewing to new Gallery

11 years agoam 94660ff8: Merge "Add album viewing to new Gallery" into gb-ub-photos-bryce
Bobby Georgescu [Tue, 19 Mar 2013 18:40:49 +0000 (11:40 -0700)]
am 94660ff8: Merge "Add album viewing to new Gallery" into gb-ub-photos-bryce

* commit '94660ff80259917e207fa15a971db1cd619dad5b':
  Add album viewing to new Gallery

11 years agoMerge "Add album viewing to new Gallery" into gb-ub-photos-bryce
Bobby Georgescu [Tue, 19 Mar 2013 18:39:02 +0000 (18:39 +0000)]
Merge "Add album viewing to new Gallery" into gb-ub-photos-bryce

11 years agoAdd album viewing to new Gallery
Bobby Georgescu [Mon, 18 Mar 2013 21:56:40 +0000 (14:56 -0700)]
Add album viewing to new Gallery

Change-Id: I71230541db0b06d41e2d23d51e83f0b3b8e8caf4

11 years agoam ff24fbbe: am 94202ecf: Improves double-tap and comparison mechanism
nicolasroard [Tue, 19 Mar 2013 17:11:22 +0000 (17:11 +0000)]
am ff24fbbe: am 94202ecf: Improves double-tap and comparison mechanism

* commit 'ff24fbbe8d8a57bff85c48009faba567ce361808':
  Improves double-tap and comparison mechanism

11 years agoam 94202ecf: Improves double-tap and comparison mechanism
nicolasroard [Tue, 19 Mar 2013 17:08:22 +0000 (10:08 -0700)]
am 94202ecf: Improves double-tap and comparison mechanism

* commit '94202ecf77d68ca7ed1b0adfe3b37daf6851e39d':
  Improves double-tap and comparison mechanism

11 years agoImproves double-tap and comparison mechanism
nicolasroard [Sat, 16 Mar 2013 21:27:22 +0000 (14:27 -0700)]
Improves double-tap and comparison mechanism

Change-Id: I1fda50d7d179703db9e0e525550018c259233e89

11 years agomerge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Tue, 19 Mar 2013 12:55:46 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev

11 years agoam c3b08ad7: am f79f954f: ImageFilterRS filters reset properly. FilterPipeline delay...
Ruben Brunk [Tue, 19 Mar 2013 07:08:00 +0000 (07:08 +0000)]
am c3b08ad7: am f79f954f: ImageFilterRS filters reset properly.  FilterPipeline delay till after load.

* commit 'c3b08ad78799de49294ae1a5f52e3cd90fb917d5':
  ImageFilterRS filters reset properly.  FilterPipeline delay till after load.

11 years agoam f79f954f: ImageFilterRS filters reset properly. FilterPipeline delay till after...
Ruben Brunk [Tue, 19 Mar 2013 07:06:21 +0000 (00:06 -0700)]
am f79f954f: ImageFilterRS filters reset properly.  FilterPipeline delay till after load.

* commit 'f79f954f4eb23bce55061c683a07fc7b3a965451':
  ImageFilterRS filters reset properly.  FilterPipeline delay till after load.

11 years agoImageFilterRS filters reset properly. FilterPipeline delay till after load.
Ruben Brunk [Tue, 19 Mar 2013 05:23:43 +0000 (22:23 -0700)]
ImageFilterRS filters reset properly.  FilterPipeline delay till after load.

Bug: 8293404
Bug: 8417804

Change-Id: I4e3fbbdb86bcb790d73455f21044e6dee9398a5d

11 years agoam d2773420: am b8270a94: Fix disappearing panels and animations on ICS
nicolasroard [Tue, 19 Mar 2013 03:48:48 +0000 (03:48 +0000)]
am d2773420: am b8270a94: Fix disappearing panels and animations on ICS

* commit 'd277342034a998e7f70fe07f655f55ef9fb38e4d':
  Fix disappearing panels and animations on ICS

11 years agoam b8270a94: Fix disappearing panels and animations on ICS
nicolasroard [Tue, 19 Mar 2013 03:46:07 +0000 (20:46 -0700)]
am b8270a94: Fix disappearing panels and animations on ICS

* commit 'b8270a94e539fc1944ae350c73b00b9df45832d5':
  Fix disappearing panels and animations on ICS

11 years agoFix disappearing panels and animations on ICS
nicolasroard [Tue, 19 Mar 2013 00:27:55 +0000 (17:27 -0700)]
Fix disappearing panels and animations on ICS

bug:8405402

Change-Id: I9c0da8fbf20c424cc64ae5cc1be42414cb2f0964

11 years agoBump up the version number to 1.1.40005
Bart Sears [Tue, 19 Mar 2013 03:02:47 +0000 (20:02 -0700)]
Bump up the version number to 1.1.40005

Change-Id: Ic01aa447fdae6628a84cd9d9561134c32c521df8

11 years agoam 783a72da: Merge "Add nakasi resources. xhdpi resources are stripped..." into gb...
nicolasroard [Tue, 19 Mar 2013 00:43:13 +0000 (17:43 -0700)]
am 783a72da: Merge "Add nakasi resources. xhdpi resources are stripped..." into gb-ub-photos-bryce

* commit '783a72dae8376fd73ea0c9972d8976909731321b':
  Add nakasi resources. xhdpi resources are stripped...

11 years agoam 3ccb0e3e: Add a cleanstep for the build server...
nicolasroard [Mon, 18 Mar 2013 22:15:06 +0000 (15:15 -0700)]
am 3ccb0e3e: Add a cleanstep for the build server...

* commit '3ccb0e3ef144ad54cc918779cc3ee10e7a182c28':
  Add a cleanstep for the build server...

11 years agoam 42559630: Merge "Fix "drop table" problem." into gb-ub-photos-bryce
George Mount [Mon, 18 Mar 2013 18:35:51 +0000 (11:35 -0700)]
am 42559630: Merge "Fix "drop table" problem." into gb-ub-photos-bryce

* commit '42559630d746e79fb139c65b2b12a35742eb0354':
  Fix "drop table" problem.

11 years agoam ac08be9e: am 783a72da: Merge "Add nakasi resources. xhdpi resources are stripped...
nicolasroard [Tue, 19 Mar 2013 00:46:18 +0000 (00:46 +0000)]
am ac08be9e: am 783a72da: Merge "Add nakasi resources. xhdpi resources are stripped..." into gb-ub-photos-bryce

* commit 'ac08be9e23c795ebe820650c528a3b10395f302c':
  Add nakasi resources. xhdpi resources are stripped...

11 years agoam 783a72da: Merge "Add nakasi resources. xhdpi resources are stripped..." into gb...
nicolasroard [Tue, 19 Mar 2013 00:43:13 +0000 (17:43 -0700)]
am 783a72da: Merge "Add nakasi resources. xhdpi resources are stripped..." into gb-ub-photos-bryce

* commit '783a72dae8376fd73ea0c9972d8976909731321b':
  Add nakasi resources. xhdpi resources are stripped...

11 years agoMerge "Add nakasi resources. xhdpi resources are stripped..." into gb-ub-photos-bryce
nicolasroard [Tue, 19 Mar 2013 00:42:00 +0000 (00:42 +0000)]
Merge "Add nakasi resources. xhdpi resources are stripped..." into gb-ub-photos-bryce

11 years agoAdd nakasi resources. xhdpi resources are stripped...
nicolasroard [Tue, 19 Mar 2013 00:36:41 +0000 (17:36 -0700)]
Add nakasi resources. xhdpi resources are stripped...

bug:8410820
Change-Id: I8a5624e1285bfd0608890ea186859706fb9c241f

11 years agoam 91bbb6e0: am cd7bd24d: (-s ours) Merge "Import translations. DO NOT MERGE" into...
Baligh Uddin [Mon, 18 Mar 2013 23:09:43 +0000 (23:09 +0000)]
am 91bbb6e0: am cd7bd24d: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '91bbb6e057c8cc7149f4554d3981386f83f99e54':
  Import translations. DO NOT MERGE

11 years agoam fa248e48: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Mon, 18 Mar 2013 23:06:22 +0000 (23:06 +0000)]
am fa248e48: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

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

11 years agoam cd7bd24d: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Mon, 18 Mar 2013 23:05:30 +0000 (16:05 -0700)]
am cd7bd24d: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

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

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Mon, 18 Mar 2013 23:03:45 +0000 (23:03 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Mon, 18 Mar 2013 23:03:30 +0000 (23:03 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

11 years agoam a885ea9e: am 75819cfe: Merge "Fix notifyChange" into gb-ub-photos-bryce
John Reck [Mon, 18 Mar 2013 22:26:29 +0000 (22:26 +0000)]
am a885ea9e: am 75819cfe: Merge "Fix notifyChange" into gb-ub-photos-bryce

* commit 'a885ea9e6ecec4d4fbc8d35b0792538dc564ed61':
  Fix notifyChange

11 years agoam 75819cfe: Merge "Fix notifyChange" into gb-ub-photos-bryce
John Reck [Mon, 18 Mar 2013 22:24:13 +0000 (15:24 -0700)]
am 75819cfe: Merge "Fix notifyChange" into gb-ub-photos-bryce

* commit '75819cfec58ba48b5ee81eb9214c8e49dccfce76':
  Fix notifyChange

11 years agoMerge "Fix notifyChange" into gb-ub-photos-bryce
John Reck [Mon, 18 Mar 2013 22:22:41 +0000 (22:22 +0000)]
Merge "Fix notifyChange" into gb-ub-photos-bryce

11 years agoam 57ee52de: am 3ccb0e3e: Add a cleanstep for the build server...
nicolasroard [Mon, 18 Mar 2013 22:18:03 +0000 (22:18 +0000)]
am 57ee52de: am 3ccb0e3e: Add a cleanstep for the build server...

* commit '57ee52def2c9517e4d80342e770a9a9b6d858718':
  Add a cleanstep for the build server...

11 years agoam 3ccb0e3e: Add a cleanstep for the build server...
nicolasroard [Mon, 18 Mar 2013 22:15:06 +0000 (15:15 -0700)]
am 3ccb0e3e: Add a cleanstep for the build server...

* commit '3ccb0e3ef144ad54cc918779cc3ee10e7a182c28':
  Add a cleanstep for the build server...

11 years agoAdd a cleanstep for the build server...
nicolasroard [Mon, 18 Mar 2013 22:10:52 +0000 (15:10 -0700)]
Add a cleanstep for the build server...

Change-Id: Ic882c28b33e04c346a1f326b1eb7cc10b870a8a3

11 years agoFix notifyChange
John Reck [Mon, 18 Mar 2013 22:07:32 +0000 (15:07 -0700)]
Fix notifyChange

Change-Id: I48d6c756a5272465b6cfaa632c879683aa51083d

11 years agoam c113bbba: am 59073597: Merge "Change delete cascade" into gb-ub-photos-bryce
George Mount [Mon, 18 Mar 2013 21:46:33 +0000 (21:46 +0000)]
am c113bbba: am 59073597: Merge "Change delete cascade" into gb-ub-photos-bryce

* commit 'c113bbba2d81111ef45f0e9010e8566043ea8712':
  Change delete cascade

11 years agoam 59073597: Merge "Change delete cascade" into gb-ub-photos-bryce
George Mount [Mon, 18 Mar 2013 21:43:49 +0000 (14:43 -0700)]
am 59073597: Merge "Change delete cascade" into gb-ub-photos-bryce

* commit '59073597fe605a519a5f74f52d400b55d071de0d':
  Change delete cascade

11 years agoMerge "Change delete cascade" into gb-ub-photos-bryce
George Mount [Mon, 18 Mar 2013 21:42:10 +0000 (21:42 +0000)]
Merge "Change delete cascade" into gb-ub-photos-bryce

11 years agoChange delete cascade
George Mount [Fri, 15 Mar 2013 14:31:35 +0000 (07:31 -0700)]
Change delete cascade

Change-Id: Ib40b0989ed437c923ff82b379e539b1141225529

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 18 Mar 2013 18:47:59 +0000 (11:47 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 18 Mar 2013 18:47:10 +0000 (11:47 -0700)]
Import translations. DO NOT MERGE

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

11 years agoam 1199caa4: am 42559630: Merge "Fix "drop table" problem." into gb-ub-photos-bryce
George Mount [Mon, 18 Mar 2013 18:38:26 +0000 (18:38 +0000)]
am 1199caa4: am 42559630: Merge "Fix "drop table" problem." into gb-ub-photos-bryce

* commit '1199caa49792dd8047306008878168b7b3138344':
  Fix "drop table" problem.

11 years agoam 42559630: Merge "Fix "drop table" problem." into gb-ub-photos-bryce
George Mount [Mon, 18 Mar 2013 18:35:51 +0000 (11:35 -0700)]
am 42559630: Merge "Fix "drop table" problem." into gb-ub-photos-bryce

* commit '42559630d746e79fb139c65b2b12a35742eb0354':
  Fix "drop table" problem.

11 years agoMerge "Fix "drop table" problem." into gb-ub-photos-bryce
George Mount [Mon, 18 Mar 2013 18:33:42 +0000 (18:33 +0000)]
Merge "Fix "drop table" problem." into gb-ub-photos-bryce

11 years agoam e690d1a2: am dc798933: Merge "Add shared preference key of LightCycle." into gb...
Angus Kong [Mon, 18 Mar 2013 18:30:53 +0000 (18:30 +0000)]
am e690d1a2: am dc798933: Merge "Add shared preference key of LightCycle." into gb-ub-photos-bryce

* commit 'e690d1a209afc8cb9c316e714553a61154c58207':
  Add shared preference key of LightCycle.

11 years agoam dc798933: Merge "Add shared preference key of LightCycle." into gb-ub-photos-bryce
Angus Kong [Mon, 18 Mar 2013 18:28:45 +0000 (11:28 -0700)]
am dc798933: Merge "Add shared preference key of LightCycle." into gb-ub-photos-bryce

* commit 'dc7989333319d5042c112805d4244aeeec41e9d7':
  Add shared preference key of LightCycle.

11 years agoMerge "Add shared preference key of LightCycle." into gb-ub-photos-bryce
Angus Kong [Mon, 18 Mar 2013 18:27:50 +0000 (18:27 +0000)]
Merge "Add shared preference key of LightCycle." into gb-ub-photos-bryce

11 years agoFix "drop table" problem.
George Mount [Mon, 18 Mar 2013 17:05:55 +0000 (10:05 -0700)]
Fix "drop table" problem.

 Bug 8404285
 Should drop table if exists when upgrading, not just drop a table.

Change-Id: Ic75fa0efc6ab44be073b2b78a8520e2289cd3148

11 years agomerge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Mon, 18 Mar 2013 12:56:25 +0000 (05:56 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev

11 years agoam 6abfce86: am 4ea01ce2: Fix xmp crash
nicolasroard [Sun, 17 Mar 2013 16:28:03 +0000 (16:28 +0000)]
am 6abfce86: am 4ea01ce2: Fix xmp crash

* commit '6abfce86f578313ef4a287ac04efd4a5f502ec32':
  Fix xmp crash

11 years agoam b647e277: am 38ac5c3e: Merge "Add new slider style" into gb-ub-photos-bryce
nicolasroard [Sun, 17 Mar 2013 16:28:03 +0000 (16:28 +0000)]
am b647e277: am 38ac5c3e: Merge "Add new slider style" into gb-ub-photos-bryce

* commit 'b647e27728433567ebb962857e3b33fa1e6659df':
  Add new slider style

11 years agoam 4ea01ce2: Fix xmp crash
nicolasroard [Sun, 17 Mar 2013 16:18:52 +0000 (09:18 -0700)]
am 4ea01ce2: Fix xmp crash

* commit '4ea01ce27d0aecd1b63d7e99b747c9858fa93b02':
  Fix xmp crash

11 years agoam 38ac5c3e: Merge "Add new slider style" into gb-ub-photos-bryce
nicolasroard [Sun, 17 Mar 2013 16:18:51 +0000 (09:18 -0700)]
am 38ac5c3e: Merge "Add new slider style" into gb-ub-photos-bryce

* commit '38ac5c3eab22ac051859b8eda40cfa5ceb675d53':
  Add new slider style

11 years agoFix xmp crash
nicolasroard [Sat, 16 Mar 2013 02:16:16 +0000 (19:16 -0700)]
Fix xmp crash

Change-Id: I256062b19e540fa77ff982552e62977789caf29b

11 years agoMerge "Add new slider style" into gb-ub-photos-bryce
nicolasroard [Sat, 16 Mar 2013 02:10:59 +0000 (02:10 +0000)]
Merge "Add new slider style" into gb-ub-photos-bryce

11 years agoAdd new slider style
nicolasroard [Sat, 16 Mar 2013 01:15:44 +0000 (18:15 -0700)]
Add new slider style

Change-Id: I3c749058b6432765b5c8d8d39d26dc4467437ddf

11 years agoAdd shared preference key of LightCycle.
Angus Kong [Sat, 16 Mar 2013 00:32:59 +0000 (17:32 -0700)]
Add shared preference key of LightCycle.

Change-Id: Ifd3171502cfde321769e3bc2b554ec14bf7bdd21

11 years agoam ffaa8d03: am 7dc5b6b3: Merge "Refactoring iconbutton." into gb-ub-photos-bryce
Ruben Brunk [Sat, 16 Mar 2013 01:07:09 +0000 (01:07 +0000)]
am ffaa8d03: am 7dc5b6b3: Merge "Refactoring iconbutton." into gb-ub-photos-bryce

* commit 'ffaa8d039f92e6da287ff30487b32e4d41eb8fe7':
  Refactoring iconbutton.

11 years agoam 7dc5b6b3: Merge "Refactoring iconbutton." into gb-ub-photos-bryce
Ruben Brunk [Sat, 16 Mar 2013 01:04:11 +0000 (18:04 -0700)]
am 7dc5b6b3: Merge "Refactoring iconbutton." into gb-ub-photos-bryce

* commit '7dc5b6b32d566d47a70ef32d93057a3fcf7524c9':
  Refactoring iconbutton.

11 years agoMerge "Refactoring iconbutton." into gb-ub-photos-bryce
Ruben Brunk [Sat, 16 Mar 2013 01:02:48 +0000 (01:02 +0000)]
Merge "Refactoring iconbutton." into gb-ub-photos-bryce

11 years agoRefactoring iconbutton.
Ruben Brunk [Fri, 15 Mar 2013 22:33:38 +0000 (15:33 -0700)]
Refactoring iconbutton.

Change-Id: Ie1538d978605ae28bb4fa6779eb2802794a35312

11 years agoam 5b1ae393: am 9674c47d: Merge "Improve AlbumSet UI in new gallery" into gb-ub-photo...
Bobby Georgescu [Fri, 15 Mar 2013 22:59:23 +0000 (22:59 +0000)]
am 5b1ae393: am 9674c47d: Merge "Improve AlbumSet UI in new gallery" into gb-ub-photos-bryce

* commit '5b1ae3933cbc01256e7530f7897ecfecda20c806':
  Improve AlbumSet UI in new gallery

11 years agoam 9674c47d: Merge "Improve AlbumSet UI in new gallery" into gb-ub-photos-bryce
Bobby Georgescu [Fri, 15 Mar 2013 22:57:28 +0000 (15:57 -0700)]
am 9674c47d: Merge "Improve AlbumSet UI in new gallery" into gb-ub-photos-bryce

* commit '9674c47ddc19351379888f0bc221190e8e05122b':
  Improve AlbumSet UI in new gallery

11 years agoMerge "Improve AlbumSet UI in new gallery" into gb-ub-photos-bryce
Bobby Georgescu [Fri, 15 Mar 2013 22:56:03 +0000 (22:56 +0000)]
Merge "Improve AlbumSet UI in new gallery" into gb-ub-photos-bryce

11 years agoImprove AlbumSet UI in new gallery
Bobby Georgescu [Fri, 15 Mar 2013 21:38:04 +0000 (14:38 -0700)]
Improve AlbumSet UI in new gallery

Change-Id: I31cbf7cf8c0c7b5f5f3413a59ad94142b13870d2

11 years agoam 84cf9da3: am ad0a874d: Prepare to switch to panolibs
John Reck [Fri, 15 Mar 2013 20:30:17 +0000 (20:30 +0000)]
am 84cf9da3: am ad0a874d: Prepare to switch to panolibs

* commit '84cf9da37fec302ca591a53f92dd7bc0456bcb44':
  Prepare to switch to panolibs

11 years agoam ad0a874d: Prepare to switch to panolibs
John Reck [Fri, 15 Mar 2013 20:28:17 +0000 (13:28 -0700)]
am ad0a874d: Prepare to switch to panolibs

* commit 'ad0a874d0383106a412d22138ebec6b51a13d88e':
  Prepare to switch to panolibs

11 years agoPrepare to switch to panolibs
John Reck [Fri, 15 Mar 2013 20:19:30 +0000 (13:19 -0700)]
Prepare to switch to panolibs

Change-Id: Ie29c0014fcb08105cab1ee6043f66b58e5ac85f8

11 years agoam 79a638d5: am b5ab491c: Delete and recreate database on upgrade.
George Mount [Fri, 15 Mar 2013 20:13:36 +0000 (20:13 +0000)]
am 79a638d5: am b5ab491c: Delete and recreate database on upgrade.

* commit '79a638d5d0260e235b81e0d76c662f25c024aa28':
  Delete and recreate database on upgrade.