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

Tomaž Vajngerl tomaz.vajngerl at collabora.co.uk
Thu Mar 30 20:25:23 UTC 2017


 android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java |   19 ++++++++++
 1 file changed, 19 insertions(+)

New commits:
commit d8c23a727689b680bc68825d810e77cc6a6571ad
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date:   Thu Mar 30 22:21:38 2017 +0200

    android: restore tabbed toolbar removed by accident
    
    commit 1503769fe15c122ff2bb8f6f7e7b4ab72656ddc2 removed tabbed
    toolbar by mistake
    
    Change-Id: I72e408d8e67b846e227d4563a8cd8455c1e73c29

diff --git a/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java b/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java
index fb41762af342..66ff92121b7a 100755
--- a/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java
+++ b/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java
@@ -25,6 +25,7 @@ import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.AdapterView;
 import android.widget.ListView;
+import android.widget.TabHost;
 import android.widget.Toast;
 
 import org.libreoffice.overlay.DocumentOverlay;
@@ -210,6 +211,24 @@ public class LibreOfficeMainActivity extends AppCompatActivity {
         mDocumentOverlay = new DocumentOverlay(this, layerView);
 
         mToolbarController.setupToolbars();
+
+        TabHost host = (TabHost) findViewById(R.id.toolbarTabHost);
+        host.setup();
+
+        TabHost.TabSpec spec = host.newTabSpec("Character");
+        spec.setContent(R.id.tab_character);
+        spec.setIndicator("Character");
+        host.addTab(spec);
+
+        spec = host.newTabSpec("Paragraph");
+        spec.setContent(R.id.tab_paragraph);
+        spec.setIndicator("Paragraph");
+        host.addTab(spec);
+
+        spec = host.newTabSpec("Insert");
+        spec.setContent(R.id.tab_insert);
+        spec.setIndicator("Insert");
+        host.addTab(spec);
     }
 
     private void openSelectPathIntent() {


More information about the Libreoffice-commits mailing list