OSDN Git Service

android-x86/packages-apps-Gallery2.git
11 years agoam cd84d676: Fix history panel overlap
nicolasroard [Thu, 29 Nov 2012 04:54:39 +0000 (20:54 -0800)]
am cd84d676: Fix history panel overlap

* commit 'cd84d67629075795d4c5c28d980f77ff8d75c593':
  Fix history panel overlap

11 years agoFix history panel overlap
nicolasroard [Thu, 29 Nov 2012 03:59:51 +0000 (19:59 -0800)]
Fix history panel overlap

bug:7545507
Change-Id: I06236f3025191896c851af1d84dc48a4dde18b1d

11 years agoam 987bc8aa: Fix wrong colors in Curves
nicolasroard [Thu, 29 Nov 2012 01:23:04 +0000 (17:23 -0800)]
am 987bc8aa: Fix wrong colors in Curves

* commit '987bc8aaafa55c45451937b27d94c1d602de4d68':
  Fix wrong colors in Curves

11 years agoam d24fdf6a: Merge "Fix moving points in the Curves editor" into gb-ub-photos-arches
nicolasroard [Thu, 29 Nov 2012 01:19:55 +0000 (17:19 -0800)]
am d24fdf6a: Merge "Fix moving points in the Curves editor" into gb-ub-photos-arches

* commit 'd24fdf6ad148ffeb34a721d90e46d038f5a7b0da':
  Fix moving points in the Curves editor

11 years agoFix wrong colors in Curves
nicolasroard [Thu, 29 Nov 2012 01:09:59 +0000 (17:09 -0800)]
Fix wrong colors in Curves

bug:7633765
Change-Id: Ie6d0c175af6a1ade8f225107408ad03e73a289d3

11 years agoMerge "Fix moving points in the Curves editor" into gb-ub-photos-arches
nicolasroard [Thu, 29 Nov 2012 01:17:35 +0000 (17:17 -0800)]
Merge "Fix moving points in the Curves editor" into gb-ub-photos-arches

11 years agoam 7a36d427: Merge "Added locking to ImageLoader." into gb-ub-photos-arches
Ruben Brunk [Thu, 29 Nov 2012 01:05:44 +0000 (17:05 -0800)]
am 7a36d427: Merge "Added locking to ImageLoader." into gb-ub-photos-arches

* commit '7a36d4275ea0375d4e6a940cc3307dbe716cf85c':
  Added locking to ImageLoader.

11 years agoMerge "Added locking to ImageLoader." into gb-ub-photos-arches
Ruben Brunk [Thu, 29 Nov 2012 01:04:48 +0000 (17:04 -0800)]
Merge "Added locking to ImageLoader." into gb-ub-photos-arches

11 years agoam e5b979ed: Merge "reduce size of tiny planet if malloc fails" into gb-ub-photos...
John Hoford [Thu, 29 Nov 2012 00:57:34 +0000 (16:57 -0800)]
am e5b979ed: Merge "reduce size of tiny planet if malloc fails" into gb-ub-photos-arches

* commit 'e5b979edb369877463e07680dddd9983bd2501cb':
  reduce size of tiny planet if malloc fails

11 years agoMerge "reduce size of tiny planet if malloc fails" into gb-ub-photos-arches
John Hoford [Thu, 29 Nov 2012 00:56:20 +0000 (16:56 -0800)]
Merge "reduce size of tiny planet if malloc fails" into gb-ub-photos-arches

11 years agoFix moving points in the Curves editor
nicolasroard [Thu, 29 Nov 2012 00:35:47 +0000 (16:35 -0800)]
Fix moving points in the Curves editor

bug:7632994
Change-Id: Ibd0b22594ad9be52e32ea860976861e4619fb513

11 years agoam 5d2227a7: Merge "Add a triangle to the popup button view" into gb-ub-photos-arches
nicolasroard [Wed, 28 Nov 2012 23:57:17 +0000 (15:57 -0800)]
am 5d2227a7: Merge "Add a triangle to the popup button view" into gb-ub-photos-arches

