OSDN Git Service

android-x86/packages-apps-Gallery2.git
11 years agoam 711c498f: am 56bc8b74: Merge "Fix snapping behavior in filmstrip" into gb-ub-photo...
Bobby Georgescu [Wed, 3 Oct 2012 21:16:42 +0000 (14:16 -0700)]
am 711c498f: am 56bc8b74: Merge "Fix snapping behavior in filmstrip" into gb-ub-photos-arches

* commit '711c498f36d63f542b7cc45ca9acbb719e83171f':
  Fix snapping behavior in filmstrip

11 years agoam 56bc8b74: Merge "Fix snapping behavior in filmstrip" into gb-ub-photos-arches
Bobby Georgescu [Wed, 3 Oct 2012 21:14:44 +0000 (14:14 -0700)]
am 56bc8b74: Merge "Fix snapping behavior in filmstrip" into gb-ub-photos-arches

* commit '56bc8b742d750f2fff9d3a30e6cc96e1850c782d':
  Fix snapping behavior in filmstrip

11 years agoMerge "Fix snapping behavior in filmstrip" into gb-ub-photos-arches
Bobby Georgescu [Wed, 3 Oct 2012 21:13:10 +0000 (14:13 -0700)]
Merge "Fix snapping behavior in filmstrip" into gb-ub-photos-arches

11 years agoFix snapping behavior in filmstrip
Bobby Georgescu [Wed, 3 Oct 2012 20:31:33 +0000 (13:31 -0700)]
Fix snapping behavior in filmstrip

Bug: 7277936
Change-Id: I57569eaac0b9e633d249754dcb3613c6c4f7ad3a

11 years agoam 81912a44: am b57e72bb: Disable destructive rotate for lightcycle panorama
Mangesh Ghiware [Wed, 3 Oct 2012 20:14:08 +0000 (13:14 -0700)]
am 81912a44: am b57e72bb: Disable destructive rotate for lightcycle panorama

* commit '81912a44c7e7d2519a7f89d9860e698959b8fe9e':
  Disable destructive rotate for lightcycle panorama

11 years agoam b57e72bb: Disable destructive rotate for lightcycle panorama
Mangesh Ghiware [Wed, 3 Oct 2012 20:10:51 +0000 (13:10 -0700)]
am b57e72bb: Disable destructive rotate for lightcycle panorama

* commit 'b57e72bb1a093afc5aee276855656c8b285c73b3':
  Disable destructive rotate for lightcycle panorama

11 years agoDisable destructive rotate for lightcycle panorama
Mangesh Ghiware [Wed, 3 Oct 2012 05:45:14 +0000 (22:45 -0700)]
Disable destructive rotate for lightcycle panorama

Bug: 7276024
Change-Id: I2b223d3928517b083cc982db8142770da02dd5b9

11 years agoam d0bd885b: am d84ae72a: Add a overflow menu item to view 360-degree panorama.
Mangesh Ghiware [Wed, 3 Oct 2012 19:47:25 +0000 (12:47 -0700)]
am d0bd885b: am d84ae72a: Add a overflow menu item to view 360-degree panorama.

* commit 'd0bd885b90576cf0ff1317c236adc805c0d0d2f4':
  Add a overflow menu item to view 360-degree panorama.

11 years agoam d84ae72a: Add a overflow menu item to view 360-degree panorama.
Mangesh Ghiware [Wed, 3 Oct 2012 19:45:38 +0000 (12:45 -0700)]
am d84ae72a: Add a overflow menu item to view 360-degree panorama.

* commit 'd84ae72adb147c0e8517a438b3dea3e87d319bb7':
  Add a overflow menu item to view 360-degree panorama.

11 years agoAdd a overflow menu item to view 360-degree panorama.
Mangesh Ghiware [Wed, 3 Oct 2012 06:26:29 +0000 (23:26 -0700)]
Add a overflow menu item to view 360-degree panorama.

Bug: 7276026
Change-Id: Ib4979e45867e22267b34fb77342ca625337c7ee4

11 years agoam fc1edb40: am 217acd7c: Change LightCycle assets.
George Mount [Wed, 3 Oct 2012 18:34:47 +0000 (11:34 -0700)]
am fc1edb40: am 217acd7c: Change LightCycle assets.

* commit 'fc1edb405ec8c7d4553d860b0adae5c6c4703433':
  Change LightCycle assets.

