OSDN Git Service

android-x86/packages-apps-Gallery2.git
11 years agoam 729a04f6: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Thu, 25 Apr 2013 23:54:51 +0000 (16:54 -0700)]
am 729a04f6: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '729a04f638e7fc7d93932024a9309adc4fc35bf5':
  Import translations. DO NOT MERGE

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Thu, 25 Apr 2013 20:57:41 +0000 (20:57 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 25 Apr 2013 20:16:55 +0000 (13:16 -0700)]
Import translations. DO NOT MERGE

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

11 years agoam 69f5d8cb: Fixes EDIT intents.
Ruben Brunk [Thu, 25 Apr 2013 19:48:52 +0000 (12:48 -0700)]
am 69f5d8cb: Fixes EDIT intents.

* commit '69f5d8cbf51422454257a00d7959b2e8d50cb0ca':
  Fixes EDIT intents.

11 years agoFixes EDIT intents.
Ruben Brunk [Wed, 24 Apr 2013 22:46:15 +0000 (15:46 -0700)]
Fixes EDIT intents.

Bug: 8712238

Change-Id: I63bb07dc304b2745a29e3bf7510e8b38ccb59c48

11 years agoam 2e7f1704: Merge "Avoid rendering underneath nav bar" into gb-ub-photos-bryce
Doris Liu [Thu, 25 Apr 2013 17:26:32 +0000 (10:26 -0700)]
am 2e7f1704: Merge "Avoid rendering underneath nav bar" into gb-ub-photos-bryce

* commit '2e7f1704c6a30f0d6febfa6ac29d5b3f665c656c':
  Avoid rendering underneath nav bar

11 years agoMerge "Avoid rendering underneath nav bar" into gb-ub-photos-bryce
Doris Liu [Thu, 25 Apr 2013 17:24:57 +0000 (17:24 +0000)]
Merge "Avoid rendering underneath nav bar" into gb-ub-photos-bryce

11 years agoresolved conflicts for merge of 6cc7a476 to gb-ub-photos-carlsbad
nicolasroard [Thu, 25 Apr 2013 15:47:11 +0000 (08:47 -0700)]
resolved conflicts for merge of 6cc7a476 to gb-ub-photos-carlsbad

Change-Id: Ide133370403bbcc6a509aa9f064ee8da38abac25

11 years agoMerge "UI changes" into gb-ub-photos-bryce
nicolasroard [Thu, 25 Apr 2013 15:20:11 +0000 (15:20 +0000)]
Merge "UI changes" into gb-ub-photos-bryce

11 years agoUI changes
nicolasroard [Sat, 20 Apr 2013 00:13:30 +0000 (17:13 -0700)]
UI changes

bug:8664728

Change-Id: I133328543af534c745526d0d58aa7a61f5748a9d

11 years agoAvoid rendering underneath nav bar
Doris Liu [Thu, 25 Apr 2013 01:09:04 +0000 (18:09 -0700)]
Avoid rendering underneath nav bar

Bug: 8647833

Change-Id: I84591c723bf289d8c57b8cb8920342566b64c528

11 years agoam 474c2273: Merge "New capture animation" into gb-ub-photos-bryce
Michael Kolb [Wed, 24 Apr 2013 23:06:38 +0000 (16:06 -0700)]
am 474c2273: Merge "New capture animation" into gb-ub-photos-bryce

* commit '474c2273f02b2333e0bed22fa40918a0939b5a69':
  New capture animation

11 years agoMerge "New capture animation" into gb-ub-photos-bryce
Michael Kolb [Wed, 24 Apr 2013 23:02:43 +0000 (23:02 +0000)]
Merge "New capture animation" into gb-ub-photos-bryce

11 years agoNew capture animation
Michael Kolb [Mon, 22 Apr 2013 17:22:21 +0000 (10:22 -0700)]
New capture animation

  Bug: 8253060

Match new UX design for capture animation
Custom layout for camera controls

Change-Id: I91875ae1685d52d4f9dbb2e6e9299428a8424766