* commit '5d2227a793b51f44f664a739cc7e931c40ba4970':
  Add a triangle to the popup button view

11 years agoMerge "Add a triangle to the popup button view" into gb-ub-photos-arches
nicolasroard [Wed, 28 Nov 2012 23:56:07 +0000 (15:56 -0800)]
Merge "Add a triangle to the popup button view" into gb-ub-photos-arches

11 years agoAdded locking to ImageLoader.
Ruben Brunk [Fri, 16 Nov 2012 21:51:08 +0000 (13:51 -0800)]
Added locking to ImageLoader.

Bug: 7471850
Change-Id: Ifbaf6e3547fad546a6faa94694bc7d3c7bb4711c

11 years agoam 6a94446d: Minor fix for some FP rounding errors in crop.
Ruben Brunk [Wed, 28 Nov 2012 23:46:05 +0000 (15:46 -0800)]
am 6a94446d: Minor fix for some FP rounding errors in crop.

* commit '6a94446de01e8b6b034cc537ee3e65d507d47a47':
  Minor fix for some FP rounding errors in crop.

11 years agoMerge "AlbumDataLoader.get returns correct value if not in cache" into gb-ub-photos...
Bobby Georgescu [Wed, 28 Nov 2012 18:44:20 +0000 (10:44 -0800)]
Merge "AlbumDataLoader.get returns correct value if not in cache" into gb-ub-photos-bryce

11 years agoMinor fix for some FP rounding errors in crop.
Ruben Brunk [Wed, 28 Nov 2012 00:13:32 +0000 (16:13 -0800)]
Minor fix for some FP rounding errors in crop.

Bug 7566505

Change-Id: Ic3b849b26e0435e0e51a3ddd80c25d8e6e9949aa

11 years agoresolved conflicts for merge of 3c6a0610 to gb-ub-photos-bryce
Your Name [Wed, 28 Nov 2012 00:07:55 +0000 (16:07 -0800)]
resolved conflicts for merge of 3c6a0610 to gb-ub-photos-bryce

Change-Id: Iac3fcc4a4b8c0295ec53edf5658169fb5fab021e

11 years agoRemove orientation compensation
Your Name [Tue, 27 Nov 2012 00:33:49 +0000 (16:33 -0800)]
Remove orientation compensation

 Bug: 7446056

Change-Id: I6f00617c890961e4d56545406bac9682356c0b15

11 years agoAlbumDataLoader.get returns correct value if not in cache
Bobby Georgescu [Tue, 27 Nov 2012 19:21:51 +0000 (11:21 -0800)]
AlbumDataLoader.get returns correct value if not in cache

Bug: 7621656
Change-Id: I8b73837f41bf4ac8c753a5d84f251219fde8ae75

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 27 Nov 2012 19:36:56 +0000 (11:36 -0800)]
Import translations. DO NOT MERGE

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

11 years agoMerge "Backup the preferences to the backup service." into gb-ub-photos-bryce
Angus Kong [Tue, 27 Nov 2012 01:37:51 +0000 (17:37 -0800)]
Merge "Backup the preferences to the backup service." into gb-ub-photos-bryce

11 years agoMerge "Video: Fix crash in trimming/muting video in GB." into gb-ub-photos-bryce
Teng-Hui Zhu [Mon, 19 Nov 2012 17:48:09 +0000 (09:48 -0800)]
Merge "Video: Fix crash in trimming/muting video in GB." into gb-ub-photos-bryce

11 years agoam c6e93291: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Fri, 16 Nov 2012 23:06:30 +0000 (15:06 -0800)]
am c6e93291: (-s ours) Import translations. DO NOT MERGE

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

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Fri, 16 Nov 2012 23:05:33 +0000 (15:05 -0800)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 16 Nov 2012 20:23:30 +0000 (12:23 -0800)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 16 Nov 2012 20:22:59 +0000 (12:22 -0800)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 16 Nov 2012 20:21:43 +0000 (12:21 -0800)]
Import translations. DO NOT MERGE

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

