mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-10-01 14:58:14 +00:00
Change some uses of TargetApi to RequiresApi
This commit is contained in:
1 parent
52027613c3
commit
ebe4fccbb1
3 files changed
+9
-12
No files matched your search
@@ -4,7 +4,4 @@
|
||||
<string name="app_name">PPSSPP</string>
|
||||
<string name="shortcut_name">PPSSPP game</string>
|
||||
|
||||
<string name="bad_disc_title">Unsupported disc</string>
|
||||
<string name="bad_disc_message">The file you selected wasn\'t recognized as a game.</string>
|
||||
|
||||
</resources>
|
||||
@@ -14,6 +14,7 @@ import android.os.Bundle;
|
||||
import android.util.Log;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.RequiresApi;
|
||||
|
||||
import java.util.Iterator;
|
||||
|
||||
@@ -143,7 +144,7 @@ class LocationHelper implements LocationListener {
|
||||
public void onProviderDisabled(@NonNull String provider) {
|
||||
}
|
||||
|
||||
@TargetApi(Build.VERSION_CODES.N)
|
||||
@RequiresApi(Build.VERSION_CODES.N)
|
||||
private void onSatelliteStatus(GnssStatus status) {
|
||||
short index = 0;
|
||||
for (short i = 0; i < status.getSatelliteCount(); i++) {
|
||||
|
||||
@@ -33,6 +33,7 @@ import android.os.Vibrator;
|
||||
import android.provider.MediaStore;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.RequiresApi;
|
||||
import androidx.documentfile.provider.DocumentFile;
|
||||
import android.text.InputType;
|
||||
import android.util.Log;
|
||||
@@ -184,7 +185,6 @@ public abstract class NativeActivity extends Activity implements SensorEventList
|
||||
return libdir;
|
||||
}
|
||||
|
||||
@TargetApi(Build.VERSION_CODES.M)
|
||||
boolean askForPermissions(String[] permissions, int requestCode) {
|
||||
boolean shouldAsk = false;
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
|
||||
@@ -200,7 +200,6 @@ public abstract class NativeActivity extends Activity implements SensorEventList
|
||||
return shouldAsk;
|
||||
}
|
||||
|
||||
@TargetApi(Build.VERSION_CODES.M)
|
||||
public void sendInitialGrants() {
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
|
||||
// Let's start out granted if it was granted already.
|
||||
@@ -1030,7 +1029,7 @@ public abstract class NativeActivity extends Activity implements SensorEventList
|
||||
return super.dispatchKeyEvent(event);
|
||||
}
|
||||
|
||||
@TargetApi(Build.VERSION_CODES.N)
|
||||
@RequiresApi(Build.VERSION_CODES.N)
|
||||
void sendMouseDelta(float dx, float dy) {
|
||||
// Ignore zero deltas.
|
||||
if (Math.abs(dx) > 0.001 || Math.abs(dx) > 0.001) {
|
||||
@@ -1281,7 +1280,7 @@ public abstract class NativeActivity extends Activity implements SensorEventList
|
||||
return bld;
|
||||
}
|
||||
|
||||
@TargetApi(Build.VERSION_CODES.M)
|
||||
@RequiresApi(Build.VERSION_CODES.M)
|
||||
private AlertDialog.Builder createDialogBuilderNew() {
|
||||
AlertDialog.Builder bld = new AlertDialog.Builder(this, android.R.style.Theme_DeviceDefault_Dialog_Alert);
|
||||
bld.setOnDismissListener(new DialogInterface.OnDismissListener() {
|
||||
@@ -1313,12 +1312,12 @@ public abstract class NativeActivity extends Activity implements SensorEventList
|
||||
input.setText(defaultText);
|
||||
input.selectAll();
|
||||
|
||||
// Lovely!
|
||||
AlertDialog.Builder bld;
|
||||
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M)
|
||||
bld = createDialogBuilderWithDeviceThemeAndUiVisibility();
|
||||
else
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
|
||||
bld = createDialogBuilderNew();
|
||||
} else {
|
||||
bld = createDialogBuilderWithDeviceThemeAndUiVisibility();
|
||||
}
|
||||
|
||||
AlertDialog.Builder builder = bld
|
||||
.setView(fl)
|
||||
|
||||
Reference in new issue
Block a user