version 2.2.5 policy fix

app/build.gradle

@@ -12,8 +12,8 @@ android {
         applicationId "com.sduduzog.slimlauncher"
         minSdkVersion 16
         targetSdkVersion 28
-        versionCode 26
-        versionName "2.2.4"
+        versionCode 27
+        versionName "2.2.5"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }

app/release/output.json

@@ -1 +0,0 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":23,"versionName":"2.2.1","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]

app/src/main/AndroidManifest.xml

@@ -28,17 +28,6 @@
                 <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>

app/src/main/java/com/sduduzog/slimlauncher/MainActivity.kt

@@ -16,8 +16,6 @@ import com.sduduzog.slimlauncher.ui.main.MainViewModel
 
 class MainActivity : AppCompatActivity(), SharedPreferences.OnSharedPreferenceChangeListener, NavController.OnDestinationChangedListener {
 
-    // TODO: Move some apps to bottom sheet.
-
     private lateinit var settings: SharedPreferences
     private val label = "main_fragment"
     private lateinit var currentLabel: String

app/src/main/java/com/sduduzog/slimlauncher/SlimAdminReceiver.kt

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

app/src/main/java/com/sduduzog/slimlauncher/ui/main/MainFragment.kt

@@ -1,7 +1,5 @@
 package com.sduduzog.slimlauncher.ui.main
 
-import android.annotation.SuppressLint
-import android.app.admin.DevicePolicyManager
 import android.content.*
 import android.net.Uri
 import android.os.Build
@@ -9,7 +7,9 @@ import android.os.Bundle
 import android.provider.AlarmClock
 import android.provider.MediaStore
 import android.provider.Settings
-import android.view.*
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
 import android.widget.FrameLayout
 import androidx.core.app.ActivityOptionsCompat
 import androidx.navigation.Navigation
@@ -18,7 +18,6 @@ import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_COLLAPS
 import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_HALF_EXPANDED
 import com.sduduzog.slimlauncher.MainActivity
 import com.sduduzog.slimlauncher.R
-import com.sduduzog.slimlauncher.SlimAdminReceiver
 import kotlinx.android.synthetic.main.main_bottom_sheet.*
 import kotlinx.android.synthetic.main.main_content.*
 import kotlinx.android.synthetic.main.main_fragment.*
@@ -30,7 +29,6 @@ class MainFragment : StatusBarThemeFragment(), MainActivity.OnBackPressedListene
 
     private lateinit var receiver: BroadcastReceiver
     private lateinit var sheetBehavior: BottomSheetBehavior<FrameLayout>
-    private val homeClickListener = HomeDoubleClickListener()
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                               savedInstanceState: Bundle?): View {
@@ -92,8 +90,6 @@ class MainFragment : StatusBarThemeFragment(), MainActivity.OnBackPressedListene
 
     private fun setEventListeners() {
 
-        main.setOnClickListener(homeClickListener)
-        mainAppsList.setOnTouchListener(homeClickListener)
 
         clockTextView.setOnClickListener {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
@@ -266,39 +262,4 @@ class MainFragment : StatusBarThemeFragment(), MainActivity.OnBackPressedListene
             updateUi()
         }
     }
-
-    inner class HomeDoubleClickListener : View.OnTouchListener, DoubleClickListener() {
-
-        private val gestureDetector = GestureDetector(context, object : GestureDetector.SimpleOnGestureListener() {
-            override fun onDoubleTap(e: MotionEvent?): Boolean {
-                performLock()
-                return super.onDoubleTap(e)
-            }
-        })
-
-        @SuppressLint("ClickableViewAccessibility")
-        override fun onTouch(p0: View?, p1: MotionEvent?): Boolean {
-            return gestureDetector.onTouchEvent(p1)
-        }
-
-        override fun onDoubleClick(v: View) {
-            performLock()
-        }
-
-        override fun onSingleClick(v: View) {
-
-        }
-
-        private fun performLock() {
-            val mComponentName = ComponentName(context!!, SlimAdminReceiver::class.java)
-            val mDevicePolicyManager = activity!!.getSystemService(
-                    Context.DEVICE_POLICY_SERVICE) as DevicePolicyManager
-            val isAdmin = mDevicePolicyManager.isAdminActive(mComponentName)
-            if (isAdmin) {
-                mDevicePolicyManager.lockNow()
-            } else {
-                MakeSlimAdminDialog().show(childFragmentManager, "Admin Dialog")
-            }
-        }
-    }
 }

app/src/main/java/com/sduduzog/slimlauncher/ui/main/MakeSlimAdminDialog.kt

@@ -1,41 +0,0 @@
-@file:Suppress("unused")
-
-package com.sduduzog.slimlauncher.ui.main
-
-import android.app.AlertDialog
-import android.app.Dialog
-import android.app.admin.DevicePolicyManager
-import android.content.ComponentName
-import android.content.Intent
-import android.os.Bundle
-import androidx.fragment.app.DialogFragment
-import com.sduduzog.slimlauncher.MainActivity.Companion.REQUEST_CODE_ENABLE_ADMIN
-import com.sduduzog.slimlauncher.R
-import com.sduduzog.slimlauncher.SlimAdminReceiver
-
-
-class MakeSlimAdminDialog : DialogFragment() {
-
-    private var mComponentName: ComponentName? = null
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        mComponentName = ComponentName(context!!, SlimAdminReceiver::class.java)
-    }
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-
-        val builder = AlertDialog.Builder(context!!)
-
-        builder.setTitle(getString(R.string.main_admin_title))
-        builder.setMessage(getString(R.string.main_admin_message))
-        builder.setNegativeButton("no, thanks") { _, _ -> }
-        builder.setPositiveButton("activate") { _, _ ->
-            val intent = Intent(DevicePolicyManager.ACTION_ADD_DEVICE_ADMIN)
-            intent.putExtra(DevicePolicyManager.EXTRA_DEVICE_ADMIN, mComponentName)
-            intent.putExtra(DevicePolicyManager.EXTRA_ADD_EXPLANATION, getString(R.string.main_admin_message))
-            startActivityForResult(intent, REQUEST_CODE_ENABLE_ADMIN)
-        }
-        return builder.create()
-    }
-}

build.gradle

@@ -8,7 +8,7 @@ buildscript {
     }
     dependencies {
         //noinspection GradleDependency
-        classpath 'com.android.tools.build:gradle:3.3.0-alpha11'
+        classpath 'com.android.tools.build:gradle:3.3.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

gradle.properties

@@ -9,6 +9,7 @@
 org.gradle.jvmargs=-Xmx1536m
 android.useAndroidX=true
 android.enableJetifier=true
+android.enableR8=true
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects