summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.com>2015-11-09 23:51:02 +0100
committerTomaž Vajngerl <tomaz.vajngerl@collabora.com>2015-11-13 11:40:33 +0100
commit01d0983e3dd963003159779ca0920ace7dc308c4 (patch)
tree9f05fb2dc1824f7ac54b78261acb57a28fd1c93f /android
parentb0166b1d063dd1ba40692eecea1fa378e868acee (diff)
android: make toolbar visuals easier to change
Change-Id: I5b4dd8b8c407640cfcd9f366cecfaf6deb0cb3be
Diffstat (limited to 'android')
-rw-r--r--android/source/res/layout/toolbar.xml6
-rw-r--r--android/source/res/values/colors.xml3
-rw-r--r--android/source/res/values/themes.xml5
3 files changed, 13 insertions, 1 deletions
diff --git a/android/source/res/layout/toolbar.xml b/android/source/res/layout/toolbar.xml
index d8faa51b4034..42136ce68ffc 100644
--- a/android/source/res/layout/toolbar.xml
+++ b/android/source/res/layout/toolbar.xml
@@ -2,9 +2,13 @@
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:elevation="3dp">
+ android:elevation="3dp"
+ android:background="@color/toolbar_background"
+ app:theme="@style/LibreOfficeTheme.Toolbar"
+ app:popupTheme="@style/LibreOfficeTheme">
</android.support.v7.widget.Toolbar>
diff --git a/android/source/res/values/colors.xml b/android/source/res/values/colors.xml
index 3e1cd2125e5d..89d106265fed 100644
--- a/android/source/res/values/colors.xml
+++ b/android/source/res/values/colors.xml
@@ -92,6 +92,9 @@
<color name="panel_grid_item_image_background">#D1D9E1</color>
+ <color name="toolbar_forgeround">#3e3e3e</color>
+ <color name="toolbar_background">#ffffff</color>
+
<color name="handle_color">#40A040</color>
</resources>
diff --git a/android/source/res/values/themes.xml b/android/source/res/values/themes.xml
index 3b865112fbd3..807bf817ca5a 100644
--- a/android/source/res/values/themes.xml
+++ b/android/source/res/values/themes.xml
@@ -14,4 +14,9 @@
<item name="android:textColor">@android:color/black</item>
<item name="android:textSize">15sp</item>
</style>
+
+ <style name="LibreOfficeTheme.Toolbar" parent="Theme.AppCompat.Light.NoActionBar">
+ <item name="colorPrimary">@color/toolbar_background</item>
+ </style>
+
</resources>