diff --git a/app/src/googlePlayFlavor/AndroidManifest.xml b/app/src/googlePlayFlavor/AndroidManifest.xml index 7e3cd6e6..bc49ab36 100644 --- a/app/src/googlePlayFlavor/AndroidManifest.xml +++ b/app/src/googlePlayFlavor/AndroidManifest.xml @@ -70,7 +70,7 @@ diff --git a/app/src/main/java/com/jens/automation2/ActivityPermissions.java b/app/src/main/java/com/jens/automation2/ActivityPermissions.java index 3336d84e..96b7d2b5 100644 --- a/app/src/main/java/com/jens/automation2/ActivityPermissions.java +++ b/app/src/main/java/com/jens/automation2/ActivityPermissions.java @@ -706,7 +706,7 @@ public class ActivityPermissions extends Activity case startPhoneCall: addToArrayListUnique(Manifest.permission.CALL_PHONE, requiredPermissions); // addToArrayListUnique(Manifest.permission.SYSTEM_ALERT_WINDOW, requiredPermissions); - addToArrayListUnique(Manifest.permission.BIND_DEVICE_ADMIN, requiredPermissions); + addToArrayListUnique(Manifest.permission.SYSTEM_ALERT_WINDOW, requiredPermissions); break; case stopPhoneCall: addToArrayListUnique(Manifest.permission.ANSWER_PHONE_CALLS, requiredPermissions); @@ -910,6 +910,8 @@ public class ActivityPermissions extends Activity case Manifest.permission.SYSTEM_ALERT_WINDOW: for(String ruleName : getRulesUsing(Action.Action_Enum.startOtherActivity)) usingElements.add(String.format(getResources().getString(R.string.ruleXrequiresThis), ruleName)); + for(String ruleName : getRulesUsing(Action.Action_Enum.startPhoneCall)) + usingElements.add(String.format(getResources().getString(R.string.ruleXrequiresThis), ruleName)); break; case Manifest.permission.ANSWER_PHONE_CALLS: for(String ruleName : getRulesUsing(Action.Action_Enum.stopPhoneCall)) @@ -951,8 +953,6 @@ public class ActivityPermissions extends Activity case Manifest.permission.BIND_DEVICE_ADMIN: for(String ruleName : getRulesUsing(Action.Action_Enum.turnScreenOnOrOff)) usingElements.add(String.format(getResources().getString(R.string.ruleXrequiresThis), ruleName)); - for(String ruleName : getRulesUsing(Action.Action_Enum.startPhoneCall)) - usingElements.add(String.format(getResources().getString(R.string.ruleXrequiresThis), ruleName)); break; case Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS: usingElements.add(getResources().getString(R.string.recommendedForBetterReliability)); diff --git a/app/src/main/java/com/jens/automation2/AutomationService.java b/app/src/main/java/com/jens/automation2/AutomationService.java index b2cedb62..c1dbb173 100644 --- a/app/src/main/java/com/jens/automation2/AutomationService.java +++ b/app/src/main/java/com/jens/automation2/AutomationService.java @@ -518,7 +518,7 @@ public class AutomationService extends Service implements OnInitListener builder.setContentTitle("Automation"); if(Settings.showIconWhenServiceIsRunning) - builder.setSmallIcon(R.drawable.ic_launcher); + builder.setSmallIcon(R.drawable.crane); builder.setCategory(Notification.CATEGORY_SERVICE); builder.setWhen(System.currentTimeMillis()); @@ -526,7 +526,7 @@ public class AutomationService extends Service implements OnInitListener Notification defaultNotification = builder.build(); - defaultNotification.icon = R.drawable.ic_launcher; + defaultNotification.icon = R.drawable.crane; defaultNotification.when = System.currentTimeMillis(); // defaultNotification.defaults |= Notification.DEFAULT_VIBRATE; @@ -573,7 +573,7 @@ public class AutomationService extends Service implements OnInitListener builder.setOnlyAlertOnce(true); if(Settings.showIconWhenServiceIsRunning) - builder.setSmallIcon(R.drawable.ic_launcher); + builder.setSmallIcon(R.drawable.crane); // builder.setContentText(textToDisplay); // builder.setSmallIcon(icon); diff --git a/app/src/main/java/com/jens/automation2/Miscellaneous.java b/app/src/main/java/com/jens/automation2/Miscellaneous.java index e33e8191..3ec8c113 100644 --- a/app/src/main/java/com/jens/automation2/Miscellaneous.java +++ b/app/src/main/java/com/jens/automation2/Miscellaneous.java @@ -1164,7 +1164,7 @@ public class Miscellaneous extends Service builder.setOnlyAlertOnce(true); if(Settings.showIconWhenServiceIsRunning && notificationChannelId.equals(AutomationService.NOTIFICATION_CHANNEL_ID_SERVICE)) - builder.setSmallIcon(R.drawable.ic_launcher); + builder.setSmallIcon(R.drawable.crane); else if(!notificationChannelId.equals(AutomationService.NOTIFICATION_CHANNEL_ID_SERVICE)) builder.setSmallIcon(R.drawable.info); diff --git a/app/src/main/res/drawable-hdpi/ic_launcher.png b/app/src/main/res/drawable-hdpi/crane.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_launcher.png rename to app/src/main/res/drawable-hdpi/crane.png diff --git a/app/src/main/res/drawable-ldpi/crane.png b/app/src/main/res/drawable-ldpi/crane.png new file mode 100644 index 00000000..29f16d8e Binary files /dev/null and b/app/src/main/res/drawable-ldpi/crane.png differ diff --git a/app/src/main/res/drawable-ldpi/ic_launcher.png b/app/src/main/res/drawable-ldpi/ic_launcher.png deleted file mode 100644 index 36354a45..00000000 Binary files a/app/src/main/res/drawable-ldpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/crane.png b/app/src/main/res/drawable-mdpi/crane.png new file mode 100644 index 00000000..29f16d8e Binary files /dev/null and b/app/src/main/res/drawable-mdpi/crane.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_launcher.png b/app/src/main/res/drawable-mdpi/ic_launcher.png deleted file mode 100644 index 64e48c14..00000000 Binary files a/app/src/main/res/drawable-mdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/crane.png b/app/src/main/res/drawable-xhdpi/crane.png new file mode 100644 index 00000000..29f16d8e Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/crane.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_launcher.png b/app/src/main/res/drawable-xhdpi/ic_launcher.png deleted file mode 100644 index 28bf15ad..00000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index cba23dd4..8ebda1d6 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -882,8 +882,8 @@ This permission is also required if the trigger is using the current wifi connection. Copy text to clipboard Text to copy - Draw over other apps - After clicking OK you\'ll be sent to a system dialog. Please select Automation there and allow "draw over other apps". + Display over other apps + After clicking OK you\'ll be sent to a system dialog. Please select Automation there and allow "Display over other apps". Variables are only available for parameter types String and URI If you want to specify a parameter you also have to click \"Add intent pair\". Otherwise your changes will not be saved. \ No newline at end of file diff --git a/fastlane/metadata/android/en-US/changelogs/134.txt b/fastlane/metadata/android/en-US/changelogs/134.txt index e362db14..21589c6c 100644 --- a/fastlane/metadata/android/en-US/changelogs/134.txt +++ b/fastlane/metadata/android/en-US/changelogs/134.txt @@ -1 +1,3 @@ -* Fixed: Added device admin permission for start-phone-call action \ No newline at end of file +* Fixed: Added overlay permission for start-phone-call action +* Change: Icon changed in Play store version +* Change: Target-SDK raised in Play store version \ No newline at end of file