[Libreoffice-commits] core.git: 2 commits - android/source

[Christian Lohmaier]

 android/source/AndroidManifest.xml                                                    |    2 ++
 android/source/build.gradle                                                           |    8 ++++----
 android/source/src/java/org/libreoffice/storage/DocumentProviderSettingsActivity.java |    4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

New commits:
commit bffb5437b48327a0572d905c792bbcc5f1f25f9a
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Tue May 30 18:30:29 2017 +0200

    enable the Action/Toolbar for Settings screens
    
    by using a theme that has it enabled
    
    Change-Id: Icf3b66d38de55e2b08d4e4ced463bab045e56c43

diff --git a/android/source/AndroidManifest.xml b/android/source/AndroidManifest.xml
index 56fe63d62008..0b384a3becc2 100644
--- a/android/source/AndroidManifest.xml
+++ b/android/source/AndroidManifest.xml
@@ -95,6 +95,7 @@
 
         <activity
             android:name=".SettingsActivity"
+            android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
             android:label="@string/app_name_settings">
         </activity>
 
@@ -109,6 +110,7 @@
 
         <!-- Document Provider Settings Activity -->
         <activity android:name=".storage.DocumentProviderSettingsActivity"
+                  android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
                   android:label="@string/storage_provider_settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/android/source/src/java/org/libreoffice/storage/DocumentProviderSettingsActivity.java b/android/source/src/java/org/libreoffice/storage/DocumentProviderSettingsActivity.java
index 7b2160a3f509..b842e79fafd6 100644
--- a/android/source/src/java/org/libreoffice/storage/DocumentProviderSettingsActivity.java
+++ b/android/source/src/java/org/libreoffice/storage/DocumentProviderSettingsActivity.java
@@ -14,7 +14,6 @@ import java.util.Set;
 import org.libreoffice.R;
 import org.libreoffice.storage.external.BrowserSelectorActivity;
 
-import android.app.Activity;
 import android.content.Intent;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.os.Bundle;
@@ -22,8 +21,9 @@ import android.preference.Preference;
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceManager;
 import android.preference.PreferenceScreen;
+import android.support.v7.app.AppCompatActivity;
 
-public class DocumentProviderSettingsActivity extends Activity {
+public class DocumentProviderSettingsActivity extends AppCompatActivity {
 
     public static final String KEY_PREF_OWNCLOUD_SERVER = "pref_server_url";
     public static final String KEY_PREF_OWNCLOUD_USER_NAME = "pref_user_name";
commit cb57abf33ffd2a76f67498b452f11d0f38e08054
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Tue May 30 18:27:08 2017 +0200

    android: bump build-tools, support-lib and gradle-plugin versions
    
    Change-Id: Ib9fa2a3ca0ad4ba5075c9c25e5b2cba1e0e7285a

diff --git a/android/source/build.gradle b/android/source/build.gradle
index 302d34a54754..92c6680f464a 100644
--- a/android/source/build.gradle
+++ b/android/source/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0'
+        classpath 'com.android.tools.build:gradle:2.3.2'
     }
 }
 
@@ -24,14 +24,14 @@ dependencies {
     ])
     compile files("${liboInstdir}/${liboShareJavaFolder}/unoil.jar")
     compile files("${liboWorkdir}/UnpackedTarball/owncloud_android_lib/bin/owncloud-android-library.jar")
-    compile 'com.android.support:appcompat-v7:25.1.0'
-    compile 'com.android.support:design:25.1.0'
+    compile 'com.android.support:appcompat-v7:25.3.1'
+    compile 'com.android.support:design:25.3.1'
     compile 'com.android.support.constraint:constraint-layout:1.0.2'
 }
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "25.0.1"
+    buildToolsVersion "25.0.3"
     compileOptions {
         // silence some java-language features hints
         sourceCompatibility 6