Android build v1.1.5
This commit is contained in:
@@ -0,0 +1,51 @@
|
||||
package com.warren.iwanttoheal;
|
||||
|
||||
import android.view.Display;
|
||||
import android.view.Window;
|
||||
import android.view.WindowManager;
|
||||
|
||||
final class AndroidDisplayPerformance {
|
||||
|
||||
private static final float TARGET_REFRESH_RATE = 60.0f;
|
||||
|
||||
private AndroidDisplayPerformance() {}
|
||||
|
||||
static void preferBatteryRefreshRate(Window window, Display display) {
|
||||
if (window == null || display == null) return;
|
||||
Display.Mode currentMode = display.getMode();
|
||||
Display.Mode selectedMode = closestBatteryMode(display, currentMode);
|
||||
if (selectedMode == null) return;
|
||||
|
||||
WindowManager.LayoutParams attributes = window.getAttributes();
|
||||
if (attributes.preferredDisplayModeId == selectedMode.getModeId()) return;
|
||||
attributes.preferredDisplayModeId = selectedMode.getModeId();
|
||||
window.setAttributes(attributes);
|
||||
}
|
||||
|
||||
private static Display.Mode closestBatteryMode(Display display, Display.Mode currentMode) {
|
||||
Display.Mode selectedMode = null;
|
||||
float selectedScore = Float.MAX_VALUE;
|
||||
|
||||
for (Display.Mode mode : display.getSupportedModes()) {
|
||||
if (
|
||||
currentMode != null
|
||||
&& (
|
||||
mode.getPhysicalWidth() != currentMode.getPhysicalWidth()
|
||||
|| mode.getPhysicalHeight() != currentMode.getPhysicalHeight()
|
||||
)
|
||||
) {
|
||||
continue;
|
||||
}
|
||||
|
||||
float refreshRate = mode.getRefreshRate();
|
||||
float score = Math.abs(refreshRate - TARGET_REFRESH_RATE);
|
||||
if (refreshRate > TARGET_REFRESH_RATE + 0.5f) score += 1000.0f;
|
||||
if (score < selectedScore) {
|
||||
selectedMode = mode;
|
||||
selectedScore = score;
|
||||
}
|
||||
}
|
||||
|
||||
return selectedMode;
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,10 @@
|
||||
package com.warren.iwanttoheal;
|
||||
|
||||
import android.content.Intent;
|
||||
import android.content.SharedPreferences;
|
||||
import android.content.pm.PackageInfo;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.os.Build;
|
||||
import android.os.Bundle;
|
||||
import android.os.SystemClock;
|
||||
import android.view.KeyEvent;
|
||||
@@ -12,15 +16,22 @@ import java.io.File;
|
||||
public abstract class ControllerBridgeActivity extends BridgeActivity {
|
||||
|
||||
public static final String EXTRA_INITIAL_URL = "com.warren.iwanttoheal.INITIAL_URL";
|
||||
private static final String PREFS_NAME = "com.warren.iwanttoheal.performance";
|
||||
private static final String CACHE_CLEARED_VERSION_KEY = "webview_cache_cleared_version";
|
||||
private static final long DPAD_THROTTLE_MS = 220;
|
||||
private long lastDpadDispatchAt = 0;
|
||||
|
||||
@Override
|
||||
public void onCreate(Bundle savedInstanceState) {
|
||||
clearWebViewServiceWorkers();
|
||||
boolean shouldClearWebViewCache = shouldClearWebViewCacheForCurrentVersion();
|
||||
if (shouldClearWebViewCache) clearWebViewServiceWorkers();
|
||||
super.onCreate(savedInstanceState);
|
||||
AndroidDisplayPerformance.preferBatteryRefreshRate(getWindow(), getWindowManager().getDefaultDisplay());
|
||||
if (bridge != null) {
|
||||
bridge.getWebView().clearCache(true);
|
||||
if (shouldClearWebViewCache) {
|
||||
bridge.getWebView().clearCache(true);
|
||||
markWebViewCacheClearedForCurrentVersion();
|
||||
}
|
||||
}
|
||||
loadIntentUrl();
|
||||
}
|
||||
@@ -35,7 +46,13 @@ public abstract class ControllerBridgeActivity extends BridgeActivity {
|
||||
@Override
|
||||
public void onWindowFocusChanged(boolean hasFocus) {
|
||||
super.onWindowFocusChanged(hasFocus);
|
||||
if (hasFocus) enableImmersiveMode();
|
||||
if (hasFocus) {
|
||||
enableImmersiveMode();
|
||||
AndroidDisplayPerformance.preferBatteryRefreshRate(
|
||||
getWindow(),
|
||||
getWindowManager().getDefaultDisplay()
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -74,6 +91,34 @@ public abstract class ControllerBridgeActivity extends BridgeActivity {
|
||||
deleteIfExists(new File(webViewData, "Service Worker"));
|
||||
}
|
||||
|
||||
private boolean shouldClearWebViewCacheForCurrentVersion() {
|
||||
return performancePreferences().getLong(CACHE_CLEARED_VERSION_KEY, -1L)
|
||||
!= currentVersionCode();
|
||||
}
|
||||
|
||||
private void markWebViewCacheClearedForCurrentVersion() {
|
||||
performancePreferences()
|
||||
.edit()
|
||||
.putLong(CACHE_CLEARED_VERSION_KEY, currentVersionCode())
|
||||
.apply();
|
||||
}
|
||||
|
||||
private SharedPreferences performancePreferences() {
|
||||
return getSharedPreferences(PREFS_NAME, MODE_PRIVATE);
|
||||
}
|
||||
|
||||
private long currentVersionCode() {
|
||||
try {
|
||||
PackageInfo packageInfo = getPackageManager().getPackageInfo(getPackageName(), 0);
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
|
||||
return packageInfo.getLongVersionCode();
|
||||
}
|
||||
return packageInfo.versionCode;
|
||||
} catch (PackageManager.NameNotFoundException exception) {
|
||||
return -1L;
|
||||
}
|
||||
}
|
||||
|
||||
private void deleteIfExists(File file) {
|
||||
if (!file.exists()) return;
|
||||
if (file.isDirectory()) {
|
||||
|
||||
@@ -259,9 +259,11 @@ public class DualScreenPlugin extends Plugin {
|
||||
private final class TopDisplayPresentation extends Presentation {
|
||||
|
||||
private final String initialUrl;
|
||||
private final Display display;
|
||||
|
||||
TopDisplayPresentation(Context context, Display display, String initialUrl) {
|
||||
super(context, display);
|
||||
this.display = display;
|
||||
this.initialUrl = initialUrl;
|
||||
}
|
||||
|
||||
@@ -277,6 +279,7 @@ public class DualScreenPlugin extends Plugin {
|
||||
| View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
|
||||
| View.SYSTEM_UI_FLAG_LAYOUT_STABLE
|
||||
);
|
||||
AndroidDisplayPerformance.preferBatteryRefreshRate(getWindow(), display);
|
||||
|
||||
FrameLayout container = new FrameLayout(getContext());
|
||||
container.setBackgroundColor(Color.BLACK);
|
||||
|
||||
Reference in New Issue
Block a user