11 years agoam 2e85f988: Merge "Fix for popuping being hard to dismiss" into gb-ub-photos-bryce
Doris Liu [Wed, 24 Apr 2013 22:39:06 +0000 (15:39 -0700)]
am 2e85f988: Merge "Fix for popuping being hard to dismiss" into gb-ub-photos-bryce

* commit '2e85f98891ffdccb1b7da1945f80af2de5c9a414':
  Fix for popuping being hard to dismiss

11 years agoMerge "Fix for popuping being hard to dismiss" into gb-ub-photos-bryce
Doris Liu [Wed, 24 Apr 2013 22:38:18 +0000 (22:38 +0000)]
Merge "Fix for popuping being hard to dismiss" into gb-ub-photos-bryce

11 years agoam 31a50d72: Merge "Reset ongoing animation when opening menu" into gb-ub-photos...
Michael Kolb [Wed, 24 Apr 2013 21:56:56 +0000 (14:56 -0700)]
am 31a50d72: Merge "Reset ongoing animation when opening menu" into gb-ub-photos-bryce

* commit '31a50d72488ec057d78dedfce290eab9264baed5':
  Reset ongoing animation when opening menu

11 years agoMerge "Reset ongoing animation when opening menu" into gb-ub-photos-bryce
Michael Kolb [Wed, 24 Apr 2013 21:54:55 +0000 (21:54 +0000)]
Merge "Reset ongoing animation when opening menu" into gb-ub-photos-bryce

11 years agoReset ongoing animation when opening menu
Michael Kolb [Wed, 24 Apr 2013 21:49:46 +0000 (14:49 -0700)]
Reset ongoing animation when opening menu

  Bug: 8687199

The XFade animation was not reset and yielded a transparent alpha

Change-Id: Ie2e43eccb2b4351ebf7d00075c567950ca6b2967

11 years agoam cc7bcd07: Merge "Fix Curves" into gb-ub-photos-bryce
John Hoford [Wed, 24 Apr 2013 20:52:45 +0000 (13:52 -0700)]
am cc7bcd07: Merge "Fix Curves" into gb-ub-photos-bryce

* commit 'cc7bcd0721735723c683b2f27267a52a76ff4244':
  Fix Curves

11 years agoMerge "Fix Curves" into gb-ub-photos-bryce
John Hoford [Wed, 24 Apr 2013 20:51:19 +0000 (20:51 +0000)]
Merge "Fix Curves" into gb-ub-photos-bryce

11 years agoam ef95774e: Merge "Fix for blank Gallery widgets on a DB upgrade" into gb-ub-photos...
Mangesh Ghiware [Wed, 24 Apr 2013 20:40:39 +0000 (13:40 -0700)]
am ef95774e: Merge "Fix for blank Gallery widgets on a DB upgrade" into gb-ub-photos-bryce

* commit 'ef95774e2463a3d3537d1ddd9b0dfca21c6d56df':
  Fix for blank Gallery widgets on a DB upgrade

11 years agoMerge "Fix for blank Gallery widgets on a DB upgrade" into gb-ub-photos-bryce
Mangesh Ghiware [Wed, 24 Apr 2013 20:39:33 +0000 (20:39 +0000)]
Merge "Fix for blank Gallery widgets on a DB upgrade" into gb-ub-photos-bryce

11 years agoFix Curves
John Hoford [Wed, 24 Apr 2013 20:15:47 +0000 (13:15 -0700)]
Fix Curves

bug:8710572
Change-Id: I49a8ea124be59de6d246ae0f9fb16f04fe447af7

11 years agoFix for blank Gallery widgets on a DB upgrade
Mangesh Ghiware [Wed, 24 Apr 2013 00:37:15 +0000 (17:37 -0700)]
Fix for blank Gallery widgets on a DB upgrade

Bug: 8660303
Change-Id: I06910ab0811d5f71ba6849d53ddc03c008fc77ad

11 years agoam 2b247c58: Merge "Store location for SRI panoramas." into gb-ub-photos-bryce
Sascha Haeberling [Wed, 24 Apr 2013 20:24:25 +0000 (13:24 -0700)]
am 2b247c58: Merge "Store location for SRI panoramas." into gb-ub-photos-bryce

