diff options
| author | Mike Beattie <mike@ethernal.org> | 2019-10-13 20:22:37 +1300 |
|---|---|---|
| committer | Mike Beattie <mike@ethernal.org> | 2019-10-15 21:19:54 +1300 |
| commit | 41b47127125e02deeb477937f145f245c044903a (patch) | |
| tree | c49348d460719ce92c26a5c23f77e0babeadc7f1 | |
| parent | 75cd8196ee9ba4ed983abdc83f1fe60fb94f2866 (diff) | |
altosdroid: Update app to use Material Design theme
Added code to force display of app logo on ActionBar, which is normally disabled under Material Design.
Signed-off-by: Mike Beattie <mike@ethernal.org>
| -rw-r--r-- | altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosDroid.java | 5 | ||||
| -rw-r--r-- | altosdroid/app/src/main/res/values/CustomTheme.xml | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosDroid.java index f2e0acd7..e2d57c3f 100644 --- a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosDroid.java +++ b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosDroid.java @@ -21,6 +21,7 @@ package org.altusmetrum.AltosDroid; import java.lang.ref.WeakReference; import java.util.*; +import android.app.ActionBar; import android.app.Activity; import android.app.PendingIntent; import android.bluetooth.BluetoothAdapter; @@ -654,6 +655,10 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener, // Set up the window layout setContentView(R.layout.altosdroid); + // Set ActionBar to show App Logo + getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_HOME | ActionBar.DISPLAY_SHOW_TITLE); + getActionBar().setLogo(R.drawable.app_icon); + // Create the Tabs and ViewPager mTabHost = (TabHost)findViewById(android.R.id.tabhost); mTabHost.setup(); diff --git a/altosdroid/app/src/main/res/values/CustomTheme.xml b/altosdroid/app/src/main/res/values/CustomTheme.xml index 6c701ea2..b3be4193 100644 --- a/altosdroid/app/src/main/res/values/CustomTheme.xml +++ b/altosdroid/app/src/main/res/values/CustomTheme.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <style name="CustomTheme" parent="android:Theme.Holo"> + <style name="CustomTheme" parent="android:Theme.Material"> </style> </resources> |