diff --git a/metadata/net.nurik.roman.dashclock.txt b/metadata/net.nurik.roman.dashclock.txt index 872a0c2376..a06f8c0e6f 100644 --- a/metadata/net.nurik.roman.dashclock.txt +++ b/metadata/net.nurik.roman.dashclock.txt @@ -30,11 +30,13 @@ Repo:DashClock Build Version:1.3.1,14,v1.3.1,subdir=main Build Version:1.4.2,17,v1.4.2,subdir=main Build Version:1.4.3,19,v1.4.3,subdir=main -Build Version:1.5,25,!problem with ant.properties at v1.5,subdir=main/src/main,\ -forceversion=yes,forcevercode=yes,srclibs=DragSort@0.6.1,\ -extlibs=android/android-support-v13.jar,target=android-17,prebuild=mkdir -p src && \ -printf 'android.library.reference.1=$$DragSort$$' >> project.properties && \ -printf 'source.dir=src;../../../api/src/main' >> ant.properties +Build Version:1.5,25,!patch needs checking at v1.5,subdir=main/src/main,\ +forceversion=yes,forcevercode=yes,srclibs=DragSort@0.6.1,patch=code-25.patch,\ +extlibs=android/android-support-v13.jar,target=android-17,prebuild=\ +echo "android.library.reference.1=$$DragSort$$" >> project.properties && \ +sed -i '59\,74d' res/values-es/strings.xml && \ +cd ../../../ && echo "source.dir=$PWD/main/src/main/java;$PWD/api/src/main/java;\ +$PWD/main/src/main/aidl;$PWD/api/src/main/aidl" >> main/src/main/ant.properties # see ../../../main/version.properties for version Auto Update Mode:None diff --git a/metadata/net.nurik.roman.dashclock/code-25.patch b/metadata/net.nurik.roman.dashclock/code-25.patch new file mode 100644 index 0000000000..ffb4cf8950 --- /dev/null +++ b/metadata/net.nurik.roman.dashclock/code-25.patch @@ -0,0 +1,14 @@ +diff --git a/main/src/main/java/com/google/android/apps/dashclock/configuration/ConfigureExtensionsFragment.java b/main/src/main/java/com/google/android/apps/dashclock/configuration/ConfigureExtensionsFragment.java +index 4016a68..6007dcf 100644 +--- a/main/src/main/java/com/google/android/apps/dashclock/configuration/ConfigureExtensionsFragment.java ++++ b/main/src/main/java/com/google/android/apps/dashclock/configuration/ConfigureExtensionsFragment.java +@@ -173,8 +173,7 @@ public class ConfigureExtensionsFragment extends Fragment implements + @Override + public boolean onTouch(View view, MotionEvent motionEvent) { + return dragSortController.onTouch(view, motionEvent) +- || (!dragSortController.isDragging() +- && swipeDismissTouchListener.onTouch(view, motionEvent)); ++ || swipeDismissTouchListener.onTouch(view, motionEvent); + + } + });