Merge branch 'jb-release' of https://android.googlesource.com/platform/packages/apps/Gallery2 into aosp
Gallery2: Use ICS alert drawable

Same bug here. It's using the old compability drawable
instead of the Holo theme one.

Change-Id: Ia84ce1d305ee63fc6bc1fdb407a91b3421842eb1
Merge branch 'jb-release' of https://android.googlesource.com/platform/packages/apps/Gallery2 into aosp
Merge branch 'jb-mr0-release' of https://android.googlesource.com/platform/packages/apps/Gallery2 into aosp-merge
Gallery2: Fix hard code message.

Change-Id: I3fb43c7e93e8dbb131df4af40aebffdb28540d2b
Gallery2: Updated italian translation

	Some minor changes

Change-Id: I4a5671b9a749062d9757cb9e7381670527915c65
Added missing hungarian translation

Change-Id: Iaeb446bddb2bc961b6dd55ba8794a6ccd5c09274
Added system to build LegacyCamera if specified

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
Revert "Added system to build LegacyCamera if specified"

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 specified

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
Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/packages/apps/Gallery2 into HEAD

Change-Id: Ibe51e0ac8eaf3a2543209be60f7986f35e041034
Gallery : Remove LOCAL_SDK_VERSION

This is needed since we need access to private apis and 4.2's build system
stubs if you have it set to "current"

Change-Id: I1e2f985238f317fb3595962801bb9b3d2792dc5a
Gallery: Removed "Settings" item from menu. (GallerySettings are empty)

As soon as GallerySettings.java has content, comments should be removed
from the files that this commit changes.
Menu without "Settings": http://i.imgur.com/gOX7x.png

Patchset2: Reverted AlbumSetPage.java changes

Change-Id: Idf8157849f9f394100ef858f4947e3f6cb734a93
Gallery: Removed "Settings" item from menu. (GallerySettings are empty)

Fixed Build Error from previous patch

Patchset2: Minor comment fix

Change-Id: Idf8157849f9f394100ef858f4947e3f6cb734a93

Conflicts:
	res/menu/albumset.xml
Some changes added to compile and run with Java 6 and Java 7.

  - correction of errors with Javac 6:
    - fields accessibility of generic class.

Change-Id: Ice8a707450cd07f1c562c826af644153a30e8cfe
Gallery2: Localize strings

Undo and redo were hardcoded in the photo editor. This allows their
localization.

Patch Set 2: Use new strings so that it may be better translated for
certain languages. (Translations in separate patch)

Change-Id: I63df977696b74128ca5e6fc45037b6b43d43a465
Gallery2: Filtershow toast translations

Toast translation strings that were copy-pasted from existing "undo" and
"redo" strings. Some of these may need to be modified for the toast to
fit on the screen.

Patch Set 2: Shorten Dutch strings as per Marco Brohet's suggestion.

Change-Id: Iaa42ca57dfdd327ffde35a77e320d7f04605f682
Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/packages/apps/Gallery2 into 1.1

Android 4.2.2 release 1
[2/2] Camera: add software HDR rendering

Since Camera stuff is compiled with Gallery2, we have to make sure the
renderscript files are compiled too.

Change-Id: Ia377a6f1e4839000aa528febc5c2b3fe42155be6
es_ES: Fix spanish translations

- Move CM additions to end of file
- Add missing translation

Change-Id: I90de978f4f386acdc72cde57d6bb704f0039ccbd