altosdroid: Switch from custom title to standard Holo theme

This gives us the menu button, which is awfully useful on devices
without a hardware version...

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/altosdroid/res/menu/option_menu.xml b/altosdroid/res/menu/option_menu.xml
index 2109ae04be8d1e1f7f2a013090ea8b8fcf802f82..1b3142a84d5d81da494abc480189ff2cda18f779 100644 (file)
--- a/altosdroid/res/menu/option_menu.xml
+++ b/altosdroid/res/menu/option_menu.xml
@@ -22,9 +22,6 @@
     <item android:id="@+id/disconnect"
          android:icon="@android:drawable/ic_notification_clear_all"
          android:title="@string/disconnect_device" />
     <item android:id="@+id/disconnect"
          android:icon="@android:drawable/ic_notification_clear_all"
          android:title="@string/disconnect_device" />

-    <item android:id="@+id/quit"
-          android:icon="@android:drawable/ic_menu_close_clear_cancel"
-          android:title="@string/quit" />

     <item android:id="@+id/select_freq"
           android:icon="@android:drawable/ic_menu_preferences"
           android:title="@string/select_freq" />
     <item android:id="@+id/select_freq"
           android:icon="@android:drawable/ic_menu_preferences"
           android:title="@string/select_freq" />


@@ -40,4 +37,7 @@
     <item android:id="@+id/map_type"
          android:icon="@android:drawable/ic_menu_mapmode"
          android:title="@string/map_type" />
     <item android:id="@+id/map_type"
          android:icon="@android:drawable/ic_menu_mapmode"
          android:title="@string/map_type" />

+    <item android:id="@+id/quit"
+          android:icon="@android:drawable/ic_menu_close_clear_cancel"
+          android:title="@string/quit" />

 </menu>
 </menu>

diff --git a/altosdroid/res/values/CustomTheme.xml b/altosdroid/res/values/CustomTheme.xml
index 4daed1f897c6a8b381f3cc089d8fd3a580d35b45..6c701ea25c7cb70f24e50aa0408120bd5bd1a3a8 100644 (file)
--- a/altosdroid/res/values/CustomTheme.xml
+++ b/altosdroid/res/values/CustomTheme.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <resources>
 <?xml version="1.0" encoding="utf-8"?>
 
 <resources>

-  <style name="CustomTheme" parent="android:Theme">
-    <item name="android:windowNoTitle">false</item>
+  <style name="CustomTheme" parent="android:Theme.Holo">

   </style>
 </resources>
   </style>
 </resources>

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index 5be9ba84429f38190e9d5038648fa85eab453600..293dff7f2f70732163187cf8aadab75330ad71f8 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -82,9 +82,6 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 
        private BluetoothAdapter mBluetoothAdapter = null;
 
 
        private BluetoothAdapter mBluetoothAdapter = null;
 

-       // Layout Views
-       private TextView mTitle;
-

        // Flight state values
        private TextView mCallsignView;
        private TextView mRSSIView;
        // Flight state values
        private TextView mCallsignView;
        private TextView mRSSIView;


@@ -221,20 +218,20 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
                                if (telemetry_state.telemetry_rate != AltosLib.ao_telemetry_rate_38400)
                                        str = str.concat(String.format(" %d bps",
                                                                       AltosLib.ao_telemetry_rate_values[telemetry_state.telemetry_rate]));
                                if (telemetry_state.telemetry_rate != AltosLib.ao_telemetry_rate_38400)
                                        str = str.concat(String.format(" %d bps",
                                                                       AltosLib.ao_telemetry_rate_values[telemetry_state.telemetry_rate]));

-                               mTitle.setText(str);
+                               setTitle(str);

                        } else {
                        } else {

-                               mTitle.setText(R.string.title_connected_to);
+                               setTitle(R.string.title_connected_to);

                        }
                        break;
                case TelemetryState.CONNECT_CONNECTING:
                        if (telemetry_state.address != null)
                        }
                        break;
                case TelemetryState.CONNECT_CONNECTING:
                        if (telemetry_state.address != null)

-                               mTitle.setText(String.format("Connecting to %s...", telemetry_state.address.name));
+                               setTitle(String.format("Connecting to %s...", telemetry_state.address.name));

                        else
                        else

-                               mTitle.setText("Connecting to something...");
+                               setTitle("Connecting to something...");

                        break;
                case TelemetryState.CONNECT_DISCONNECTED:
                case TelemetryState.CONNECT_NONE:
                        break;
                case TelemetryState.CONNECT_DISCONNECTED:
                case TelemetryState.CONNECT_NONE:

-                       mTitle.setText(R.string.title_not_connected);
+                       setTitle(R.string.title_not_connected);

                        break;
                }
        }
                        break;
                }
        }


@@ -427,9 +424,7 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
                fm = getSupportFragmentManager();
 
                // Set up the window layout
                fm = getSupportFragmentManager();
 
                // Set up the window layout

-               requestWindowFeature(Window.FEATURE_CUSTOM_TITLE);

                setContentView(R.layout.altosdroid);
                setContentView(R.layout.altosdroid);

-               getWindow().setFeatureInt(Window.FEATURE_CUSTOM_TITLE, R.layout.custom_title);

 
                // Create the Tabs and ViewPager
                mTabHost = (TabHost)findViewById(android.R.id.tabhost);
 
                // Create the Tabs and ViewPager
                mTabHost = (TabHost)findViewById(android.R.id.tabhost);


@@ -447,11 +442,6 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
                mTabsAdapter.addTab(mTabHost.newTabSpec("map").setIndicator(create_tab_view("Map")), TabMap.class, null);
                mTabsAdapter.addTab(mTabHost.newTabSpec("offmap").setIndicator(create_tab_view("OffMap")), TabMapOffline.class, null);
 
                mTabsAdapter.addTab(mTabHost.newTabSpec("map").setIndicator(create_tab_view("Map")), TabMap.class, null);
                mTabsAdapter.addTab(mTabHost.newTabSpec("offmap").setIndicator(create_tab_view("OffMap")), TabMapOffline.class, null);
 

-               // Set up the custom title
-               mTitle = (TextView) findViewById(R.id.title_left_text);
-               mTitle.setText(R.string.app_name);
-               mTitle = (TextView) findViewById(R.id.title_right_text);
-

                // Display the Version
                mVersion = (TextView) findViewById(R.id.version);
                mVersion.setText("Version: " + BuildInfo.version +
                // Display the Version
                mVersion = (TextView) findViewById(R.id.version);
                mVersion.setText("Version: " + BuildInfo.version +