diff options
author | wjiang <wjiang@codeaurora.org> | 2014-02-14 17:45:53 +0800 |
---|---|---|
committer | Xiaojing Zhang <zhangx@codeaurora.org> | 2014-11-04 20:38:14 -0800 |
commit | 47184c7b2bfb477a1ff800ac8a463478e4674dd9 (patch) | |
tree | c7646ed7247010ca7d483d93e37d2b99c90c20b9 /res/layout/audio_effects_dialog.xml | |
parent | 99cfa4d1f436735ec403b1e1dbb4167b26d43cd9 (diff) | |
download | android_packages_apps_Gallery2-47184c7b2bfb477a1ff800ac8a463478e4674dd9.tar.gz android_packages_apps_Gallery2-47184c7b2bfb477a1ff800ac8a463478e4674dd9.tar.bz2 android_packages_apps_Gallery2-47184c7b2bfb477a1ff800ac8a463478e4674dd9.zip |
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
Diffstat (limited to 'res/layout/audio_effects_dialog.xml')
-rw-r--r-- | res/layout/audio_effects_dialog.xml | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/res/layout/audio_effects_dialog.xml b/res/layout/audio_effects_dialog.xml index 83892c224..49dcafb56 100644 --- a/res/layout/audio_effects_dialog.xml +++ b/res/layout/audio_effects_dialog.xml @@ -42,22 +42,12 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. android:gravity="center_horizontal" android:paddingBottom="10dp"> - <Switch - android:id="@+id/audio_effects_switch" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/audio_effects" - android:textAppearance="?android:attr/textAppearanceSmall" - android:layout_marginTop="10dp" - android:layout_marginLeft="25dp" - android:layout_marginRight="30dp" /> - <LinearLayout android:id="@+id/aEffectsPanel" android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="horizontal" - android:layout_marginTop="5dp" + android:layout_marginTop="12dp" android:layout_marginBottom="10dp" android:gravity="center_vertical"> @@ -65,16 +55,16 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. android:id="@+id/bBStrengthKnob" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_weight="1" custom:label="@string/bass_boost_strength" - custom:background="@drawable/knob_bg" custom:foreground="@drawable/knob" /> <com.android.gallery3d.ui.Knob android:id="@+id/vIStrengthKnob" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_weight="1" custom:label="@string/virtualizer_strength" - custom:background="@drawable/knob_bg" custom:foreground="@drawable/knob" /> </LinearLayout> |