diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-04-20 23:17:52 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-04-20 23:17:52 +0000 |
| commit | f4a77ab90f5287d1f6ac6d3518196d65aed91e12 (patch) | |
| tree | 52a980dd60082668ec92d0cc9a880289d0ba4e04 | |
| parent | e2c06b0a470cdb01fc5cce6b19146bafea5d00ef (diff) | |
| parent | c283efbed1f80486622ffe3ea2e1805d6b2b6718 (diff) | |
| download | android_packages_wallpapers_LivePicker-f4a77ab90f5287d1f6ac6d3518196d65aed91e12.tar.gz android_packages_wallpapers_LivePicker-f4a77ab90f5287d1f6ac6d3518196d65aed91e12.tar.bz2 android_packages_wallpapers_LivePicker-f4a77ab90f5287d1f6ac6d3518196d65aed91e12.zip | |
Snap for 5490587 from c283efbed1f80486622ffe3ea2e1805d6b2b6718 to qt-release
Change-Id: Ib3914267d00cd280d6e613c8d3a2ad29291e2563
| -rw-r--r-- | res/values-hi/strings.xml | 3 | ||||
| -rw-r--r-- | src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java | 14 |
2 files changed, 7 insertions, 10 deletions
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml index 9ef5f9d..beff1cb 100644 --- a/res/values-hi/strings.xml +++ b/res/values-hi/strings.xml @@ -35,6 +35,5 @@ <string name="explore_further" msgid="2891466461738034935">"बेहतर जानें"</string> <string name="tab_info" msgid="2612717074705274392">"जानकारी"</string> <string name="tab_customize" msgid="5282247400178296263">"पसंद के मुताबिक बनाएं"</string> - <!-- no translation found for delete_wallpaper_confirmation (6449356646369781400) --> - <skip /> + <string name="delete_wallpaper_confirmation" msgid="6449356646369781400">"अपने फ़ोन से यह वॉलपेपर मिटाना चाहते हैं?"</string> </resources> diff --git a/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java b/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java index 9cd50c3..7cfdb4d 100644 --- a/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java +++ b/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java @@ -504,14 +504,6 @@ public class LiveWallpaperPreview extends Activity { @Override public boolean dispatchTouchEvent(MotionEvent ev) { - if (mWallpaperConnection != null && mWallpaperConnection.mEngine != null) { - MotionEvent dup = MotionEvent.obtainNoHistory(ev); - try { - mWallpaperConnection.mEngine.dispatchPointer(dup); - } catch (RemoteException e) { - } - } - if (ev.getAction() == MotionEvent.ACTION_DOWN) { onUserInteraction(); } @@ -521,6 +513,12 @@ public class LiveWallpaperPreview extends Activity { } if (!handled && mWallpaperConnection != null && mWallpaperConnection.mEngine != null) { + MotionEvent dup = MotionEvent.obtainNoHistory(ev); + try { + mWallpaperConnection.mEngine.dispatchPointer(dup); + } catch (RemoteException e) { + } + int action = ev.getActionMasked(); try { if (action == MotionEvent.ACTION_UP) { |