• R/O
  • HTTP
  • SSH
  • HTTPS

コミット

タグ
未設定

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

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

コミットメタ情報

リビジョンd0dd2bb0e5835ad0608b4c9268261bd5354fb507 (tree)
日時2014-09-16 22:37:46
作者Masahiko, SAWAI <say@user...>
コミッターMasahiko, SAWAI

ログメッセージ

Fixed a crash bug in preference activity

変更サマリ

差分

--- a/android-R/res/values-large/dimens_about_app.xml
+++ b/android-R/res/values-large/dimens_about_app.xml
@@ -5,8 +5,8 @@
55
66 <dimen name="about_app_info_item_margin">8dip</dimen>
77
8- <dimen name="about_app_name_textSize">32sp</dimen>
9- <dimen name="about_app_version_textSize">26sp</dimen>
8+ <dimen name="about_app_name_textSize">44sp</dimen>
9+ <dimen name="about_app_version_textSize">28sp</dimen>
1010
11- <dimen name="about_app_label_textSize">18sp</dimen>
11+ <dimen name="about_app_label_textSize">20sp</dimen>
1212 </resources>
--- a/android-R/res/values-small/dimens_about_app.xml
+++ b/android-R/res/values-small/dimens_about_app.xml
@@ -5,8 +5,8 @@
55
66 <dimen name="about_app_info_item_margin">4dip</dimen>
77
8- <dimen name="about_app_name_textSize">24sp</dimen>
9- <dimen name="about_app_version_textSize">18sp</dimen>
8+ <dimen name="about_app_name_textSize">32sp</dimen>
9+ <dimen name="about_app_version_textSize">20sp</dimen>
1010
1111 <dimen name="about_app_label_textSize">14sp</dimen>
1212 </resources>
--- a/android-R/res/values-xlarge/dimens_about_app.xml
+++ b/android-R/res/values-xlarge/dimens_about_app.xml
@@ -5,7 +5,7 @@
55
66 <dimen name="about_app_info_item_margin">12dip</dimen>
77
8- <dimen name="about_app_name_textSize">40sp</dimen>
8+ <dimen name="about_app_name_textSize">60sp</dimen>
99 <dimen name="about_app_version_textSize">32sp</dimen>
1010
1111 <dimen name="about_app_label_textSize">24sp</dimen>
--- a/android-R/res/values/dimens_about_app.xml
+++ b/android-R/res/values/dimens_about_app.xml
@@ -5,8 +5,8 @@
55
66 <dimen name="about_app_info_item_margin">4dip</dimen>
77
8- <dimen name="about_app_name_textSize">24sp</dimen>
9- <dimen name="about_app_version_textSize">20sp</dimen>
8+ <dimen name="about_app_name_textSize">36sp</dimen>
9+ <dimen name="about_app_version_textSize">24sp</dimen>
1010
1111 <dimen name="about_app_label_textSize">16sp</dimen>
1212 </resources>
--- a/android-R/res/xml/preferences.xml
+++ b/android-R/res/xml/preferences.xml
@@ -34,32 +34,58 @@
3434 </PreferenceCategory>
3535
3636 <PreferenceCategory android:title="@string/etc" >
37- <PreferenceScreen
38- android:title="@string/about_app_title"
39- android:summary="@string/about_app_summary"
37+ <PreferenceScreen
38+ android:key="about_app_screen"
39+ android:title="@string/about_app_title"
40+ android:summary="@string/about_app_summary"
4041 >
41- <intent
42- android:action="android.intent.action.MAIN"
43- android:targetPackage="org.routine_work.android_r"
44- android:targetClass="org.routine_work.android_r.about.AppVersionActivity"
45- />
42+ <PreferenceScreen
43+ android:title="@string/application_version_title"
44+ android:summary="@string/application_version_summary"
45+ >
46+ <intent
47+ android:action="android.intent.action.MAIN"
48+ android:targetPackage="org.routine_work.android_r"
49+ android:targetClass="org.routine_work.android_r.about.AppVersionActivity"
50+ />
51+ </PreferenceScreen>
52+ <PreferenceScreen
53+ android:title="@string/application_store_title"
54+ android:summary="@string/application_store_summary"
55+ >
56+ <intent
57+ android:action="android.intent.action.MAIN"
58+ android:targetPackage="org.routine_work.android_r"
59+ android:targetClass="org.routine_work.android_r.about.AppStoreActivity"
60+ />
61+ </PreferenceScreen>
62+ <PreferenceScreen
63+ android:title="@string/application_management_title"
64+ android:summary="@string/application_management_summary"
65+ >
66+ <intent
67+ android:action="android.intent.action.MAIN"
68+ android:targetPackage="org.routine_work.android_r"
69+ android:targetClass="org.routine_work.android_r.about.AppManagementActivity"
70+ />
71+ </PreferenceScreen>
4672 </PreferenceScreen>
4773 </PreferenceCategory>
4874
4975
50-<!--
51- <PreferenceCategory android:title="Debug" >
52- <PreferenceScreen
53- android:title="Debug"
54- android:summary="Debug functions"
55- >
56- <intent
57- android:action="android.intent.action.MAIN"
58- android:targetPackage="org.routine_work.android.battery_logger"
59- android:targetClass="org.routine_work.android.battery_logger.DebugActivity"
60- />
61- </PreferenceScreen>
62- </PreferenceCategory>
63--->
76+ <!--
77+ <PreferenceCategory android:title="Debug" >
78+ <PreferenceScreen
79+ android:title="Debug"
80+ android:summary="Debug functions"
81+ >
82+ <intent
83+ android:action="android.intent.action.MAIN"
84+ android:targetPackage="org.routine_work.android.battery_logger"
85+ android:targetClass="org.routine_work.android.battery_logger.DebugActivity"
86+ />
87+ </PreferenceScreen>
88+ </PreferenceCategory>
89+ -->
6490
6591 </PreferenceScreen>