11 years agoam 217acd7c: Change LightCycle assets.
George Mount [Wed, 3 Oct 2012 18:33:01 +0000 (11:33 -0700)]
am 217acd7c: Change LightCycle assets.

* commit '217acd7c338871f426f4c975a8f9b889275cd321':
  Change LightCycle assets.

11 years agoChange LightCycle assets.
George Mount [Wed, 3 Oct 2012 17:46:16 +0000 (10:46 -0700)]
Change LightCycle assets.

 Bug 7279463

Change-Id: Ic0253875b5554649004beeaf6b73795c304b5369

11 years agoam 042b3ad6: am e0d9d42c: (-s ours) Merge "Import translations. DO NOT MERGE" into...
Baligh Uddin [Wed, 3 Oct 2012 15:30:45 +0000 (08:30 -0700)]
am 042b3ad6: am e0d9d42c: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit '042b3ad6d2e08ea25a9ee8ee209a2fc1e1efa43e':
  Import translations. DO NOT MERGE

11 years agoam b93fa454: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Wed, 3 Oct 2012 15:30:44 +0000 (08:30 -0700)]
am b93fa454: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

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

11 years agoam e0d9d42c: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Wed, 3 Oct 2012 15:29:06 +0000 (08:29 -0700)]
am e0d9d42c: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

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

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Wed, 3 Oct 2012 15:28:43 +0000 (08:28 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Baligh Uddin [Wed, 3 Oct 2012 15:28:19 +0000 (08:28 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Baligh Uddin [Wed, 3 Oct 2012 15:27:25 +0000 (08:27 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

11 years agoam b80ac7f5: am f4e22eb4: Correct behavior when swiping to placeholder item in PhotoPage
Bobby Georgescu [Wed, 3 Oct 2012 07:20:25 +0000 (00:20 -0700)]
am b80ac7f5: am f4e22eb4: Correct behavior when swiping to placeholder item in PhotoPage

* commit 'b80ac7f5bbaff18103465eb313e86b9fe573f5e3':
  Correct behavior when swiping to placeholder item in PhotoPage

11 years agoam f4e22eb4: Correct behavior when swiping to placeholder item in PhotoPage
Bobby Georgescu [Wed, 3 Oct 2012 07:18:49 +0000 (00:18 -0700)]
am f4e22eb4: Correct behavior when swiping to placeholder item in PhotoPage

* commit 'f4e22eb44bfae0c2a3b6570f19480c8c3535d808':
  Correct behavior when swiping to placeholder item in PhotoPage

11 years agoCorrect behavior when swiping to placeholder item in PhotoPage
Bobby Georgescu [Wed, 3 Oct 2012 01:34:08 +0000 (18:34 -0700)]
Correct behavior when swiping to placeholder item in PhotoPage

Bug: 7261641
Change-Id: I54deed0f20a4673cb5470ffc128c73cddc071772

11 years agoam f6af2a32: am 847587b5: Remove redundant handling of share action.
Mangesh Ghiware [Wed, 3 Oct 2012 07:09:22 +0000 (00:09 -0700)]
am f6af2a32: am 847587b5: Remove redundant handling of share action.

* commit 'f6af2a3240cbd6de44e51049e8f5c5a87cab09f8':
  Remove redundant handling of share action.

11 years agoam 847587b5: Remove redundant handling of share action.
Mangesh Ghiware [Wed, 3 Oct 2012 07:07:30 +0000 (00:07 -0700)]
am 847587b5: Remove redundant handling of share action.

* commit '847587b51800d4b2d241cd1b7c8b589be2c24133':
  Remove redundant handling of share action.

11 years agoRemove redundant handling of share action.
Mangesh Ghiware [Wed, 3 Oct 2012 06:50:53 +0000 (23:50 -0700)]
Remove redundant handling of share action.

Bug: 7256214

Gallery PhotoPage was handling the menu item selection for the share
action, in addition to the ShareActionProvider. Removing this leftover
code from pre-ActionBar implementation.

Change-Id: I0c91b9a7c05b38758ad1b76dd657225daaab1922

11 years agoam edceb4d0: am c7b2c287: Add Shadow feature
John Hoford [Wed, 3 Oct 2012 02:31:24 +0000 (19:31 -0700)]
am edceb4d0: am c7b2c287: Add Shadow feature

* commit 'edceb4d0b3974931c2f83a8d67b3fd8b14f65036':
  Add Shadow feature

11 years agoam c7b2c287: Add Shadow feature
John Hoford [Wed, 3 Oct 2012 02:28:57 +0000 (19:28 -0700)]
am c7b2c287: Add Shadow feature

* commit 'c7b2c287bfbe3f53a4d65800c3884b0082ad683c':
  Add Shadow feature

11 years agoAdd Shadow feature
John Hoford [Wed, 3 Oct 2012 01:12:03 +0000 (18:12 -0700)]
Add Shadow feature

bug:7234321
Change-Id: Ib0d4db773486e469ed818385b68b7b907070c297

11 years agoam 75a946ff: am 45e666c6: Merge "Implements image sharing" into gb-ub-photos-arches
nicolasroard [Wed, 3 Oct 2012 00:33:28 +0000 (17:33 -0700)]
am 75a946ff: am 45e666c6: Merge "Implements image sharing" into gb-ub-photos-arches

* commit '75a946ff012f966601d1098aac761a8ff69789f6':
  Implements image sharing

11 years agoam 45e666c6: Merge "Implements image sharing" into gb-ub-photos-arches
nicolasroard [Wed, 3 Oct 2012 00:31:12 +0000 (17:31 -0700)]
am 45e666c6: Merge "Implements image sharing" into gb-ub-photos-arches

* commit '45e666c65b75d36327c3491fb8e1245ba5cf4c77':
  Implements image sharing

11 years agoMerge "Implements image sharing" into gb-ub-photos-arches
nicolasroard [Wed, 3 Oct 2012 00:29:49 +0000 (17:29 -0700)]
Merge "Implements image sharing" into gb-ub-photos-arches

11 years agoImplements image sharing
nicolasroard [Mon, 1 Oct 2012 07:25:11 +0000 (00:25 -0700)]
Implements image sharing

bug:7233986
Change-Id: I8feb94d77facf8dbb8da5fab89b49ed7c224116e

11 years agoam 11a41ac9: am 9481d05b: Do not show grid/filmstrip spinner in secure camera mode
Bobby Georgescu [Wed, 3 Oct 2012 00:19:31 +0000 (17:19 -0700)]
am 11a41ac9: am 9481d05b: Do not show grid/filmstrip spinner in secure camera mode

* commit '11a41ac916415bd4fab16d7e1a8f2b61fe97231f':
  Do not show grid/filmstrip spinner in secure camera mode

11 years agoam 9481d05b: Do not show grid/filmstrip spinner in secure camera mode
Bobby Georgescu [Wed, 3 Oct 2012 00:17:51 +0000 (17:17 -0700)]
am 9481d05b: Do not show grid/filmstrip spinner in secure camera mode

* commit '9481d05b0782dccd495c66d2e3240cd7448bbd4a':
  Do not show grid/filmstrip spinner in secure camera mode

11 years agoDo not show grid/filmstrip spinner in secure camera mode
Bobby Georgescu [Tue, 2 Oct 2012 23:28:20 +0000 (16:28 -0700)]
Do not show grid/filmstrip spinner in secure camera mode

Bug: 7274284
Change-Id: I74ede883fe726bd05e95b30d3f91da2856543123

11 years agoam 4b759a13: am 45f089d6: Show Camera placeholder as first filmstrip item in roll
Bobby Georgescu [Tue, 2 Oct 2012 22:54:11 +0000 (15:54 -0700)]
am 4b759a13: am 45f089d6: Show Camera placeholder as first filmstrip item in roll

* commit '4b759a1341313fa4aeaaf8293202eb2aaabadec5':
  Show Camera placeholder as first filmstrip item in roll

11 years agoam 45f089d6: Show Camera placeholder as first filmstrip item in roll
Bobby Georgescu [Tue, 2 Oct 2012 22:53:15 +0000 (15:53 -0700)]
am 45f089d6: Show Camera placeholder as first filmstrip item in roll

* commit '45f089d69141e3fb0dfaad9bc34d275b61eb2aee':
  Show Camera placeholder as first filmstrip item in roll

11 years agoShow Camera placeholder as first filmstrip item in roll
Bobby Georgescu [Tue, 2 Oct 2012 20:30:09 +0000 (13:30 -0700)]
Show Camera placeholder as first filmstrip item in roll

Bug: 7272674
The camera roll filmstrip view now shows a shortcut to
launch the camera when opened from the Gallery app.
Note: the edits to SnailAlbum and SnailSource were made to
allow sharing code between SingleItemAlbum and SnailAlbum

Change-Id: I1bd2f3db99138c4b79a41c9c5baee46704cd18e0

11 years agoam 65c16ee5: am 51915a62: Merge "Trimming: Exit current activity after click done...
Teng-Hui Zhu [Tue, 2 Oct 2012 20:58:40 +0000 (13:58 -0700)]
am 65c16ee5: am 51915a62: Merge "Trimming: Exit current activity after click done" into gb-ub-photos-arches

* commit '65c16ee5bb556df724b4d4a59dbc31c25697a939':
  Trimming: Exit current activity after click done

11 years agoam 51915a62: Merge "Trimming: Exit current activity after click done" into gb-ub...
Teng-Hui Zhu [Tue, 2 Oct 2012 20:57:22 +0000 (13:57 -0700)]
am 51915a62: Merge "Trimming: Exit current activity after click done" into gb-ub-photos-arches

* commit '51915a622bbd32e90f0cd43b69a7851e13825737':
  Trimming: Exit current activity after click done

11 years agoMerge "Trimming: Exit current activity after click done" into gb-ub-photos-arches
Teng-Hui Zhu [Tue, 2 Oct 2012 20:56:24 +0000 (13:56 -0700)]
Merge "Trimming: Exit current activity after click done" into gb-ub-photos-arches

11 years agoam 31e3baa0: am 536ff151: Merge "Fix NFC regression" into gb-ub-photos-arches
John Reck [Tue, 2 Oct 2012 20:54:42 +0000 (13:54 -0700)]
am 31e3baa0: am 536ff151: Merge "Fix NFC regression" into gb-ub-photos-arches

* commit '31e3baa099c0d57280c4a538296ec0826b21d6ad':
  Fix NFC regression

11 years agoam 536ff151: Merge "Fix NFC regression" into gb-ub-photos-arches
John Reck [Tue, 2 Oct 2012 20:52:12 +0000 (13:52 -0700)]
am 536ff151: Merge "Fix NFC regression" into gb-ub-photos-arches

* commit '536ff1512fae7c8ad6ee276bf102269011fb6e50':
  Fix NFC regression

11 years agoMerge "Fix NFC regression" into gb-ub-photos-arches
John Reck [Tue, 2 Oct 2012 20:51:03 +0000 (13:51 -0700)]
Merge "Fix NFC regression" into gb-ub-photos-arches

11 years agoFix NFC regression
John Reck [Tue, 2 Oct 2012 20:38:22 +0000 (13:38 -0700)]
Fix NFC regression

 Bug: 7263536

Change-Id: Ieba6147fdc0279888ec1e6ea2101eab235522b9f

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 2 Oct 2012 20:19:59 +0000 (13:19 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 2 Oct 2012 20:19:36 +0000 (13:19 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 2 Oct 2012 20:18:50 +0000 (13:18 -0700)]
Import translations. DO NOT MERGE

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

11 years agoam 2ddf485a: am 6423defe: Fix crash, remove logging added to diagnose bug
Bobby Georgescu [Tue, 2 Oct 2012 19:39:54 +0000 (12:39 -0700)]
am 2ddf485a: am 6423defe: Fix crash, remove logging added to diagnose bug

* commit '2ddf485a61b675e84f00ed3e415788aaa8a8c156':
  Fix crash, remove logging added to diagnose bug

11 years agoam 6423defe: Fix crash, remove logging added to diagnose bug
Bobby Georgescu [Tue, 2 Oct 2012 19:37:44 +0000 (12:37 -0700)]
am 6423defe: Fix crash, remove logging added to diagnose bug

* commit '6423defee1d8ccf4d462d40ae4f82c7d73b11ab5':
  Fix crash, remove logging added to diagnose bug

11 years agoFix crash, remove logging added to diagnose bug
Bobby Georgescu [Tue, 2 Oct 2012 18:41:25 +0000 (11:41 -0700)]
Fix crash, remove logging added to diagnose bug

Bug: 7216012
LocalMergeAlbum index was not being initialized
in constructor so it was possible to access the
index before it was populated with information.

Change-Id: I7025839b0f3953b827f06c717cff6dc47a15b06c

11 years agoTrimming: Exit current activity after click done
Teng-Hui Zhu [Tue, 2 Oct 2012 18:21:37 +0000 (11:21 -0700)]
Trimming: Exit current activity after click done

Don't auto exit the trimmed video playing.
bug:7093055

Change-Id: I97fa1556cbe0591f2204ab4135b85375f82abbe8

11 years agoam 1856b8fc: am 462923e5: Check item is editable before attempting to launch editor
Bobby Georgescu [Tue, 2 Oct 2012 17:43:33 +0000 (10:43 -0700)]
am 1856b8fc: am 462923e5: Check item is editable before attempting to launch editor

* commit '1856b8fcfdfe75093a14fe53c3d25f64680c941c':
  Check item is editable before attempting to launch editor

11 years agoam 462923e5: Check item is editable before attempting to launch editor
Bobby Georgescu [Tue, 2 Oct 2012 17:42:39 +0000 (10:42 -0700)]
am 462923e5: Check item is editable before attempting to launch editor

* commit '462923e5800e151ab5ec450063334ba430c1da3a':
  Check item is editable before attempting to launch editor

11 years agoCheck item is editable before attempting to launch editor
Bobby Georgescu [Tue, 2 Oct 2012 17:30:07 +0000 (10:30 -0700)]
Check item is editable before attempting to launch editor

Bug: 7269840
Change-Id: I18af824865b8a158c7a89e2b34f51a32de144057

11 years agoam a3d2afd6: am 13360629: Remove ActionBarSherlock
Owen Lin [Tue, 2 Oct 2012 09:11:46 +0000 (02:11 -0700)]
am a3d2afd6: am 13360629: Remove ActionBarSherlock

* commit 'a3d2afd6b885ebc56f590e0b373f625bd0d64155':
  Remove ActionBarSherlock

11 years agoam 13360629: Remove ActionBarSherlock
Owen Lin [Tue, 2 Oct 2012 09:10:02 +0000 (02:10 -0700)]
am 13360629: Remove ActionBarSherlock

* commit '1336062985c9824d7fd796b1cebd5eaa8e4163ca':
  Remove ActionBarSherlock

11 years agoRemove ActionBarSherlock
Owen Lin [Tue, 2 Oct 2012 07:27:00 +0000 (15:27 +0800)]
Remove ActionBarSherlock

bug: 7242682

Change-Id: Ibf1fa136cafdca25273ee39ae9c065560b2db5cb

11 years agoam 70814a18: am 935b9cfe: Merge "Update assets of the lock screen image in the secure...
Wu-cheng Li [Tue, 2 Oct 2012 06:36:42 +0000 (23:36 -0700)]
am 70814a18: am 935b9cfe: Merge "Update assets of the lock screen image in the secure album." into gb-ub-photos-arches

* commit '70814a18aa9327c02e7876a939d10637dbf02155':
  Update assets of the lock screen image in the secure album.

11 years agoam 935b9cfe: Merge "Update assets of the lock screen image in the secure album."...
Wu-cheng Li [Tue, 2 Oct 2012 06:32:00 +0000 (23:32 -0700)]
am 935b9cfe: Merge "Update assets of the lock screen image in the secure album." into gb-ub-photos-arches

* commit '935b9cfe991c3afe119720c487dc24cc02c55584':
  Update assets of the lock screen image in the secure album.

11 years agoMerge "Update assets of the lock screen image in the secure album." into gb-ub-photos...
Wu-cheng Li [Tue, 2 Oct 2012 04:51:52 +0000 (21:51 -0700)]
Merge "Update assets of the lock screen image in the secure album." into gb-ub-photos-arches

11 years agoam ba36d9b1: am 2fc053ed: Merge "Revert "Enable swiping from LightCycle to Gallery...
George Mount [Tue, 2 Oct 2012 01:30:44 +0000 (18:30 -0700)]
am ba36d9b1: am 2fc053ed: Merge "Revert "Enable swiping from LightCycle to Gallery"" into gb-ub-photos-arches

* commit 'ba36d9b1ecc0d6021701d28682e5b1fccc165ab0':
  Revert "Enable swiping from LightCycle to Gallery"

11 years agoam 2fc053ed: Merge "Revert "Enable swiping from LightCycle to Gallery"" into gb-ub...
George Mount [Tue, 2 Oct 2012 01:27:59 +0000 (18:27 -0700)]
am 2fc053ed: Merge "Revert "Enable swiping from LightCycle to Gallery"" into gb-ub-photos-arches

* commit '2fc053edc38bf5070d980b541aa267b7a3325a8c':
  Revert "Enable swiping from LightCycle to Gallery"

11 years agoMerge "Revert "Enable swiping from LightCycle to Gallery"" into gb-ub-photos-arches
George Mount [Tue, 2 Oct 2012 01:26:38 +0000 (18:26 -0700)]
Merge "Revert "Enable swiping from LightCycle to Gallery"" into gb-ub-photos-arches

11 years agoam abf8e3fd: am 7b4bdd0a: Merge "Improve display of ActionBar album mode switcher...
Bobby Georgescu [Tue, 2 Oct 2012 01:22:02 +0000 (18:22 -0700)]
am abf8e3fd: am 7b4bdd0a: Merge "Improve display of ActionBar album mode switcher" into gb-ub-photos-arches

* commit 'abf8e3fd799bb729536973cef9863a78038497d5':
  Improve display of ActionBar album mode switcher

11 years agoam 7b4bdd0a: Merge "Improve display of ActionBar album mode switcher" into gb-ub...
Bobby Georgescu [Tue, 2 Oct 2012 01:19:40 +0000 (18:19 -0700)]
am 7b4bdd0a: Merge "Improve display of ActionBar album mode switcher" into gb-ub-photos-arches

* commit '7b4bdd0ac9d2b13e33d46918551f7fb2d642922d':
  Improve display of ActionBar album mode switcher

11 years agoMerge "Improve display of ActionBar album mode switcher" into gb-ub-photos-arches
Bobby Georgescu [Tue, 2 Oct 2012 01:18:45 +0000 (18:18 -0700)]
Merge "Improve display of ActionBar album mode switcher" into gb-ub-photos-arches

11 years agoImprove display of ActionBar album mode switcher
Bobby Georgescu [Tue, 2 Oct 2012 00:49:30 +0000 (17:49 -0700)]
Improve display of ActionBar album mode switcher

Bug: 7265942
Bug: 7266862
- Ellipsize the title of the album when appropriate
- Show correctly title when swiping from camera to gallery
- Hide the delete icon in the overflow menu to match the
  latest UX mocks, making more room for title

Change-Id: Ief77f65c972e75086c5dbf4229c9462cbcc17940

11 years agoRevert "Enable swiping from LightCycle to Gallery"
George Mount [Tue, 2 Oct 2012 01:15:45 +0000 (18:15 -0700)]
Revert "Enable swiping from LightCycle to Gallery"

This reverts commit 6fd25fd9a457346c8c32e8c4e68c7c491205730b
Changed mechanism for enabling swipe in LightCycle.

Change-Id: I5c9395eb97ee88d015fb3765d0594d92c4ae126d

11 years agoam d0b8143d: am 3cf07221: Merge "Fix exposure and fixed warnings" into gb-ub-photos...
John Hoford [Tue, 2 Oct 2012 00:56:07 +0000 (17:56 -0700)]
am d0b8143d: am 3cf07221: Merge "Fix exposure and fixed warnings" into gb-ub-photos-arches

* commit 'd0b8143d42b96760aa864d36821ed57925444509':
  Fix exposure and fixed warnings

11 years agoam 3cf07221: Merge "Fix exposure and fixed warnings" into gb-ub-photos-arches
John Hoford [Tue, 2 Oct 2012 00:54:06 +0000 (17:54 -0700)]
am 3cf07221: Merge "Fix exposure and fixed warnings" into gb-ub-photos-arches

* commit '3cf072213abc2e2b03f7c1a0069b37b2ca79f70c':
  Fix exposure and fixed warnings

11 years agoMerge "Fix exposure and fixed warnings" into gb-ub-photos-arches
John Hoford [Tue, 2 Oct 2012 00:52:41 +0000 (17:52 -0700)]
Merge "Fix exposure and fixed warnings" into gb-ub-photos-arches

11 years agoFix exposure and fixed warnings
John Hoford [Tue, 2 Oct 2012 00:21:55 +0000 (17:21 -0700)]
Fix exposure and fixed warnings

bug:7234321

11 years agoam 838f5981: am 83f50a9b: Merge "Fix for exceptions when image has no orientation...
Ruben Brunk [Tue, 2 Oct 2012 00:34:40 +0000 (17:34 -0700)]
am 838f5981: am 83f50a9b: Merge "Fix for exceptions when image has no orientation data." into gb-ub-photos-arches

* commit '838f598105693121fb73e8dcf3b9fcbc204a3b5b':
  Fix for exceptions when image has no orientation data.

11 years agoam 83f50a9b: Merge "Fix for exceptions when image has no orientation data." into...
Ruben Brunk [Tue, 2 Oct 2012 00:32:55 +0000 (17:32 -0700)]
am 83f50a9b: Merge "Fix for exceptions when image has no orientation data." into gb-ub-photos-arches

* commit '83f50a9b3f3ba9ada8dc6999ed997499fd78c052':
  Fix for exceptions when image has no orientation data.

11 years agoMerge "Fix for exceptions when image has no orientation data." into gb-ub-photos...
Ruben Brunk [Tue, 2 Oct 2012 00:31:17 +0000 (17:31 -0700)]
Merge "Fix for exceptions when image has no orientation data." into gb-ub-photos-arches

11 years agoam 700ae7e0: am 526c3060: Merge "Enable swiping from LightCycle to Gallery" into...
George Mount [Tue, 2 Oct 2012 00:26:28 +0000 (17:26 -0700)]
am 700ae7e0: am 526c3060: Merge "Enable swiping from LightCycle to Gallery" into gb-ub-photos-arches

* commit '700ae7e0a7737690abf20a7602bcab4ba4fff414':
  Enable swiping from LightCycle to Gallery

11 years agoam 526c3060: Merge "Enable swiping from LightCycle to Gallery" into gb-ub-photos...
George Mount [Tue, 2 Oct 2012 00:24:44 +0000 (17:24 -0700)]
am 526c3060: Merge "Enable swiping from LightCycle to Gallery" into gb-ub-photos-arches

* commit '526c306051b0b92bcd54923a52a4c5bccaef7d77':
  Enable swiping from LightCycle to Gallery

11 years agoMerge "Enable swiping from LightCycle to Gallery" into gb-ub-photos-arches
George Mount [Tue, 2 Oct 2012 00:22:23 +0000 (17:22 -0700)]
Merge "Enable swiping from LightCycle to Gallery" into gb-ub-photos-arches

11 years agoam e61c870f: am 3cf502a9: Move grid/filmstrip switching to ActionBar title "spinner"
Bobby Georgescu [Mon, 1 Oct 2012 23:59:44 +0000 (16:59 -0700)]
am e61c870f: am 3cf502a9: Move grid/filmstrip switching to ActionBar title "spinner"

* commit 'e61c870ff4ff215d553e3596a519ead0b255ec0d':
  Move grid/filmstrip switching to ActionBar title "spinner"

11 years agoam 3cf502a9: Move grid/filmstrip switching to ActionBar title "spinner"
Bobby Georgescu [Mon, 1 Oct 2012 23:57:23 +0000 (16:57 -0700)]
am 3cf502a9: Move grid/filmstrip switching to ActionBar title "spinner"

* commit '3cf502a91b36bf6ce633f897505b0a2c3fc53ad5':
  Move grid/filmstrip switching to ActionBar title "spinner"

11 years agoMove grid/filmstrip switching to ActionBar title "spinner"
Bobby Georgescu [Mon, 1 Oct 2012 22:50:11 +0000 (15:50 -0700)]
Move grid/filmstrip switching to ActionBar title "spinner"

Bug: 7233818
Bug: 7240846
Bug: 7258973

Tapping the title of the album, whether in filmstrip or
grid mode, allows switching between these modes using a
menu. The album name is now displayed when viewing pictures
in the filmstrip or zoomed in modes. Finally, no longer
allow switching to grid mode when not appropriate.

Change-Id: I4ee511feb7a74581fe185933ddd5110e5eb9feb0

11 years agoam f18dd1e1: am c58fe396: Merge "Remove OnFrameAvailableListener in tear down" into...
John Reck [Mon, 1 Oct 2012 22:37:36 +0000 (15:37 -0700)]
am f18dd1e1: am c58fe396: Merge "Remove OnFrameAvailableListener in tear down" into gb-ub-photos-arches

* commit 'f18dd1e13dc291c03df01db703178b5fb414d0d1':
  Remove OnFrameAvailableListener in tear down

11 years agoam c58fe396: Merge "Remove OnFrameAvailableListener in tear down" into gb-ub-photos...
John Reck [Mon, 1 Oct 2012 22:35:42 +0000 (15:35 -0700)]
am c58fe396: Merge "Remove OnFrameAvailableListener in tear down" into gb-ub-photos-arches

* commit 'c58fe396fb7c6208740fa22a005e94a358b8266f':
  Remove OnFrameAvailableListener in tear down

11 years agoMerge "Remove OnFrameAvailableListener in tear down" into gb-ub-photos-arches
John Reck [Mon, 1 Oct 2012 22:34:52 +0000 (15:34 -0700)]
Merge "Remove OnFrameAvailableListener in tear down" into gb-ub-photos-arches

11 years agoRemove OnFrameAvailableListener in tear down
John Reck [Mon, 1 Oct 2012 22:26:10 +0000 (15:26 -0700)]
Remove OnFrameAvailableListener in tear down

 Bug: 7217305

Change-Id: I79d1741cd757b2cc15a42336153af755ae84bd57

11 years agoFix for exceptions when image has no orientation data.
Ruben Brunk [Mon, 1 Oct 2012 22:08:23 +0000 (15:08 -0700)]
Fix for exceptions when image has no orientation data.

Bug: 7219163

When image has no orientation data, getOrientation now
catches the SQLiteException.

Change-Id: I6783f05bae67532c1b186fc07ca96b9361440984

11 years agoam 73a9a0f4: am d87b77c4: (-s ours) Merge "Import translations. DO NOT MERGE" into...
Baligh Uddin [Mon, 1 Oct 2012 21:56:25 +0000 (14:56 -0700)]
am 73a9a0f4: am d87b77c4: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit '73a9a0f4f366ed54cdc1f47b5d2c759084591fa2':
  Import translations. DO NOT MERGE

11 years agoam d87b77c4: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Mon, 1 Oct 2012 21:53:51 +0000 (14:53 -0700)]
am d87b77c4: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

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

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Baligh Uddin [Mon, 1 Oct 2012 21:53:25 +0000 (14:53 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Baligh Uddin [Mon, 1 Oct 2012 21:52:41 +0000 (14:52 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

11 years agoEnable swiping from LightCycle to Gallery
George Mount [Fri, 28 Sep 2012 19:55:22 +0000 (12:55 -0700)]
Enable swiping from LightCycle to Gallery

 Bug 7212420

Change-Id: Ic61bc06c6113c969e4b2e6e9c87c78a8aa2cb402

11 years agoam a58b741c: am d87c8624: More logs for gallery crash error, remove a potential cause
Bobby Georgescu [Mon, 1 Oct 2012 18:36:51 +0000 (11:36 -0700)]
am a58b741c: am d87c8624: More logs for gallery crash error, remove a potential cause

* commit 'a58b741cb28a7b64b09d75785b6cf2002a181093':
  More logs for gallery crash error, remove a potential cause

11 years agoam d87c8624: More logs for gallery crash error, remove a potential cause
Bobby Georgescu [Mon, 1 Oct 2012 18:35:11 +0000 (11:35 -0700)]
am d87c8624: More logs for gallery crash error, remove a potential cause

* commit 'd87c8624a7ae477a6dea86d63866ade04f8d7e7c':
  More logs for gallery crash error, remove a potential cause

11 years agoam ab8aec91: Import translations. DO NOT MERGE
Baligh Uddin [Mon, 1 Oct 2012 18:26:46 +0000 (11:26 -0700)]
am ab8aec91: Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 1 Oct 2012 18:24:15 +0000 (11:24 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 1 Oct 2012 18:23:23 +0000 (11:23 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 1 Oct 2012 18:22:22 +0000 (11:22 -0700)]
Import translations. DO NOT MERGE

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

11 years agoMore logs for gallery crash error, remove a potential cause
Bobby Georgescu [Sun, 30 Sep 2012 21:09:30 +0000 (14:09 -0700)]
More logs for gallery crash error, remove a potential cause

Bug: 7216012
Made sure that FilterDeleteSet doesn't ever return stale
item counts, added extra logging in LocalMergeAlbum for
NoSuchElementException so that we can have more info to
diagnose this crash if it happens in the future.

Change-Id: Ic988522fda4a16bb483db6ad34bc7f81ee098b03

11 years agoUpdate assets of the lock screen image in the secure album.
Wu-cheng Li [Mon, 1 Oct 2012 15:49:07 +0000 (23:49 +0800)]
Update assets of the lock screen image in the secure album.

bug:7192331
Change-Id: I551e14420e43106e97b093884571eaea27b00425