(SHIFT) set minSdk 29 (Android 10 / Q)
Change-Id: I9ad048e6b942ef2abda477e2c43d0657d7aa64b9
Signed-off-by: Alexander Martinz <amartinz@shiftphones.com>
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index ea379e8..4b9851f 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -12,7 +12,7 @@
defaultConfig {
applicationId = "org.lineageos.aperture.dev"
- minSdk = 31
+ minSdk = 29
targetSdk = 33
versionCode = 1
versionName = "1.0"
diff --git a/app/src/main/java/org/lineageos/aperture/CameraActivity.kt b/app/src/main/java/org/lineageos/aperture/CameraActivity.kt
index 6b7e4d1..a2c6380 100644
--- a/app/src/main/java/org/lineageos/aperture/CameraActivity.kt
+++ b/app/src/main/java/org/lineageos/aperture/CameraActivity.kt
@@ -16,7 +16,6 @@
import android.graphics.Rect
import android.graphics.drawable.AnimatedVectorDrawable
import android.graphics.drawable.ColorDrawable
-import android.icu.number.NumberFormatter
import android.location.Location
import android.location.LocationListener
import android.location.LocationManager
@@ -82,7 +81,6 @@
import org.lineageos.aperture.utils.ShortcutsUtils
import org.lineageos.aperture.utils.StorageUtils
import org.lineageos.aperture.utils.TimeUtils
-import java.util.Locale
import java.util.concurrent.ExecutorService
import java.util.concurrent.Executors
@@ -431,8 +429,7 @@
handler.sendMessageDelayed(handler.obtainMessage(MSG_HIDE_EXPOSURE_SLIDER), 2000)
}
exposureLevel.textFormatter = {
- EXPOSURE_LEVEL_FORMATTER.format(Int.mapToRange(camera.exposureCompensationRange, it))
- .toString()
+ Int.mapToRange(camera.exposureCompensationRange, it).toString()
}
// Set primary bar button callbacks
@@ -1407,9 +1404,5 @@
private const val MSG_HIDE_ZOOM_SLIDER = 0
private const val MSG_HIDE_FOCUS_RING = 1
private const val MSG_HIDE_EXPOSURE_SLIDER = 2
-
- private val EXPOSURE_LEVEL_FORMATTER = NumberFormatter.with()
- .locale(Locale.US)
- .sign(NumberFormatter.SignDisplay.EXCEPT_ZERO)
}
}