* commit '2b247c58611779c69aa2f0f243acf0b6d0a65333':
  Store location for SRI panoramas.

11 years agoMerge "Store location for SRI panoramas." into gb-ub-photos-bryce
Sascha Haeberling [Wed, 24 Apr 2013 20:23:19 +0000 (20:23 +0000)]
Merge "Store location for SRI panoramas." into gb-ub-photos-bryce

11 years agoam dc464a12: Merge "Fix local adjust" into gb-ub-photos-bryce
John Hoford [Wed, 24 Apr 2013 20:21:17 +0000 (13:21 -0700)]
am dc464a12: Merge "Fix local adjust" into gb-ub-photos-bryce

* commit 'dc464a129bad2a2918531fc8a4415c41b60605e6':
  Fix local adjust

11 years agoMerge "Fix local adjust" into gb-ub-photos-bryce
John Hoford [Wed, 24 Apr 2013 20:19:27 +0000 (20:19 +0000)]
Merge "Fix local adjust" into gb-ub-photos-bryce

11 years agoam 8acf85be: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Wed, 24 Apr 2013 19:41:59 +0000 (12:41 -0700)]
am 8acf85be: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

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

11 years agoam a6e5864f: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Wed, 24 Apr 2013 19:41:58 +0000 (12:41 -0700)]
am a6e5864f: (-s ours) Import translations. DO NOT MERGE

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

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Wed, 24 Apr 2013 19:41:08 +0000 (19:41 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

11 years agoStore location for SRI panoramas.
Sascha Haeberling [Wed, 24 Apr 2013 17:58:58 +0000 (10:58 -0700)]
Store location for SRI panoramas.

  Bug: 8692005

Change-Id: I1499de0103e518ee321ebb0c566b9fb4a7a853d3

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 24 Apr 2013 17:52:45 +0000 (10:52 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 24 Apr 2013 17:50:35 +0000 (10:50 -0700)]
Import translations. DO NOT MERGE

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

11 years agoFix local adjust
John Hoford [Sat, 20 Apr 2013 15:12:48 +0000 (08:12 -0700)]
Fix local adjust

bug:8655977
Change-Id: I0aa4ac30de077663f52418528757a842372e0fc2

11 years agoam 0c71308c: Merge "interruptible renderer" into gb-ub-photos-bryce
John Hoford [Wed, 24 Apr 2013 01:18:48 +0000 (18:18 -0700)]
am 0c71308c: Merge "interruptible renderer" into gb-ub-photos-bryce

* commit '0c71308c9d2a72d4a3faf00242707de773d5beba':
  interruptible renderer

11 years agoMerge "interruptible renderer" into gb-ub-photos-bryce
John Hoford [Wed, 24 Apr 2013 01:17:02 +0000 (01:17 +0000)]
Merge "interruptible renderer" into gb-ub-photos-bryce

11 years agoam 7d62e546: Use FULL_SENSOR for unlocked orientation.
Angus Kong [Wed, 24 Apr 2013 00:30:33 +0000 (17:30 -0700)]
am 7d62e546: Use FULL_SENSOR for unlocked orientation.

* commit '7d62e546b3b9eedc1f5c9d8f3ee644025f554fe3':
  Use FULL_SENSOR for unlocked orientation.

11 years agoUse FULL_SENSOR for unlocked orientation.
Angus Kong [Tue, 23 Apr 2013 23:44:33 +0000 (16:44 -0700)]
Use FULL_SENSOR for unlocked orientation.

bug:8689453
Change-Id: Ia81d970772f091fbd9bec142acfd5e9f84e0a0fb

11 years agointerruptible renderer
John Hoford [Tue, 23 Apr 2013 22:55:51 +0000 (15:55 -0700)]
interruptible renderer

bug:8632908
Change-Id: I4df59fb0c82370491d953292fd1cd17443054ab3

11 years agoFix for popuping being hard to dismiss
Doris Liu [Tue, 23 Apr 2013 18:00:37 +0000 (11:00 -0700)]
Fix for popuping being hard to dismiss

Bug: 8688503
Change-Id: I86f1451867d7606060e5f81fdd3b8b0af1e0a6d3

11 years agoam 8600c562: Fix to check if crop activity got bad bitmap.
Ruben Brunk [Tue, 23 Apr 2013 18:52:26 +0000 (11:52 -0700)]
am 8600c562: Fix to check if crop activity got bad bitmap.

* commit '8600c562b8ed0f636bc966a8aac83dc90326f0fb':
  Fix to check if crop activity got bad bitmap.

11 years agoFix to check if crop activity got bad bitmap.
Ruben Brunk [Tue, 23 Apr 2013 17:29:25 +0000 (10:29 -0700)]
Fix to check if crop activity got bad bitmap.

Bug: 8692297
Change-Id: I1900c45c71b3d1c6203e4d25a7ad5354f409fcf2

11 years agoam ae52b3e3: Fixes video mode indicators by resetting them on init.
Sascha Haeberling [Tue, 23 Apr 2013 17:25:52 +0000 (10:25 -0700)]
am ae52b3e3: Fixes video mode indicators by resetting them on init.

* commit 'ae52b3e3f0f356e1b91e883729d0d82cb40d7a42':
  Fixes video mode indicators by resetting them on init.

11 years agoFixes video mode indicators by resetting them on init.
Sascha Haeberling [Tue, 23 Apr 2013 16:58:51 +0000 (09:58 -0700)]
Fixes video mode indicators by resetting them on init.

  Bug: 8696004

Change-Id: I2bfc235ac87d836c29a53425e623121304a4c08a

11 years agoam 86d622f7: Bump up the version number to 1.1.40011
Bart Sears [Tue, 23 Apr 2013 06:15:23 +0000 (23:15 -0700)]
am 86d622f7: Bump up the version number to 1.1.40011

* commit '86d622f79e9b72b78b7d9b34c66c6ed9d83c9ea5':
  Bump up the version number to 1.1.40011

11 years agoBump up the version number to 1.1.40011
Bart Sears [Tue, 23 Apr 2013 01:43:29 +0000 (18:43 -0700)]
Bump up the version number to 1.1.40011

Bug: 8607157
Change-Id: I7fc2c526228d9526b0af28181b6505173bbfbd7d

11 years agoam d313bb0a: Merge "Make sure we don\'t add the pano sharing menu in the secure lock...
Sascha Haeberling [Mon, 22 Apr 2013 23:57:30 +0000 (16:57 -0700)]
am d313bb0a: Merge "Make sure we don\'t add the pano sharing menu in the secure lock screen." into gb-ub-photos-bryce

* commit 'd313bb0acf2bc8b1114180fa9a7f50d6393168a2':
  Make sure we don't add the pano sharing menu in the secure lock screen.

11 years agoMerge "Make sure we don't add the pano sharing menu in the secure lock screen." into...
Sascha Haeberling [Mon, 22 Apr 2013 23:55:04 +0000 (23:55 +0000)]
Merge "Make sure we don't add the pano sharing menu in the secure lock screen." into gb-ub-photos-bryce

11 years agoam 98698ea0: Merge "Fix wallpaper crop UI." into gb-ub-photos-bryce
Ruben Brunk [Mon, 22 Apr 2013 23:54:24 +0000 (16:54 -0700)]
am 98698ea0: Merge "Fix wallpaper crop UI." into gb-ub-photos-bryce

* commit '98698ea0dd09f0cdc4ecdc92ae4718ea60164fd2':
  Fix wallpaper crop UI.

11 years agoMerge "Fix wallpaper crop UI." into gb-ub-photos-bryce
Ruben Brunk [Mon, 22 Apr 2013 23:53:03 +0000 (23:53 +0000)]
Merge "Fix wallpaper crop UI." into gb-ub-photos-bryce

11 years agoMake sure we don't add the pano sharing menu in the secure lock screen.
Sascha Haeberling [Mon, 22 Apr 2013 23:06:25 +0000 (16:06 -0700)]
Make sure we don't add the pano sharing menu in the secure lock screen.

  Bug: 8473022

Change-Id: Ie2221b6a660b7c9dc39cef89a509da4b2659adb3

11 years agoam 7706d294: Merge "Refactor the methods for changing the on-screen indicators."...
Sascha Haeberling [Mon, 22 Apr 2013 22:58:06 +0000 (15:58 -0700)]
am 7706d294: Merge "Refactor the methods for changing the on-screen indicators." into gb-ub-photos-bryce

* commit '7706d29493dc3c45cc8e4a276232177954cfe1b6':
  Refactor the methods for changing the on-screen indicators.

11 years agoMerge "Refactor the methods for changing the on-screen indicators." into gb-ub-photos...
Sascha Haeberling [Mon, 22 Apr 2013 22:55:54 +0000 (22:55 +0000)]
Merge "Refactor the methods for changing the on-screen indicators." into gb-ub-photos-bryce

11 years agoFix wallpaper crop UI.
Ruben Brunk [Mon, 22 Apr 2013 22:07:28 +0000 (15:07 -0700)]
Fix wallpaper crop UI.

Bug: 8687759
Change-Id: Ice32fdabdae585fc39e78ce1f3e7e1796c5d99b3

11 years agoam 15b83326: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Mon, 22 Apr 2013 21:56:52 +0000 (14:56 -0700)]
am 15b83326: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '15b83326d22b58058b745255aade9f9bf5c09111':
  Import translations. DO NOT MERGE

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Mon, 22 Apr 2013 21:53:53 +0000 (21:53 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

11 years agoam 6fe2995e: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Mon, 22 Apr 2013 21:53:46 +0000 (14:53 -0700)]
am 6fe2995e: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '6fe2995e44f38e7393ca4c12e5af5bf5b02d6297':
  Import translations. DO NOT MERGE

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Mon, 22 Apr 2013 21:52:51 +0000 (21:52 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

11 years agoRefactor the methods for changing the on-screen indicators.
Sascha Haeberling [Mon, 22 Apr 2013 21:27:36 +0000 (14:27 -0700)]
Refactor the methods for changing the on-screen indicators.

  Bug: 8609355

This will be used in PanoramaModule to set the indicators to their
default values when the module is initialized.

Change-Id: I02f230fb222cbbc184b9265aac75f4a3f17b4cd6

11 years agoam 9c48a6c3: Fixes build. Removes dead code.
Ruben Brunk [Mon, 22 Apr 2013 20:40:54 +0000 (13:40 -0700)]
am 9c48a6c3: Fixes build. Removes dead code.

* commit '9c48a6c30b2d663d382a8a4bc1c61ea75dfe46a1':
  Fixes build. Removes dead code.

11 years agoam 1365eec6: Merge "Fix orientation changes for wallpaper setter." into gb-ub-photos...
Ruben Brunk [Mon, 22 Apr 2013 20:40:54 +0000 (13:40 -0700)]
am 1365eec6: Merge "Fix orientation changes for wallpaper setter." into gb-ub-photos-bryce

* commit '1365eec634694796c1e3432abff54dd658bd4641':
  Fix orientation changes for wallpaper setter.

11 years agoam 4a6dc2b1: Merge "Reenables crop aspect ratio menu." into gb-ub-photos-bryce
Ruben Brunk [Mon, 22 Apr 2013 20:40:53 +0000 (13:40 -0700)]
am 4a6dc2b1: Merge "Reenables crop aspect ratio menu." into gb-ub-photos-bryce

* commit '4a6dc2b147af34ab4545f6f647b4038c64fc80d0':
  Reenables crop aspect ratio menu.

11 years agoam 608f7c98: Merge "More menu fixes" into gb-ub-photos-bryce
Michael Kolb [Mon, 22 Apr 2013 20:40:53 +0000 (13:40 -0700)]
am 608f7c98: Merge "More menu fixes" into gb-ub-photos-bryce

* commit '608f7c9843f48aeccc1678622dc3327958150c31':
  More menu fixes

11 years agoam d6e6533a: Merge "Fix for camera switcher hard to hit" into gb-ub-photos-bryce
Doris Liu [Mon, 22 Apr 2013 20:40:52 +0000 (13:40 -0700)]
am d6e6533a: Merge "Fix for camera switcher hard to hit" into gb-ub-photos-bryce

* commit 'd6e6533a054ea526021c3331a18f93a618442f13':
  Fix for camera switcher hard to hit

11 years agoam ed689873: Merge "Fix camera buttons showing up at wrong position" into gb-ub-photo...
Doris Liu [Mon, 22 Apr 2013 20:40:51 +0000 (13:40 -0700)]
am ed689873: Merge "Fix camera buttons showing up at wrong position" into gb-ub-photos-bryce

* commit 'ed689873c9da338859dc8858c08afa4fa31578f2':
  Fix camera buttons showing up at wrong position

11 years agoam ca6f04e2: Remove dead code
Bobby Georgescu [Mon, 22 Apr 2013 20:40:45 +0000 (13:40 -0700)]
am ca6f04e2: Remove dead code

* commit 'ca6f04e27bbcab953bd3f9dcf50476a1c4b70aac':
  Remove dead code

11 years agoam d97733b2: Strings update
nicolasroard [Mon, 22 Apr 2013 20:40:43 +0000 (13:40 -0700)]
am d97733b2: Strings update

* commit 'd97733b2d3cd1fe7398bb399a1fbd227ef0ba746':
  Strings update

11 years agoam bb894c4f: Merge "String updates." into gb-ub-photos-bryce
Nicolas Roard [Mon, 22 Apr 2013 20:40:43 +0000 (13:40 -0700)]
am bb894c4f: Merge "String updates." into gb-ub-photos-bryce

* commit 'bb894c4f321b27ede8e97c42117973376bbaf32f':
  String updates.

11 years agoam 237216ee: Rename scenemode AUTO to NONE
Michael Kolb [Mon, 22 Apr 2013 20:40:42 +0000 (13:40 -0700)]
am 237216ee: Rename scenemode AUTO to NONE

* commit '237216eeba5c05d63aa075ac8dc4af423044f302':
  Rename scenemode AUTO to NONE

11 years agoam f53eea80: Merge "Ensure consistent image thumbnail handling." into gb-ub-photos...
Ruben Brunk [Mon, 22 Apr 2013 20:40:42 +0000 (13:40 -0700)]
am f53eea80: Merge "Ensure consistent image thumbnail handling." into gb-ub-photos-bryce

* commit 'f53eea80c773a1686631f9e2ec6edab23c8944b5':
  Ensure consistent image thumbnail handling.

11 years agoam afc46d5a: Merge "Fix saved video timestamps." into gb-ub-photos-bryce
Ruben Brunk [Mon, 22 Apr 2013 20:40:40 +0000 (13:40 -0700)]
am afc46d5a: Merge "Fix saved video timestamps." into gb-ub-photos-bryce

* commit 'afc46d5a608ccfc1f370cc705e0c27eb0b678ded':
  Fix saved video timestamps.

11 years agoam 91d26f6c: tiny planet fix
John Hoford [Mon, 22 Apr 2013 20:40:39 +0000 (13:40 -0700)]
am 91d26f6c: tiny planet fix

* commit '91d26f6c3b183862eeffc1856e2d758e800d13f4':
  tiny planet fix

11 years agoam eeb5b71b: Merge "Remove photos from gallery2 manifest" into gb-ub-photos-bryce
John Reck [Mon, 22 Apr 2013 20:40:38 +0000 (13:40 -0700)]
am eeb5b71b: Merge "Remove photos from gallery2 manifest" into gb-ub-photos-bryce

* commit 'eeb5b71b03dbe1b6e43528bdeafe1cc23089be0e':
  Remove photos from gallery2 manifest

11 years agoam beba6b1c: Merge "Fix labels" into gb-ub-photos-bryce
Michael Kolb [Mon, 22 Apr 2013 20:40:38 +0000 (13:40 -0700)]
am beba6b1c: Merge "Fix labels" into gb-ub-photos-bryce

* commit 'beba6b1c36f79aded98f71dbf45454dd947ce7b8':
  Fix labels

11 years agoam 935d4c80: Merge "Make MediaSaveService destroyed after unbound." into gb-ub-photos...
Angus Kong [Mon, 22 Apr 2013 20:40:37 +0000 (13:40 -0700)]
am 935d4c80: Merge "Make MediaSaveService destroyed after unbound." into gb-ub-photos-bryce

* commit '935d4c8037d7b5f56e4dea1c96bd8f4b68cb6236':
  Make MediaSaveService destroyed after unbound.

11 years agoam ca3875b2: Merge "Save video using MediaSaveService." into gb-ub-photos-bryce
Angus Kong [Mon, 22 Apr 2013 20:40:37 +0000 (13:40 -0700)]
am ca3875b2: Merge "Save video using MediaSaveService." into gb-ub-photos-bryce

* commit 'ca3875b21375defd0d42c57c05994cd67f0d59cd':
  Save video using MediaSaveService.

11 years agoam faf2f040: Fix multi selection issue
Bobby Georgescu [Mon, 22 Apr 2013 20:40:36 +0000 (13:40 -0700)]
am faf2f040: Fix multi selection issue

* commit 'faf2f040f38532213fa237cf45c9794cf1a85859':
  Fix multi selection issue

11 years agoam 32049103: Merge "Lock camera orientation using FW API" into gb-ub-photos-bryce
Michael Kolb [Mon, 22 Apr 2013 20:40:35 +0000 (13:40 -0700)]
am 32049103: Merge "Lock camera orientation using FW API" into gb-ub-photos-bryce

* commit '32049103305c99e8be1f7af3e46933277e02a7c3':
  Lock camera orientation using FW API

11 years agoam 45826e18: Merge "Pass the camera to recorders after all is set." into gb-ub-photos...
Angus Kong [Mon, 22 Apr 2013 20:40:35 +0000 (13:40 -0700)]
am 45826e18: Merge "Pass the camera to recorders after all is set." into gb-ub-photos-bryce

* commit '45826e188598cd6171fc0ec3112e2fbf52fbc952':
  Pass the camera to recorders after all is set.

11 years agoam b1051814: Merge "Fix memory leak in pie controller" into gb-ub-photos-bryce
Doris Liu [Mon, 22 Apr 2013 20:40:34 +0000 (13:40 -0700)]
am b1051814: Merge "Fix memory leak in pie controller" into gb-ub-photos-bryce

* commit 'b10518142bb84abe2ffe1bd3aa10ff4ee7982370':
  Fix memory leak in pie controller

11 years agoam 14fe2887: Merge "Allow swiping to filmstrip from blocker bar" into gb-ub-photos...
Doris Liu [Mon, 22 Apr 2013 20:40:33 +0000 (13:40 -0700)]
am 14fe2887: Merge "Allow swiping to filmstrip from blocker bar" into gb-ub-photos-bryce

* commit '14fe288784c574c84edbf84306329dc8b70d8b4d':
  Allow swiping to filmstrip from blocker bar

11 years agoam a7e098c8: Merge "Drop in new assets of correct size" into gb-ub-photos-bryce
Michael Kolb [Mon, 22 Apr 2013 20:40:33 +0000 (13:40 -0700)]
am a7e098c8: Merge "Drop in new assets of correct size" into gb-ub-photos-bryce

* commit 'a7e098c8e798160fdc2410867ec7eba325b7cd96':
  Drop in new assets of correct size

11 years agoam 316af8dd: Merge "Fix crop activity aspect ratio and orientation handling." into...
Ruben Brunk [Mon, 22 Apr 2013 20:40:32 +0000 (13:40 -0700)]
am 316af8dd: Merge "Fix crop activity aspect ratio and orientation handling." into gb-ub-photos-bryce

* commit '316af8dd675d777f4bd9512b8af5391c7c89363f':
  Fix crop activity aspect ratio and orientation handling.

11 years agoresolved conflicts for merge of a1939d22 to gb-ub-photos-carlsbad
repo sync [Mon, 22 Apr 2013 20:37:02 +0000 (13:37 -0700)]
resolved conflicts for merge of a1939d22 to gb-ub-photos-carlsbad

Change-Id: Ic6759448c932823720021e85e1232736ff2085f8

11 years agoFixes build. Removes dead code.
Ruben Brunk [Mon, 22 Apr 2013 18:45:06 +0000 (11:45 -0700)]
Fixes build. Removes dead code.

Change-Id: Ieef56407304254235295d81e09e55f1cd69b87cb

11 years agoMerge "Fix orientation changes for wallpaper setter." into gb-ub-photos-bryce
Ruben Brunk [Mon, 22 Apr 2013 18:32:01 +0000 (18:32 +0000)]
Merge "Fix orientation changes for wallpaper setter." into gb-ub-photos-bryce

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

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

11 years agoMerge "Reenables crop aspect ratio menu." into gb-ub-photos-bryce
Ruben Brunk [Mon, 22 Apr 2013 18:31:33 +0000 (18:31 +0000)]
Merge "Reenables crop aspect ratio menu." into gb-ub-photos-bryce

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 22 Apr 2013 18:29:49 +0000 (11:29 -0700)]
Import translations. DO NOT MERGE

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

