diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2017-05-30 18:30:29 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2017-05-30 18:33:13 +0200 |
| commit | bffb5437b48327a0572d905c792bbcc5f1f25f9a (patch) | |
| tree | c418678f259109bd9d5bb55c1742b28d080e6237 /android | |
| parent | cb57abf33ffd2a76f67498b452f11d0f38e08054 (diff) | |
enable the Action/Toolbar for Settings screens
by using a theme that has it enabled
Change-Id: Icf3b66d38de55e2b08d4e4ced463bab045e56c43
Diffstat (limited to 'android')
| -rw-r--r-- | android/source/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | android/source/src/java/org/libreoffice/storage/DocumentProviderSettingsActivity.java | 4 |
2 files changed, 4 insertions, 2 deletions
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"; |