[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - 2 commits - android/experimental

[Jack Leigh]

 android/experimental/LOAndroid3/res/values/themes.xml                                  |    2 -
 android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java |   20 +++-------
 2 files changed, 7 insertions(+), 15 deletions(-)

New commits:
commit 046cd6a03adb6f9c0d6519e068c2244cafcc9b2d
Author: Jack Leigh <jack.leigh at collabora.com>
Date:   Thu Mar 19 14:43:14 2015 +0000

    android: Change to v7 support ActionBar and new theme
    
    Change-Id: I39d273e397a3bcbfc1d7140dca4af89858f2c06a
    Reviewed-on: https://gerrit.libreoffice.org/14948
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
    Tested-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/android/experimental/LOAndroid3/res/values/themes.xml b/android/experimental/LOAndroid3/res/values/themes.xml
index 2d8f593..1468013 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 6c3d0d17..fe96cc6 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) {
commit b802a6ffc0c5006d5f64b637432c7d095af53d74
Author: Jack Leigh <jack.leigh at collabora.com>
Date:   Thu Mar 19 14:42:36 2015 +0000

    android: Remove striping on ActionBar
    
    Change-Id: I7b675e7cf5b28558be57e293547531a9369c3462
    Reviewed-on: https://gerrit.libreoffice.org/14947
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
    Tested-by: Tomaž Vajngerl <quikee at gmail.com>

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 fee06b8..6c3d0d17 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
@@ -122,15 +122,6 @@ public class LibreOfficeUIActivity extends Activity implements ActionBar.OnNavig
         actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
         actionBar.setListNavigationCallbacks(list, this);
 
-        //make striped actionbar
-        BitmapDrawable bg = (BitmapDrawable)getResources().getDrawable(R.drawable.bg_striped);
-        bg.setTileModeXY(Shader.TileMode.REPEAT, Shader.TileMode.REPEAT);
-        actionBar.setBackgroundDrawable(bg);
-
-        BitmapDrawable bgSplit = (BitmapDrawable)getResources().getDrawable(R.drawable.bg_striped_split_img);
-        bgSplit.setTileModeXY(Shader.TileMode.REPEAT, Shader.TileMode.REPEAT);
-        actionBar.setSplitBackgroundDrawable(bgSplit);
-
         if( viewMode == GRID_VIEW){
             // code to make a grid view
             setContentView(R.layout.file_grid);