• R/O
  • HTTP
  • SSH
  • HTTPS

コミット

タグ
未設定

よく使われているワード(クリックで追加)

javaandroidc++objective-ccocoa誰得c#gamebathyscaphephplinuxrubyqt翻訳pythoncomegatwindowstwitterguiframeworkbtronvb.netdirectxtestdomarduino計画中(planning stage)previewerpukiwiki

Navigation voice changer app for Android


コミットメタ情報

リビジョン8991b813df856fd33c5533109a341ad783bdcf8a (tree)
日時2013-08-11 00:30:11
作者HMML <hmml3939@gmai...>
コミッターHMML

ログメッセージ

Fix crash on 4.0.

変更サマリ

差分

--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,8 @@
11 <?xml version="1.0" encoding="utf-8"?>
22 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
33 package="jp.nekoteki.android.navivoicechanger"
4- android:versionCode="1"
5- android:versionName="1.0" >
4+ android:versionCode="2"
5+ android:versionName="1.0.1" >
66
77 <uses-sdk
88 android:minSdkVersion="14"
--- a/project.properties
+++ b/project.properties
@@ -11,4 +11,4 @@
1111 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
1212
1313 # Project target.
14-target=android-17
14+target=android-18
--- a/res/menu/download.xml
+++ b/res/menu/download.xml
@@ -1,4 +1,4 @@
11 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
2- <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>
2+ <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>
33
44 </menu>
--- a/res/menu/install_list.xml
+++ b/res/menu/install_list.xml
@@ -1,4 +1,4 @@
11 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
2- <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>
2+ <item android:id="@+id/menu_go_download" android:showAsAction="always" android:icon="@android:drawable/ic_menu_search" android:title="@string/title_activity_download"></item>
33
44 </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 {
380380 //
381381 NavUtils.navigateUpFromSameTask(this);
382382 return true;
383+ case R.id.menu_go_install:
384+ startActivity(new Intent(DownloadActivity.this, InstallListActivity.class));
385+ return true;
383386 }
384387 return super.onOptionsItemSelected(item);
385388 }
@@ -393,10 +396,6 @@ public class DownloadActivity extends Activity {
393396 }
394397 }
395398
396- public void goInstallListFromMenu(MenuItem item) {
397- startActivity(new Intent(DownloadActivity.this, InstallListActivity.class));
398- }
399-
400399 public void onCreateContextMenu(ContextMenu menu, View view, ContextMenuInfo info) {
401400 super.onCreateContextMenu(menu, view, info);
402401 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 {
165165 //
166166 NavUtils.navigateUpFromSameTask(this);
167167 return true;
168+ case R.id.menu_go_download:
169+ startActivity(new Intent(InstallListActivity.this, DownloadActivity.class));
168170 }
169171 return super.onOptionsItemSelected(item);
170172 }
@@ -208,8 +210,4 @@ public class InstallListActivity extends Activity {
208210 }
209211 return true;
210212 }
211-
212- public void goDownloadActivityFromMenu(MenuItem item) {
213- startActivity(new Intent(InstallListActivity.this, DownloadActivity.class));
214- }
215213 }