From 41b47127125e02deeb477937f145f245c044903a Mon Sep 17 00:00:00 2001 From: Mike Beattie Date: Sun, 13 Oct 2019 20:22:37 +1300 Subject: 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 --- .../app/src/main/java/org/altusmetrum/AltosDroid/AltosDroid.java | 5 +++++ altosdroid/app/src/main/res/values/CustomTheme.xml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) 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 @@ - -- cgit v1.2.3