mirror of https://github.com/rusefi/rusefi-1.git
has been a while since I've touched Android!
This commit is contained in:
parent
860b0b1377
commit
51ae09a7b0
|
@ -26,14 +26,12 @@ import android.content.IntentFilter;
|
||||||
import android.content.SharedPreferences;
|
import android.content.SharedPreferences;
|
||||||
import android.hardware.usb.UsbDevice;
|
import android.hardware.usb.UsbDevice;
|
||||||
import android.hardware.usb.UsbManager;
|
import android.hardware.usb.UsbManager;
|
||||||
import android.os.Build;
|
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.preference.PreferenceManager;
|
import android.preference.PreferenceManager;
|
||||||
import android.text.Editable;
|
import android.text.Editable;
|
||||||
import android.text.TextWatcher;
|
import android.text.TextWatcher;
|
||||||
import android.text.util.Linkify;
|
import android.text.util.Linkify;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.Window;
|
|
||||||
import android.view.WindowManager;
|
import android.view.WindowManager;
|
||||||
import android.widget.Button;
|
import android.widget.Button;
|
||||||
import android.widget.EditText;
|
import android.widget.EditText;
|
||||||
|
@ -45,6 +43,7 @@ import com.google.android.material.snackbar.Snackbar;
|
||||||
import com.rusefi.Callable;
|
import com.rusefi.Callable;
|
||||||
import com.rusefi.Timeouts;
|
import com.rusefi.Timeouts;
|
||||||
import com.rusefi.app.serial.AndroidSerial;
|
import com.rusefi.app.serial.AndroidSerial;
|
||||||
|
import com.rusefi.app.util.AndroidUtil;
|
||||||
import com.rusefi.auth.AuthTokenUtil;
|
import com.rusefi.auth.AuthTokenUtil;
|
||||||
import com.rusefi.binaryprotocol.BinaryProtocol;
|
import com.rusefi.binaryprotocol.BinaryProtocol;
|
||||||
import com.rusefi.dfu.DfuConnection;
|
import com.rusefi.dfu.DfuConnection;
|
||||||
|
@ -115,7 +114,7 @@ public class rusEFI extends Activity {
|
||||||
usbManager = (UsbManager) getSystemService(Context.USB_SERVICE);
|
usbManager = (UsbManager) getSystemService(Context.USB_SERVICE);
|
||||||
|
|
||||||
// turn on screen while ADB debugging idle phone
|
// turn on screen while ADB debugging idle phone
|
||||||
turnScreenOn();
|
AndroidUtil.turnScreenOn(this);
|
||||||
|
|
||||||
mStatusView = findViewById(R.id.text_status);
|
mStatusView = findViewById(R.id.text_status);
|
||||||
mResultView = findViewById(R.id.text_result);
|
mResultView = findViewById(R.id.text_result);
|
||||||
|
@ -180,15 +179,6 @@ public class rusEFI extends Activity {
|
||||||
unregisterReceiver(mUsbReceiver);
|
unregisterReceiver(mUsbReceiver);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void turnScreenOn() {
|
|
||||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
|
|
||||||
setTurnScreenOn(true);
|
|
||||||
} else {
|
|
||||||
Window window = getWindow();
|
|
||||||
window.addFlags(WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private final BroadcastReceiver mUsbReceiver = new BroadcastReceiver() {
|
private final BroadcastReceiver mUsbReceiver = new BroadcastReceiver() {
|
||||||
public void onReceive(Context context, Intent intent) {
|
public void onReceive(Context context, Intent intent) {
|
||||||
String action = intent.getAction();
|
String action = intent.getAction();
|
||||||
|
|
|
@ -0,0 +1,20 @@
|
||||||
|
package com.rusefi.app.util;
|
||||||
|
|
||||||
|
import android.app.Activity;
|
||||||
|
import android.os.Build;
|
||||||
|
import android.view.Window;
|
||||||
|
import android.view.WindowManager;
|
||||||
|
|
||||||
|
public class AndroidUtil {
|
||||||
|
private AndroidUtil() {
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void turnScreenOn(Activity rusEFI) {
|
||||||
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
|
||||||
|
rusEFI.setTurnScreenOn(true);
|
||||||
|
} else {
|
||||||
|
Window window = rusEFI.getWindow();
|
||||||
|
window.addFlags(WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue