From 0b7b61d7df630654ad3be14b4bf532f0a7d6a5c1 Mon Sep 17 00:00:00 2001 From: Egor N Date: Mon, 15 Feb 2016 16:47:53 +0200 Subject: [PATCH 1/2] Use 24h format for log timestamp and log filename --- .../java/io/palaima/debugdrawer/timber/data/LumberYard.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debugdrawer-timber/src/main/java/io/palaima/debugdrawer/timber/data/LumberYard.java b/debugdrawer-timber/src/main/java/io/palaima/debugdrawer/timber/data/LumberYard.java index fb3cb1d..90499be 100644 --- a/debugdrawer-timber/src/main/java/io/palaima/debugdrawer/timber/data/LumberYard.java +++ b/debugdrawer-timber/src/main/java/io/palaima/debugdrawer/timber/data/LumberYard.java @@ -37,8 +37,8 @@ public class LumberYard { private static final int BUFFER_SIZE = 200; - private static final DateFormat FILENAME_DATE = new SimpleDateFormat("yyyy-MM-dd hhmm a", Locale.US); - private static final DateFormat LOG_DATE_PATTERN = new SimpleDateFormat("MM-dd hh:mm:ss.S", Locale.US); + private static final DateFormat FILENAME_DATE = new SimpleDateFormat("yyyy-MM-dd HHmm a", Locale.US); + private static final DateFormat LOG_DATE_PATTERN = new SimpleDateFormat("MM-dd HH:mm:ss.S", Locale.US); private static final String LOG_FILE_END = ".log"; From d082ca959eed1fcb350b6c67286a830334fa2227 Mon Sep 17 00:00:00 2001 From: Egor N Date: Mon, 15 Feb 2016 17:42:34 +0200 Subject: [PATCH 2/2] Set FLAG_ACTIVITY_NEW_TASK flag in SettingsModule --- .../palaima/debugdrawer/commons/SettingsModule.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/debugdrawer-commons/src/main/java/io/palaima/debugdrawer/commons/SettingsModule.java b/debugdrawer-commons/src/main/java/io/palaima/debugdrawer/commons/SettingsModule.java index 74e0b82..20d8236 100644 --- a/debugdrawer-commons/src/main/java/io/palaima/debugdrawer/commons/SettingsModule.java +++ b/debugdrawer-commons/src/main/java/io/palaima/debugdrawer/commons/SettingsModule.java @@ -121,6 +121,7 @@ public void onClick(View v) { if (v == developer || v == developerTitle) { // open dev settings Intent devIntent = new Intent(Settings.ACTION_APPLICATION_DEVELOPMENT_SETTINGS); + devIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); ResolveInfo resolveInfo = context.getPackageManager().resolveActivity(devIntent, 0); if (resolveInfo != null) context.startActivity(devIntent); else Toast.makeText(context, "Developer settings not available on device", @@ -128,14 +129,18 @@ public void onClick(View v) { } else if (v == battery || v == batteryTitle) { // try to find an app to handle battery settings Intent batteryIntent = new Intent(Intent.ACTION_POWER_USAGE_SUMMARY); + batteryIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); ResolveInfo resolveInfo = context.getPackageManager().resolveActivity(batteryIntent, 0); if (resolveInfo != null) context.startActivity(batteryIntent); else Toast.makeText(context, "No app found to handle power usage intent", Toast.LENGTH_SHORT).show(); } else if (v == settings || v == settingsTitle) { // open android settings - context.startActivity(new Intent(Settings.ACTION_SETTINGS)); + Intent settingsIntent = new Intent(Settings.ACTION_SETTINGS); + settingsIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + context.startActivity(settingsIntent); } else if (v == info || v == infoTitle) { Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS); + intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); intent.setData(Uri.parse("package:" + context.getPackageName())); context.startActivity(intent); } else if (v == uninstall || v == uninstallTitle) { @@ -144,7 +149,9 @@ public void onClick(View v) { Intent uninstallIntent = new Intent(Intent.ACTION_DELETE, packageURI); context.startActivity(uninstallIntent); } else if (v == location || v == locationTitle) { - context.startActivity(new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS)); + Intent locationIntent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS); + locationIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + context.startActivity(locationIntent); } } }