android/source/res/layout/toolbar_bottom.xml | 131
+++++-----
android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java | 5
2 files changed, 80 insertions(+), 56 deletions(-)
New commits:
commit 46855d3a98b515f334c447707c533025cfe98a48
Author: Mert Tumer <merttu...@outlook.com>
Date: Tue Jul 10 14:10:54 2018 -0700
Style tab added to Android Viewer
This is a base change, further implementations may be added
Change-Id: I8aa5b5314f2b1e93821baf3da3e44803904f57fa
Reviewed-on: https://gerrit.libreoffice.org/57249
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
diff --git a/android/source/res/layout/toolbar_bottom.xml
b/android/source/res/layout/toolbar_bottom.xml
index d1476a57fa57..d1820216d2ab 100644
--- a/android/source/res/layout/toolbar_bottom.xml
+++ b/android/source/res/layout/toolbar_bottom.xml
@@ -169,62 +169,6 @@
</LinearLayout>
- <RelativeLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:id="@+id/font_color_picker"
- android:padding="10dp">
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="Font Color"
- android:paddingBottom="12dp"
- android:paddingTop="12dp"
- android:textSize="14sp"
- android:gravity="center_vertical"
- android:textColor="@color/fontBlack"
- android:layout_alignParentLeft="true"
-
- />
- <ImageButton
-
android:id="@+id/font_color_picker_button"
- android:layout_width="24dp"
- android:layout_height="24dp"
- android:gravity="center_vertical"
- android:paddingBottom="12dp"
- android:paddingTop="12dp"
- android:layout_alignParentRight="true"
- />
-
- </RelativeLayout>
- <RelativeLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:id="@+id/font_back_color_picker"
- android:padding="10dp">
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="Font Back Color"
- android:paddingBottom="12dp"
- android:paddingTop="12dp"
- android:textSize="14sp"
- android:gravity="center_vertical"
- android:textColor="@color/fontBlack"
- android:layout_alignParentLeft="true"
-
- />
- <ImageButton
-
android:id="@+id/font_back_color_picker_button"
- android:layout_width="24dp"
- android:layout_height="24dp"
- android:gravity="center_vertical"
- android:paddingBottom="12dp"
- android:paddingTop="12dp"
- android:layout_alignParentRight="true"
- />
-
- </RelativeLayout>
</LinearLayout>
</ScrollView>
@@ -389,6 +333,81 @@
</LinearLayout>
</ScrollView>
</LinearLayout>
+ <LinearLayout
+ android:id="@+id/tab_style"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+
+ <ScrollView
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/toolbar_height">
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_weight="0.5"
+ android:orientation="vertical">
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:id="@+id/font_color_picker"
+ android:padding="10dp">
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="Font Color"
+ android:paddingBottom="12dp"
+ android:paddingTop="12dp"
+ android:textSize="14sp"
+ android:gravity="center_vertical"
+ android:textColor="@color/fontBlack"
+ android:layout_alignParentLeft="true"
+
+ />
+ <ImageButton
+
android:id="@+id/font_color_picker_button"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:gravity="center_vertical"
+ android:paddingBottom="12dp"
+ android:paddingTop="12dp"
+ android:layout_alignParentRight="true"
+ />
+
+ </RelativeLayout>
+
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:id="@+id/font_back_color_picker"
+ android:padding="10dp">
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="Font Back Color"
+ android:paddingBottom="12dp"
+ android:paddingTop="12dp"
+ android:textSize="14sp"
+ android:gravity="center_vertical"
+ android:textColor="@color/fontBlack"
+ android:layout_alignParentLeft="true"
+
+ />
+ <ImageButton
+
android:id="@+id/font_back_color_picker_button"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:gravity="center_vertical"
+ android:paddingBottom="12dp"
+ android:paddingTop="12dp"
+ android:layout_alignParentRight="true"
+ />
+
+ </RelativeLayout>
+ </LinearLayout>
+ </ScrollView>
+
+ </LinearLayout>
</FrameLayout>
</LinearLayout>
</TabHost>
diff --git
a/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java
b/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java
index 4cde5d96f992..e65d6c31e51a 100644
--- a/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java
+++ b/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java
@@ -239,6 +239,11 @@ public class LibreOfficeMainActivity extends
AppCompatActivity implements Settin
spec.setIndicator("Insert");
host.addTab(spec);
+ spec = host.newTabSpec("Style");
+ spec.setContent(R.id.tab_style);
+ spec.setIndicator("Style");
+ host.addTab(spec);
+
LinearLayout bottomToolbarLayout = findViewById(R.id.toolbar_bottom);
LinearLayout toolbarColorPickerLayout =
findViewById(R.id.toolbar_color_picker);
LinearLayout toolbarBackColorPickerLayout =
findViewById(R.id.toolbar_back_color_picker);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