11 years agoVideo: Fix crash in trimming/muting video in GB.
Teng-Hui Zhu [Tue, 13 Nov 2012 18:39:38 +0000 (10:39 -0800)]
Video: Fix crash in trimming/muting video in GB.

Basically switched to use sherlock actionbar and protect various new methods
with API level check.

bug:7546257

Change-Id: Ic16f75126c619578a9e9c2520fa264687d89a2e6

11 years agoMerge "Video: Add the mute functionality." into gb-ub-photos-bryce
Teng-Hui Zhu [Fri, 16 Nov 2012 17:53:16 +0000 (09:53 -0800)]
Merge "Video: Add the mute functionality." into gb-ub-photos-bryce

11 years agoam 18b38883: Guard tiles by synchronized block.
Angus Kong [Fri, 16 Nov 2012 02:19:30 +0000 (18:19 -0800)]
am 18b38883: Guard tiles by synchronized block.

* commit '18b388839ed9858a3b35cec9a636e5cde58a528a':
  Guard tiles by synchronized block.

11 years agoam 139efdbc: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Fri, 16 Nov 2012 02:19:29 +0000 (18:19 -0800)]
am 139efdbc: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit '139efdbcd66d718b0d24d42e2ea18432469ac005':
  Import translations. DO NOT MERGE

11 years agoam b0aae659: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Fri, 16 Nov 2012 02:19:29 +0000 (18:19 -0800)]
am b0aae659: (-s ours) Import translations. DO NOT MERGE

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

11 years agoVideo: Add the mute functionality.
Teng-Hui Zhu [Tue, 13 Nov 2012 18:39:26 +0000 (10:39 -0800)]
Video: Add the mute functionality.

1. Enable the mute video functionality.
2. Consolidate the sharing code, especially for file handling.

bug:7543943

Change-Id: Ie7ec605996bc3242b1a50385f506e6a50ee2d2fc

11 years agoRemove import exiftags
Earl Ou [Wed, 14 Nov 2012 09:19:39 +0000 (17:19 +0800)]
Remove import exiftags

Change-Id: Ifa9882a32ab788e02b1ce5f1751d8c976d67c013

11 years agoGuard tiles by synchronized block.
Angus Kong [Wed, 14 Nov 2012 09:11:10 +0000 (17:11 +0800)]
Guard tiles by synchronized block.

Tiles might be touched in different threads.

bug:7490351
Change-Id: Ie30d43db90cf63f7a6ec6438faabfcae8bca151a

11 years agouse ExifReader in MediaDetails
Earl Ou [Wed, 14 Nov 2012 08:23:35 +0000 (16:23 +0800)]
use ExifReader in MediaDetails

Change-Id: If8c7f32804ba55b4b0351c350e324dc1b6e508d7

11 years agouse ExifParser in ImageLoader
Earl Ou [Wed, 14 Nov 2012 05:46:40 +0000 (13:46 +0800)]
use ExifParser in ImageLoader

Change-Id: Ibcee97c15b2cc7df3aaa6c6c65535ca00cef2ed6

11 years agoUse getValueAt() to read different data in ExifTag
Earl Ou [Wed, 14 Nov 2012 07:30:51 +0000 (15:30 +0800)]
Use getValueAt() to read different data in ExifTag

Change-Id: I4d8a72523a6ad4ae34e173c4b845a462644e83c7

11 years agoMerge "use NO_VALUE when the output of exiftool is invalid" into gb-ub-photos-bryce
Hung-ying Tyan [Tue, 13 Nov 2012 06:16:14 +0000 (22:16 -0800)]
Merge "use NO_VALUE when the output of exiftool is invalid" into gb-ub-photos-bryce

