ソースを参照

Merge remote-tracking branch 'origin/revert-41-task/code_cleanup' into develop

# Conflicts:
#	app/src/main/java/com/sduduzog/slimlauncher/data/model/App.kt
#	app/src/main/java/com/sduduzog/slimlauncher/ui/main/HomeFragment.kt
#	app/src/main/java/com/sduduzog/slimlauncher/ui/options/AddAppFragment.kt
#	app/src/main/java/com/sduduzog/slimlauncher/utils/LoadInstalledApps.kt
Beautus 6 年 前
コミット
6263bbc2a2

+ 0 - 2
app/src/main/java/com/sduduzog/slimlauncher/ui/main/HomeFragment.kt

@@ -1,7 +1,5 @@
 package com.sduduzog.slimlauncher.ui.main
 
-import android.content.*
-import android.os.Build
 import android.content.*
 import android.os.Bundle
 import android.provider.AlarmClock

+ 4 - 7
app/src/main/java/com/sduduzog/slimlauncher/ui/options/OptionsFragment.kt

@@ -3,7 +3,6 @@ package com.sduduzog.slimlauncher.ui.options
 import android.content.Context.MODE_PRIVATE
 import android.content.Intent
 import android.net.Uri
-import android.os.Build
 import android.os.Bundle
 import android.provider.Settings
 import android.view.LayoutInflater
@@ -34,12 +33,10 @@ class OptionsFragment : BaseFragment() {
             val intent = Intent(Settings.ACTION_SETTINGS)
             launchActivity(it, intent)
         }
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            options_fragment_device_settings.setOnLongClickListener {
-                val intent = Intent(Settings.ACTION_HOME_SETTINGS)
-                launchActivity(it, intent)
-                true
-            }
+        options_fragment_device_settings.setOnLongClickListener {
+            val intent = Intent(Settings.ACTION_HOME_SETTINGS)
+            launchActivity(it, intent)
+            true
         }
         options_fragment_change_theme.setOnClickListener {
             val changeThemeDialog = ChangeThemeDialog.getThemeChooser()