diff options
| author | Jack Leigh <jack.leigh@collabora.com> | 2015-03-19 14:43:14 +0000 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-03-30 09:23:45 +0200 |
| commit | ce6b4d5ed32e67b39c534e2ad9082fa783829931 (patch) | |
| tree | 7b5d6a9b9969a63006e125f78c208be50e5c1cb8 /android | |
| parent | 3bab59b406294e70d025680a5f71acdba129b1ac (diff) | |
android: Change to v7 support ActionBar and new theme
Change-Id: I39d273e397a3bcbfc1d7140dca4af89858f2c06a
Reviewed-on: https://gerrit.libreoffice.org/14948
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Tested-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'android')
| -rw-r--r-- | android/experimental/LOAndroid3/res/values/themes.xml | 2 | ||||
| -rw-r--r-- | android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/android/experimental/LOAndroid3/res/values/themes.xml b/android/experimental/LOAndroid3/res/values/themes.xml index 2d8f593d5141..1468013ac7b4 100644 --- a/android/experimental/LOAndroid3/res/values/themes.xml +++ b/android/experimental/LOAndroid3/res/values/themes.xml @@ -7,6 +7,6 @@ <item name="windowActionBar">false</item> </style> - <style name="BrowserTheme" parent="android:Theme.Holo.Light.DarkActionBar"> + <style name="BrowserTheme" parent="Theme.AppCompat.Light"> </style> </resources> diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java index 6c3d0d173f91..fe96cc6b2c20 100644 --- a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java +++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java @@ -9,7 +9,6 @@ package org.libreoffice.ui; -import android.app.ActionBar; import android.app.Activity; import android.content.ComponentName; import android.content.Context; @@ -23,6 +22,8 @@ import android.os.AsyncTask; import android.os.Bundle; import android.preference.PreferenceManager; import android.support.v4.widget.DrawerLayout; +import android.support.v7.app.ActionBar; +import android.support.v7.app.ActionBarActivity; import android.util.Log; import android.view.ContextMenu; import android.view.ContextMenu.ContextMenuInfo; @@ -61,7 +62,7 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; -public class LibreOfficeUIActivity extends Activity implements ActionBar.OnNavigationListener { +public class LibreOfficeUIActivity extends ActionBarActivity implements ActionBar.OnNavigationListener { private String LOGTAG = LibreOfficeUIActivity.class.getSimpleName(); private SharedPreferences prefs; private int filterMode = FileUtilities.ALL; @@ -111,7 +112,7 @@ public class LibreOfficeUIActivity extends Activity implements ActionBar.OnNavig public void createUI() { - ActionBar actionBar = getActionBar(); + ActionBar actionBar = getSupportActionBar(); actionBar.setDisplayShowTitleEnabled(false); //This should show current directory if anything //make the navigation spinner @@ -165,9 +166,9 @@ public class LibreOfficeUIActivity extends Activity implements ActionBar.OnNavig private void refreshView() { // enable home icon as "up" if required if (!currentDirectory.equals(homeDirectory)) { - getActionBar().setDisplayHomeAsUpEnabled(true); + getSupportActionBar().setDisplayHomeAsUpEnabled(true); } else { - getActionBar().setDisplayHomeAsUpEnabled(false); + getSupportActionBar().setDisplayHomeAsUpEnabled(false); } // refresh view if (viewMode == GRID_VIEW) { |