11 years agoMerge "Do not use parentheses for Model tag in exiftool parser" into gb-ub-photos...
Hung-ying Tyan [Tue, 13 Nov 2012 06:15:53 +0000 (22:15 -0800)]
Merge "Do not use parentheses for Model tag in exiftool parser" into gb-ub-photos-bryce

11 years agoMerge "Parse the layer of exiftool output" into gb-ub-photos-bryce
Hung-ying Tyan [Tue, 13 Nov 2012 06:15:28 +0000 (22:15 -0800)]
Merge "Parse the layer of exiftool output" into gb-ub-photos-bryce

11 years agoMerge "Exiftool parser" into gb-ub-photos-bryce
Hung-ying Tyan [Tue, 13 Nov 2012 06:15:04 +0000 (22:15 -0800)]
Merge "Exiftool parser" into gb-ub-photos-bryce

11 years agoFix UnsupportedOperationException in MediaObject
Doris Liu [Mon, 12 Nov 2012 23:17:36 +0000 (15:17 -0800)]
Fix UnsupportedOperationException in MediaObject

Bug: 6495745
Change-Id: I770833f0c3fec6f187e961f511a7d9d2591f5f97

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Fri, 9 Nov 2012 22:19:27 +0000 (14:19 -0800)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Baligh Uddin [Fri, 9 Nov 2012 22:19:12 +0000 (14:19 -0800)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 9 Nov 2012 14:52:00 +0000 (06:52 -0800)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 9 Nov 2012 14:51:36 +0000 (06:51 -0800)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 9 Nov 2012 14:48:48 +0000 (06:48 -0800)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 9 Nov 2012 14:48:20 +0000 (06:48 -0800)]
Import translations. DO NOT MERGE

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

11 years agoreduce size of tiny planet if malloc fails
John Hoford [Thu, 8 Nov 2012 18:41:24 +0000 (10:41 -0800)]
reduce size of tiny planet if malloc fails

bug:7477815
Change-Id: I03fec9246e368fb7f929769dc5e5e6266761dc34

11 years agoBackup the preferences to the backup service.
Angus Kong [Thu, 1 Nov 2012 03:49:43 +0000 (11:49 +0800)]
Backup the preferences to the backup service.

bug:7259104
Change-Id: Id99f8782f0fb5b93b89930d51d38e7d1d98af11d

11 years agoConvenient function to add timestamp related exif tags
Earl Ou [Wed, 7 Nov 2012 09:56:11 +0000 (17:56 +0800)]
Convenient function to add timestamp related exif tags

Change-Id: I8a20c38d5fd35517d0520b29aac362eff32cbdd9

11 years agouse ExifParser to parse the orientaion
Earl Ou [Wed, 7 Nov 2012 07:28:48 +0000 (15:28 +0800)]
use ExifParser to parse the orientaion

Change-Id: I47171c028cbc1f94b7de5d067de0636a9e241fbb

11 years agoHandle wrong thumbnail tag type
Earl Ou [Wed, 24 Oct 2012 05:09:39 +0000 (13:09 +0800)]
Handle wrong thumbnail tag type

Change-Id: If41834f0aa86425a06aaede815f3e0c3cdd17fd9

11 years agoHandle undefined tags and ignore copyright tag in exif test
Earl Ou [Wed, 24 Oct 2012 02:44:03 +0000 (10:44 +0800)]
Handle undefined tags and ignore copyright tag in exif test

Change-Id: I531518555257bdaefb79b681282c6aad07542b4b

11 years agoHandle invalid offset value in ExifParser
Earl Ou [Fri, 19 Oct 2012 15:27:44 +0000 (23:27 +0800)]
Handle invalid offset value in ExifParser

Change-Id: I6d4a0edec361f8359535761d7f12ab9363ff1ad1

11 years agoignore image with invalid thumbnail type in Exif test
Earl Ou [Fri, 19 Oct 2012 12:23:28 +0000 (20:23 +0800)]
ignore image with invalid thumbnail type in Exif test

