Merge remote-tracking branch 'origin/master'

OsmAnd/.gitignore

@@ -17,6 +17,7 @@ out/
 use/
 osmand.properties
 osmand.xml
+assets/style.css
 assets/help/*.html
 assets/help/images
 assets/help/screens

OsmAnd/assets/style.css

@@ -1,20 +1,37 @@
    
    body{padding:0; margin:0; }
    a {color:#536DFE;}
-   xmp{white-space: pre-wrap;}
+   xmp, pre{white-space: pre-wrap;}
-   .main{ margin:0 auto; font-family:arial; font-size:11pt;}
+   
-	.main{width:95%;}
+   h1{display:none;}
-	xmp{max-width:95%;}
+   
+   .main{ margin:0 auto; font-family:arial; font-size:11pt; margin-top:30px;}
+   @media(max-device-width: 799px)
+   {
+		.main{width:95%;}
+		xmp, pre{max-width:95%;}
+   }
+   @media(min-width: 800px)
+   {
+		.main{width:800px;}
+		xmp, pre{max-width:800px;}
+   }
+   
    .code{font-style:italic;}
    
-   .list li{padding-bottom:10px; color:#000; }
+   
-   .list li a{ text-decoration:none;} 
+   .list li, .textlist li{padding-bottom:10px; color:#000; }
-   .subtitle{border-bottom:1px solid #F3F3F3; font-size:13pt; margin-top:10px; font-weight:bold;}
+   .list li a, .textlist li a{ text-decoration:none;} 
+   .innerlist{list-style-type: none; padding-left:15px;}
+   .subtitle {border-bottom:1px solid #F3F3F3; font-size:13pt; margin-top:10px; font-weight:bold;}
+   .subtitle h2{font-size:13pt;}
    .blocksubtitle{font-weight:bold; margin-top:10px;}
+   .blocksubsubtitle{font-weight:bold; margin-top:10px; font-size:9pt;}
     h1{background-color:#FF8F00; font-size:15pt; color:#fff; padding-left:15px; padding-top:30px; padding-bottom:15px; font-weight:bold; 
    -webkit-border-radius: 4px;-moz-border-radius: 4px;border-radius: 4px; margin-top:-5px;}
    .content{padding:15px; padding-top:5px;}
    .content ul{padding-left:20px;}
+   
    /************home page*****************/
    .mainlist{list-style-type: none; margin:0; padding:0;}  
    .mainlist li{border-bottom: 1px solid #F3F3F3; padding:15px; }
@@ -25,19 +42,21 @@
    /*****features**********************/
    .featuretitle{border-bottom:1px solid #F3F3F3; font-size:14pt; margin-top:10px; font-weight:bold;}
    .features li{padding-bottom:10px;}  
+  
   /*************frequently asked questions**************/  
    .toc .list li{color:#D2D2D2;}
    .toc .subtitle{font-weight:normal;}  
   
-  .screenshot{max-width:95%; max-height:100%; padding:7px; border:1px solid #ddd;}
+  .screenshot, .centeredimageblog img{max-width:95%; max-height:100%; padding:7px; border:1px solid #ddd; margin-bottom:20px;} 
-  .imgcontainer{margin:20px 30px;}
+  .imgcontainer, .centeredimageblog{margin:20px 30px;}
+  
+   .download{width:24px; height:24px; padding-left:15px; vertical-align: bottom;}
+   
   .legendcontainer{margin:0;}
   .legend{width:100%;}
-   /*div {border-width: 1px; padding: 10px;
+  
-   		border: groove; margin-left:auto;margin-right:auto; width:480pt}
+  .definition{font-weight:bold;}
-   h3.help { text-align: center}
+  
-   h4.help { text-align: center}
+  /***********help about****************************************************/
-   li.help { text-align:justify}
+.about .surname{font-weight:bold;}
-   img.help { width:auto; height:auto; max-width: 50%;}
+.about h3{margin-top:30px;}
-   p.img {text-align: center}*/
-

OsmAnd/build.gradle

@@ -324,6 +324,13 @@ tasks.withType(JavaCompile) {
 	compileTask -> compileTask.dependsOn << [collectExternalResources, buildOsmAndCore, cleanupDuplicatesInCore]
 }
 
+task appStart(type: Exec) {
+    // linux 
+    commandLine 'adb', 'shell', 'am', 'start', '-n', 'net.osmand.plus/net.osmand.plus.activities.MapActivity'
+    // windows
+    // commandLine 'cmd', '/c', 'adb', 'shell', 'am', 'start', '-n', 'net.osmand.plus/net.osmand.plus.activities.MapActivity'      
+}
+
 clean.dependsOn 'cleanNoTranslate'
 
 task cleanNoTranslate() {

OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesSettingsDialogFragment.java

@@ -30,9 +30,6 @@ public class LiveUpdatesSettingsDialogFragment extends DialogFragment {
 	public static final String LOCAL_INDEX_INFO = "local_index_info";
 
 	private static final String LOCAL_INDEX = "local_index";
-	private static final int UPDATE_HOURLY = 0;
-	private static final int UPDATE_DAILY = 1;
-	private static final int UPDATE_WEEKLY = 2;
 	private static final String UPDATE_TIMES = "_update_times";
 	private static final String TIME_OF_DAY_TO_UPDATE = "_time_of_day_to_update";
 	private static final int MORNING_UPDATE_TIME = 8;