Merge branch 'master' into 3.0

app/build.gradle

@@ -10,6 +10,7 @@ buildscript {
   dependencies {
     classpath "com.android.tools.build:gradle:$androidGradlePluginVersion"
     classpath "com.testdroid:gradle:$testdroidGradlePluginVersion"
+    classpath 'org.apache.httpcomponents:httpclient-android:4.3.3'
   }
 }
 
@@ -48,7 +49,6 @@ dependencies {
   implementation "com.android.support:design:$supportLibraryVersion"
   implementation "com.android.support:cardview-v7:$supportLibraryVersion"
   implementation "com.android.support:multidex:$multidexVersion"
-
   implementation "com.android.support.constraint:constraint-layout:$constraintLayoutVersion"
 
   androidTestImplementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.3'
@@ -183,6 +183,8 @@ android {
     cruncherEnabled true
   }
 
+  testBuildType "coverage"
+
   lintOptions {
     // Treat lint seriously
     abortOnError true
@@ -260,7 +262,7 @@ android {
       if (project.hasProperty('version_name')) {
         versionName project.property('version_name')
       } else {
-        versionName "2.3"
+        versionName "2.4"
       }
     }
     // Custom apps built from a json file, zim file and icon set

app/src/main/res/layout/search.xml

@@ -15,12 +15,12 @@
       xmlns:app="http://schemas.android.com/apk/res-auto"
       android:id="@+id/toolbar_layout"
       android:layout_width="match_parent"
-      android:layout_height="?actionBarSize">
+      android:layout_height="?android:attr/actionBarSize">
 
       <android.support.v7.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?actionBarSize"
+        android:layout_height="?android:attr/actionBarSize"
         android:background="?colorPrimaryDark"
         app:popupTheme="@style/AppTheme.PopupOverlay"
         app:theme="@style/AppTheme.AppBarOverlay" />

gradle.properties

@@ -1,3 +1,4 @@
 android.enableD8=true
 android.enableD8.desugaring=true
+org.gradle.configureondemand=false
 org.gradle.jvmargs=-Xmx4096m