xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove actionbar

Browse Source
This commit is contained in:
Hannes Janetzek 2012-09-18 15:44:25 +02:00
parent 28cc35a32d
commit d3f8f7ceef
6 changed files with 97 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
AndroidManifest.xml
View File

@ -12,12 +12,14 @@
<uses-sdk
android:minSdkVersion="10"
android:targetSdkVersion="16" />
android:targetSdkVersion="10" />
<application
android:icon="@drawable/globe2"
android:label="@string/application_name"
android:theme="@style/Theme.TileMap" >
android:theme="@android:style/Theme.NoTitleBar"
>
<!-- android:theme="@style/Theme.TileMap" -->
<activity
android:name="org.oscim.app.TileMap"
android:configChanges="orientation|screenSize" >

4
res/layout/activity_tilemap.xml
View File

@ -12,8 +12,8 @@
<ToggleButton
android:id="@+id/snapToLocationView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="57dp"
android:layout_height="72dp"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:layout_marginBottom="10dip"

93
res/menu/options_menu_pre_honeycomb.xml
View File

@ -13,77 +13,82 @@
<item
android:id="@+id/menu_position_my_location_disable"
android:title="@string/menu_position_my_location_disable"/>
<!-- <item
<!--
<item
android:id="@+id/menu_position_last_known"
android:title="@string/menu_position_last_known"/> -->
android:title="@string/menu_position_last_known"/>
-->
<item
android:id="@+id/menu_position_enter_coordinates"
android:title="@string/menu_position_enter_coordinates"/>
<item
android:id="@+id/menu_position_map_center"
android:title="@string/menu_position_map_file_center"/>
<item
<item
android:id="@+id/menu_rotation_enable"
android:title="@string/menu_rotation_enable"/>
<item
android:id="@+id/menu_rotation_disable"
android:title="@string/menu_rotation_disable"/>
<item
<item
android:id="@+id/menu_compass_enable"
android:title="@string/menu_compass_enable"/>
<item
<item
android:id="@+id/menu_compass_disable"
android:title="@string/menu_compass_disable"/>
</menu>
</item>
<item
<!--
<item
android:id="@+id/menu_options"
android:icon="@drawable/ic_menu_options"
android:showAsAction="always"
android:title="@string/menu_options">
<menu>
-->
<!-- android:icon="@drawable/ic_menu_preferences" -->
<item
android:id="@+id/menu_preferences"
android:showAsAction="never"
android:icon="@drawable/ic_menu_options"
android:title="@string/menu_preferences"/>
<menu>
<!-- android:icon="@drawable/ic_menu_preferences" -->
<item
android:id="@+id/menu_preferences"
android:showAsAction="never"
android:title="@string/menu_preferences"/>
<!-- android:icon="@drawable/ic_menu_mapmode" -->
<!-- android:icon="@drawable/ic_menu_archive" -->
<item
android:id="@+id/menu_mapfile"
android:showAsAction="never"
android:title="@string/menu_mapfile"/>
<!-- <item
<!-- android:icon="@drawable/ic_menu_mapmode" -->
<!-- android:icon="@drawable/ic_menu_archive" -->
<!--
<item
android:id="@+id/menu_mapfile"
android:showAsAction="never"
android:title="@string/menu_mapfile"/>
-->
<!--
<item
android:id="@+id/menu_info_map_file"
android:title="@string/menu_info_map_file"/> -->
<item
android:id="@+id/menu_info_about"
android:title="@string/menu_info_about"/>
android:title="@string/menu_info_map_file"/>
-->
<!--
</menu>
</item>
-->
<item
android:id="@+id/menu_render_theme"
android:showAsAction="never"
android:title="@string/menu_render_theme">
<menu>
<item
android:id="@+id/menu_render_theme_osmarender"
android:title="@string/menu_render_theme_osmarender"/>
<item
android:id="@+id/menu_render_theme_tronrender"
android:title="@string/menu_render_theme_tronrender"/>
<item
android:id="@+id/menu_render_theme_select_file"
android:title="@string/menu_render_theme_select_file"/>
</menu>
</item>
android:id="@+id/menu_render_theme"
android:showAsAction="never"
android:title="@string/menu_render_theme">
<menu>
<item
android:id="@+id/menu_render_theme_osmarender"
android:title="@string/menu_render_theme_osmarender"/>
<item
android:id="@+id/menu_render_theme_tronrender"
android:title="@string/menu_render_theme_tronrender"/>
<item
android:id="@+id/menu_render_theme_select_file"
android:title="@string/menu_render_theme_select_file"/>
</menu>
</item>
<item
android:id="@+id/menu_info_about"
android:title="@string/menu_info_about"/>
</menu>

4
res/values/strings.xml
View File

@ -50,7 +50,7 @@
<string name="longitude">Longitude</string>
<string name="menu_info">Info</string>
<string name="menu_info_map_file">Map file properties</string>
<string name="menu_info_about">About this software</string>
<string name="menu_info_about">About</string>
<string name="menu_mapfile">Map file</string>
<string name="menu_position">Position</string>
<string name="menu_rotation_enable">Enable rotation</string>
@ -63,7 +63,7 @@
<string name="menu_position_my_location_enable">Show my location</string>
<string name="menu_position_my_location_disable">Remove my location</string>
<string name="menu_preferences">Preferences</string>
<string name="menu_render_theme">Render theme</string>
<string name="menu_render_theme">Theme</string>
<string name="menu_render_theme_osmarender">Default Theme</string>
<string name="menu_render_theme_tronrender">Tube Theme</string>
<string name="menu_render_theme_select_file">Select XML file …</string>