Change-Id: I6fc3a2dde4caf881b3b63aa95f1997ee9ccd4dbc

11 years agoHandle tag not found in ExifParserTest
Earl Ou [Fri, 19 Oct 2012 12:08:13 +0000 (20:08 +0800)]
Handle tag not found in ExifParserTest

Change-Id: I892336ff3f73f91f5ac45ab9868f4ecfa61051ac

11 years agofix OOM in exif test
Earl Ou [Wed, 24 Oct 2012 01:46:29 +0000 (09:46 +0800)]
fix OOM in exif test

Change-Id: I41831e5831b2081f9b6bef6e57bd914faa41385b

11 years agoam 85d20a07: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Wed, 7 Nov 2012 00:06:28 +0000 (16:06 -0800)]
am 85d20a07: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit '85d20a07d6412f453e7956c105ff8f8548094186':
  Import translations. DO NOT MERGE

11 years agoam 9ec5de9d: Fix scenario where launching Gallery launches Camera
Bobby Georgescu [Wed, 7 Nov 2012 00:06:26 +0000 (16:06 -0800)]
am 9ec5de9d: Fix scenario where launching Gallery launches Camera

* commit '9ec5de9dbf46caecd2f0b38a72d31fa37ecb0466':
  Fix scenario where launching Gallery launches Camera

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Baligh Uddin [Tue, 6 Nov 2012 22:37:44 +0000 (14:37 -0800)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 6 Nov 2012 19:57:33 +0000 (11:57 -0800)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 6 Nov 2012 19:56:55 +0000 (11:56 -0800)]
Import translations. DO NOT MERGE

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

11 years agoFix scenario where launching Gallery launches Camera
Bobby Georgescu [Tue, 6 Nov 2012 05:21:55 +0000 (21:21 -0800)]
Fix scenario where launching Gallery launches Camera

Bug: 7479102
Change-Id: Ib4676a7149c659897eee1dbbb92ab09861bd0ed4

11 years agoSplit PhotoPage into FilmstripPage and SinglePhotoPage
Bobby Georgescu [Mon, 5 Nov 2012 22:12:51 +0000 (14:12 -0800)]
Split PhotoPage into FilmstripPage and SinglePhotoPage

Bug: 7479348
Change-Id: I98f668bd00e2e09bda9d5d9965fdbdaf1b832bfa

11 years agoLoad correct localized album names after language change
Bobby Georgescu [Mon, 5 Nov 2012 21:31:42 +0000 (13:31 -0800)]
Load correct localized album names after language change

Bug: 7459805
Change-Id: I484ffea5b07488ffdda2e265c4efa32a3333ea03

11 years agoAdding AccessibilityUtils class
Doris Liu [Mon, 5 Nov 2012 21:09:52 +0000 (13:09 -0800)]
Adding AccessibilityUtils class

Bug: 7434841

All the functions in this class should be backward compatible to
gingerbread.

Change-Id: I280a64d195b2df123607a5cdad5886e3048dbb92

11 years agoAdd API check for method announceForAccessibility
Doris Liu [Sat, 3 Nov 2012 01:22:07 +0000 (18:22 -0700)]
Add API check for method announceForAccessibility

Bug: 7434841
Change-Id: Ib97a322b4cdb1e1ca81d6ffa092e40f5ae172cb4

11 years agoam b41864f1: (-s ours) Merge "Lock icon in secure album should redirect to gallery...
Bart Sears [Fri, 2 Nov 2012 23:27:30 +0000 (16:27 -0700)]
am b41864f1: (-s ours) Merge "Lock icon in secure album should redirect to gallery after unlock." into gb-ub-photos-arches

* commit 'b41864f13b83a4f2d92f601b2e4381762ad1effa':
  Lock icon in secure album should redirect to gallery after unlock.

