diff --git a/app/src/main/java/com/dkanada/gramophone/ui/activities/SplashActivity.java b/app/src/main/java/com/dkanada/gramophone/ui/activities/SplashActivity.java index 67965aeb..5472cb93 100644 --- a/app/src/main/java/com/dkanada/gramophone/ui/activities/SplashActivity.java +++ b/app/src/main/java/com/dkanada/gramophone/ui/activities/SplashActivity.java @@ -69,19 +69,20 @@ public class SplashActivity extends AbsBaseActivity { PowerManager pm = (PowerManager) getSystemService(POWER_SERVICE); return !pm.isIgnoringBatteryOptimizations(packageName); } + return false; } private void showBatteryOptimizationDialog() { AlertDialog.Builder builder = new AlertDialog.Builder(SplashActivity.this); - builder.setMessage(R.string.action_disable_battery_optimizations_message) - .setTitle(R.string.action_disable_battery_optimizations_title) - .setNegativeButton(R.string.action_cancel, new DialogInterface.OnClickListener() { + builder.setMessage(R.string.battery_optimizations_message) + .setTitle(R.string.battery_optimizations_title) + .setNegativeButton(R.string.ignore, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { login(); } }) - .setPositiveButton(R.string.action_go_to_optimization_settings, new DialogInterface.OnClickListener() { + .setPositiveButton(R.string.disable, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { openPowerSettings(SplashActivity.this); } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 21ba0570..7a942bfc 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -44,10 +44,6 @@ Sleep timer Set New playlist - Disable battery optimizations - Please disable battery optimizations for media playback while the screen is off - Cancel - Go to settings Albums Artists @@ -74,6 +70,8 @@ Bitrate Sample Rate + Battery Optimizations + Please disable battery optimizations for media playback while the screen is off. "Added 1 title to the queue." Added %1$d titles to the queue. %1$s?]]> @@ -189,6 +187,8 @@ Gelli Card Login + Disable + Ignore Logout Username Password