68
src/org/oscim/app/TileMap.java
View File

@ -18,7 +18,6 @@ import org.oscim.view.MapActivity;
import org.oscim.view.MapView;
import android.annotation.TargetApi;
import android.app.ActionBar;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
@ -39,7 +38,6 @@ import android.view.MenuItem;
import android.view.MotionEvent;
import android.view.View;
import android.view.WindowManager;
import android.widget.ArrayAdapter;
import android.widget.EditText;
import android.widget.SeekBar;
import android.widget.SpinnerAdapter;
@ -78,10 +76,10 @@ public class TileMap extends MapActivity {
@Override
public boolean onCreateOptionsMenu(Menu menu) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB)
getMenuInflater().inflate(R.menu.options_menu, menu);
else
getMenuInflater().inflate(R.menu.options_menu_pre_honeycomb, menu);
// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB)
// getMenuInflater().inflate(R.menu.options_menu, menu);
// else
getMenuInflater().inflate(R.menu.options_menu_pre_honeycomb, menu);
mMenu = menu;
@ -141,14 +139,6 @@ public class TileMap extends MapActivity {
showDialog(DIALOG_ENTER_COORDINATES);
return true;
case R.id.menu_position_map_center:
// disable GPS follow mode if it is enabled
mLocation.disableSnapToLocation(true);
mMapView.setCenter(mMapView.getMapDatabase()
.getMapInfo().mapCenter);
return true;
case R.id.menu_preferences:
startActivity(new Intent(this, EditPreferences.class));
return true;
@ -171,9 +161,16 @@ public class TileMap extends MapActivity {
startRenderThemePicker();
return true;
case R.id.menu_mapfile:
startMapFilePicker();
return true;
// case R.id.menu_position_map_center:
// // disable GPS follow mode if it is enabled
// mLocation.disableSnapToLocation(true);
//
// mMapView.setCenter(mMapView.getMapDatabase()
// .getMapInfo().mapCenter);
// return true;
// case R.id.menu_mapfile:
// startMapFilePicker();
// return true;
default:
return false;
@ -216,10 +213,11 @@ public class TileMap extends MapActivity {
if (mMapDatabase == MapDatabases.MAP_READER) {
menu.findItem(R.id.menu_mapfile).setVisible(true);
menu.findItem(R.id.menu_position_map_center).setVisible(true);
} else {
menu.findItem(R.id.menu_mapfile).setVisible(false);
menu.findItem(R.id.menu_position_map_center).setVisible(false);
}
// else {
// menu.findItem(R.id.menu_mapfile).setVisible(false);
// menu.findItem(R.id.menu_position_map_center).setVisible(false);
// }
toggleMenuRotation();
@ -278,21 +276,21 @@ public class TileMap extends MapActivity {
return Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB;
}
@TargetApi(11)
// @TargetApi(11)
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (!isPreHoneyComb()) {
mSpinnerAdapter = ArrayAdapter.createFromResource(this,
R.array.view_sections,
android.R.layout.simple_spinner_dropdown_item);
ActionBar actionBar = getActionBar();
actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
// actionBar.setListNavigationCallbacks(mSpinnerAdapter, this);
actionBar.setDisplayShowTitleEnabled(false);
}
// if (!isPreHoneyComb()) {
// mSpinnerAdapter = ArrayAdapter.createFromResource(this,
// R.array.view_sections,
// android.R.layout.simple_spinner_dropdown_item);
// ActionBar actionBar = getActionBar();
// actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
//
// // actionBar.setListNavigationCallbacks(mSpinnerAdapter, this);
// actionBar.setDisplayShowTitleEnabled(false);
// }
// set up the layout views
setContentView(R.layout.activity_tilemap);
@ -500,7 +498,7 @@ public class TileMap extends MapActivity {
// }
//
// if (mapGeneratorInternalNew != mapGeneratorInternal) {
// MapGenerator mapGenerator = MapGeneratorFactory.createMapGenerator(mapGeneratorInternalNew);
// TileGenerator mapGenerator = MapGeneratorFactory.createMapGenerator(mapGeneratorInternalNew);
// mapView.setMapGenerator(mapGenerator);
// mapGeneratorInternal = mapGeneratorInternalNew;
// }
@ -575,9 +573,9 @@ public class TileMap extends MapActivity {
// mMapView.setMapFile(mMapView.getMapFile());
// }
if (Build.VERSION.SDK_INT >= 11) {
VersionHelper.refreshActionBarMenu(this);
}
// if (Build.VERSION.SDK_INT >= 11) {
// VersionHelper.refreshActionBarMenu(this);
// }
}
static class VersionHelper {

8
src/org/oscim/app/preferences/EditPreferences.java
View File

@ -16,8 +16,6 @@ package org.oscim.app.preferences;
import org.oscim.app.R;
import android.annotation.TargetApi;
import android.os.Build;
import android.os.Bundle;
import android.preference.PreferenceActivity;
@ -31,13 +29,13 @@ public class EditPreferences extends PreferenceActivity {
addPreferencesFromResource(R.xml.preferences);
}
@TargetApi(11)
// @TargetApi(11)
@Override
protected void onResume() {
super.onResume();
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB)
getActionBar().hide();
// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB)
// getActionBar().hide();
// check if the full screen mode should be activated
// if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean("fullscreen",