11 years agoFix orientation changes for wallpaper setter.
Ruben Brunk [Mon, 22 Apr 2013 17:53:08 +0000 (10:53 -0700)]
Fix orientation changes for wallpaper setter.

Bug: 8670036
Change-Id: I44932bcc8cd8b89686186e42fa1eb2644af87b47

11 years agoMerge "More menu fixes" into gb-ub-photos-bryce
Michael Kolb [Mon, 22 Apr 2013 17:31:50 +0000 (17:31 +0000)]
Merge "More menu fixes" into gb-ub-photos-bryce

11 years agoMore menu fixes
Michael Kolb [Fri, 19 Apr 2013 23:21:24 +0000 (16:21 -0700)]
More menu fixes

  Bug: 8660834

Add label dropshadow, reposition fixed menu
Adjust dead zone and angle

Change-Id: I7d62c03bcdcdec6268ef805f56114327f471b6d7

11 years agoMerge "Fix for camera switcher hard to hit" into gb-ub-photos-bryce
Doris Liu [Mon, 22 Apr 2013 17:13:22 +0000 (17:13 +0000)]
Merge "Fix for camera switcher hard to hit" into gb-ub-photos-bryce

11 years agoMerge "Fix camera buttons showing up at wrong position" into gb-ub-photos-bryce
Doris Liu [Mon, 22 Apr 2013 17:13:05 +0000 (17:13 +0000)]
Merge "Fix camera buttons showing up at wrong position" into gb-ub-photos-bryce

11 years agoFix for camera switcher hard to hit
Doris Liu [Sat, 20 Apr 2013 21:12:53 +0000 (14:12 -0700)]
Fix for camera switcher hard to hit

Bug: 8667079
Change-Id: I9d40617f4e3bcfcd810223d818b212d335c80707

11 years agoReenables crop aspect ratio menu.
Ruben Brunk [Sat, 20 Apr 2013 00:00:51 +0000 (17:00 -0700)]
Reenables crop aspect ratio menu.

Bug: 8471812

Change-Id: I50044f4c787ba326e24f67c5370e1f8a220eb005

11 years agoFix camera buttons showing up at wrong position
Doris Liu [Sat, 20 Apr 2013 18:30:35 +0000 (11:30 -0700)]
Fix camera buttons showing up at wrong position

Bug: 8607034
Change-Id: Ia796a9f5e56fd0566e2f4853ec48b9371e8134e2

11 years agoRemove dead code
Bobby Georgescu [Sat, 20 Apr 2013 17:26:15 +0000 (10:26 -0700)]
Remove dead code

Bug: 8672542
Change-Id: Ia6046b17f8ae77ffe6b8090b5fbd1dda2bc0327e