Skip to content

Commit aa97bb5

Browse files
committed
lower the required OS version to 8, Oreo
1 parent 661ff46 commit aa97bb5

File tree

2 files changed

+18
-6
lines changed

2 files changed

+18
-6
lines changed

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ android {
1414

1515
defaultConfig {
1616
applicationId "com.simplemobiletools.launcher"
17-
minSdkVersion 30
17+
minSdkVersion 26
1818
targetSdkVersion 33
1919
versionCode 4
2020
versionName "5.0.2"

app/src/main/kotlin/com/simplemobiletools/launcher/activities/MainActivity.kt

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ import androidx.core.view.GestureDetectorCompat
3030
import androidx.core.view.isVisible
3131
import com.simplemobiletools.commons.extensions.*
3232
import com.simplemobiletools.commons.helpers.ensureBackgroundThread
33+
import com.simplemobiletools.commons.helpers.isPiePlus
34+
import com.simplemobiletools.commons.helpers.isQPlus
35+
import com.simplemobiletools.commons.helpers.isRPlus
3336
import com.simplemobiletools.launcher.BuildConfig
3437
import com.simplemobiletools.launcher.R
3538
import com.simplemobiletools.launcher.extensions.*
@@ -77,7 +80,11 @@ class MainActivity : SimpleActivity(), FlingListener {
7780
appLaunched(BuildConfig.APPLICATION_ID)
7881

7982
mDetector = GestureDetectorCompat(this, MyGestureListener(this))
80-
window.setDecorFitsSystemWindows(false)
83+
84+
if (isRPlus()) {
85+
window.setDecorFitsSystemWindows(false)
86+
}
87+
8188
mScreenHeight = realScreenSize.y
8289
mAllAppsFragmentY = mScreenHeight
8390
mWidgetsFragmentY = mScreenHeight
@@ -154,9 +161,11 @@ class MainActivity : SimpleActivity(), FlingListener {
154161
updateStatusbarColor(Color.TRANSPARENT)
155162

156163
main_holder.onGlobalLayout {
157-
val addTopPadding = main_holder.rootWindowInsets.displayCutout != null
158-
(all_apps_fragment as AllAppsFragment).setupViews(addTopPadding)
159-
(widgets_fragment as WidgetsFragment).setupViews(addTopPadding)
164+
if (isPiePlus()) {
165+
val addTopPadding = main_holder.rootWindowInsets.displayCutout != null
166+
(all_apps_fragment as AllAppsFragment).setupViews(addTopPadding)
167+
(widgets_fragment as WidgetsFragment).setupViews(addTopPadding)
168+
}
160169
}
161170

162171
ensureBackgroundThread {
@@ -475,7 +484,10 @@ class MainActivity : SimpleActivity(), FlingListener {
475484

476485
val contextTheme = ContextThemeWrapper(this, getPopupMenuTheme())
477486
return PopupMenu(contextTheme, anchorView, Gravity.TOP or Gravity.END).apply {
478-
setForceShowIcon(true)
487+
if (isQPlus()) {
488+
setForceShowIcon(true)
489+
}
490+
479491
inflate(R.menu.menu_app_icon)
480492
menu.findItem(R.id.resize).isVisible = gridItem.type == ITEM_TYPE_WIDGET
481493
menu.findItem(R.id.app_info).isVisible = gridItem.type == ITEM_TYPE_ICON

0 commit comments

Comments
 (0)