11 years agoMerge "Lock icon in secure album should redirect to gallery after unlock." into gb...
Bart Sears [Fri, 2 Nov 2012 22:34:01 +0000 (15:34 -0700)]
Merge "Lock icon in secure album should redirect to gallery after unlock." into gb-ub-photos-arches

11 years agoMerge "Don't use activatedBackgroundIndicator under API 14" into gb-ub-photos-bryce
Angus Kong [Fri, 2 Nov 2012 17:38:26 +0000 (10:38 -0700)]
Merge "Don't use activatedBackgroundIndicator under API 14" into gb-ub-photos-bryce

11 years agoam 3252800c: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Fri, 2 Nov 2012 14:22:18 +0000 (07:22 -0700)]
am 3252800c: (-s ours) Import translations. DO NOT MERGE

* commit '3252800c7fe6bdb69b066eae0db739d06cfec64d':
  Import translations. DO NOT MERGE

11 years agoDon't use activatedBackgroundIndicator under API 14
Angus Kong [Fri, 2 Nov 2012 08:53:22 +0000 (16:53 +0800)]
Don't use activatedBackgroundIndicator under API 14

bug:7460473
Change-Id: I5d46302e13dfda04f72128329ecea147913ea8d8

11 years agoLock icon in secure album should redirect to gallery after unlock.
Wu-cheng Li [Fri, 2 Nov 2012 05:36:07 +0000 (13:36 +0800)]
Lock icon in secure album should redirect to gallery after unlock.

Use FLAG_DISMISS_KEYGUARD so lock screen will be brought up
when launching gallery.

bug:7462572

Change-Id: I345398cc6cfc09901e1ce8309ebdb65cf15088e0

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 2 Nov 2012 05:06:42 +0000 (22:06 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 2 Nov 2012 05:06:20 +0000 (22:06 -0700)]
Import translations. DO NOT MERGE

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

11 years agoam 25fab805: Merge "Fix extra gray item in secure album." into gb-ub-photos-arches
George Mount [Thu, 1 Nov 2012 20:40:01 +0000 (13:40 -0700)]
am 25fab805: Merge "Fix extra gray item in secure album." into gb-ub-photos-arches

* commit '25fab8057e0db4b1ff33b8da13b270d9af8ae217':
  Fix extra gray item in secure album.

11 years agoMerge "Fix extra gray item in secure album." into gb-ub-photos-arches
George Mount [Thu, 1 Nov 2012 20:37:54 +0000 (13:37 -0700)]
Merge "Fix extra gray item in secure album." into gb-ub-photos-arches

11 years agoam 40bb7158: Merge "Jump to lockscreen in secure album if tap on video" into gb-ub...
Bart Sears [Thu, 1 Nov 2012 20:00:41 +0000 (13:00 -0700)]
am 40bb7158: Merge "Jump to lockscreen in secure album if tap on video" into gb-ub-photos-arches

* commit '40bb7158b8bda53433b36b94d6efed0e3937dcf2':
  Jump to lockscreen in secure album if tap on video

11 years agoMerge "Jump to lockscreen in secure album if tap on video" into gb-ub-photos-arches
Bart Sears [Thu, 1 Nov 2012 19:59:00 +0000 (12:59 -0700)]
Merge "Jump to lockscreen in secure album if tap on video" into gb-ub-photos-arches

11 years agoam 769d38db: Fix tiny planet not using XMP metadata anymore
Sascha Haeberling [Thu, 1 Nov 2012 19:54:31 +0000 (12:54 -0700)]
am 769d38db: Fix tiny planet not using XMP metadata anymore

* commit '769d38db5736cd690ab7837c0824572739c39184':
  Fix tiny planet not using XMP metadata anymore

11 years agoFix extra gray item in secure album.
George Mount [Thu, 1 Nov 2012 17:40:22 +0000 (10:40 -0700)]
Fix extra gray item in secure album.

 Bug 7454444

Change-Id: I83f40e7e74f658a7b9ada148932a231ef8c31f73

