浏览代码

fix on touch listener

sduduzog 7 年之前
父节点
当前提交
e18620bcb3

+ 2 - 2
app/build.gradle

@@ -12,8 +12,8 @@ android {
         applicationId "com.sduduzog.slimlauncher"
         minSdkVersion 16
         targetSdkVersion 28
-        versionCode 21
-        versionName "2.1.2"
+        versionCode 22
+        versionName "2.2.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }

+ 11 - 0
app/src/main/AndroidManifest.xml

@@ -29,6 +29,17 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <receiver
+            android:name=".SlimAdminReceiver"
+            android:permission="android.permission.BIND_DEVICE_ADMIN">
+            <meta-data
+                android:name="android.app.device_admin"
+                android:resource="@xml/admin"/>
+
+            <intent-filter>
+                <action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
+            </intent-filter>
+        </receiver>
     </application>
 
 </manifest>

+ 6 - 0
app/src/main/java/com/sduduzog/slimlauncher/SlimAdminReceiver.kt

@@ -0,0 +1,6 @@
+package com.sduduzog.slimlauncher
+
+import android.app.admin.DeviceAdminReceiver
+
+class SlimAdminReceiver : DeviceAdminReceiver() {
+}

+ 14 - 7
app/src/main/java/com/sduduzog/slimlauncher/ui/main/MainFragment.kt

@@ -9,7 +9,6 @@ import android.os.Bundle
 import android.provider.AlarmClock
 import android.provider.MediaStore
 import android.provider.Settings
-import android.util.Log
 import android.view.*
 import android.widget.FrameLayout
 import androidx.core.app.ActivityCompat
@@ -94,8 +93,7 @@ class MainFragment : StatusBarThemeFragment(), MainActivity.OnBackPressedListene
 
     private fun setEventListeners() {
 
-        main.setOnTouchListener(homeClickListener)
-
+        main.setOnClickListener(homeClickListener)
         mainAppsList.setOnTouchListener(homeClickListener)
 
         clockTextView.setOnClickListener {
@@ -310,20 +308,29 @@ class MainFragment : StatusBarThemeFragment(), MainActivity.OnBackPressedListene
         }
     }
 
-    inner class HomeDoubleClickListener : View.OnTouchListener {
+    inner class HomeDoubleClickListener : View.OnTouchListener, DoubleClickListener() {
 
         private val gestureDetector = GestureDetector(context, object : GestureDetector.SimpleOnGestureListener() {
             override fun onDoubleTap(e: MotionEvent?): Boolean {
-                Log.d("MAIN", "double click")
+                performLock()
                 return super.onDoubleTap(e)
             }
         })
 
         @SuppressLint("ClickableViewAccessibility")
         override fun onTouch(p0: View?, p1: MotionEvent?): Boolean {
-            gestureDetector.onTouchEvent(p1)
-            return true
+            return gestureDetector.onTouchEvent(p1)
+        }
+
+        override fun onDoubleClick(v: View) {
+            performLock()
         }
+
+        override fun onSingleClick(v: View) {
+
+        }
+
+        private fun performLock() {}
     }
 
     companion object {

+ 1 - 1
app/src/main/res/values/strings.xml

@@ -53,7 +53,7 @@
     <string name="settings_button_change_theme">Change</string>
     <string name="about_title">Slim launcher</string>
     <string name="about_text">
-    Slim v2.1.2 \u00a9 2018\n\nSource : <a href="https://github.com/sduduzog/slim-launcher">https://github.com/sduduzog/slim-launcher</a>\n\n<a href="mailto:gumedesduduzo@gmail.com">gumedesduduzo@gmail.com</a>\n\nBecome a tester <a href="https://play.google.com/apps/testing/com.sduduzog.slimlauncher">Click here</a>
+    Slim v2.2.0 \u00a9 2019\n\nSource : <a href="https://github.com/sduduzog/slim-launcher">https://github.com/sduduzog/slim-launcher</a>\n\n<a href="mailto:gumedesduduzo@gmail.com">gumedesduduzo@gmail.com</a>\n\nBecome a tester <a href="https://play.google.com/apps/testing/com.sduduzog.slimlauncher">Click here</a>
     </string>
     <string name="theme_chooser_dialog_title">Change theme</string>
     <string name="main_call_icon">call icon</string>

+ 6 - 0
app/src/main/res/xml/admin.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<device-admin>
+    <uses-policies>
+        <force-lock />
+    </uses-policies>
+</device-admin>