提交: 8991b813df856fd33c5533109a341ad783bdcf8a - NaviVoiceChanger (git)

Navigation voice changer app for Android

Commit MetaInfo

• 修订版: 8991b813df856fd33c5533109a341ad783bdcf8a (tree)
• 时间: 2013-08-11 00:30:11
• 作者: HMML <hmml3939@gmai...>
• Commiter: HMML

Log Message

Fix crash on 4.0.

更改概述

• modified: AndroidManifest.xml
• modified: project.properties
• modified: res/menu/download.xml
• modified: res/menu/install_list.xml
• modified: src/jp/nekoteki/android/navivoicechanger/DownloadActivity.java
• modified: src/jp/nekoteki/android/navivoicechanger/InstallListActivity.java

差异

--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="jp.nekoteki.android.navivoicechanger"
-    android:versionCode="1"
-    android:versionName="1.0" >
+    android:versionCode="2"
+    android:versionName="1.0.1" >
 
     <uses-sdk
         android:minSdkVersion="14"

--- a/project.properties
+++ b/project.properties
@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-17
+target=android-18

--- a/res/menu/download.xml
+++ b/res/menu/download.xml
@@ -1,4 +1,4 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:id="@+id/menu_go_install" android:showAsAction="always" android:icon="@android:drawable/ic_menu_add" android:onClick="goInstallListFromMenu" android:title="@string/title_activity_install_list"></item>
+    <item android:id="@+id/menu_go_install" android:showAsAction="always" android:icon="@android:drawable/ic_menu_add" android:title="@string/title_activity_install_list"></item>
 
 </menu>

--- a/res/menu/install_list.xml
+++ b/res/menu/install_list.xml
@@ -1,4 +1,4 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:id="@+id/menu_go_download" android:showAsAction="always" android:icon="@android:drawable/ic_menu_search" android:title="@string/title_activity_download" android:onClick="goDownloadActivityFromMenu"></item>
+    <item android:id="@+id/menu_go_download" android:showAsAction="always" android:icon="@android:drawable/ic_menu_search" android:title="@string/title_activity_download"></item>
 
 </menu>

--- a/src/jp/nekoteki/android/navivoicechanger/DownloadActivity.java
+++ b/src/jp/nekoteki/android/navivoicechanger/DownloadActivity.java
@@ -380,6 +380,9 @@ public class DownloadActivity extends Activity {
 			//
 			NavUtils.navigateUpFromSameTask(this);
 			return true;
+		case R.id.menu_go_install:
+			startActivity(new Intent(DownloadActivity.this, InstallListActivity.class));
+			return true;
 		}
 		return super.onOptionsItemSelected(item);
 	}
@@ -393,10 +396,6 @@ public class DownloadActivity extends Activity {
 		}
 	}
 	
-	public void goInstallListFromMenu(MenuItem item) {
-		startActivity(new Intent(DownloadActivity.this, InstallListActivity.class));
-	}
-
 	public void onCreateContextMenu(ContextMenu menu, View view, ContextMenuInfo info) {
 		super.onCreateContextMenu(menu, view, info);
 		AdapterContextMenuInfo ainfo = (AdapterContextMenuInfo) info;

--- a/src/jp/nekoteki/android/navivoicechanger/InstallListActivity.java
+++ b/src/jp/nekoteki/android/navivoicechanger/InstallListActivity.java
@@ -165,6 +165,8 @@ public class InstallListActivity extends Activity {
 			//
 			NavUtils.navigateUpFromSameTask(this);
 			return true;
+		case R.id.menu_go_download:
+			startActivity(new Intent(InstallListActivity.this, DownloadActivity.class));
 		}
 		return super.onOptionsItemSelected(item);
 	}
@@ -208,8 +210,4 @@ public class InstallListActivity extends Activity {
 		}
 		return true;
 	}
-
-	public void goDownloadActivityFromMenu(MenuItem item) {
-		startActivity(new Intent(InstallListActivity.this, DownloadActivity.class));
-	}
 }