11 years agoJump to lockscreen in secure album if tap on video
Angus Kong [Thu, 1 Nov 2012 07:08:44 +0000 (15:08 +0800)]
Jump to lockscreen in secure album if tap on video

bug:7454356
Change-Id: I1e7e9ed886d414d5b41abdb1cc1d00c7736ae006

11 years agoFix tiny planet not using XMP metadata anymore
Sascha Haeberling [Thu, 1 Nov 2012 00:21:02 +0000 (17:21 -0700)]
Fix tiny planet not using XMP metadata anymore

 Bug: 7452777

Background: Semantics of isPanoramaSafe has changed and should not be
called from within the TinyPlanet filter at all.

Change-Id: I6bada525d30d9ff21fdff99f52c6697c3f828c7e

11 years agoUse the system-standard long press vibration pattern
Bobby Georgescu [Wed, 31 Oct 2012 23:33:56 +0000 (16:33 -0700)]
Use the system-standard long press vibration pattern

Bug: 7216819
Change-Id: I575868583777a7a953d767d0cdaa91a439d908ff

11 years agoDisable operations when no item is selected
Doris Liu [Wed, 31 Oct 2012 23:25:23 +0000 (16:25 -0700)]
Disable operations when no item is selected

Bug: 7441208
Change-Id: I2f435ad8aa0b578ecfec426f7ad6287f0f210f48

11 years agoMerge "Fix jank on videoplayer auto-exit" into gb-ub-photos-bryce
Bobby Georgescu [Wed, 31 Oct 2012 22:12:57 +0000 (15:12 -0700)]
Merge "Fix jank on videoplayer auto-exit" into gb-ub-photos-bryce

11 years agoMerge "Gingerbread support-ish" into gb-ub-photos-bryce
John Reck [Wed, 31 Oct 2012 22:10:18 +0000 (15:10 -0700)]
Merge "Gingerbread support-ish" into gb-ub-photos-bryce

11 years agoGingerbread support-ish
John Reck [Wed, 31 Oct 2012 00:34:20 +0000 (17:34 -0700)]
Gingerbread support-ish

This reverts commit 1336062985c9824d7fd796b1cebd5eaa8e4163ca.

Change-Id: I718ec56315dc207a3e612abb4576bddab9afa2ee

11 years agoFix jank on videoplayer auto-exit
Bobby Georgescu [Wed, 31 Oct 2012 21:59:59 +0000 (14:59 -0700)]
Fix jank on videoplayer auto-exit

Bug: 7344292
Change-Id: I3af95d3370769a6465644fa4aabe3f2ffa2980e7

11 years agoam 262c7bd7: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Wed, 31 Oct 2012 16:40:39 +0000 (09:40 -0700)]
am 262c7bd7: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit '262c7bd76f21d440f2da3a4118c432987fcb8cdd':
  Import translations. DO NOT MERGE

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Wed, 31 Oct 2012 16:39:39 +0000 (09:39 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Baligh Uddin [Wed, 31 Oct 2012 16:39:23 +0000 (09:39 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

11 years agoam 8d0392d6: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Wed, 31 Oct 2012 16:18:19 +0000 (09:18 -0700)]
am 8d0392d6: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

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

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Wed, 31 Oct 2012 16:16:37 +0000 (09:16 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Baligh Uddin [Wed, 31 Oct 2012 16:16:19 +0000 (09:16 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

11 years agoMerge "Handle invalid data type in ExifParser" into gb-ub-photos-bryce
Hung-ying Tyan [Wed, 31 Oct 2012 06:55:13 +0000 (23:55 -0700)]
Merge "Handle invalid data type in ExifParser" into gb-ub-photos-bryce

11 years agoMerge "Handle images with multile APP1 in ExifParser" into gb-ub-photos-bryce
Hung-ying Tyan [Wed, 31 Oct 2012 06:54:12 +0000 (23:54 -0700)]
Merge "Handle images with multile APP1 in ExifParser" into gb-ub-photos-bryce