fixed merge error. app-version 0.4.3.151201

k3b · Nov 30, 2015 · 7d34e1b · 7d34e1b
1 parent 85bf10d
commit 7d34e1b
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -10,8 +10,8 @@ android {
 
         minSdkVersion 14
         targetSdkVersion 21
-        versionCode 9
-        versionName "0.4.2.151105"
+        versionCode 10
+        versionName "0.4.3.151201"
     }
     buildTypes {
         release {

diff --git a/app/src/main/java/de/k3b/android/androFotoFinder/Global.java b/app/src/main/java/de/k3b/android/androFotoFinder/Global.java
@@ -39,18 +39,32 @@ public class Global {
     public static boolean debugEnabled = false;
     public static boolean debugEnabledViewItem = false;
     public static boolean debugEnabledSql = false;
+    public static boolean debugEnabledMemory = false;
 
     public static int maxSelectionMarkersInMap = 255;
 
     public static int slideshowIntervallInMilliSecs = 1500;
 
+    /** defines the timespan after which the [Image-View's](Image-View) ActionBar is hidden */
+    public static int actionBarHideTimeInMilliSecs = 2000;
+
     public static boolean clearSelectionAfterCommand = false;
 
     /** true update only if media scanner is not running. false=risky=always allow.  */
     public static boolean mustCheckMediaScannerRunning = true;
     public static File reportDir = new File(Environment.getExternalStorageDirectory(), "databases/sql");
     public static String reportExt = ".query";
 
+    /** defines the filesystem's directory where crash reports are written to. */
+    public static File logCatDir = new File(Environment.getExternalStorageDirectory(), "copy/log");
+
+    /** remember last picked geo-s */
+    public static File pickHistoryFile = null; // initialized in app.onCreate with local database file
+    public static int pickHistoryMax = 25;
+
+    /** false: cmd setGeo => form(GeoEditActivity) => mapPicker */
+    public static boolean geoNoEdit = true;
+
     public static void debugMemory(String modul, String message) {
         if (false && Global.debugEnabled) {
             Runtime r = Runtime.getRuntime();

diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml
@@ -24,8 +24,10 @@ this program. If not, see <http://www.gnu.org/licenses/>
 <resources>
     <string name="app_name">a Photo Manager</string>
     <string name="about_summary">About a Photo Manager</string>
-    <string name="app_viewer_name">a Photo Viewer</string>
-    <string name="app_map_name">a Photo Map</string>
+    <string name="app_image_viewer_title">a Photo Viewer</string>
+    <string name="app_map_title">a Photo Map</string>
+    <string name="btn_popup" translatable="false">&#8230;</string>
+    <string name="global_log_file_path" translatable="false">copy/aPhotoManager.log</string>
 
 <string name="about_content"><![CDATA["<html><body>
 <a href="https://github.com/k3b/AndroFotoFinder/wiki"><b>A Photo Manager</b></a><br/>Version AndroFotoFinder $versionName$