diff options
| author | Santhosh Kumar H E <skhara@codeaurora.org> | 2013-10-17 12:12:31 +0530 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2013-10-31 19:40:18 -0600 |
| commit | ac01520bf3423dd9e01db774c850c4709ae7e20f (patch) | |
| tree | c93fe80a48ebd9e35e10464758faba4b7f5ea0b5 /res/layout/photo_module.xml | |
| parent | bc68e5cd09676f4259afb93d6a14b7cf0cff68ac (diff) | |
| download | android_packages_apps_Snap-ac01520bf3423dd9e01db774c850c4709ae7e20f.tar.gz android_packages_apps_Snap-ac01520bf3423dd9e01db774c850c4709ae7e20f.tar.bz2 android_packages_apps_Snap-ac01520bf3423dd9e01db774c850c4709ae7e20f.zip | |
Bring skin tone seekbar to front...
Skin tone dialog was part of frame layout and render overlay was
drawn on top of this. So render overlay was consuming all touch
events. This change makes sure skin tone dialog receive touch events
whenever it is visible.
Change-Id: I1d01bcc101c2f9090f0f163397e86553f98b49ac
Conflicts:
res/layout/photo_module.xml
src/com/android/camera/PhotoModule.java
Conflicts:
res/layout/photo_module.xml
src/com/android/camera/PhotoModule.java
(cherry picked from commit 675a15daf9b9eef543386630dc65f3fa9dac498e)
(cherry picked from commit ac2d0ab2b068576bf1adf05e4cef96aaf4c14be3)
Diffstat (limited to 'res/layout/photo_module.xml')
| -rw-r--r-- | res/layout/photo_module.xml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/res/layout/photo_module.xml b/res/layout/photo_module.xml index 0157bbcbb..a2ccd007f 100644 --- a/res/layout/photo_module.xml +++ b/res/layout/photo_module.xml @@ -1,4 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> +</layout/photo_module.xml +xml version="1.0" encoding="utf-8"?> <!-- Copyright (C) 2013 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,6 +36,7 @@ android:id="@+id/preview_content" android:layout_width="match_parent" android:layout_height="match_parent" /> + </FrameLayout> <RelativeLayout android:id="@+id/linear" android:orientation="vertical" android:layout_width="match_parent" @@ -95,7 +97,6 @@ </TableRow> </TableLayout> </RelativeLayout> - </FrameLayout> <ImageView android:id="@+id/review_image" android:layout_width="match_parent" |