• R/O
  • HTTP
  • SSH
  • HTTPS

コミット

タグ

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

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

Offline HTML Reader for Android


コミットメタ情報

リビジョン2ef3c0ed097566a6607abbb15b06ffe3f5ae0ec8 (tree)
日時2012-10-08 17:36:19
作者Kana Koda <kodakana@linu...>
コミッターKana Koda

ログメッセージ

HoneyComb以降では機能しない「選択してコピー」(シフトキーのエミュレーション)を隠すようにした。

変更サマリ

差分

Binary files a/bin/Unnet Browser.apk and b/bin/Unnet Browser.apk differ
Binary files a/bin/classes.dex and b/bin/classes.dex differ
Binary files a/bin/classes/org/pulpdust/unnetbrowser/R$string.class and b/bin/classes/org/pulpdust/unnetbrowser/R$string.class differ
Binary files a/bin/classes/org/pulpdust/unnetbrowser/R$style.class and b/bin/classes/org/pulpdust/unnetbrowser/R$style.class differ
Binary files a/bin/classes/org/pulpdust/unnetbrowser/R$xml.class and b/bin/classes/org/pulpdust/unnetbrowser/R$xml.class differ
Binary files a/bin/classes/org/pulpdust/unnetbrowser/UnnetBrowserActivity$1.class and b/bin/classes/org/pulpdust/unnetbrowser/UnnetBrowserActivity$1.class differ
Binary files a/bin/classes/org/pulpdust/unnetbrowser/UnnetBrowserActivity$10.class and b/bin/classes/org/pulpdust/unnetbrowser/UnnetBrowserActivity$10.class differ
Binary files a/bin/classes/org/pulpdust/unnetbrowser/UnnetBrowserActivity$11.class and b/bin/classes/org/pulpdust/unnetbrowser/UnnetBrowserActivity$11.class differ
Binary files a/bin/classes/org/pulpdust/unnetbrowser/UnnetBrowserActivity$12.class and b/bin/classes/org/pulpdust/unnetbrowser/UnnetBrowserActivity$12.class differ
Binary files a/bin/classes/org/pulpdust/unnetbrowser/UnnetBrowserActivity$13.class and b/bin/classes/org/pulpdust/unnetbrowser/UnnetBrowserActivity$13.class differ
Binary files a/bin/classes/org/pulpdust/unnetbrowser/UnnetBrowserActivity$2.class and b/bin/classes/org/pulpdust/unnetbrowser/UnnetBrowserActivity$2.class differ
Binary files a/bin/classes/org/pulpdust/unnetbrowser/UnnetBrowserActivity$3.class and b/bin/classes/org/pulpdust/unnetbrowser/UnnetBrowserActivity$3.class differ
Binary files a/bin/classes/org/pulpdust/unnetbrowser/UnnetBrowserActivity$4.class and b/bin/classes/org/pulpdust/unnetbrowser/UnnetBrowserActivity$4.class differ
Binary files a/bin/classes/org/pulpdust/unnetbrowser/UnnetBrowserActivity$5.class and b/bin/classes/org/pulpdust/unnetbrowser/UnnetBrowserActivity$5.class differ
Binary files a/bin/classes/org/pulpdust/unnetbrowser/UnnetBrowserActivity$6.class and b/bin/classes/org/pulpdust/unnetbrowser/UnnetBrowserActivity$6.class differ
Binary files a/bin/classes/org/pulpdust/unnetbrowser/UnnetBrowserActivity$7.class and b/bin/classes/org/pulpdust/unnetbrowser/UnnetBrowserActivity$7.class differ
Binary files a/bin/classes/org/pulpdust/unnetbrowser/UnnetBrowserActivity$8.class and b/bin/classes/org/pulpdust/unnetbrowser/UnnetBrowserActivity$8.class differ
Binary files a/bin/classes/org/pulpdust/unnetbrowser/UnnetBrowserActivity$9.class and b/bin/classes/org/pulpdust/unnetbrowser/UnnetBrowserActivity$9.class differ
Binary files a/bin/classes/org/pulpdust/unnetbrowser/UnnetBrowserActivity.class and b/bin/classes/org/pulpdust/unnetbrowser/UnnetBrowserActivity.class differ
Binary files a/bin/resources.ap_ and b/bin/resources.ap_ differ
--- a/gen/org/pulpdust/unnetbrowser/R.java
+++ b/gen/org/pulpdust/unnetbrowser/R.java
@@ -39,7 +39,7 @@ public final class R {
3939 public static final int main=0x7f030001;
4040 }
4141 public static final class string {
42- public static final int about=0x7f060034;
42+ public static final int about=0x7f06003b;
4343 public static final int address=0x7f060005;
4444 public static final int app_author=0x7f060006;
4545 public static final int app_copy=0x7f060008;
@@ -48,14 +48,14 @@ public final class R {
4848 public static final int app_name=0x7f060001;
4949 public static final int app_ver=0x7f060004;
5050 public static final int back=0x7f06001a;
51- public static final int behaviour=0x7f060033;
51+ public static final int behaviour=0x7f06003a;
5252 public static final int bottom=0x7f06000d;
5353 public static final int buttons=0x7f060015;
5454 public static final int close=0x7f060010;
5555 public static final int copy=0x7f060007;
56- public static final int display=0x7f060032;
57- public static final int err_404=0x7f060035;
58- public static final int err_500=0x7f060036;
56+ public static final int display=0x7f060039;
57+ public static final int err_404=0x7f06003c;
58+ public static final int err_500=0x7f06003d;
5959 public static final int etc=0x7f060011;
6060 public static final int find=0x7f060014;
6161 public static final int first=0x7f060021;
@@ -66,7 +66,7 @@ public final class R {
6666 public static final int index=0x7f060013;
6767 public static final int info_restart=0x7f06002f;
6868 public static final int license=0x7f060009;
69- public static final int loading=0x7f060037;
69+ public static final int loading=0x7f06003e;
7070 public static final int m_next=0x7f060018;
7171 public static final int m_prev=0x7f060017;
7272 public static final int match=0x7f06001c;
@@ -75,7 +75,7 @@ public final class R {
7575 public static final int pgdn=0x7f060020;
7676 public static final int pgup=0x7f06001f;
7777 public static final int pref_button=0x7f060025;
78- public static final int pref_cache=0x7f060031;
78+ public static final int pref_cache=0x7f060038;
7979 public static final int pref_font=0x7f060026;
8080 public static final int pref_image=0x7f060028;
8181 public static final int pref_restart=0x7f06002d;
@@ -85,6 +85,13 @@ public final class R {
8585 public static final int pref_title_desc=0x7f06002c;
8686 public static final int pref_titlebar=0x7f060024;
8787 public static final int pref_vol=0x7f060030;
88+ public static final int pref_vol_def=0x7f060031;
89+ public static final int pref_vol_fns=0x7f060035;
90+ public static final int pref_vol_fns_v11=0x7f060036;
91+ public static final int pref_vol_iof=0x7f060037;
92+ public static final int pref_vol_nop=0x7f060033;
93+ public static final int pref_vol_scl=0x7f060032;
94+ public static final int pref_vol_zoom=0x7f060034;
8895 public static final int pref_wide=0x7f06002a;
8996 public static final int pref_zoom=0x7f060029;
9097 public static final int prefs=0x7f06000f;
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -50,6 +50,13 @@
5050 <string name="pref_restart_desc">タイトルバーの設定を反映するために自動的に再起動するかどうか。</string>
5151 <string name="info_restart">設定を反映するために自動的に再起動します。</string>
5252 <string name="pref_vol">音量キー</string>
53+ <string name="pref_vol_def">割り当てなし</string>
54+ <string name="pref_vol_scl">スクロール</string>
55+ <string name="pref_vol_nop">前後のファイルへ</string>
56+ <string name="pref_vol_zoom">拡大/縮小</string>
57+ <string name="pref_vol_fns">検索/選択</string>
58+ <string name="pref_vol_fns_v11">検索</string>
59+ <string name="pref_vol_iof">目次/進む</string>
5360 <string name="pref_cache">閉じるときにキャッシュを削除する</string>
5461 <string name="display">表示</string>
5562 <string name="behaviour">動作</string>
--- a/res/values-ja/arrays.xml
+++ b/res/values-v11/arrays.xml
@@ -33,12 +33,12 @@
3333 <item>32</item>
3434 </string-array>
3535 <string-array name="vol_func_labels">
36- <item>割り当てなし</item>
37- <item>スクロール</item>
38- <item>前後のファイルへ</item>
39- <item>拡大/縮小</item>
40- <item>検索/選択</item>
41- <item>目次/進む</item>
36+ <item>@string/pref_vol_def</item>
37+ <item>@string/pref_vol_scl</item>
38+ <item>@string/pref_vol_nop</item>
39+ <item>@string/pref_vol_zoom</item>
40+ <item>@string/pref_vol_fns_v11</item>
41+ <item>@string/pref_vol_iof</item>
4242 </string-array>
4343 <string-array name="vol_func_values">
4444 <item>0</item>
@@ -48,5 +48,4 @@
4848 <item>4</item>
4949 <item>5</item>
5050 </string-array>
51-
5251 </resources>
\ No newline at end of file
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -33,12 +33,12 @@
3333 <item>32</item>
3434 </string-array>
3535 <string-array name="vol_func_labels">
36- <item>Default</item>
37- <item>Page scroll</item>
38- <item>Go to next/prev</item>
39- <item>Zoom in/out</item>
40- <item>Find/Select</item>
41- <item>Index/Forward</item>
36+ <item>@string/pref_vol_def</item>
37+ <item>@string/pref_vol_scl</item>
38+ <item>@string/pref_vol_nop</item>
39+ <item>@string/pref_vol_zoom</item>
40+ <item>@string/pref_vol_fns</item>
41+ <item>@string/pref_vol_iof</item>
4242 </string-array>
4343 <string-array name="vol_func_values">
4444 <item>0</item>
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -50,6 +50,13 @@
5050 <string name="pref_restart_desc">Or automatically restarted in take to effect the setting of the title bar.</string>
5151 <string name="info_restart">Are automatically restarted in take to effect the setting.</string>
5252 <string name="pref_vol">Volume Key</string>
53+ <string name="pref_vol_def">Default</string>
54+ <string name="pref_vol_scl">Page scroll</string>
55+ <string name="pref_vol_nop">Go to next/prev</string>
56+ <string name="pref_vol_zoom">Zoom in/out</string>
57+ <string name="pref_vol_fns">Find/Select</string>
58+ <string name="pref_vol_fns_v11">Find</string>
59+ <string name="pref_vol_iof">Index/Forward</string>
5360 <string name="pref_cache">To delete cache when close</string>
5461 <string name="display">Display</string>
5562 <string name="behaviour">Behaviour</string>
--- a/src/org/pulpdust/unnetbrowser/UnnetBrowserActivity.java
+++ b/src/org/pulpdust/unnetbrowser/UnnetBrowserActivity.java
@@ -19,6 +19,7 @@ import android.content.Intent;
1919 import android.content.SharedPreferences;
2020 import android.content.res.Configuration;
2121 import android.net.Uri;
22+import android.os.Build;
2223 import android.os.Bundle;
2324 import android.os.Environment;
2425 import android.preference.PreferenceManager;
@@ -566,8 +567,10 @@ public class UnnetBrowserActivity extends Activity {
566567 // sbmn1.setIcon(android.R.drawable.ic_menu_more);
567568 // sbmn1.clearHeader();
568569 // sbmn1.setQwertyMode(true);
569- MenuItem mnitm4 = menu.add(0, MENU_CPY, 0, R.string.select);
570- mnitm4.setAlphabeticShortcut('c');
570+ if (Build.VERSION.SDK_INT <= 10){
571+ MenuItem mnitm4 = menu.add(0, MENU_CPY, 0, R.string.select);
572+ mnitm4.setAlphabeticShortcut('c');
573+ }
571574 MenuItem mnitm5 = menu.add(0, MENU_FND, 0, R.string.find);
572575 mnitm5.setAlphabeticShortcut('f');
573576 MenuItem mnitm7 = menu.add(0, MENU_FSC, 0, R.string.fullscreen);
@@ -757,7 +760,13 @@ public class UnnetBrowserActivity extends Activity {
757760 webview.zoomOut();
758761 return true;
759762 } else if (volkey == 4){
760- shiftDown();
763+ if (Build.VERSION.SDK_INT <= 10){
764+ shiftDown();
765+ } else {
766+ edittext1.selectAll();
767+ showFinder();
768+ mode_find = true;
769+ }
761770 return true;
762771 } else if (volkey == 5){
763772 if (webview.canGoForward()){