From 47184c7b2bfb477a1ff800ac8a463478e4674dd9 Mon Sep 17 00:00:00 2001
From: wjiang <wjiang@codeaurora.org>
Date: Fri, 14 Feb 2014 17:45:53 +0800
Subject: Gallery2: Fix batches of issues in movie effects

Fix following issues:
- All settings aren't restored to previous state when user cancel
his operations.
- Check the validity to avoid calling member function of an already
released object.
- Recycle effect instance when MovieActivity pauses.
- Don't restore strength from pref when toggling switch.
- Force the Effect's dialog to be uncancelable.
- Fix null pointer and effect leak issue due to CMCC features.
- Fix audio effects dialog display on small screens.
- Recognize bluetooth headset.
- Update visual design.

Conflicts:
	src/com/android/gallery3d/ui/Knob.java

Change-Id: I803897508c0c1a6723170b7691e3ece03680e4f1
---
 AndroidManifest.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'AndroidManifest.xml')

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 780ee8bc6..679ca0408 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -32,6 +32,7 @@
     <uses-permission android:name="android.permission.WRITE_APN_SETTINGS"/>
     <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
     <uses-permission android:name="com.android.gallery3d.permission.GALLERY_PROVIDER" />
+    <uses-permission android:name="android.permission.BLUETOOTH" />
 
     <supports-screens android:smallScreens="false"
             android:normalScreens="true" android:largeScreens="true"
-- 
cgit v1.2.3