summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Gallery2: Hide "Settings" item from menu. (GallerySettings are empty)jellybeancoudu2013-01-241-0/+6
| | | | | | | | | | | | | | | | Patch Set 2: minor typo fix Patch Set 3: Peter Gregus's easier solution * inspired from Geo-Piskas's cm-10.1 patches * https://github.com/CyanogenMod/android_packages_apps_Gallery2/commit/dde77bda2f1f1923026d7164b38298821f1c825b * https://github.com/CyanogenMod/android_packages_apps_Gallery2/commit/3afe270b445e8804d894166652672c0947d915f1 * Thanks to Peter Gregus for easier solution As soon as GallerySettings.java has content, settings should be set to visible in albumset.xml. Menu without "Settings": http://i.imgur.com/gOX7x.png Change-Id: I499abad5bcc42d19724026c943b0a2b14f2f8bab
* Merge "Gallery2: update pt-pt translations" into jellybeanSteve Kondik2012-12-052-16/+16
|\
| * Gallery2: update pt-pt translationsJoão Ventura2012-11-252-16/+16
| | | | | | | | Change-Id: Ia8a4e36d1c405fb359faa745e3c2be0bbf287864
* | Added system to build LegacyCamera if specifiedjellybean-stableRashed Abdel-Tawab2012-11-101-1/+46
|/ | | | | | | | | | | | | | | | | | | | | | | | | | Some devices (all 2011 Xperias, and most 2010 legacy devices) cannot use the default Jellybean camera. Instead they can run the LegacyCamera app This commit enables using LegacyCamera wrapped into Gallery apk like the normal JB camera is wrapped into Gallery To use, just add BOARD_USES_LEGACY_CAMERA := true to your BoardConfig Credits: Inspired by a patch by Bryan Gantt <dragonzkiller@gmail.com> Enhanced by Rashed Abdel-Tawab <rashedabdeltawab@gmail.com> Thanks for tips and hints from: - Konsta Tuomio <konsta09@gmail.com> - Arnav Gupta <championswimmer@gmail.com> - Ricardo Cerqueira <cyanogenmod@cerqueira.org> Changelog: Patch set 1: Fixed up the code Patch set 2: Use BOARD_USES_LEGACY_CAMERA instead Patch set 3: Fix up normal Camera stuff Patch set 4: Clean up. This should be it Patch set 5: Reomved whitespace, documented the if's and else's, ready to merge now Change-Id: I2e07032e6a097b8334762af789bf2c72f2515cab
* Revert "Added system to build LegacyCamera if specified"Ricardo Cerqueira2012-11-061-25/+1
| | | | | | | | This patch does the complete reverse of what it's supposed to. "ifeq (,$(findstring LegacyCamera,$(PRODUCT_PACKAGES)))" matches the _absence_ of LegacyCamera in the list of packages. This reverts commit dd9c5ca25902e723b2229d1438be4c297e6f348a
* Added system to build LegacyCamera if specifiedRashed Abdel-Tawab2012-10-191-1/+25
| | | | | | | | | | | | | Must be built with the LegacyCamera commit that moves PanoramaActivity to the root directory. Inspired by a patch by Bryan Gantt <dragonzkiller@gmail.com> Cleaned up and enhanced by Rashed Abdel-Tawab <rashedabdeltawab@gmail.com> Patch set 1: Initial Commit Patch set 2: Fix errors with libjni_legacymosaic.so not building Patch set 3: Clean-up the code Change-Id: Id59e72ada6893c6f6de2b2f486a637509a50d71d
* Added missing hungarian translationTamás Tóth2012-10-141-0/+2
| | | | Change-Id: Iaeb446bddb2bc961b6dd55ba8794a6ccd5c09274
* Gallery2: Updated italian translationrheeze2012-10-101-0/+2
| | | | | | Some minor changes Change-Id: I4a5671b9a749062d9757cb9e7381670527915c65
* Gallery2: Fix hard code message.YuanQY2012-10-094-2/+11
| | | | Change-Id: I3fb43c7e93e8dbb131df4af40aebffdb28540d2b
* Merge branch 'jb-mr0-release' of ↵Steve Kondik2012-10-091-6/+2
|\ | | | | | | https://android.googlesource.com/platform/packages/apps/Gallery2 into aosp-merge
| * Do not accept fling gesture after we changed from/to filmstrip mode.Chih-Chung Chang2012-09-101-6/+2
| | | | | | | | Change-Id: Ifb3d692bcf621ff02c6d4e6d91ba8484d702f905
| * merge in jb-mr0-release history after reset to jb-devThe Android Automerger2012-07-170-0/+0
| |\
* | \ Merge branch 'jb-release' of ↵Steve Kondik2012-09-240-0/+0
|\ \ \ | | | | | | | | | | | | https://android.googlesource.com/platform/packages/apps/Gallery2 into aosp
| * \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-07-240-0/+0
| |\ \ \ | | |_|/ | |/| |
| | * | merge in jb-release history after reset to jb-devThe Android Automerger2012-07-180-0/+0
| | |\ \ | | |/ / | |/| / | | |/
| | * Import translations. DO NOT MERGEYing Wang2012-07-131-11/+11
| | | | | | | | | | | | | | | Change-Id: I2d34057147bfe8ae4d4698e43c41aed9c2b9f71e Auto-generated-cl: translation import
* | | Gallery2: Use ICS alert drawableBjörn Lundén2012-08-141-1/+1
| | | | | | | | | | | | | | | | | | | | | Same bug here. It's using the old compability drawable instead of the Holo theme one. Change-Id: Ia84ce1d305ee63fc6bc1fdb407a91b3421842eb1
* | | Merge branch 'jb-release' of ↵Steve Kondik2012-08-100-0/+0
|\| | | | | | | | | | | https://android.googlesource.com/platform/packages/apps/Gallery2 into aosp
| * | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-280-0/+0
| |\ \ | | |/ | |/|
| | * merge in jb-release history after reset to jb-devThe Android Automerger2012-06-270-0/+0
| | |\
| | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-06-260-0/+0
| | | |\
| | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-06-220-0/+0
| | | | |\
| | | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-06-210-0/+0
| | | | | |\
| | | | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-06-210-0/+0
| | | | | | |\
| | | | | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-06-200-0/+0
| | | | | | | |\
| | | | | | | | * Make SystemUI always consists with the contrller overlay.Owen Lin2012-06-192-10/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I81f2a71fd38fc2588a9acb97b9d333978ffb5e48 fix: 6679875
| | | | | | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-06-190-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-06-130-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-06-120-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-06-110-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-06-070-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-06-060-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-06-050-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-06-030-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-05-310-0/+0
| | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-05-300-0/+0
| | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-05-290-0/+0
| | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-05-240-0/+0
| | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-05-230-0/+0
| | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | * Limit the size of a ScreenNail.Owen Lin2012-05-225-11/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:6528366 This bug was happened because we are trying to make a texture beyond the max size allowed in GL. Here is what we do in this CL: 1. Limit the size of a screen nail 2. Print warning message, if we try to allocate a texture beyond the size 3. Don't show fall-back animation if the image is not loaded yet. Change-Id: I004b1138efd0eef7ba11aa89556f67743ca46745
| | | | | | | | | | | | | | | | | | | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-05-220-0/+0
| | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-05-200-0/+0
| | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | * Fix a NPE found by Moneky.Owen Lin2012-05-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AlbumLabelMaker.mBitmapPool could be null if the setLabelWidth() has never been called or called with width as 0. bug:6510386 Change-Id: Idaaa0a1a7239271ba3ae3217e65029b382464c10
| | | | | | | | | | | | | | | | | | | | | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-05-170-0/+0
| | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-05-170-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | * Fix a dead lock while we freeze the screen.Owen Lin2012-05-163-2/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 6504696 Change-Id: If960967142bb0df773ce075bf76f5726c37e1d27
| | | | | | | | | | | | | | | | | | | | | | | | | * Restore deleted string still referenced from menu resource.Eric Fischer2012-05-161-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I518dc004a92ee68682c2085c8d2f002896198feb
| | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-05-160-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-05-150-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-05-140-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | |\