Merge lp:narau into lp:narau/fdroid

[Yvon TANGUY]

Version 0.8.1 to fix the build problem with SDK 17 (4.2 Jelly Bean) not supported yet.

[Yvon TANGUY (vono22)]

review: Approve

=== modified file 'Assets/gen_png.py'
--- Assets/gen_png.py	2012-12-11 22:34:12 +0000
+++ Assets/gen_png.py	2012-12-18 18:47:22 +0000
@@ -1,4 +1,22 @@
 #!/usr/bin/env python
+#    Copyright (C) 2012 Yvon TANGUY
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+# ---------------------------------------------------------------------------
+# This script generate png images from the svg files.
+# It needs inkscape and trimage to run.
+#
 
 import os
 import sys
@@ -6,14 +24,48 @@
 
 DIRS=['drawable-ldpi', 'drawable-mdpi', 'drawable-hdpi', 'drawable-xhdpi']
 RES=[36, 48, 72, 96]
+
+def usage():
+	print('usage:')
+	print(sys.argv[0] + ' [-s <dir_suffix>] [-r <res_values>] [file.svg...]')
+	print('')
+	print('file.svg        : list of svg files. If there is no file, it takes every svg file')
+	print('                  in the current directory')
+	print('-s <dir_suffix> : a suffix like v11 to create drawable-{lmhx}dpi-v11')
+	print('-r <res_values> : exported png file size: 24,32,48,64')
+	print('                  default values are 36,48,72,96')
+	sys.exit(0)
+
+args_n = 1
+dir_suffix=''
+
+# search for --help first
+if " ".join(sys.argv).find('--help') > -1:
+	usage()
+
+if len(sys.argv) >= (args_n + 2) and sys.argv[args_n] == '-s':
+	dir_suffix = '-' + sys.argv[args_n+1]
+	args_n += 2
+if len(sys.argv) >= (args_n + 2) and sys.argv[args_n] == '-r':
+	# transform the parameter into an int array
+	try:
+		png_res = map(int, sys.argv[args_n+1].split(','))
+	except ValueError as ve:
+		print('Error: ' + str(ve))
+		usage()
+	if len(png_res) != 4:
+		print('Error: Not enough resolutions')
+		usage()
+	args_n += 2
+else:
+	png_res = RES
+
+start_files_args = args_n
+
 for i in range(len(DIRS)):
-	d_dir = DIRS[i]
-	res = str(RES[i])
+	d_dir = DIRS[i] + dir_suffix
+	res = str(png_res[i])
 
-	start_files_args = 1
-	if len(sys.argv) >= 3 and sys.argv[1] == '-s':
-		d_dir = d_dir + '-' + sys.argv[2]
-		start_files_args = 3
 	if len(sys.argv) > start_files_args:
 		files = sys.argv[start_files_args:]
 	else:
@@ -22,10 +74,13 @@
 	print('Gen png for ' + d_dir + ' (' + res + 'x' + res + ')...')
 	subprocess.call(['/bin/mkdir', '-p', d_dir])
 	for svg in files:
-		if len(svg) > 4 and svg[-4:] == '.svg':
+		if len(svg) > 4 and svg[-4:] == '.svg' and os.path.isfile(svg):
 			png=d_dir + '/' + svg[:-4] + '.png'
 			subprocess.call(['/usr/bin/inkscape', '-z', '-C', svg, '-e', png, '-w', res, '-h', res])
 			trimage = subprocess.Popen(['/usr/bin/trimage', '-f', png])
+		else:
+			print('ignoring ' + svg)
 
-trimage.wait()
+if trimage:
+	trimage.wait()
 

=== added file 'Assets/holo_dark/ic_erase.svg'
--- Assets/holo_dark/ic_erase.svg	1970-01-01 00:00:00 +0000
+++ Assets/holo_dark/ic_erase.svg	2012-12-18 18:47:22 +0000
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<!--
+    Copyright (C) 2012 Yvon TANGUY
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+-->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   version="1.1">
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1020.3622)">
+    <g
+       id="g3766"
+       transform="matrix(1.0041347,0,0,0.99980837,21.288481,-16.644624)"
+       style="fill:#ffffff;fill-opacity:1;stroke:#808080;stroke-width:0.94550657;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.50196078;stroke-dasharray:none">
+      <path
+         style="fill:#ffffff;fill-opacity:1;stroke:#808080;stroke-width:0.94550657;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.50196078;stroke-dasharray:none"
+         d="m -10.92751,1061.7366 -2.830402,-2.8426 5.6608049,-5.6853 -5.6608049,-5.6853 2.830402,-2.8427 5.6608054,5.6853 5.66080514,-5.6853 2.83040256,2.8427 -5.6608051,5.6853 5.6608051,5.6853 -2.83040256,2.8426 -5.66080514,-5.6853 z"
+         id="path3772"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccccccccc" />
+    </g>
+  </g>
+</svg>

=== modified file 'Assets/holo_dark/ic_media_next.svg'
--- Assets/holo_dark/ic_media_next.svg	2012-12-12 23:41:33 +0000
+++ Assets/holo_dark/ic_media_next.svg	2012-12-18 18:47:22 +0000
@@ -1,6 +1,23 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
+<!--
+    Copyright (C) 2012 Yvon TANGUY
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+-->
+
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -21,11 +38,11 @@
      inkscape:groupmode="layer">
     <g
        id="g766"
-       transform="matrix(1.25,0,0,-1.25,45.459852,-5.0189698)"
-       style="opacity:0.8;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate">
+       transform="matrix(0.86001832,0,0,-0.96174358,36.26881,-0.17188755)"
+       style="opacity:0.8;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:1.20000005;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.50196078;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter3755);enable-background:accumulate">
       <path
-         d="m -16.920903,-7.215176 0,-8.7086 -16.246979,8.7086 c 0.06811,-9.609915 0,-9.589704 0,-19.2 l 16.246979,8.713087 0,-8.713087 2.953021,0 0,19.2 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;color:#000000;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m -17.754052,-7.215176 0,-7.520444 -15.41383,7.520444 c 0.06811,-9.609915 0,-9.589704 0,-19.2 l 15.41383,7.520444 0,-7.520444 3.78617,0 0,19.2 z"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:1.20000005;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.50196078;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
          id="path768"
          inkscape:connector-curvature="0"
          sodipodi:nodetypes="ccccccccc" />

=== modified file 'Assets/holo_dark/ic_media_play.svg'
--- Assets/holo_dark/ic_media_play.svg	2012-12-12 23:41:33 +0000
+++ Assets/holo_dark/ic_media_play.svg	2012-12-18 18:47:22 +0000
@@ -1,6 +1,23 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
+<!--
+    Copyright (C) 2012 Yvon TANGUY
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+-->
+
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -12,18 +29,20 @@
    width="32px"
    height="32px"
    id="svg3606"
-   version="1.1">
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="ic_media_play.svg">
   <g
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <g
        id="g766"
-       transform="matrix(1.25,0,0,-1.25,45.459852,-5.0189698)"
-       style="opacity:0.8;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate">
+       transform="matrix(0.9375,0,0,-1.0416667,38.094889,-1.5158092)"
+       style="opacity:0.80000000000000004;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:1.51789325;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;stroke-opacity:0.50196081000000004;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round;filter:url(#filter3777)">
       <path
          d="m -33.167882,-7.215176 0,-19.2 19.2,9.6 z"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:1.51789325;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;stroke-opacity:0.50196081000000004;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round"
          id="path768"
          inkscape:connector-curvature="0"
          sodipodi:nodetypes="cccc" />

=== modified file 'Assets/holo_dark/ic_media_previous.svg'
--- Assets/holo_dark/ic_media_previous.svg	2012-12-12 23:41:33 +0000
+++ Assets/holo_dark/ic_media_previous.svg	2012-12-18 18:47:22 +0000
@@ -1,6 +1,23 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
+<!--
+    Copyright (C) 2012 Yvon TANGUY
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+-->
+
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -12,18 +29,20 @@
    width="32px"
    height="32px"
    id="svg3606"
-   version="1.1">
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="ic_media_previous.svg">
   <g
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <g
        id="g766"
-       transform="matrix(-1.25,0,0,-1.25,-13.459853,-5.0189698)"
-       style="fill:#ffffff;fill-opacity:1;opacity:0.8">
+       transform="matrix(-0.86001832,0,0,-0.96174358,-4.2688106,-0.17188755)"
+       style="opacity:0.8;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:1.20000005;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.50196078;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter3755);enable-background:accumulate">
       <path
-         d="m -16.920903,-7.215176 0,-8.7086 -16.246979,8.7086 c 0.06811,-9.609915 0,-9.589704 0,-19.2 l 16.246979,8.713087 0,-8.713087 2.953021,0 0,19.2 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="m -17.754052,-7.215176 0,-7.520444 -15.41383,7.520444 c 0.06811,-9.609915 0,-9.589704 0,-19.2 l 15.41383,7.520444 0,-7.520444 3.78617,0 0,19.2 z"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:1.20000005;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.50196078;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
          id="path768"
          inkscape:connector-curvature="0"
          sodipodi:nodetypes="ccccccccc" />

=== modified file 'Narau/AndroidManifest.xml'
--- Narau/AndroidManifest.xml	2012-12-13 16:03:49 +0000
+++ Narau/AndroidManifest.xml	2012-12-18 18:47:22 +0000
@@ -17,8 +17,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.vono.narau"
-    android:versionCode="5"
-    android:versionName="0.8" >
+    android:versionCode="6"
+    android:versionName="0.8.1" >
 
     <!-- Permissions needed to download the database -->
     <uses-permission android:name="android.permission.INTERNET" />

=== modified file 'Narau/project.properties'
--- Narau/project.properties	2012-12-01 22:50:01 +0000
+++ Narau/project.properties	2012-12-18 18:47:22 +0000
@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-17
+target=android-16

=== added file 'Narau/res/drawable-hdpi/ic_erase.png'
Binary files Narau/res/drawable-hdpi/ic_erase.png	1970-01-01 00:00:00 +0000 and Narau/res/drawable-hdpi/ic_erase.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'Narau/res/drawable-hdpi/ic_media_next.png'
Binary files Narau/res/drawable-hdpi/ic_media_next.png	2012-12-12 23:41:33 +0000 and Narau/res/drawable-hdpi/ic_media_next.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'Narau/res/drawable-hdpi/ic_media_play.png'
Binary files Narau/res/drawable-hdpi/ic_media_play.png	2012-12-12 23:41:33 +0000 and Narau/res/drawable-hdpi/ic_media_play.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'Narau/res/drawable-hdpi/ic_media_previous.png'
Binary files Narau/res/drawable-hdpi/ic_media_previous.png	2012-12-12 23:41:33 +0000 and Narau/res/drawable-hdpi/ic_media_previous.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'Narau/res/drawable-hdpi/ic_menu_dictionary_offline.png'
Binary files Narau/res/drawable-hdpi/ic_menu_dictionary_offline.png	2012-12-11 22:34:12 +0000 and Narau/res/drawable-hdpi/ic_menu_dictionary_offline.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'Narau/res/drawable-hdpi/ic_menu_dictionary_online.png'
Binary files Narau/res/drawable-hdpi/ic_menu_dictionary_online.png	2012-12-11 22:34:12 +0000 and Narau/res/drawable-hdpi/ic_menu_dictionary_online.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'Narau/res/drawable-hdpi/ic_menu_drill_from_japanese.png'
Binary files Narau/res/drawable-hdpi/ic_menu_drill_from_japanese.png	2012-12-11 22:34:12 +0000 and Narau/res/drawable-hdpi/ic_menu_drill_from_japanese.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'Narau/res/drawable-hdpi/ic_menu_drill_to_japanese.png'
Binary files Narau/res/drawable-hdpi/ic_menu_drill_to_japanese.png	2012-12-11 22:34:12 +0000 and Narau/res/drawable-hdpi/ic_menu_drill_to_japanese.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'Narau/res/drawable-hdpi/ic_menu_reading.png'
Binary files Narau/res/drawable-hdpi/ic_menu_reading.png	2012-12-11 22:34:12 +0000 and Narau/res/drawable-hdpi/ic_menu_reading.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'Narau/res/drawable-hdpi/ic_menu_writing.png'
Binary files Narau/res/drawable-hdpi/ic_menu_writing.png	2012-12-11 22:34:12 +0000 and Narau/res/drawable-hdpi/ic_menu_writing.png	2012-12-18 18:47:22 +0000 differ
=== added file 'Narau/res/drawable-ldpi/ic_erase.png'
Binary files Narau/res/drawable-ldpi/ic_erase.png	1970-01-01 00:00:00 +0000 and Narau/res/drawable-ldpi/ic_erase.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'Narau/res/drawable-ldpi/ic_media_next.png'
Binary files Narau/res/drawable-ldpi/ic_media_next.png	2012-12-12 23:41:33 +0000 and Narau/res/drawable-ldpi/ic_media_next.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'Narau/res/drawable-ldpi/ic_media_play.png'
Binary files Narau/res/drawable-ldpi/ic_media_play.png	2012-12-12 23:41:33 +0000 and Narau/res/drawable-ldpi/ic_media_play.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'Narau/res/drawable-ldpi/ic_media_previous.png'
Binary files Narau/res/drawable-ldpi/ic_media_previous.png	2012-12-12 23:41:33 +0000 and Narau/res/drawable-ldpi/ic_media_previous.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'Narau/res/drawable-ldpi/ic_menu_dictionary_offline.png'
Binary files Narau/res/drawable-ldpi/ic_menu_dictionary_offline.png	2012-12-11 22:34:12 +0000 and Narau/res/drawable-ldpi/ic_menu_dictionary_offline.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'Narau/res/drawable-ldpi/ic_menu_dictionary_online.png'
Binary files Narau/res/drawable-ldpi/ic_menu_dictionary_online.png	2012-12-11 22:34:12 +0000 and Narau/res/drawable-ldpi/ic_menu_dictionary_online.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'Narau/res/drawable-ldpi/ic_menu_drill_from_japanese.png'
Binary files Narau/res/drawable-ldpi/ic_menu_drill_from_japanese.png	2012-12-11 22:34:12 +0000 and Narau/res/drawable-ldpi/ic_menu_drill_from_japanese.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'Narau/res/drawable-ldpi/ic_menu_drill_to_japanese.png'
Binary files Narau/res/drawable-ldpi/ic_menu_drill_to_japanese.png	2012-12-11 22:34:12 +0000 and Narau/res/drawable-ldpi/ic_menu_drill_to_japanese.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'Narau/res/drawable-ldpi/ic_menu_reading.png'
Binary files Narau/res/drawable-ldpi/ic_menu_reading.png	2012-12-11 22:34:12 +0000 and Narau/res/drawable-ldpi/ic_menu_reading.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'Narau/res/drawable-ldpi/ic_menu_writing.png'
Binary files Narau/res/drawable-ldpi/ic_menu_writing.png	2012-12-11 22:34:12 +0000 and Narau/res/drawable-ldpi/ic_menu_writing.png	2012-12-18 18:47:22 +0000 differ
=== added file 'Narau/res/drawable-mdpi/ic_erase.png'
Binary files Narau/res/drawable-mdpi/ic_erase.png	1970-01-01 00:00:00 +0000 and Narau/res/drawable-mdpi/ic_erase.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'Narau/res/drawable-mdpi/ic_media_next.png'
Binary files Narau/res/drawable-mdpi/ic_media_next.png	2012-12-12 23:41:33 +0000 and Narau/res/drawable-mdpi/ic_media_next.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'Narau/res/drawable-mdpi/ic_media_play.png'
Binary files Narau/res/drawable-mdpi/ic_media_play.png	2012-12-12 23:41:33 +0000 and Narau/res/drawable-mdpi/ic_media_play.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'Narau/res/drawable-mdpi/ic_media_previous.png'
Binary files Narau/res/drawable-mdpi/ic_media_previous.png	2012-12-12 23:41:33 +0000 and Narau/res/drawable-mdpi/ic_media_previous.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'Narau/res/drawable-mdpi/ic_menu_dictionary_offline.png'
Binary files Narau/res/drawable-mdpi/ic_menu_dictionary_offline.png	2012-12-11 22:34:12 +0000 and Narau/res/drawable-mdpi/ic_menu_dictionary_offline.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'Narau/res/drawable-mdpi/ic_menu_dictionary_online.png'
Binary files Narau/res/drawable-mdpi/ic_menu_dictionary_online.png	2012-12-11 22:34:12 +0000 and Narau/res/drawable-mdpi/ic_menu_dictionary_online.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'Narau/res/drawable-mdpi/ic_menu_drill_from_japanese.png'
Binary files Narau/res/drawable-mdpi/ic_menu_drill_from_japanese.png	2012-12-11 22:34:12 +0000 and Narau/res/drawable-mdpi/ic_menu_drill_from_japanese.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'Narau/res/drawable-mdpi/ic_menu_drill_to_japanese.png'
Binary files Narau/res/drawable-mdpi/ic_menu_drill_to_japanese.png	2012-12-11 22:34:12 +0000 and Narau/res/drawable-mdpi/ic_menu_drill_to_japanese.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'Narau/res/drawable-mdpi/ic_menu_reading.png'
Binary files Narau/res/drawable-mdpi/ic_menu_reading.png	2012-12-11 22:34:12 +0000 and Narau/res/drawable-mdpi/ic_menu_reading.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'Narau/res/drawable-mdpi/ic_menu_writing.png'
Binary files Narau/res/drawable-mdpi/ic_menu_writing.png	2012-12-11 22:34:12 +0000 and Narau/res/drawable-mdpi/ic_menu_writing.png	2012-12-18 18:47:22 +0000 differ
=== added file 'Narau/res/drawable-xhdpi/ic_erase.png'
Binary files Narau/res/drawable-xhdpi/ic_erase.png	1970-01-01 00:00:00 +0000 and Narau/res/drawable-xhdpi/ic_erase.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'Narau/res/drawable-xhdpi/ic_media_next.png'
Binary files Narau/res/drawable-xhdpi/ic_media_next.png	2012-12-12 23:41:33 +0000 and Narau/res/drawable-xhdpi/ic_media_next.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'Narau/res/drawable-xhdpi/ic_media_play.png'
Binary files Narau/res/drawable-xhdpi/ic_media_play.png	2012-12-12 23:41:33 +0000 and Narau/res/drawable-xhdpi/ic_media_play.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'Narau/res/drawable-xhdpi/ic_media_previous.png'
Binary files Narau/res/drawable-xhdpi/ic_media_previous.png	2012-12-12 23:41:33 +0000 and Narau/res/drawable-xhdpi/ic_media_previous.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'Narau/res/drawable-xhdpi/ic_menu_dictionary_offline.png'
Binary files Narau/res/drawable-xhdpi/ic_menu_dictionary_offline.png	2012-12-11 22:34:12 +0000 and Narau/res/drawable-xhdpi/ic_menu_dictionary_offline.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'Narau/res/drawable-xhdpi/ic_menu_dictionary_online.png'
Binary files Narau/res/drawable-xhdpi/ic_menu_dictionary_online.png	2012-12-11 22:34:12 +0000 and Narau/res/drawable-xhdpi/ic_menu_dictionary_online.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'Narau/res/drawable-xhdpi/ic_menu_drill_from_japanese.png'
Binary files Narau/res/drawable-xhdpi/ic_menu_drill_from_japanese.png	2012-12-11 22:34:12 +0000 and Narau/res/drawable-xhdpi/ic_menu_drill_from_japanese.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'Narau/res/drawable-xhdpi/ic_menu_drill_to_japanese.png'
Binary files Narau/res/drawable-xhdpi/ic_menu_drill_to_japanese.png	2012-12-11 22:34:12 +0000 and Narau/res/drawable-xhdpi/ic_menu_drill_to_japanese.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'Narau/res/drawable-xhdpi/ic_menu_reading.png'
Binary files Narau/res/drawable-xhdpi/ic_menu_reading.png	2012-12-11 22:34:12 +0000 and Narau/res/drawable-xhdpi/ic_menu_reading.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'Narau/res/drawable-xhdpi/ic_menu_writing.png'
Binary files Narau/res/drawable-xhdpi/ic_menu_writing.png	2012-12-11 22:34:12 +0000 and Narau/res/drawable-xhdpi/ic_menu_writing.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'Narau/res/layout-land/download.xml'
--- Narau/res/layout-land/download.xml	2012-12-12 23:41:33 +0000
+++ Narau/res/layout-land/download.xml	2012-12-18 18:47:22 +0000
@@ -84,7 +84,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="15dp"
-            android:drawableLeft="@android:drawable/ic_delete"
+            android:drawableLeft="@drawable/ic_erase"
             android:onClick="onClickButtonCancel"
             android:text="@android:string/cancel" />
 

=== modified file 'Narau/res/layout-land/learn_writing.xml'
--- Narau/res/layout-land/learn_writing.xml	2012-12-13 00:54:38 +0000
+++ Narau/res/layout-land/learn_writing.xml	2012-12-18 18:47:22 +0000
@@ -59,7 +59,7 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/clear"
             android:onClick="clearUserDrawing"
-            android:src="@android:drawable/ic_delete" />
+            android:src="@drawable/ic_erase" />
 
         <ImageButton
             android:id="@+id/learnWritingButtonNext"

=== modified file 'Narau/res/layout-large-land/dictionary_offline.xml'
--- Narau/res/layout-large-land/dictionary_offline.xml	2012-12-11 01:07:49 +0000
+++ Narau/res/layout-large-land/dictionary_offline.xml	2012-12-18 18:47:22 +0000
@@ -45,6 +45,8 @@
         android:name="org.vono.narau.common.dictionary.EntryListFragment"
         android:layout_width="0dp"
         android:layout_height="match_parent"
+        android:layout_marginBottom="5dp"
+        android:layout_marginTop="10dp"
         android:layout_weight="0.5" />
 
 </LinearLayout>
\ No newline at end of file

=== modified file 'Narau/res/layout-large-land/download.xml'
--- Narau/res/layout-large-land/download.xml	2012-12-12 23:41:33 +0000
+++ Narau/res/layout-large-land/download.xml	2012-12-18 18:47:22 +0000
@@ -92,7 +92,7 @@
         android:layout_height="wrap_content"
         android:layout_marginLeft="100dp"
         android:layout_marginRight="100dp"
-        android:drawableLeft="@android:drawable/ic_delete"
+        android:drawableLeft="@drawable/ic_erase"
         android:onClick="onClickButtonCancel"
         android:text="@android:string/cancel" />
 

=== modified file 'Narau/res/layout-large-land/kanji_to_words.xml'
--- Narau/res/layout-large-land/kanji_to_words.xml	2012-12-13 20:37:03 +0000
+++ Narau/res/layout-large-land/kanji_to_words.xml	2012-12-18 18:47:22 +0000
@@ -39,7 +39,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:gravity="center_horizontal"
+            android:gravity="center"
             android:textAppearance="?android:attr/textAppearanceLarge" >
         </TextView>
 

=== modified file 'Narau/res/layout-large-land/learn_writing.xml'
--- Narau/res/layout-large-land/learn_writing.xml	2012-12-13 00:54:38 +0000
+++ Narau/res/layout-large-land/learn_writing.xml	2012-12-18 18:47:22 +0000
@@ -60,7 +60,7 @@
             android:contentDescription="@string/clear"
             android:onClick="clearUserDrawing"
             android:scaleType="fitCenter"
-            android:src="@android:drawable/ic_delete" />
+            android:src="@drawable/ic_erase" />
 
         <ImageButton
             android:id="@+id/learnWritingButtonNext"

=== modified file 'Narau/res/layout-large-port/download.xml'
--- Narau/res/layout-large-port/download.xml	2012-12-12 23:41:33 +0000
+++ Narau/res/layout-large-port/download.xml	2012-12-18 18:47:22 +0000
@@ -91,7 +91,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
-        android:drawableLeft="@android:drawable/ic_delete"
+        android:drawableLeft="@drawable/ic_erase"
         android:onClick="onClickButtonCancel"
         android:text="@android:string/cancel" />
 

=== modified file 'Narau/res/layout-large-port/kanji_to_words.xml'
--- Narau/res/layout-large-port/kanji_to_words.xml	2012-12-12 23:41:33 +0000
+++ Narau/res/layout-large-port/kanji_to_words.xml	2012-12-18 18:47:22 +0000
@@ -38,7 +38,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:gravity="center_horizontal"
+            android:gravity="center"
             android:textAppearance="?android:attr/textAppearanceLarge" >
         </TextView>
 

=== modified file 'Narau/res/layout-large-port/learn_writing.xml'
--- Narau/res/layout-large-port/learn_writing.xml	2012-12-13 00:54:38 +0000
+++ Narau/res/layout-large-port/learn_writing.xml	2012-12-18 18:47:22 +0000
@@ -71,7 +71,7 @@
                 android:contentDescription="@string/clear"
                 android:onClick="clearUserDrawing"
                 android:scaleType="fitCenter"
-                android:src="@android:drawable/ic_delete" />
+                android:src="@drawable/ic_erase" />
 
             <ImageButton
                 android:id="@+id/learnWritingButtonNext"

=== modified file 'Narau/res/layout/download.xml'
--- Narau/res/layout/download.xml	2012-12-12 23:41:33 +0000
+++ Narau/res/layout/download.xml	2012-12-18 18:47:22 +0000
@@ -89,7 +89,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="15dp"
-        android:drawableLeft="@android:drawable/ic_delete"
+        android:drawableLeft="@drawable/ic_erase"
         android:onClick="onClickButtonCancel"
         android:text="@android:string/cancel" />
 

=== modified file 'Narau/res/layout/kanji_line_sub_category.xml'
--- Narau/res/layout/kanji_line_sub_category.xml	2012-12-13 17:40:21 +0000
+++ Narau/res/layout/kanji_line_sub_category.xml	2012-12-18 18:47:22 +0000
@@ -35,7 +35,6 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_alignParentRight="true"
-        android:layout_marginRight="5dp"
         android:adjustViewBounds="true"
         android:contentDescription="@string/next"
         android:scaleType="centerInside"

=== modified file 'Narau/res/layout/kanji_to_words.xml'
--- Narau/res/layout/kanji_to_words.xml	2012-12-13 00:54:38 +0000
+++ Narau/res/layout/kanji_to_words.xml	2012-12-18 18:47:22 +0000
@@ -40,7 +40,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:gravity="center_horizontal"
+            android:gravity="center"
             android:lines="2"
             android:textAppearance="?android:attr/textAppearanceLarge" >
         </TextView>

=== modified file 'Narau/res/layout/learn_writing.xml'
--- Narau/res/layout/learn_writing.xml	2012-12-13 00:54:38 +0000
+++ Narau/res/layout/learn_writing.xml	2012-12-18 18:47:22 +0000
@@ -73,7 +73,7 @@
                 android:contentDescription="@string/clear"
                 android:onClick="clearUserDrawing"
                 android:scaleType="fitCenter"
-                android:src="@android:drawable/ic_delete" />
+                android:src="@drawable/ic_erase" />
 
             <ImageButton
                 android:id="@+id/learnWritingButtonNext"

=== modified file 'Narau/res/layout/main_menu_item.xml'
--- Narau/res/layout/main_menu_item.xml	2012-12-11 22:34:12 +0000
+++ Narau/res/layout/main_menu_item.xml	2012-12-18 18:47:22 +0000
@@ -21,11 +21,17 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layout_marginLeft="16dip"
+    android:layout_marginRight="?android:attr/scrollbarSize"
     android:baselineAligned="false"
     android:gravity="center_vertical"
-    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:minHeight="?android:attr/listPreferredItemHeight" >
+
+    <!-- android-17: -->
+    <!--
     android:paddingEnd="?android:attr/scrollbarSize"
-    android:paddingStart="16dip" >
+    android:paddingStart="16dip"
+    -->
 
     <LinearLayout
         android:layout_width="wrap_content"
@@ -41,11 +47,12 @@
             android:contentDescription="@android:string/untitled" />
     </LinearLayout>
 
+    <!-- android-17: android:layout_marginEnd="6dip" -->
+
     <RelativeLayout
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginBottom="6dip"
-        android:layout_marginEnd="6dip"
         android:layout_marginLeft="6dip"
         android:layout_marginTop="6dip"
         android:layout_weight="1" >
@@ -59,11 +66,13 @@
             android:singleLine="true"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
+        <!-- android-17: android:layout_alignStart="@android:id/title" -->
+
         <TextView
             android:id="@+android:id/summary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignStart="@android:id/title"
+            android:layout_alignLeft="@android:id/title"
             android:layout_below="@android:id/title"
             android:maxLines="4"
             android:textAppearance="?android:attr/textAppearanceSmall"

=== modified file 'Narau/res/layout/narau.xml'
--- Narau/res/layout/narau.xml	2012-11-26 18:30:29 +0000
+++ Narau/res/layout/narau.xml	2012-12-18 18:47:22 +0000
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<fragment xmlns:android="http://schemas.android.com/apk/res/android"
+    android:name="org.vono.narau.MainMenuFragment"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical" >
-
-    <fragment
-        android:name="org.vono.narau.MainMenuFragment"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:tag="main_menu_items" />
-
-</LinearLayout>
\ No newline at end of file
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    android:layout_marginLeft="@dimen/narauMargingLeft"
+    android:layout_marginRight="@dimen/narauMargingRight"
+    android:tag="main_menu_items" />

=== added directory 'Narau/res/values-large'
=== added file 'Narau/res/values-large/dimens.xml'
--- Narau/res/values-large/dimens.xml	1970-01-01 00:00:00 +0000
+++ Narau/res/values-large/dimens.xml	2012-12-18 18:47:22 +0000
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <dimen name="narauMargingLeft">50dip</dimen>
+    <dimen name="narauMargingRight">50dip</dimen>
+
+</resources>
\ No newline at end of file

=== added file 'Narau/res/values/dimens.xml'
--- Narau/res/values/dimens.xml	1970-01-01 00:00:00 +0000
+++ Narau/res/values/dimens.xml	2012-12-18 18:47:22 +0000
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="narauMargingLeft">10dp</dimen>
+    <dimen name="narauMargingRight">10dp</dimen>
+</resources>
\ No newline at end of file

=== modified file 'Narau/res/values/values.xml'
--- Narau/res/values/values.xml	2012-12-16 19:56:19 +0000
+++ Narau/res/values/values.xml	2012-12-18 18:47:22 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <!-- http://serveur/narau/narau_db_infos.txt -->
+    <!-- http://192.168.3.1/narau/narau_db_infos_ip.txt -->
     <item name="db_infos_url" type="string">https://bazaar.launchpad.net/~vono22/narau/fdroid/view/head:/NarauDBInfo/narau_db_infos.txt</item>
     <!-- Preferences names -->
     <item name="prefNameVersion" type="string">version</item>

=== modified file 'Narau/src/org/vono/narau/Narau.java'
--- Narau/src/org/vono/narau/Narau.java	2012-12-13 20:37:03 +0000
+++ Narau/src/org/vono/narau/Narau.java	2012-12-18 18:47:22 +0000
@@ -328,7 +328,7 @@
 			final TextView tvSummary = (TextView) cView.findViewById(android.R.id.summary);
 			final ImageView ivIcon = (ImageView) cView.findViewById(android.R.id.icon);
 
-			final MenuActivity item = listActivities.get(position);
+			final MenuActivity item = this.listActivities.get(position);
 			tvTitle.setText(item.name);
 			ivIcon.setImageDrawable(item.icon);
 			tvSummary.setText(item.description);

=== modified file 'Narau/src/org/vono/narau/QuitThread.java'
--- Narau/src/org/vono/narau/QuitThread.java	2012-12-09 01:58:19 +0000
+++ Narau/src/org/vono/narau/QuitThread.java	2012-12-18 18:47:22 +0000
@@ -88,12 +88,12 @@
 
 		synchronized (this) {
 			try {
-				this.wait(exitTime);
+				this.wait(this.exitTime);
 			} catch (InterruptedException ie) {
 			}
 
 			if (this.haveToExit) {
-				Log.i(TAG, "Stop application after " + (exitTime / 1000) + "s of inactivity");
+				Log.i(TAG, "Stop application after " + (this.exitTime / 1000) + "s of inactivity");
 				System.exit(0);
 			}
 		}

=== modified file 'Narau/src/org/vono/narau/common/Common.java'
--- Narau/src/org/vono/narau/common/Common.java	2012-12-09 01:58:19 +0000
+++ Narau/src/org/vono/narau/common/Common.java	2012-12-18 18:47:22 +0000
@@ -166,10 +166,8 @@
 	}
 
 	/**
-	 * Based on: <a
-	 * href="http://www.mauvecloud.net/charsets/kanagenerator.html">
-	 * kanagenerator</a> and <a
-	 * href="http://www.mauvecloud.net/charsets/romaji.html">romaji</a>
+	 * Based on: <a href="http://www.mauvecloud.net/charsets/kanagenerator.html"> kanagenerator</a>
+	 * and <a href="http://www.mauvecloud.net/charsets/romaji.html">romaji</a>
 	 * 
 	 * @param originalText
 	 *            The text to convert
@@ -262,8 +260,7 @@
 	}
 
 	/**
-	 * Return a localized string from the application's package's default string
-	 * table.
+	 * Return a localized string from the application's package's default string table.
 	 * 
 	 * @param id
 	 *            The resource id for the string
@@ -276,9 +273,9 @@
 	}
 
 	/**
-	 * Return a localized formatted string from the application's package's
-	 * default string table, substituting the format arguments as defined in
-	 * java.util.Formatter and java.lang.String.format.
+	 * Return a localized formatted string from the application's package's default string table,
+	 * substituting the format arguments as defined in java.util.Formatter and
+	 * java.lang.String.format.
 	 * 
 	 * @param id
 	 *            Resource id for the format string formatArgs The format
@@ -391,8 +388,8 @@
 	}
 
 	/**
-	 * My split string function (String.toSplit() don't work like I want) May
-	 * return an array of 0 length.
+	 * My split string function (String.toSplit() don't work like I want) May return an array of 0
+	 * length.
 	 * 
 	 * @param toSplit
 	 *            The String to split

=== modified file 'Narau/src/org/vono/narau/common/dictionary/EntryArrayAdapter.java'
--- Narau/src/org/vono/narau/common/dictionary/EntryArrayAdapter.java	2012-12-16 19:16:57 +0000
+++ Narau/src/org/vono/narau/common/dictionary/EntryArrayAdapter.java	2012-12-18 18:47:22 +0000
@@ -95,7 +95,8 @@
 			tvReading.setMovementMethod(LinkMovementMethod.getInstance());
 
 			tvSense.setText(Html.fromHtml(entry.getHTMLSenses()));
-			LayoutParams lp = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT, 1.0f);
+			LayoutParams lp = new LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
+					ViewGroup.LayoutParams.WRAP_CONTENT, 1.0f);
 			tvSense.setLayoutParams(lp);
 			tvSense.setMovementMethod(LinkMovementMethod.getInstance());
 			// Try to put the tvSense displayed

=== modified file 'Narau/src/org/vono/narau/common/dictionary/EntryListFragment.java'
--- Narau/src/org/vono/narau/common/dictionary/EntryListFragment.java	2012-12-11 01:07:49 +0000
+++ Narau/src/org/vono/narau/common/dictionary/EntryListFragment.java	2012-12-18 18:47:22 +0000
@@ -70,7 +70,7 @@
 		View v = super.onCreateView(inflater, container, savedInstanceState);
 
 		if (0 != this.headerLayoutId) {
-			View header = super.getLayoutInflater(savedInstanceState).inflate(headerLayoutId, null);
+			View header = super.getLayoutInflater(savedInstanceState).inflate(this.headerLayoutId, null);
 
 			// http://stackoverflow.com/a/4401369
 			LayoutParams lp = new ListView.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);

=== modified file 'Narau/src/org/vono/narau/common/kanji/KanjiListSelectActivity.java'
--- Narau/src/org/vono/narau/common/kanji/KanjiListSelectActivity.java	2012-12-09 01:58:19 +0000
+++ Narau/src/org/vono/narau/common/kanji/KanjiListSelectActivity.java	2012-12-18 18:47:22 +0000
@@ -47,8 +47,8 @@
 import android.widget.TextView;
 
 /**
- * Display a list of kanjis pass as an extra with the TAG key, and return the
- * position of the character which had a long click on it.
+ * Display a list of kanjis pass as an extra with the TAG key, and return the position of the
+ * character which had a long click on it.
  * 
  */
 public class KanjiListSelectActivity extends Activity implements OnTouchListener, OnLongClickListener {
@@ -69,9 +69,8 @@
 	private ArrayList<Kanji> kanjiList;
 	private ArrayList<Radical> radicalsList;
 	/**
-	 * When kanjis are filtered, store the display position and the absolute
-	 * kanji position, to be able to return the good value to the parent
-	 * activity.
+	 * When kanjis are filtered, store the display position and the absolute kanji position, to be
+	 * able to return the good value to the parent activity.
 	 */
 	private SparseIntArray filterPositions;
 	private int numRadSelected;
@@ -270,7 +269,7 @@
 			}
 			sbRad.append("</body></html>");
 			this.textViewRadicals.setText(Html.fromHtml(sbRad.toString()));
-			
+
 		} else {
 			// Build the list of selected radicals
 			final ArrayList<Radical> lRadicalsList = this.radicalsList;
@@ -375,6 +374,11 @@
 			dest.writeByte((byte) (this.noMatch ? 1 : 0));
 		}
 
+		@Override
+		public int hashCode() {
+			return this.codepoint;
+		}
+
 		public static final Parcelable.Creator<Radical> CREATOR = new Parcelable.Creator<Radical>() {
 			public Radical createFromParcel(Parcel in) {
 				return new Radical(in);
@@ -446,16 +450,16 @@
 
 		@Override
 		public void handleMessage(Message msg) {
-			if (LOAD_DONE == msg.what && null != activity) {
-				if (null != activity.progressDialog) {
-					activity.progressDialog.dismiss();
-					activity.progressDialog = null;
+			if (LOAD_DONE == msg.what && null != this.activity) {
+				if (null != this.activity.progressDialog) {
+					this.activity.progressDialog.dismiss();
+					this.activity.progressDialog = null;
 				}
-				activity.kanjiList = KanjiListSelectActivity.thread.tKanjiList;
-				activity.radicalsList = KanjiListSelectActivity.thread.tRadicalsList;
+				this.activity.kanjiList = KanjiListSelectActivity.thread.tKanjiList;
+				this.activity.radicalsList = KanjiListSelectActivity.thread.tRadicalsList;
 
-				activity.initUI();
-				activity.updateKanjiList();
+				this.activity.initUI();
+				this.activity.updateKanjiList();
 
 				KanjiListSelectActivity.thread = null;
 				KanjiListSelectActivity.handler = null;

=== modified file 'Narau/src/org/vono/narau/common/kanji/KanjiView.java'
--- Narau/src/org/vono/narau/common/kanji/KanjiView.java	2012-12-09 01:58:19 +0000
+++ Narau/src/org/vono/narau/common/kanji/KanjiView.java	2012-12-18 18:47:22 +0000
@@ -219,9 +219,9 @@
 		switch (event.getAction()) {
 		case MotionEvent.ACTION_DOWN:
 			if (this.svgDrawing.isPointInDrawing(x, y)) {
-				drawable = this.svgDrawing;
+				this.drawable = this.svgDrawing;
 			} else if (this.userDrawing.isPointInDrawing(x, y)) {
-				drawable = this.userDrawing;
+				this.drawable = this.userDrawing;
 			}
 			if (null != this.drawable) {
 				this.drawable.touchDown(x, y);
@@ -493,7 +493,7 @@
 			this.touchX = x;
 			this.touchY = y;
 			this.path = new Path();
-			this.paths.add(path);
+			this.paths.add(this.path);
 			this.path.moveTo(x, y);
 			super.strokesNumberPos.add(new PointF(x, y));
 		}
@@ -745,7 +745,7 @@
 				char c = svgPath.charAt(i);
 				boolean isLetter = Character.isLetter(c);
 
-				if (((intPartTen > 1 && c == '-') || c == ',' || (i > 0 && isLetter))) {
+				if (((intPartTen > 1 && c == '-') || c == ',' || (i > 0 && isLetter)) && null != params) {
 					// end of the number, start of the new one
 					float f = intPart;
 					if (0 != floatPartTen) {
@@ -795,7 +795,7 @@
 					}
 				}
 
-				if (i == lastPos) {
+				if (i == lastPos && null != params) {
 					// The last number
 					float f = intPart;
 					if (0 != floatPartTen) {
@@ -828,7 +828,7 @@
 		public String toString() {
 			StringBuilder sb = new StringBuilder();
 
-			sb.append(cmd);
+			sb.append(this.cmd);
 			int numF = this.params.size();
 
 			for (int i = 0; i < numF; i++) {
@@ -846,7 +846,7 @@
 
 		boolean valid() {
 			boolean ret = true;
-			int numParams = params.size();
+			int numParams = this.params.size();
 
 			switch (this.cmd) {
 			case 'c':

=== modified file 'Narau/src/org/vono/narau/common/kanji/KanjiViewDialogSeekBar.java'
--- Narau/src/org/vono/narau/common/kanji/KanjiViewDialogSeekBar.java	2012-12-09 01:58:19 +0000
+++ Narau/src/org/vono/narau/common/kanji/KanjiViewDialogSeekBar.java	2012-12-18 18:47:22 +0000
@@ -112,7 +112,7 @@
 		this.dismiss();
 		Preferences.setFloat(this.idPrefName, this.fValue);
 		if (null != this.dismissListener) {
-			dismissListener.onDialogDismiss(this);
+			this.dismissListener.onDialogDismiss(this);
 		}
 	}
 

=== modified file 'Narau/src/org/vono/narau/db/DictionaryDB.java'
--- Narau/src/org/vono/narau/db/DictionaryDB.java	2012-12-16 19:16:57 +0000
+++ Narau/src/org/vono/narau/db/DictionaryDB.java	2012-12-18 18:47:22 +0000
@@ -470,8 +470,8 @@
 		public Entry next() {
 			Entry entry = null;
 
-			if (null != super.cursor && !super.cursor.isClosed() && cursor.moveToNext()) {
-				int id = cursor.getInt(0);
+			if (null != super.cursor && !super.cursor.isClosed() && super.cursor.moveToNext()) {
+				int id = super.cursor.getInt(0);
 				entry = DictionaryDB.loadEntry(id);
 			}
 			return entry;
@@ -531,9 +531,9 @@
 		public Entry next() {
 			if (null != this.cursor && this.cursor.moveToNext()) {
 
-				final int id = cursor.getInt(0);
-				final String keb = cursor.getString(1);
-				final String pri = cursor.getString(2);
+				final int id = super.cursor.getInt(0);
+				final String keb = super.cursor.getString(1);
+				final String pri = super.cursor.getString(2);
 
 				// The kanji element
 				Entry entry = new Entry(id);

=== modified file 'Narau/src/org/vono/narau/db/InfosDB.java'
--- Narau/src/org/vono/narau/db/InfosDB.java	2012-12-11 01:07:49 +0000
+++ Narau/src/org/vono/narau/db/InfosDB.java	2012-12-18 18:47:22 +0000
@@ -189,6 +189,11 @@
 		return false;
 	}
 
+	@Override
+	public int hashCode() {
+		return this.dbName.hashCode();
+	}
+
 	/**
 	 * Parse a single line in narau_db_infos.txt file<br/>
 	 * 

=== modified file 'Narau/src/org/vono/narau/db/KanjiDB.java'
--- Narau/src/org/vono/narau/db/KanjiDB.java	2012-12-11 01:07:49 +0000
+++ Narau/src/org/vono/narau/db/KanjiDB.java	2012-12-18 18:47:22 +0000
@@ -604,7 +604,7 @@
 		public Kanji first() {
 			Kanji kanji = null;
 			if (this.cursor.moveToFirst()) {
-				kanji = KanjiDB.cursorToKanji(cursor, null, this.listLangDB, this.loadMeaning, this.loadSVG,
+				kanji = KanjiDB.cursorToKanji(this.cursor, null, this.listLangDB, this.loadMeaning, this.loadSVG,
 						this.loadReading);
 				this.current = 0;
 			}
@@ -618,7 +618,7 @@
 		public Kanji next() {
 			Kanji kanji = null;
 			if (!this.cursor.isClosed() && this.cursor.moveToNext()) {
-				kanji = KanjiDB.cursorToKanji(cursor, null, this.listLangDB, this.loadMeaning, this.loadSVG,
+				kanji = KanjiDB.cursorToKanji(this.cursor, null, this.listLangDB, this.loadMeaning, this.loadSVG,
 						this.loadReading);
 				this.current++;
 			}
@@ -632,7 +632,7 @@
 		public Kanji previous() {
 			Kanji kanji = null;
 			if (this.cursor.moveToPrevious()) {
-				kanji = KanjiDB.cursorToKanji(cursor, null, this.listLangDB, this.loadMeaning, this.loadSVG,
+				kanji = KanjiDB.cursorToKanji(this.cursor, null, this.listLangDB, this.loadMeaning, this.loadSVG,
 						this.loadReading);
 				this.current--;
 			}
@@ -646,7 +646,7 @@
 		public Kanji last() {
 			Kanji kanji = null;
 			if (this.cursor.moveToLast()) {
-				kanji = KanjiDB.cursorToKanji(cursor, null, this.listLangDB, this.loadMeaning, this.loadSVG,
+				kanji = KanjiDB.cursorToKanji(this.cursor, null, this.listLangDB, this.loadMeaning, this.loadSVG,
 						this.loadReading);
 				this.current = this.count;
 			}
@@ -666,7 +666,7 @@
 			if (!this.cursor.isClosed() && newPosition >= 0 && newPosition < this.count) {
 				if (this.cursor.moveToPosition(newPosition)) {
 					this.current = newPosition;
-					kanji = KanjiDB.cursorToKanji(cursor, null, this.listLangDB, this.loadMeaning, this.loadSVG,
+					kanji = KanjiDB.cursorToKanji(this.cursor, null, this.listLangDB, this.loadMeaning, this.loadSVG,
 							this.loadReading);
 				}
 			}
@@ -683,7 +683,7 @@
 		public Kanji get(int index) {
 			Kanji kanji = null;
 			if (this.cursor.moveToPosition(index)) {
-				kanji = KanjiDB.cursorToKanji(cursor, null, this.listLangDB, this.loadMeaning, this.loadSVG,
+				kanji = KanjiDB.cursorToKanji(this.cursor, null, this.listLangDB, this.loadMeaning, this.loadSVG,
 						this.loadReading);
 				this.cursor.moveToPosition(this.current);
 			}
@@ -763,8 +763,8 @@
 		public Integer next() {
 			this.codepoint = -1;
 			if (!this.cursor.isAfterLast() && !this.cursor.isClosed()) {
-				if (cursor.moveToNext()) {
-					this.codepoint = cursor.getInt(0);
+				if (this.cursor.moveToNext()) {
+					this.codepoint = this.cursor.getInt(0);
 					this.current++;
 				}
 			}
@@ -779,8 +779,8 @@
 		public Integer previous() {
 			this.codepoint = -1;
 			if (!this.cursor.isBeforeFirst() && !this.cursor.isClosed()) {
-				if (cursor.moveToPrevious()) {
-					this.codepoint = cursor.getInt(0);
+				if (this.cursor.moveToPrevious()) {
+					this.codepoint = this.cursor.getInt(0);
 					this.current--;
 				}
 			}
@@ -795,8 +795,8 @@
 		public Integer first() {
 			this.codepoint = -1;
 			if (!this.cursor.isClosed()) {
-				if (cursor.moveToFirst()) {
-					this.codepoint = cursor.getInt(0);
+				if (this.cursor.moveToFirst()) {
+					this.codepoint = this.cursor.getInt(0);
 					this.current = 0;
 				}
 			}
@@ -811,8 +811,8 @@
 		public Integer last() {
 			this.codepoint = -1;
 			if (!this.cursor.isClosed()) {
-				if (cursor.moveToLast()) {
-					this.codepoint = cursor.getInt(0);
+				if (this.cursor.moveToLast()) {
+					this.codepoint = this.cursor.getInt(0);
 					this.current = this.count;
 				}
 			}
@@ -832,7 +832,7 @@
 			if (!this.cursor.isClosed() && newPosition >= 0 && newPosition < this.count) {
 				if (this.cursor.moveToPosition(newPosition)) {
 					this.current = newPosition;
-					this.codepoint = cursor.getInt(0);
+					this.codepoint = this.cursor.getInt(0);
 				}
 			}
 			return this.codepoint;

=== modified file 'Narau/src/org/vono/narau/dictionary/DictionaryBase.java'
--- Narau/src/org/vono/narau/dictionary/DictionaryBase.java	2012-12-16 19:16:57 +0000
+++ Narau/src/org/vono/narau/dictionary/DictionaryBase.java	2012-12-18 18:47:22 +0000
@@ -56,7 +56,7 @@
 	private static final char A_ROMANJI = 'a';
 	private static final char A_HIRAGANA = 'あ';
 	private static final char A_KATAKANA = 'ア';
-	
+
 	protected static final String LANG_PAIR_SEP = ",";
 
 	private static final int ACTIVITY_HISTORY_RESULT_CODE = 1209;
@@ -276,6 +276,7 @@
 
 		this.editTextInput.setText(Common.EMPTY_STRING);
 		this.buttonConvRomanji.setText(Character.valueOf(A_HIRAGANA).toString());
+		this.editTextInput.requestFocus();
 		this.setWidgetEnabled(true);
 
 		// show the keyboard

=== modified file 'Narau/src/org/vono/narau/dictionary/DictionaryOfflineActivity.java'
--- Narau/src/org/vono/narau/dictionary/DictionaryOfflineActivity.java	2012-12-13 16:03:49 +0000
+++ Narau/src/org/vono/narau/dictionary/DictionaryOfflineActivity.java	2012-12-18 18:47:22 +0000
@@ -96,9 +96,10 @@
 
 		final ArrayList<Language> languagesDictionary = Preferences.getLangsPriorities(DatabaseType.dictonary);
 		final int numLangs = languagesDictionary.size();
-		final ArrayList<Language> languagesDisplay = new ArrayList<Language>(numLangs + 1);
+		final ArrayList<Language> languagesDisplay = new ArrayList<Language>(numLangs + 2);
 		this.languageAuto = new Language(AUTO, AUTO, AUTO, super.getString(R.string.dictionaryOfflineAutoLang));
 		languagesDisplay.add(this.languageAuto);
+		languagesDisplay.add(Language.JAPANESE);
 		for (int i = 0; i < numLangs; i++) {
 			languagesDisplay.add(languagesDictionary.get(i));
 		}
@@ -137,7 +138,6 @@
 		} else {
 			super.buttonSearch.setTag(BUTTON_DO_SEARCH);
 		}
-
 	}
 
 	@Override
@@ -511,11 +511,11 @@
 				if (0 == numResult) {
 					toastMessage = this.activity.getString(R.string.dictionaryNoResult);
 				} else if (searchComplete) {
-					String toastMessageTemplate = activity.getString(R.string.toastNumWords);
+					String toastMessageTemplate = this.activity.getString(R.string.toastNumWords);
 					toastMessage = String.format(toastMessageTemplate, DictionaryOfflineActivity.thread.searchText,
 							numResult);
 				} else {
-					String toastMessageTemplate = activity.getString(R.string.toastNumWordsInterrupt);
+					String toastMessageTemplate = this.activity.getString(R.string.toastNumWordsInterrupt);
 					toastMessage = String.format(toastMessageTemplate, DictionaryOfflineActivity.thread.searchText,
 							numResult);
 				}

=== modified file 'Narau/src/org/vono/narau/dictionary/DictionaryOnlineActivity.java'
--- Narau/src/org/vono/narau/dictionary/DictionaryOnlineActivity.java	2012-12-16 19:16:57 +0000
+++ Narau/src/org/vono/narau/dictionary/DictionaryOnlineActivity.java	2012-12-18 18:47:22 +0000
@@ -391,6 +391,7 @@
 	 * 
 	 * @see ONLINE_DICTS
 	 */
+	@Override
 	protected void updateButtonSearchText() {
 		if (R.string.dictionaryOnlineUnknown == this.serviceId) {
 			super.buttonSearch.setText(super.getString(R.string.dictionaryOnlineUnknown));
@@ -403,8 +404,9 @@
 	private static StringBuilder getContent(InputStream iStream) throws IOException {
 		StringBuilder sb = new StringBuilder();
 
-		BufferedReader br = new BufferedReader(new InputStreamReader(iStream, "UTF-8"));
-		char[] buffer = new char[512];
+		final int bufSize = 512;
+		BufferedReader br = new BufferedReader(new InputStreamReader(iStream, "UTF-8"), bufSize);
+		final char[] buffer = new char[bufSize];
 
 		int read = br.read(buffer);
 
@@ -469,7 +471,7 @@
 			final String cookieURL = urisInfos[0];
 			if (null != cookieURL) {
 
-				final String serviceName = DictionaryOnlineActivity.this.getString(serviceId);
+				final String serviceName = DictionaryOnlineActivity.this.getString(this.serviceStringId);
 				HistoryDB historyDB = HistoryDB.getHistoryDB();
 
 				CookieStore cookieStore = historyDB.getCookies(serviceName);

=== modified file 'Narau/src/org/vono/narau/dictionary/HistoryFragment.java'
--- Narau/src/org/vono/narau/dictionary/HistoryFragment.java	2012-12-11 22:34:12 +0000
+++ Narau/src/org/vono/narau/dictionary/HistoryFragment.java	2012-12-18 18:47:22 +0000
@@ -92,7 +92,7 @@
 
 		public SearchAdapter(Context context, DictionaryType type) {
 			super(context, R.layout.dictionary_search_result_item);
-			mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+			this.mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
 			// if (android.os.Build.VERSION.SDK_INT >=
 			// android.os.Build.VERSION_CODES.HONEYCOMB) {
 			// super.addAll(HistoryDB.getHistoryDB().getAll());

=== modified file 'Narau/src/org/vono/narau/download/DownloaderActivity.java'
--- Narau/src/org/vono/narau/download/DownloaderActivity.java	2012-12-16 19:16:57 +0000
+++ Narau/src/org/vono/narau/download/DownloaderActivity.java	2012-12-18 18:47:22 +0000
@@ -390,7 +390,7 @@
 						}
 					}
 
-					if (numSubAvail == 0 && dbInfo.action == Action.none) {
+					if (numSubAvail == 0 && dbInfo.action == Action.none && null != firstSub) {
 						if (v != dbInfo.checkBox) {
 							// Mark the main db as to be deleted
 							// Rerun all
@@ -442,7 +442,7 @@
 							}
 						}
 
-						if (0 == numSubAvail) {
+						if (0 == numSubAvail && null != firstSub) {
 							if (firstSub.haveLatest()) {
 								firstSub.checkBox.setChecked(false);
 								firstSub.action = Action.none;
@@ -748,7 +748,7 @@
 					tvUpdate.setVisibility(View.GONE);
 				}
 
-			} else {
+			} else if (null != currentMainDB) {
 				viewGroup = (ViewGroup) inflater.inflate(R.layout.download_question_cb_sub, null);
 				DownloaderActivity.genNewViewIds(i, viewGroup);
 

=== modified file 'Narau/src/org/vono/narau/download/DownloaderGzipDB.java'
--- Narau/src/org/vono/narau/download/DownloaderGzipDB.java	2012-12-09 01:58:19 +0000
+++ Narau/src/org/vono/narau/download/DownloaderGzipDB.java	2012-12-18 18:47:22 +0000
@@ -118,7 +118,7 @@
 
 		@Override
 		public int read() throws IOException {
-			int readByte = in.read();
+			int readByte = this.in.read();
 			if (readByte != -1) {
 				this.readCount++;
 				if (null != this.messageDigest) {
@@ -302,7 +302,7 @@
 
 			} // for
 
-			if (!success && requestStop) {
+			if (!this.success && requestStop) {
 				dbInfo.file.delete();
 			}
 

=== modified file 'Narau/src/org/vono/narau/exercise/DrillCharActivity.java'
--- Narau/src/org/vono/narau/exercise/DrillCharActivity.java	2012-12-12 01:26:48 +0000
+++ Narau/src/org/vono/narau/exercise/DrillCharActivity.java	2012-12-18 18:47:22 +0000
@@ -43,11 +43,11 @@
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
+import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.ProgressBar;
 import android.widget.TableLayout;
 import android.widget.TableRow;
-import android.widget.TableRow.LayoutParams;
 import android.widget.TextView;
 
 /**
@@ -104,7 +104,7 @@
 			DrillCharActivity.progressHandler = new ProgressHandler();
 		}
 
-		testState = TestState.ERROR;
+		this.testState = TestState.ERROR;
 		if (savedInstanceState == null) {
 			// New start
 			if (DrillCharActivity.threadLoadKanji != null) {
@@ -123,7 +123,7 @@
 			final Serializable sIC = extra.getSerializable(KanjiArrayAdapter.ITEM_CATEGORY);
 			final String direction = extra.getString(DrillMenuActivity.DRILL_DIRECTION);
 			if (initDrillQA(sIC, direction)) {
-				testState = TestState.NEW;
+				this.testState = TestState.NEW;
 			}
 		} else {
 			// Pass here when there is for example a screen rotation
@@ -131,7 +131,7 @@
 			this.testState = TestState.valueOf(savedInstanceState.getString(ST_TS));
 			this.testType = TestType.valueOf(savedInstanceState.getString(ST_TT));
 
-			if (testState == TestState.IN_PROGRESS && DrillCharActivity.threadLoadKanji != null
+			if (this.testState == TestState.IN_PROGRESS && DrillCharActivity.threadLoadKanji != null
 					&& DrillCharActivity.progressHandler.activity != null) {
 				DrillCharActivity.progressHandler.setActivity(this);
 				DrillCharActivity.progressHandler.progressDialog = ProgressDialog.show(this, Common.EMPTY_STRING,
@@ -139,7 +139,7 @@
 			}
 		}
 
-		switch (testState) {
+		switch (this.testState) {
 		case DONE:
 			this.initUIResult();
 			break;
@@ -251,7 +251,7 @@
 	private void initUI(Bundle savedInstanceState) {
 		this.listButtons = new ArrayList<Button>(NUM_ANSWERS);
 
-		switch (testType) {
+		switch (this.testType) {
 		case KANA_ROMANJI:
 		case ROMANJI_KANA:
 			super.setContentView(R.layout.drill_kana);
@@ -292,7 +292,7 @@
 		this.textViewGood = (TextView) super.findViewById(R.id.drillTextViewGoodAnswer);
 		this.textViewBad = (TextView) super.findViewById(R.id.drillTextViewBadAnswer);
 
-		if (testType == TestType.ROMANJI_KANA) {
+		if (this.testType == TestType.ROMANJI_KANA) {
 			this.textViewQuestion.setTextAppearance(super.getApplicationContext(), android.R.attr.textAppearanceLarge);
 			this.textViewQuestion.setTextSize(30.0f);
 		}
@@ -354,8 +354,8 @@
 		final int max = DrillCharActivity.progressHandler.numKanji;
 		final Context context = super.getApplicationContext();
 		final ArrayList<DrillQA> drillQA = DrillCharActivity.progressHandler.drillQA;
-		final TableRow.LayoutParams lpTv = new TableRow.LayoutParams(LayoutParams.MATCH_PARENT,
-				LayoutParams.WRAP_CONTENT, 1 / 3.0f);
+		final TableRow.LayoutParams lpTv = new TableRow.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
+				ViewGroup.LayoutParams.WRAP_CONTENT, 1 / 3.0f);
 
 		lpTv.setMargins(0, 3, 0, 3);
 
@@ -421,7 +421,7 @@
 		Button button = (Button) v;
 		if (dqa.answer != button.getText().toString()) {
 			// Bad response
-			textViewBad.setText(dqa.question + " ≠ " + button.getText().toString());
+			this.textViewBad.setText(dqa.question + " ≠ " + button.getText().toString());
 			this.textViewBad.setVisibility(View.VISIBLE);
 			dqa.userAnswer = button.getText().toString();
 			DrillCharActivity.progressHandler.numBadResponse++;
@@ -463,6 +463,12 @@
 				dqa.see = true;
 			}
 		}
+
+		if (null == dqa) {
+			Log.e(TAG, "nextQuestion: dqa must not be null at this point");
+			return;
+		}
+
 		DrillCharActivity.progressHandler.currentTest = dqa;
 		this.textViewQuestion.setText(dqa.question);
 
@@ -546,12 +552,12 @@
 		super.onSaveInstanceState(savedInstanceState);
 		savedInstanceState.putString(ST_TS, this.testState.name());
 		savedInstanceState.putString(ST_TT, this.testType.name());
-		if (testState != TestState.DONE) {
+		if (this.testState != TestState.DONE) {
 			savedInstanceState.putCharSequence(ST_TG, this.textViewGood.getText());
 			savedInstanceState.putCharSequence(ST_TB, this.textViewBad.getText());
 			ArrayList<CharSequence> buttonsText = new ArrayList<CharSequence>(NUM_ANSWERS);
 			for (int i = 0; i < NUM_ANSWERS; i++) {
-				buttonsText.add(listButtons.get(i).getText());
+				buttonsText.add(this.listButtons.get(i).getText());
 			}
 			savedInstanceState.putCharSequenceArrayList(ST_BT, buttonsText);
 		}
@@ -589,8 +595,8 @@
 
 			DrillCharActivity.threadLoadKanji = this;
 
-			KanjiDB.KanjiDBIterator kanjiIterator = KanjiDB.getKanjiIterator(selection, selectionArgs, true, false,
-					false);
+			KanjiDB.KanjiDBIterator kanjiIterator = KanjiDB.getKanjiIterator(this.selection, this.selectionArgs, true,
+					false, false);
 			kanjiIterator.first();
 			final int num = kanjiIterator.getCount();
 

=== modified file 'Narau/src/org/vono/narau/learn/reading/KanaChartActivity.java'
--- Narau/src/org/vono/narau/learn/reading/KanaChartActivity.java	2012-12-09 01:58:19 +0000
+++ Narau/src/org/vono/narau/learn/reading/KanaChartActivity.java	2012-12-18 18:47:22 +0000
@@ -49,9 +49,8 @@
 	// KanaChartActivity.class.getSimpleName();
 
 	static final int TYPE_MASK = KanjiData.KANA_CHART;
-	
+
 	private static HashMap<Common.KanaType, KanaChartActivity.TableScrollView> views;
-	
 
 	static {
 		KanaChartActivity.views = new HashMap<Common.KanaType, KanaChartActivity.TableScrollView>(2);
@@ -100,12 +99,12 @@
 			}
 
 			int count = kanaChartArray.length;
-			TableRow.LayoutParams lpOne = new TableRow.LayoutParams(
-					TableRow.LayoutParams.MATCH_PARENT, TableRow.LayoutParams.WRAP_CONTENT);
+			TableRow.LayoutParams lpOne = new TableRow.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
+					ViewGroup.LayoutParams.WRAP_CONTENT);
 			lpOne.span = 5;
 
-			TableRow.LayoutParams lpSix = new TableRow.LayoutParams(
-					TableRow.LayoutParams.MATCH_PARENT, TableRow.LayoutParams.WRAP_CONTENT);
+			TableRow.LayoutParams lpSix = new TableRow.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
+					ViewGroup.LayoutParams.WRAP_CONTENT);
 			lpSix.setMargins(0, 3, 0, 3);
 
 			for (int i = 0; i < count; i++) {
@@ -128,14 +127,13 @@
 							TextView tv = new TextView(context);
 							// tv.setBackgroundColor(Color.BLUE);
 
-							String romanji = Common.convertKana(line[j], wc.type,
-									Common.KanaType.ROMANJI);
+							String romanji = Common.convertKana(line[j], wc.type, Common.KanaType.ROMANJI);
 							tv.setTextSize(30);
 							tv.setGravity(Gravity.CENTER);
 
 							tv.setText(kana + "\n" + romanji);
-							LayoutParams lp = new LinearLayout.LayoutParams(
-									LayoutParams.WRAP_CONTENT, LayoutParams.MATCH_PARENT, 1.0f);
+							LayoutParams lp = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT,
+									ViewGroup.LayoutParams.MATCH_PARENT, 1.0f);
 							tv.setLayoutParams(lp);
 
 							row.addView(tv, lpSix);
@@ -184,7 +182,7 @@
 			// to make all the kana TextView's have the same size.
 			int tvW = w / 5;
 			if (w > 0) {
-				for (TextView tv : listTV) {
+				for (TextView tv : this.listTV) {
 					tv.setWidth(tvW);
 				}
 			}

=== modified file 'Narau/src/org/vono/narau/learn/reading/KanjiToWordActivity.java'
--- Narau/src/org/vono/narau/learn/reading/KanjiToWordActivity.java	2012-12-13 00:54:38 +0000
+++ Narau/src/org/vono/narau/learn/reading/KanjiToWordActivity.java	2012-12-18 18:47:22 +0000
@@ -485,8 +485,8 @@
 		@Override
 		public void run() {
 
-			final KanjiDB.KanjiDBIterator kanjiIterator = KanjiDB.getKanjiIterator(selection, selectionArgs, true,
-					false, true);
+			final KanjiDB.KanjiDBIterator kanjiIterator = KanjiDB.getKanjiIterator(this.selection, this.selectionArgs,
+					true, false, true);
 
 			Kanji kanji = kanjiIterator.first();
 			int count = 0;

=== modified file 'Narau/src/org/vono/narau/learn/writing/LearnWritingActivity.java'
--- Narau/src/org/vono/narau/learn/writing/LearnWritingActivity.java	2012-12-09 01:58:19 +0000
+++ Narau/src/org/vono/narau/learn/writing/LearnWritingActivity.java	2012-12-18 18:47:22 +0000
@@ -452,7 +452,7 @@
 
 		@Override
 		public void run() {
-			final KanjiDB.KanjiSVGIterator kanjiIteratorUnicode = KanjiDB.getKanjiSVGIterator(selection, selectionArgs);
+			final KanjiDB.KanjiSVGIterator kanjiIteratorUnicode = KanjiDB.getKanjiSVGIterator(this.selection, this.selectionArgs);
 
 			int codepoint = kanjiIteratorUnicode.first();
 			while (codepoint != -1) {
@@ -492,13 +492,13 @@
 
 		@Override
 		public void handleMessage(Message msg) {
-			if (LOAD_DONE == msg.what && null != activity) {
-				if (null != activity.progressDialog) {
-					activity.progressDialog.dismiss();
-					activity.progressDialog = null;
+			if (LOAD_DONE == msg.what && null != this.activity) {
+				if (null != this.activity.progressDialog) {
+					this.activity.progressDialog.dismiss();
+					this.activity.progressDialog = null;
 				}
-				activity.currentPosition = 0;
-				activity.updateCurrentPosition();
+				this.activity.currentPosition = 0;
+				this.activity.updateCurrentPosition();
 			}
 		}
 	}

=== modified file 'Narau/src/org/vono/narau/models/dictionary/Entry.java'
--- Narau/src/org/vono/narau/models/dictionary/Entry.java	2012-12-11 01:07:49 +0000
+++ Narau/src/org/vono/narau/models/dictionary/Entry.java	2012-12-18 18:47:22 +0000
@@ -33,9 +33,8 @@
  * <p>
  * entry (ent_seq, k_ele*, r_ele+, info?, sense+)
  * </p>
- * Entries consist of kanji elements, reading elements, general information and
- * sense elements. Each entry must have at least one reading element and one
- * sense element. Others are optional.
+ * Entries consist of kanji elements, reading elements, general information and sense elements. Each
+ * entry must have at least one reading element and one sense element. Others are optional.
  * 
  */
 public class Entry implements Comparable<Entry>, Parcelable {
@@ -63,8 +62,7 @@
 	public ArrayList<ReadingElement> r_ele;
 
 	/**
-	 * The sense element will record the translational equivalent of the
-	 * Japanese word
+	 * The sense element will record the translational equivalent of the Japanese word
 	 */
 	public ArrayList<Sense> senses;
 
@@ -98,7 +96,7 @@
 
 	public boolean haveLang(String lang) {
 		if (null != this.senses) {
-			for (Sense s : senses) {
+			for (Sense s : this.senses) {
 				if (s.glosses.containsKey(lang)) {
 					return true;
 				}
@@ -124,7 +122,7 @@
 	public String getFirstGloss() {
 		if (null != this.senses) {
 			final ArrayList<Language> languages = Preferences.getLangsPriorities(DatabaseType.dictonary);
-			for (Sense s : senses) {
+			for (Sense s : this.senses) {
 				final HashMap<Language, String> glosses = s.glosses;
 				for (Language language : languages) {
 					if (glosses.containsKey(language)) {
@@ -353,8 +351,8 @@
 
 	/**
 	 * Sort for the KanjiToWords<br/>
-	 * This is not a very good sorting method, but it seems to work. At least
-	 * the result is better with than without :-)<br/>
+	 * This is not a very good sorting method, but it seems to work. At least the result is better
+	 * with than without :-)<br/>
 	 * This is an ugly code!
 	 */
 	private void makeSortOrder() {
@@ -404,6 +402,11 @@
 		return false;
 	}
 
+	@Override
+	public int hashCode() {
+		return this.sequence;
+	}
+
 	/**
 	 * <p>
 	 * Compare the frequencies of this Japanese entry.

=== modified file 'Narau/src/org/vono/narau/models/history/OnlineResult.java'
--- Narau/src/org/vono/narau/models/history/OnlineResult.java	2012-12-13 17:40:21 +0000
+++ Narau/src/org/vono/narau/models/history/OnlineResult.java	2012-12-18 18:47:22 +0000
@@ -86,6 +86,7 @@
 		return this.service + "\n" + this.sourceLang.displayName + "/" + this.destLang.displayName;
 	}
 
+	@SuppressWarnings("cast")
 	@Override
 	public long getId() {
 		return ((long) this.searchTerm.hashCode()) + ((long) this.sourceLang.langISO3.hashCode())
@@ -274,7 +275,7 @@
 				while (jr.hasNext()) {
 
 					String name = jr.nextName();
-					
+
 					if (JsonToken.NULL == jr.peek()) {
 						jr.skipValue();
 						continue;

=== modified file 'Narau/src/org/vono/narau/models/history/SearchResult.java'
--- Narau/src/org/vono/narau/models/history/SearchResult.java	2012-12-11 22:34:12 +0000
+++ Narau/src/org/vono/narau/models/history/SearchResult.java	2012-12-18 18:47:22 +0000
@@ -77,6 +77,11 @@
 		return equal;
 	}
 
+	@Override
+	public int hashCode() {
+		return Long.valueOf(this.getId()).hashCode();
+	}
+
 	public abstract String getDisplayLanguage();
 
 	public abstract long getId();

=== modified file 'Narau/src/org/vono/narau/preferences/Preferences.java'
--- Narau/src/org/vono/narau/preferences/Preferences.java	2012-12-16 19:56:19 +0000
+++ Narau/src/org/vono/narau/preferences/Preferences.java	2012-12-18 18:47:22 +0000
@@ -305,6 +305,8 @@
 			case kanji:
 				key = Common.getResourcesString(R.string.prefNameKanjiLangPrio);
 				break;
+			default:
+				return;
 			}
 
 			langsPriorities.put(database, values);

=== modified file 'Narau/src/org/vono/narau/utils/FontFitTextView.java'
--- Narau/src/org/vono/narau/utils/FontFitTextView.java	2012-12-09 01:58:19 +0000
+++ Narau/src/org/vono/narau/utils/FontFitTextView.java	2012-12-18 18:47:22 +0000
@@ -64,10 +64,10 @@
 	 */
 	private void initComponent() {
 		// Context c, AttributeSet attrs, int defStyle
-		paint = new Paint();
-		paint.setTextSize(10);
-		paint.setTextAlign(Align.CENTER);
-		paint.setAntiAlias(true);
+		this.paint = new Paint();
+		this.paint.setTextSize(10);
+		this.paint.setTextAlign(Align.CENTER);
+		this.paint.setAntiAlias(true);
 
 		// FIXME: Get background/foreground colors from style
 
@@ -113,12 +113,12 @@
 		// TypedArray a = theme.obtainStyledAttributes(attrs, styles, defStyle,
 		// 0);
 
-		paint.setColor(Color.WHITE);
+		this.paint.setColor(Color.WHITE);
 	}
 
 	public void setFontColor(int c) {
 		// TODO use style to get the text color
-		paint.setColor(c);
+		this.paint.setColor(c);
 	}
 
 	/**
@@ -156,8 +156,8 @@
 		// DisplayMetrics metrics =
 		// super.getContext().getResources().getDisplayMetrics();
 
-		paint.setTextSize(fontSize);
-		paint.getTextBounds(s, 0, s.length(), rect);
+		this.paint.setTextSize(fontSize);
+		this.paint.getTextBounds(s, 0, s.length(), rect);
 		txtWidth = rect.width();
 		txtHeight = rect.height();
 		if (txtWidth > availableWidth || txtHeight > availableHeight) {
@@ -165,8 +165,8 @@
 		}
 
 		while (!gotIt) {
-			paint.setTextSize(fontSize);
-			paint.getTextBounds(s, 0, s.length(), rect);
+			this.paint.setTextSize(fontSize);
+			this.paint.getTextBounds(s, 0, s.length(), rect);
 			txtWidth = rect.width();
 			txtHeight = rect.height();
 
@@ -258,7 +258,7 @@
 		String text = getText().toString();
 		if (text.length() > 0) {
 			calcTextSize(text, canvas);
-			canvas.drawText(text, calcStartDrawingPosX(), calcStartDrawingPosY(), paint);
+			canvas.drawText(text, calcStartDrawingPosX(), calcStartDrawingPosY(), this.paint);
 		}
 	};
 

=== modified file 'Narau/src/org/vono/narau/utils/JsonReader.java'
--- Narau/src/org/vono/narau/utils/JsonReader.java	2012-12-08 02:05:54 +0000
+++ Narau/src/org/vono/narau/utils/JsonReader.java	2012-12-18 18:47:22 +0000
@@ -321,16 +321,16 @@
 	 * Returns the type of the next token without consuming it.
 	 */
 	public JsonToken peek() throws IOException {
-		if (token != null) {
-			return token;
+		if (this.token != null) {
+			return this.token;
 		}
 
 		switch (peekStack()) {
 		case EMPTY_DOCUMENT:
 			replaceTop(JsonScope.NONEMPTY_DOCUMENT);
 			JsonToken firstToken = nextValue();
-			if (!lenient && token != JsonToken.BEGIN_ARRAY && token != JsonToken.BEGIN_OBJECT) {
-				throw new IOException("Expected JSON document to start with '[' or '{' but was " + token);
+			if (!this.lenient && this.token != JsonToken.BEGIN_ARRAY && this.token != JsonToken.BEGIN_OBJECT) {
+				throw new IOException("Expected JSON document to start with '[' or '{' but was " + this.token);
 			}
 			return firstToken;
 		case EMPTY_ARRAY:
@@ -484,7 +484,7 @@
 		} catch (NumberFormatException ignored) {
 			double asDouble = Double.parseDouble(value); // don't catch this NumberFormatException
 			result = (long) asDouble;
-			if ((double) result != asDouble) {
+			if (result != asDouble) {
 				throw new NumberFormatException(value);
 			}
 		}
@@ -516,7 +516,7 @@
 		} catch (NumberFormatException ignored) {
 			double asDouble = Double.parseDouble(value); // don't catch this NumberFormatException
 			result = (int) asDouble;
-			if ((double) result != asDouble) {
+			if (result != asDouble) {
 				throw new NumberFormatException(value);
 			}
 		}

=== modified file 'Narau/src/org/vono/narau/utils/Language.java'
--- Narau/src/org/vono/narau/utils/Language.java	2012-12-16 19:16:57 +0000
+++ Narau/src/org/vono/narau/utils/Language.java	2012-12-18 18:47:22 +0000
@@ -115,7 +115,7 @@
 
 	@Override
 	public int hashCode() {
-		return langISO3.hashCode() + displayName.hashCode();
+		return this.langISO3.hashCode() + this.displayName.hashCode();
 	}
 
 	@Override

=== modified file 'Narau/src/org/vono/narau/utils/StringPool.java'
--- Narau/src/org/vono/narau/utils/StringPool.java	2012-12-09 01:58:19 +0000
+++ Narau/src/org/vono/narau/utils/StringPool.java	2012-12-18 18:47:22 +0000
@@ -52,15 +52,15 @@
 		// Pick a bucket using Doug Lea's supplemental secondaryHash function (from HashMap)
 		hashCode ^= (hashCode >>> 20) ^ (hashCode >>> 12);
 		hashCode ^= (hashCode >>> 7) ^ (hashCode >>> 4);
-		int index = hashCode & (pool.length - 1);
+		int index = hashCode & (this.pool.length - 1);
 
-		String pooled = pool[index];
+		String pooled = this.pool[index];
 		if (pooled != null && contentEquals(pooled, array, start, length)) {
 			return pooled;
 		}
 
 		String result = new String(array, start, length);
-		pool[index] = result;
+		this.pool[index] = result;
 		return result;
 	}
 }
\ No newline at end of file

=== modified file 'NarauCupcake/.settings/org.eclipse.jdt.core.prefs'
--- NarauCupcake/.settings/org.eclipse.jdt.core.prefs	2012-11-27 14:41:06 +0000
+++ NarauCupcake/.settings/org.eclipse.jdt.core.prefs	2012-12-18 18:47:22 +0000
@@ -1,4 +1,11 @@
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.source=1.5

=== modified file 'NarauCupcake/AndroidManifest.xml'
--- NarauCupcake/AndroidManifest.xml	2012-12-15 23:46:16 +0000
+++ NarauCupcake/AndroidManifest.xml	2012-12-18 18:47:22 +0000
@@ -17,8 +17,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.vono.narau"
-    android:versionCode="5"
-    android:versionName="0.8" >
+    android:versionCode="6"
+    android:versionName="0.8.1" >
 
     <!-- Permissions needed to download the database -->
     <uses-permission android:name="android.permission.INTERNET" />

=== added file 'NarauCupcake/res/drawable-hdpi/ic_erase.png'
Binary files NarauCupcake/res/drawable-hdpi/ic_erase.png	1970-01-01 00:00:00 +0000 and NarauCupcake/res/drawable-hdpi/ic_erase.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'NarauCupcake/res/drawable-hdpi/ic_media_next.png'
Binary files NarauCupcake/res/drawable-hdpi/ic_media_next.png	2012-12-15 23:46:16 +0000 and NarauCupcake/res/drawable-hdpi/ic_media_next.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'NarauCupcake/res/drawable-hdpi/ic_media_play.png'
Binary files NarauCupcake/res/drawable-hdpi/ic_media_play.png	2012-12-15 23:46:16 +0000 and NarauCupcake/res/drawable-hdpi/ic_media_play.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'NarauCupcake/res/drawable-hdpi/ic_media_previous.png'
Binary files NarauCupcake/res/drawable-hdpi/ic_media_previous.png	2012-12-15 23:46:16 +0000 and NarauCupcake/res/drawable-hdpi/ic_media_previous.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'NarauCupcake/res/drawable-hdpi/ic_menu_dictionary_offline.png'
Binary files NarauCupcake/res/drawable-hdpi/ic_menu_dictionary_offline.png	2012-12-15 23:46:16 +0000 and NarauCupcake/res/drawable-hdpi/ic_menu_dictionary_offline.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'NarauCupcake/res/drawable-hdpi/ic_menu_dictionary_online.png'
Binary files NarauCupcake/res/drawable-hdpi/ic_menu_dictionary_online.png	2012-12-15 23:46:16 +0000 and NarauCupcake/res/drawable-hdpi/ic_menu_dictionary_online.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'NarauCupcake/res/drawable-hdpi/ic_menu_drill_from_japanese.png'
Binary files NarauCupcake/res/drawable-hdpi/ic_menu_drill_from_japanese.png	2012-12-15 23:46:16 +0000 and NarauCupcake/res/drawable-hdpi/ic_menu_drill_from_japanese.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'NarauCupcake/res/drawable-hdpi/ic_menu_drill_to_japanese.png'
Binary files NarauCupcake/res/drawable-hdpi/ic_menu_drill_to_japanese.png	2012-12-15 23:46:16 +0000 and NarauCupcake/res/drawable-hdpi/ic_menu_drill_to_japanese.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'NarauCupcake/res/drawable-hdpi/ic_menu_reading.png'
Binary files NarauCupcake/res/drawable-hdpi/ic_menu_reading.png	2012-12-15 23:46:16 +0000 and NarauCupcake/res/drawable-hdpi/ic_menu_reading.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'NarauCupcake/res/drawable-hdpi/ic_menu_writing.png'
Binary files NarauCupcake/res/drawable-hdpi/ic_menu_writing.png	2012-12-15 23:46:16 +0000 and NarauCupcake/res/drawable-hdpi/ic_menu_writing.png	2012-12-18 18:47:22 +0000 differ
=== added file 'NarauCupcake/res/drawable-ldpi/ic_erase.png'
Binary files NarauCupcake/res/drawable-ldpi/ic_erase.png	1970-01-01 00:00:00 +0000 and NarauCupcake/res/drawable-ldpi/ic_erase.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'NarauCupcake/res/drawable-ldpi/ic_media_next.png'
Binary files NarauCupcake/res/drawable-ldpi/ic_media_next.png	2012-12-15 23:46:16 +0000 and NarauCupcake/res/drawable-ldpi/ic_media_next.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'NarauCupcake/res/drawable-ldpi/ic_media_play.png'
Binary files NarauCupcake/res/drawable-ldpi/ic_media_play.png	2012-12-15 23:46:16 +0000 and NarauCupcake/res/drawable-ldpi/ic_media_play.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'NarauCupcake/res/drawable-ldpi/ic_media_previous.png'
Binary files NarauCupcake/res/drawable-ldpi/ic_media_previous.png	2012-12-15 23:46:16 +0000 and NarauCupcake/res/drawable-ldpi/ic_media_previous.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'NarauCupcake/res/drawable-ldpi/ic_menu_dictionary_offline.png'
Binary files NarauCupcake/res/drawable-ldpi/ic_menu_dictionary_offline.png	2012-12-15 23:46:16 +0000 and NarauCupcake/res/drawable-ldpi/ic_menu_dictionary_offline.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'NarauCupcake/res/drawable-ldpi/ic_menu_dictionary_online.png'
Binary files NarauCupcake/res/drawable-ldpi/ic_menu_dictionary_online.png	2012-12-15 23:46:16 +0000 and NarauCupcake/res/drawable-ldpi/ic_menu_dictionary_online.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'NarauCupcake/res/drawable-ldpi/ic_menu_drill_from_japanese.png'
Binary files NarauCupcake/res/drawable-ldpi/ic_menu_drill_from_japanese.png	2012-12-15 23:46:16 +0000 and NarauCupcake/res/drawable-ldpi/ic_menu_drill_from_japanese.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'NarauCupcake/res/drawable-ldpi/ic_menu_drill_to_japanese.png'
Binary files NarauCupcake/res/drawable-ldpi/ic_menu_drill_to_japanese.png	2012-12-15 23:46:16 +0000 and NarauCupcake/res/drawable-ldpi/ic_menu_drill_to_japanese.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'NarauCupcake/res/drawable-ldpi/ic_menu_reading.png'
Binary files NarauCupcake/res/drawable-ldpi/ic_menu_reading.png	2012-12-15 23:46:16 +0000 and NarauCupcake/res/drawable-ldpi/ic_menu_reading.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'NarauCupcake/res/drawable-ldpi/ic_menu_writing.png'
Binary files NarauCupcake/res/drawable-ldpi/ic_menu_writing.png	2012-12-15 23:46:16 +0000 and NarauCupcake/res/drawable-ldpi/ic_menu_writing.png	2012-12-18 18:47:22 +0000 differ
=== added file 'NarauCupcake/res/drawable/ic_erase.png'
Binary files NarauCupcake/res/drawable/ic_erase.png	1970-01-01 00:00:00 +0000 and NarauCupcake/res/drawable/ic_erase.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'NarauCupcake/res/drawable/ic_media_next.png'
Binary files NarauCupcake/res/drawable/ic_media_next.png	2012-12-15 23:46:16 +0000 and NarauCupcake/res/drawable/ic_media_next.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'NarauCupcake/res/drawable/ic_media_play.png'
Binary files NarauCupcake/res/drawable/ic_media_play.png	2012-12-15 23:46:16 +0000 and NarauCupcake/res/drawable/ic_media_play.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'NarauCupcake/res/drawable/ic_media_previous.png'
Binary files NarauCupcake/res/drawable/ic_media_previous.png	2012-12-15 23:46:16 +0000 and NarauCupcake/res/drawable/ic_media_previous.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'NarauCupcake/res/drawable/ic_menu_dictionary_offline.png'
Binary files NarauCupcake/res/drawable/ic_menu_dictionary_offline.png	2012-12-15 23:46:16 +0000 and NarauCupcake/res/drawable/ic_menu_dictionary_offline.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'NarauCupcake/res/drawable/ic_menu_dictionary_online.png'
Binary files NarauCupcake/res/drawable/ic_menu_dictionary_online.png	2012-12-15 23:46:16 +0000 and NarauCupcake/res/drawable/ic_menu_dictionary_online.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'NarauCupcake/res/drawable/ic_menu_drill_from_japanese.png'
Binary files NarauCupcake/res/drawable/ic_menu_drill_from_japanese.png	2012-12-15 23:46:16 +0000 and NarauCupcake/res/drawable/ic_menu_drill_from_japanese.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'NarauCupcake/res/drawable/ic_menu_drill_to_japanese.png'
Binary files NarauCupcake/res/drawable/ic_menu_drill_to_japanese.png	2012-12-15 23:46:16 +0000 and NarauCupcake/res/drawable/ic_menu_drill_to_japanese.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'NarauCupcake/res/drawable/ic_menu_reading.png'
Binary files NarauCupcake/res/drawable/ic_menu_reading.png	2012-12-15 23:46:16 +0000 and NarauCupcake/res/drawable/ic_menu_reading.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'NarauCupcake/res/drawable/ic_menu_writing.png'
Binary files NarauCupcake/res/drawable/ic_menu_writing.png	2012-12-15 23:46:16 +0000 and NarauCupcake/res/drawable/ic_menu_writing.png	2012-12-18 18:47:22 +0000 differ
=== modified file 'NarauCupcake/res/layout-land/download.xml'
--- NarauCupcake/res/layout-land/download.xml	2012-12-15 23:46:16 +0000
+++ NarauCupcake/res/layout-land/download.xml	2012-12-18 18:47:22 +0000
@@ -84,7 +84,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="15dp"
-            android:drawableLeft="@android:drawable/ic_delete"
+            android:drawableLeft="@drawable/ic_erase"
             android:onClick="onClickButtonCancel"
             android:text="@android:string/cancel" />
 

=== modified file 'NarauCupcake/res/layout-land/learn_writing.xml'
--- NarauCupcake/res/layout-land/learn_writing.xml	2012-12-15 23:46:16 +0000
+++ NarauCupcake/res/layout-land/learn_writing.xml	2012-12-18 18:47:22 +0000
@@ -59,7 +59,7 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/clear"
             android:onClick="clearUserDrawing"
-            android:src="@android:drawable/ic_delete" />
+            android:src="@drawable/ic_erase" />
 
         <ImageButton
             android:id="@+id/learnWritingButtonNext"

=== modified file 'NarauCupcake/res/layout/download.xml'
--- NarauCupcake/res/layout/download.xml	2012-12-15 23:46:16 +0000
+++ NarauCupcake/res/layout/download.xml	2012-12-18 18:47:22 +0000
@@ -89,7 +89,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="15dp"
-        android:drawableLeft="@android:drawable/ic_delete"
+        android:drawableLeft="@drawable/ic_erase"
         android:onClick="onClickButtonCancel"
         android:text="@android:string/cancel" />
 

=== modified file 'NarauCupcake/res/layout/kanji_to_words.xml'
--- NarauCupcake/res/layout/kanji_to_words.xml	2012-12-15 23:46:16 +0000
+++ NarauCupcake/res/layout/kanji_to_words.xml	2012-12-18 18:47:22 +0000
@@ -40,7 +40,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:gravity="center_horizontal"
+            android:gravity="center"
             android:lines="2"
             android:textAppearance="?android:attr/textAppearanceLarge" >
         </TextView>

=== modified file 'NarauCupcake/res/layout/learn_writing.xml'
--- NarauCupcake/res/layout/learn_writing.xml	2012-12-15 23:46:16 +0000
+++ NarauCupcake/res/layout/learn_writing.xml	2012-12-18 18:47:22 +0000
@@ -73,7 +73,7 @@
                 android:contentDescription="@string/clear"
                 android:onClick="clearUserDrawing"
                 android:scaleType="fitCenter"
-                android:src="@android:drawable/ic_delete" />
+                android:src="@drawable/ic_erase" />
 
             <ImageButton
                 android:id="@+id/learnWritingButtonNext"

=== modified file 'NarauCupcake/res/values/values.xml'
--- NarauCupcake/res/values/values.xml	2012-12-16 19:56:19 +0000
+++ NarauCupcake/res/values/values.xml	2012-12-18 18:47:22 +0000
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
+    <!-- http://192.168.3.1/narau/narau_db_infos_ip.txt -->
     <item name="db_infos_url" type="string">https://bazaar.launchpad.net/~vono22/narau/fdroid/view/head:/NarauDBInfo/narau_db_infos.txt</item>
     <!-- Preferences names -->
     <item name="prefNameVersion" type="string">version</item>

=== modified file 'NarauCupcake/src/android/compat/view/MenuCompat.java'
--- NarauCupcake/src/android/compat/view/MenuCompat.java	2012-12-16 19:16:57 +0000
+++ NarauCupcake/src/android/compat/view/MenuCompat.java	2012-12-18 18:47:22 +0000
@@ -100,6 +100,7 @@
 		return null;
 	}
 
+	@SuppressWarnings("unqualified-field-access")
 	private static class MenuInfos implements MenuBuilder.Callback {
 		private MenuBuilder menuBuilder;
 		private DecorView frameLayout;

=== modified file 'NarauCupcake/src/android/compat/view/MenuInflater.java'
--- NarauCupcake/src/android/compat/view/MenuInflater.java	2012-12-15 23:46:16 +0000
+++ NarauCupcake/src/android/compat/view/MenuInflater.java	2012-12-18 18:47:22 +0000
@@ -42,6 +42,7 @@
  * XmlPullParser over a plain XML file at runtime; it only works with an XmlPullParser returned from
  * a compiled resource (R. <em>something</em> file.)
  */
+@SuppressWarnings("unqualified-field-access")
 public class MenuInflater {
 	/** Menu tag name in XML. */
 	private static final String XML_MENU = "menu";

=== modified file 'NarauCupcake/src/android/compat/view/menu/IconMenuItemView.java'
--- NarauCupcake/src/android/compat/view/menu/IconMenuItemView.java	2012-12-15 23:46:16 +0000
+++ NarauCupcake/src/android/compat/view/menu/IconMenuItemView.java	2012-12-18 18:47:22 +0000
@@ -32,6 +32,7 @@
 /**
  * The item view for each item in the {@link IconMenuView}.
  */
+@SuppressWarnings("unqualified-field-access")
 public final class IconMenuItemView extends TextView implements MenuView.ItemView {
 
 	private static final int NO_ALPHA = 0xFF;

=== modified file 'NarauCupcake/src/android/compat/view/menu/IconMenuView.java'
--- NarauCupcake/src/android/compat/view/menu/IconMenuView.java	2012-12-15 23:46:16 +0000
+++ NarauCupcake/src/android/compat/view/menu/IconMenuView.java	2012-12-18 18:47:22 +0000
@@ -46,6 +46,7 @@
  * @attr ref android.R.styleable#IconMenuView_maxItemsPerRow
  * 
  */
+@SuppressWarnings("unqualified-field-access")
 public final class IconMenuView extends ViewGroup implements ItemInvoker, MenuView, Runnable {
 	private static final int ITEM_CAPTION_CYCLE_DELAY = 1000;
 

=== modified file 'NarauCupcake/src/android/compat/view/menu/MenuBuilder.java'
--- NarauCupcake/src/android/compat/view/menu/MenuBuilder.java	2012-12-15 23:46:16 +0000
+++ NarauCupcake/src/android/compat/view/menu/MenuBuilder.java	2012-12-18 18:47:22 +0000
@@ -47,6 +47,7 @@
 /**
  * Implementation of the {@link android.view.Menu} interface for creating a standard menu UI.
  */
+@SuppressWarnings("unqualified-field-access")
 public class MenuBuilder implements Menu {
 	// private static final String LOGTAG = "MenuBuilder";
 
@@ -60,7 +61,7 @@
 	 * The menu type that represents a menu dialog. Examples are context and sub menus. This menu
 	 * type will not have a corresponding MenuView, but it will have an ItemView.
 	 */
-	public static final int TYPE_DIALOG = 2;
+	public static final int TYmActivityPE_DIALOG = 2;
 
 	private static final String VIEWS_TAG = "android:views";
 

=== modified file 'NarauCupcake/src/android/compat/view/menu/MenuItemImpl.java'
--- NarauCupcake/src/android/compat/view/menu/MenuItemImpl.java	2012-12-15 23:46:16 +0000
+++ NarauCupcake/src/android/compat/view/menu/MenuItemImpl.java	2012-12-18 18:47:22 +0000
@@ -29,7 +29,7 @@
 import android.view.ViewDebug;
 import android.view.ViewGroup;
 
-
+@SuppressWarnings("unqualified-field-access")
 public final class MenuItemImpl implements MenuItem {
 	private final int mId;
 	private final int mGroup;

=== modified file 'NarauCupcake/src/android/compat/view/menu/SubMenuBuilder.java'
--- NarauCupcake/src/android/compat/view/menu/SubMenuBuilder.java	2012-12-15 23:46:16 +0000
+++ NarauCupcake/src/android/compat/view/menu/SubMenuBuilder.java	2012-12-18 18:47:22 +0000
@@ -27,6 +27,7 @@
  * The model for a sub menu, which is an extension of the menu.  Most methods are proxied to
  * the parent menu.
  */
+@SuppressWarnings("unqualified-field-access")
 public class SubMenuBuilder extends MenuBuilder implements SubMenu {
     private MenuBuilder mParentMenu;
     private MenuItemImpl mItem;

=== modified file 'NarauCupcake/src/android/support/v4/app/BackStackRecord.java'
--- NarauCupcake/src/android/support/v4/app/BackStackRecord.java	2012-11-21 00:38:43 +0000
+++ NarauCupcake/src/android/support/v4/app/BackStackRecord.java	2012-12-18 18:47:22 +0000
@@ -27,6 +27,7 @@
 import java.io.PrintWriter;
 import java.util.ArrayList;
 
+@SuppressWarnings("unqualified-field-access")
 final class BackStackState implements Parcelable {
 	final int[] mOps;
 	final int mTransition;
@@ -168,6 +169,7 @@
 /**
  * @hide Entry of an operation on the fragment back stack.
  */
+@SuppressWarnings("unqualified-field-access")
 final class BackStackRecord extends FragmentTransaction implements FragmentManager.BackStackEntry, Runnable {
 	static final String TAG = "BackStackEntry";
 

=== modified file 'NarauCupcake/src/android/support/v4/app/DialogFragment.java'
--- NarauCupcake/src/android/support/v4/app/DialogFragment.java	2012-11-21 00:38:43 +0000
+++ NarauCupcake/src/android/support/v4/app/DialogFragment.java	2012-12-18 18:47:22 +0000
@@ -36,6 +36,7 @@
  * implementation is still used; it does not try to switch to the framework's
  * implementation. See the framework SDK documentation for a class overview.
  */
+@SuppressWarnings("unqualified-field-access")
 public class DialogFragment extends Fragment implements DialogInterface.OnCancelListener,
 		DialogInterface.OnDismissListener {
 

=== modified file 'NarauCupcake/src/android/support/v4/app/Fragment.java'
--- NarauCupcake/src/android/support/v4/app/Fragment.java	2012-11-21 00:38:43 +0000
+++ NarauCupcake/src/android/support/v4/app/Fragment.java	2012-12-18 18:47:22 +0000
@@ -47,6 +47,7 @@
 import java.io.PrintWriter;
 import java.util.HashMap;
 
+@SuppressWarnings("unqualified-field-access")
 final class FragmentState implements Parcelable {
 	final String mClassName;
 	final int mIndex;
@@ -147,12 +148,12 @@
 }
 
 /**
- * Static library support version of the framework's
- * {@link android.app.Fragment}. Used to write apps that run on platforms prior
- * to Android 3.0. When running on Android 3.0 or above, this implementation is
- * still used; it does not try to switch to the framework's implementation. See
+ * Static library support version of the framework's {@link android.app.Fragment}. Used to write
+ * apps that run on platforms prior to Android 3.0. When running on Android 3.0 or above, this
+ * implementation is still used; it does not try to switch to the framework's implementation. See
  * the framework SDK documentation for a class overview.
  */
+@SuppressWarnings("unqualified-field-access")
 public class Fragment implements ComponentCallbacks, OnCreateContextMenuListener {
 	private static final HashMap<String, Class<?>> sClassMap = new HashMap<String, Class<?>>();
 
@@ -288,8 +289,8 @@
 	boolean mCheckedForLoaderManager;
 
 	/**
-	 * State information that has been retrieved from a fragment instance
-	 * through {@link FragmentManager#saveFragmentInstanceState(Fragment)
+	 * State information that has been retrieved from a fragment instance through
+	 * {@link FragmentManager#saveFragmentInstanceState(Fragment)
 	 * FragmentManager.saveFragmentInstanceState}.
 	 */
 	public static class SavedState implements Parcelable {
@@ -326,8 +327,8 @@
 	}
 
 	/**
-	 * Thrown by {@link Fragment#instantiate(Context, String, Bundle)} when
-	 * there is an instantiation failure.
+	 * Thrown by {@link Fragment#instantiate(Context, String, Bundle)} when there is an
+	 * instantiation failure.
 	 */
 	static public class InstantiationException extends RuntimeException {
 		/**
@@ -341,51 +342,46 @@
 	}
 
 	/**
-	 * Default constructor. <strong>Every</strong> fragment must have an empty
-	 * constructor, so it can be instantiated when restoring its activity's
-	 * state. It is strongly recommended that subclasses do not have other
-	 * constructors with parameters, since these constructors will not be called
-	 * when the fragment is re-instantiated; instead, arguments can be supplied
-	 * by the caller with {@link #setArguments} and later retrieved by the
-	 * Fragment with {@link #getArguments}.
+	 * Default constructor. <strong>Every</strong> fragment must have an empty constructor, so it
+	 * can be instantiated when restoring its activity's state. It is strongly recommended that
+	 * subclasses do not have other constructors with parameters, since these constructors will not
+	 * be called when the fragment is re-instantiated; instead, arguments can be supplied by the
+	 * caller with {@link #setArguments} and later retrieved by the Fragment with
+	 * {@link #getArguments}.
 	 * 
 	 * <p>
-	 * Applications should generally not implement a constructor. The first
-	 * place application code an run where the fragment is ready to be used is
-	 * in {@link #onAttach(Activity)}, the point where the fragment is actually
-	 * associated with its activity. Some applications may also want to
-	 * implement {@link #onInflate} to retrieve attributes from a layout
-	 * resource, though should take care here because this happens for the
-	 * fragment is attached to its activity.
+	 * Applications should generally not implement a constructor. The first place application code
+	 * an run where the fragment is ready to be used is in {@link #onAttach(Activity)}, the point
+	 * where the fragment is actually associated with its activity. Some applications may also want
+	 * to implement {@link #onInflate} to retrieve attributes from a layout resource, though should
+	 * take care here because this happens for the fragment is attached to its activity.
 	 */
 	public Fragment() {
 	}
 
 	/**
-	 * Like {@link #instantiate(Context, String, Bundle)} but with a null
-	 * argument Bundle.
+	 * Like {@link #instantiate(Context, String, Bundle)} but with a null argument Bundle.
 	 */
 	public static Fragment instantiate(Context context, String fname) {
 		return instantiate(context, fname, null);
 	}
 
 	/**
-	 * Create a new instance of a Fragment with the given class name. This is
-	 * the same as calling its empty constructor.
+	 * Create a new instance of a Fragment with the given class name. This is the same as calling
+	 * its empty constructor.
 	 * 
 	 * @param context
-	 *            The calling context being used to instantiate the fragment.
-	 *            This is currently just used to get its ClassLoader.
+	 *            The calling context being used to instantiate the fragment. This is currently just
+	 *            used to get its ClassLoader.
 	 * @param fname
 	 *            The class name of the fragment to instantiate.
 	 * @param args
-	 *            Bundle of arguments to supply to the fragment, which it can
-	 *            retrieve with {@link #getArguments()}. May be null.
+	 *            Bundle of arguments to supply to the fragment, which it can retrieve with
+	 *            {@link #getArguments()}. May be null.
 	 * @return Returns a new fragment instance.
 	 * @throws InstantiationException
-	 *             If there is a failure in instantiating the given fragment
-	 *             class. This is a runtime exception; it is not normally
-	 *             expected to happen.
+	 *             If there is a failure in instantiating the given fragment class. This is a
+	 *             runtime exception; it is not normally expected to happen.
 	 */
 	public static Fragment instantiate(Context context, String fname, Bundle args) {
 		try {
@@ -467,9 +463,8 @@
 	}
 
 	/**
-	 * Return the identifier this fragment is known by. This is either the
-	 * android:id value supplied in a layout or the container view ID supplied
-	 * when adding the fragment.
+	 * Return the identifier this fragment is known by. This is either the android:id value supplied
+	 * in a layout or the container view ID supplied when adding the fragment.
 	 */
 	final public int getId() {
 		return mFragmentId;
@@ -483,11 +478,10 @@
 	}
 
 	/**
-	 * Supply the construction arguments for this fragment. This can only be
-	 * called before the fragment has been attached to its activity; that is,
-	 * you should call it immediately after constructing the fragment. The
-	 * arguments supplied here will be retained across fragment destroy and
-	 * creation.
+	 * Supply the construction arguments for this fragment. This can only be called before the
+	 * fragment has been attached to its activity; that is, you should call it immediately after
+	 * constructing the fragment. The arguments supplied here will be retained across fragment
+	 * destroy and creation.
 	 */
 	public void setArguments(Bundle args) {
 		if (mIndex >= 0) {
@@ -504,9 +498,8 @@
 	}
 
 	/**
-	 * Set the initial saved state that this Fragment should restore itself from
-	 * when first being constructed, as returned by
-	 * {@link FragmentManager#saveFragmentInstanceState(Fragment)
+	 * Set the initial saved state that this Fragment should restore itself from when first being
+	 * constructed, as returned by {@link FragmentManager#saveFragmentInstanceState(Fragment)
 	 * FragmentManager.saveFragmentInstanceState}.
 	 * 
 	 * @param state
@@ -520,17 +513,16 @@
 	}
 
 	/**
-	 * Optional target for this fragment. This may be used, for example, if this
-	 * fragment is being started by another, and when done wants to give a
-	 * result back to the first. The target set here is retained across
-	 * instances via {@link FragmentManager#putFragment
+	 * Optional target for this fragment. This may be used, for example, if this fragment is being
+	 * started by another, and when done wants to give a result back to the first. The target set
+	 * here is retained across instances via {@link FragmentManager#putFragment
 	 * FragmentManager.putFragment()}.
 	 * 
 	 * @param fragment
 	 *            The fragment that is the target of this one.
 	 * @param requestCode
-	 *            Optional request code, for convenience if you are going to
-	 *            call back with {@link #onActivityResult(int, int, Intent)}.
+	 *            Optional request code, for convenience if you are going to call back with
+	 *            {@link #onActivityResult(int, int, Intent)}.
 	 */
 	public void setTargetFragment(Fragment fragment, int requestCode) {
 		mTarget = fragment;
@@ -569,8 +561,8 @@
 	}
 
 	/**
-	 * Return a localized, styled CharSequence from the application's package's
-	 * default string table.
+	 * Return a localized, styled CharSequence from the application's package's default string
+	 * table.
 	 * 
 	 * @param resId
 	 *            Resource id for the CharSequence text
@@ -580,8 +572,7 @@
 	}
 
 	/**
-	 * Return a localized string from the application's package's default string
-	 * table.
+	 * Return a localized string from the application's package's default string table.
 	 * 
 	 * @param resId
 	 *            Resource id for the string
@@ -591,9 +582,9 @@
 	}
 
 	/**
-	 * Return a localized formatted string from the application's package's
-	 * default string table, substituting the format arguments as defined in
-	 * {@link java.util.Formatter} and {@link java.lang.String#format}.
+	 * Return a localized formatted string from the application's package's default string table,
+	 * substituting the format arguments as defined in {@link java.util.Formatter} and
+	 * {@link java.lang.String#format}.
 	 * 
 	 * @param resId
 	 *            Resource id for the format string
@@ -606,11 +597,10 @@
 	}
 
 	/**
-	 * Return the FragmentManager for interacting with fragments associated with
-	 * this fragment's activity. Note that this will be non-null slightly before
-	 * {@link #getActivity()}, during the time from when the fragment is placed
-	 * in a {@link FragmentTransaction} until it is committed and attached to
-	 * its activity.
+	 * Return the FragmentManager for interacting with fragments associated with this fragment's
+	 * activity. Note that this will be non-null slightly before {@link #getActivity()}, during the
+	 * time from when the fragment is placed in a {@link FragmentTransaction} until it is committed
+	 * and attached to its activity.
 	 */
 	final public FragmentManager getFragmentManager() {
 		return mFragmentManager;
@@ -624,46 +614,44 @@
 	}
 
 	/**
-	 * Return true if the fragment has been explicitly detached from the UI.
-	 * That is, {@link FragmentTransaction#detach(Fragment)
-	 * FragmentTransaction.detach(Fragment)} has been used on it.
+	 * Return true if the fragment has been explicitly detached from the UI. That is,
+	 * {@link FragmentTransaction#detach(Fragment) FragmentTransaction.detach(Fragment)} has been
+	 * used on it.
 	 */
 	final public boolean isDetached() {
 		return mDetached;
 	}
 
 	/**
-	 * Return true if this fragment is currently being removed from its
-	 * activity. This is <em>not</em> whether its activity is finishing, but
-	 * rather whether it is in the process of being removed from its activity.
+	 * Return true if this fragment is currently being removed from its activity. This is
+	 * <em>not</em> whether its activity is finishing, but rather whether it is in the process of
+	 * being removed from its activity.
 	 */
 	final public boolean isRemoving() {
 		return mRemoving;
 	}
 
 	/**
-	 * Return true if the layout is included as part of an activity view
-	 * hierarchy via the &lt;fragment&gt; tag. This will always be true when
-	 * fragments are created through the &lt;fragment&gt; tag, <em>except</em>
-	 * in the case where an old fragment is restored from a previous state and
-	 * it does not appear in the layout of the current state.
+	 * Return true if the layout is included as part of an activity view hierarchy via the
+	 * &lt;fragment&gt; tag. This will always be true when fragments are created through the
+	 * &lt;fragment&gt; tag, <em>except</em> in the case where an old fragment is restored from a
+	 * previous state and it does not appear in the layout of the current state.
 	 */
 	final public boolean isInLayout() {
 		return mInLayout;
 	}
 
 	/**
-	 * Return true if the fragment is in the resumed state. This is true for the
-	 * duration of {@link #onResume()} and {@link #onPause()} as well.
+	 * Return true if the fragment is in the resumed state. This is true for the duration of
+	 * {@link #onResume()} and {@link #onPause()} as well.
 	 */
 	final public boolean isResumed() {
 		return mResumed;
 	}
 
 	/**
-	 * Return true if the fragment is currently visible to the user. This means
-	 * it: (1) has been added, (2) has its view attached to the window, and (3)
-	 * is not hidden.
+	 * Return true if the fragment is currently visible to the user. This means it: (1) has been
+	 * added, (2) has its view attached to the window, and (3) is not hidden.
 	 */
 	final public boolean isVisible() {
 		return isAdded() && !mHidden && mView != null && mView.getWindowToken() != null
@@ -671,41 +659,36 @@
 	}
 
 	/**
-	 * Return true if the fragment has been hidden. By default fragments are
-	 * shown. You can find out about changes to this state with
-	 * {@link #onHiddenChanged}. Note that the hidden state is orthogonal to
-	 * other states -- that is, to be visible to the user, a fragment must be
-	 * both started and not hidden.
+	 * Return true if the fragment has been hidden. By default fragments are shown. You can find out
+	 * about changes to this state with {@link #onHiddenChanged}. Note that the hidden state is
+	 * orthogonal to other states -- that is, to be visible to the user, a fragment must be both
+	 * started and not hidden.
 	 */
 	final public boolean isHidden() {
 		return mHidden;
 	}
 
 	/**
-	 * Called when the hidden state (as returned by {@link #isHidden()} of the
-	 * fragment has changed. Fragments start out not hidden; this will be called
-	 * whenever the fragment changes state from that.
+	 * Called when the hidden state (as returned by {@link #isHidden()} of the fragment has changed.
+	 * Fragments start out not hidden; this will be called whenever the fragment changes state from
+	 * that.
 	 * 
 	 * @param hidden
-	 *            True if the fragment is now hidden, false if it is not
-	 *            visible.
+	 *            True if the fragment is now hidden, false if it is not visible.
 	 */
 	public void onHiddenChanged(boolean hidden) {
 	}
 
 	/**
-	 * Control whether a fragment instance is retained across Activity
-	 * re-creation (such as from a configuration change). This can only be used
-	 * with fragments not in the back stack. If set, the fragment lifecycle will
-	 * be slightly different when an activity is recreated:
+	 * Control whether a fragment instance is retained across Activity re-creation (such as from a
+	 * configuration change). This can only be used with fragments not in the back stack. If set,
+	 * the fragment lifecycle will be slightly different when an activity is recreated:
 	 * <ul>
-	 * <li> {@link #onDestroy()} will not be called (but {@link #onDetach()}
-	 * still will be, because the fragment is being detached from its current
-	 * activity).
-	 * <li> {@link #onCreate(Bundle)} will not be called since the fragment is
-	 * not being re-created.
-	 * <li> {@link #onAttach(Activity)} and {@link #onActivityCreated(Bundle)}
-	 * <b>will</b> still be called.
+	 * <li> {@link #onDestroy()} will not be called (but {@link #onDetach()} still will be, because
+	 * the fragment is being detached from its current activity).
+	 * <li> {@link #onCreate(Bundle)} will not be called since the fragment is not being re-created.
+	 * <li> {@link #onAttach(Activity)} and {@link #onActivityCreated(Bundle)} <b>will</b> still be
+	 * called.
 	 * </ul>
 	 */
 	public void setRetainInstance(boolean retain) {
@@ -717,9 +700,8 @@
 	}
 
 	/**
-	 * Report that this fragment would like to participate in populating the
-	 * options menu by receiving a call to {@link #onCreateOptionsMenu} and
-	 * related methods.
+	 * Report that this fragment would like to participate in populating the options menu by
+	 * receiving a call to {@link #onCreateOptionsMenu} and related methods.
 	 * 
 	 * @param hasMenu
 	 *            If true, the fragment has menu items to contribute.
@@ -734,14 +716,13 @@
 	}
 
 	/**
-	 * Set a hint for whether this fragment's menu should be visible. This is
-	 * useful if you know that a fragment has been placed in your view hierarchy
-	 * so that the user can not currently seen it, so any menu items it has
-	 * should also not be shown.
+	 * Set a hint for whether this fragment's menu should be visible. This is useful if you know
+	 * that a fragment has been placed in your view hierarchy so that the user can not currently
+	 * seen it, so any menu items it has should also not be shown.
 	 * 
 	 * @param menuVisible
-	 *            The default is true, meaning the fragment's menu will be shown
-	 *            as usual. If false, the user will not see the menu.
+	 *            The default is true, meaning the fragment's menu will be shown as usual. If false,
+	 *            the user will not see the menu.
 	 */
 	public void setMenuVisibility(boolean menuVisible) {
 		if (mMenuVisible != menuVisible) {
@@ -753,20 +734,18 @@
 	}
 
 	/**
-	 * Set a hint to the system about whether this fragment's UI is currently
-	 * visible to the user. This hint defaults to true and is persistent across
-	 * fragment instance state save and restore.
+	 * Set a hint to the system about whether this fragment's UI is currently visible to the user.
+	 * This hint defaults to true and is persistent across fragment instance state save and restore.
 	 * 
 	 * <p>
-	 * An app may set this to false to indicate that the fragment's UI is
-	 * scrolled out of visibility or is otherwise not directly visible to the
-	 * user. This may be used by the system to prioritize operations such as
-	 * fragment lifecycle updates or loader ordering behavior.
+	 * An app may set this to false to indicate that the fragment's UI is scrolled out of visibility
+	 * or is otherwise not directly visible to the user. This may be used by the system to
+	 * prioritize operations such as fragment lifecycle updates or loader ordering behavior.
 	 * </p>
 	 * 
 	 * @param isVisibleToUser
-	 *            true if this fragment's UI is currently visible to the user
-	 *            (default), false if it is not.
+	 *            true if this fragment's UI is currently visible to the user (default), false if it
+	 *            is not.
 	 */
 	public void setUserVisibleHint(boolean isVisibleToUser) {
 		if (!mUserVisibleHint && isVisibleToUser && mState < STARTED) {
@@ -800,8 +779,7 @@
 	}
 
 	/**
-	 * Call {@link Activity#startActivity(Intent)} on the fragment's containing
-	 * Activity.
+	 * Call {@link Activity#startActivity(Intent)} on the fragment's containing Activity.
 	 */
 	public void startActivity(Intent intent) {
 		if (mActivity == null) {
@@ -811,8 +789,8 @@
 	}
 
 	/**
-	 * Call {@link Activity#startActivityForResult(Intent, int)} on the
-	 * fragment's containing Activity.
+	 * Call {@link Activity#startActivityForResult(Intent, int)} on the fragment's containing
+	 * Activity.
 	 */
 	public void startActivityForResult(Intent intent, int requestCode) {
 		if (mActivity == null) {
@@ -822,79 +800,69 @@
 	}
 
 	/**
-	 * Receive the result from a previous call to
-	 * {@link #startActivityForResult(Intent, int)}. This follows the related
-	 * Activity API as described there in
+	 * Receive the result from a previous call to {@link #startActivityForResult(Intent, int)}. This
+	 * follows the related Activity API as described there in
 	 * {@link Activity#onActivityResult(int, int, Intent)}.
 	 * 
 	 * @param requestCode
-	 *            The integer request code originally supplied to
-	 *            startActivityForResult(), allowing you to identify who this
-	 *            result came from.
+	 *            The integer request code originally supplied to startActivityForResult(), allowing
+	 *            you to identify who this result came from.
 	 * @param resultCode
-	 *            The integer result code returned by the child activity through
-	 *            its setResult().
+	 *            The integer result code returned by the child activity through its setResult().
 	 * @param data
-	 *            An Intent, which can return result data to the caller (various
-	 *            data can be attached to Intent "extras").
+	 *            An Intent, which can return result data to the caller (various data can be
+	 *            attached to Intent "extras").
 	 */
 	public void onActivityResult(int requestCode, int resultCode, Intent data) {
 	}
 
 	/**
-	 * @hide Hack so that DialogFragment can make its Dialog before creating its
-	 *       views, and the view construction can use the dialog's context for
-	 *       inflation. Maybe this should become a public API. Note sure.
+	 * @hide Hack so that DialogFragment can make its Dialog before creating its views, and the view
+	 *       construction can use the dialog's context for inflation. Maybe this should become a
+	 *       public API. Note sure.
 	 */
-	@SuppressWarnings("unused")
 	public LayoutInflater getLayoutInflater(Bundle savedInstanceState) {
 		return mActivity.getLayoutInflater();
 	}
 
 	/**
-	 * Called when a fragment is being created as part of a view layout
-	 * inflation, typically from setting the content view of an activity. This
-	 * may be called immediately after the fragment is created from a <fragment>
-	 * tag in a layout file. Note this is <em>before</em> the fragment's
-	 * {@link #onAttach(Activity)} has been called; all you should do here is
-	 * parse the attributes and save them away.
+	 * Called when a fragment is being created as part of a view layout inflation, typically from
+	 * setting the content view of an activity. This may be called immediately after the fragment is
+	 * created from a <fragment> tag in a layout file. Note this is <em>before</em> the fragment's
+	 * {@link #onAttach(Activity)} has been called; all you should do here is parse the attributes
+	 * and save them away.
 	 * 
 	 * <p>
-	 * This is called every time the fragment is inflated, even if it is being
-	 * inflated into a new instance with saved state. It typically makes sense
-	 * to re-parse the parameters each time, to allow them to change with
-	 * different configurations.
+	 * This is called every time the fragment is inflated, even if it is being inflated into a new
+	 * instance with saved state. It typically makes sense to re-parse the parameters each time, to
+	 * allow them to change with different configurations.
 	 * </p>
 	 * 
 	 * <p>
-	 * Here is a typical implementation of a fragment that can take parameters
-	 * both through attributes supplied here as well from
-	 * {@link #getArguments()}:
+	 * Here is a typical implementation of a fragment that can take parameters both through
+	 * attributes supplied here as well from {@link #getArguments()}:
 	 * </p>
 	 * 
 	 * {@sample development/samples/ApiDemos/src/com/example/android/apis/app/
 	 * FragmentArguments.java fragment}
 	 * 
 	 * <p>
-	 * Note that parsing the XML attributes uses a "styleable" resource. The
-	 * declaration for the styleable used here is:
-	 * </p>
-	 * 
-	 * {@sample development/samples/ApiDemos/res/values/attrs.xml
-	 * fragment_arguments}
-	 * 
-	 * <p>
-	 * The fragment can then be declared within its activity's content layout
-	 * through a tag like this:
-	 * </p>
-	 * 
-	 * {@sample development/samples/ApiDemos/res/layout/fragment_arguments.xml
-	 * from_attributes}
-	 * 
-	 * <p>
-	 * This fragment can also be created dynamically from arguments given at
-	 * runtime in the arguments Bundle; here is an example of doing so at
-	 * creation of the containing activity:
+	 * Note that parsing the XML attributes uses a "styleable" resource. The declaration for the
+	 * styleable used here is:
+	 * </p>
+	 * 
+	 * {@sample development/samples/ApiDemos/res/values/attrs.xml fragment_arguments}
+	 * 
+	 * <p>
+	 * The fragment can then be declared within its activity's content layout through a tag like
+	 * this:
+	 * </p>
+	 * 
+	 * {@sample development/samples/ApiDemos/res/layout/fragment_arguments.xml from_attributes}
+	 * 
+	 * <p>
+	 * This fragment can also be created dynamically from arguments given at runtime in the
+	 * arguments Bundle; here is an example of doing so at creation of the containing activity:
 	 * </p>
 	 * 
 	 * {@sample development/samples/ApiDemos/src/com/example/android/apis/app/
@@ -905,16 +873,16 @@
 	 * @param attrs
 	 *            The attributes at the tag where the fragment is being created.
 	 * @param savedInstanceState
-	 *            If the fragment is being re-created from a previous saved
-	 *            state, this is the state.
+	 *            If the fragment is being re-created from a previous saved state, this is the
+	 *            state.
 	 */
 	public void onInflate(Activity activity, AttributeSet attrs, Bundle savedInstanceState) {
 		mCalled = true;
 	}
 
 	/**
-	 * Called when a fragment is first attached to its activity.
-	 * {@link #onCreate(Bundle)} will be called after this.
+	 * Called when a fragment is first attached to its activity. {@link #onCreate(Bundle)} will be
+	 * called after this.
 	 */
 	public void onAttach(@SuppressWarnings("unused") Activity activity) {
 		mCalled = true;
@@ -929,46 +897,41 @@
 	}
 
 	/**
-	 * Called to do initial creation of a fragment. This is called after
-	 * {@link #onAttach(Activity)} and before
-	 * {@link #onCreateView(LayoutInflater, ViewGroup, Bundle)}.
+	 * Called to do initial creation of a fragment. This is called after {@link #onAttach(Activity)}
+	 * and before {@link #onCreateView(LayoutInflater, ViewGroup, Bundle)}.
 	 * 
 	 * <p>
-	 * Note that this can be called while the fragment's activity is still in
-	 * the process of being created. As such, you can not rely on things like
-	 * the activity's content view hierarchy being initialized at this point. If
-	 * you want to do work once the activity itself is created, see
+	 * Note that this can be called while the fragment's activity is still in the process of being
+	 * created. As such, you can not rely on things like the activity's content view hierarchy being
+	 * initialized at this point. If you want to do work once the activity itself is created, see
 	 * {@link #onActivityCreated(Bundle)}.
 	 * 
 	 * @param savedInstanceState
-	 *            If the fragment is being re-created from a previous saved
-	 *            state, this is the state.
+	 *            If the fragment is being re-created from a previous saved state, this is the
+	 *            state.
 	 */
 	public void onCreate(Bundle savedInstanceState) {
 		mCalled = true;
 	}
 
 	/**
-	 * Called to have the fragment instantiate its user interface view. This is
-	 * optional, and non-graphical fragments can return null (which is the
-	 * default implementation). This will be called between
-	 * {@link #onCreate(Bundle)} and {@link #onActivityCreated(Bundle)}.
+	 * Called to have the fragment instantiate its user interface view. This is optional, and
+	 * non-graphical fragments can return null (which is the default implementation). This will be
+	 * called between {@link #onCreate(Bundle)} and {@link #onActivityCreated(Bundle)}.
 	 * 
 	 * <p>
-	 * If you return a View from here, you will later be called in
-	 * {@link #onDestroyView} when the view is being released.
+	 * If you return a View from here, you will later be called in {@link #onDestroyView} when the
+	 * view is being released.
 	 * 
 	 * @param inflater
-	 *            The LayoutInflater object that can be used to inflate any
-	 *            views in the fragment,
+	 *            The LayoutInflater object that can be used to inflate any views in the fragment,
 	 * @param container
-	 *            If non-null, this is the parent view that the fragment's UI
-	 *            should be attached to. The fragment should not add the view
-	 *            itself, but this can be used to generate the LayoutParams of
-	 *            the view.
+	 *            If non-null, this is the parent view that the fragment's UI should be attached to.
+	 *            The fragment should not add the view itself, but this can be used to generate the
+	 *            LayoutParams of the view.
 	 * @param savedInstanceState
-	 *            If non-null, this fragment is being re-constructed from a
-	 *            previous saved state as given here.
+	 *            If non-null, this fragment is being re-constructed from a previous saved state as
+	 *            given here.
 	 * 
 	 * @return Return the View for the fragment's UI, or null.
 	 */
@@ -978,26 +941,23 @@
 	}
 
 	/**
-	 * Called immediately after
-	 * {@link #onCreateView(LayoutInflater, ViewGroup, Bundle)} has returned,
-	 * but before any saved state has been restored in to the view. This gives
-	 * subclasses a chance to initialize themselves once they know their view
-	 * hierarchy has been completely created. The fragment's view hierarchy is
-	 * not however attached to its parent at this point.
+	 * Called immediately after {@link #onCreateView(LayoutInflater, ViewGroup, Bundle)} has
+	 * returned, but before any saved state has been restored in to the view. This gives subclasses
+	 * a chance to initialize themselves once they know their view hierarchy has been completely
+	 * created. The fragment's view hierarchy is not however attached to its parent at this point.
 	 * 
 	 * @param view
-	 *            The View returned by
-	 *            {@link #onCreateView(LayoutInflater, ViewGroup, Bundle)}.
+	 *            The View returned by {@link #onCreateView(LayoutInflater, ViewGroup, Bundle)}.
 	 * @param savedInstanceState
-	 *            If non-null, this fragment is being re-constructed from a
-	 *            previous saved state as given here.
+	 *            If non-null, this fragment is being re-constructed from a previous saved state as
+	 *            given here.
 	 */
 	public void onViewCreated(View view, Bundle savedInstanceState) {
 	}
 
 	/**
-	 * Get the root view for the fragment's layout (the one returned by
-	 * {@link #onCreateView}), if provided.
+	 * Get the root view for the fragment's layout (the one returned by {@link #onCreateView}), if
+	 * provided.
 	 * 
 	 * @return The fragment's root view, or null if it has no layout.
 	 */
@@ -1006,27 +966,24 @@
 	}
 
 	/**
-	 * Called when the fragment's activity has been created and this fragment's
-	 * view hierarchy instantiated. It can be used to do final initialization
-	 * once these pieces are in place, such as retrieving views or restoring
-	 * state. It is also useful for fragments that use
-	 * {@link #setRetainInstance(boolean)} to retain their instance, as this
-	 * callback tells the fragment when it is fully associated with the new
-	 * activity instance. This is called after {@link #onCreateView} and before
-	 * {@link #onStart()}.
+	 * Called when the fragment's activity has been created and this fragment's view hierarchy
+	 * instantiated. It can be used to do final initialization once these pieces are in place, such
+	 * as retrieving views or restoring state. It is also useful for fragments that use
+	 * {@link #setRetainInstance(boolean)} to retain their instance, as this callback tells the
+	 * fragment when it is fully associated with the new activity instance. This is called after
+	 * {@link #onCreateView} and before {@link #onStart()}.
 	 * 
 	 * @param savedInstanceState
-	 *            If the fragment is being re-created from a previous saved
-	 *            state, this is the state.
+	 *            If the fragment is being re-created from a previous saved state, this is the
+	 *            state.
 	 */
 	public void onActivityCreated(Bundle savedInstanceState) {
 		mCalled = true;
 	}
 
 	/**
-	 * Called when the Fragment is visible to the user. This is generally tied
-	 * to {@link Activity#onStart() Activity.onStart} of the containing
-	 * Activity's lifecycle.
+	 * Called when the Fragment is visible to the user. This is generally tied to
+	 * {@link Activity#onStart() Activity.onStart} of the containing Activity's lifecycle.
 	 */
 	public void onStart() {
 		mCalled = true;
@@ -1044,31 +1001,28 @@
 	}
 
 	/**
-	 * Called when the fragment is visible to the user and actively running.
-	 * This is generally tied to {@link Activity#onResume() Activity.onResume}
-	 * of the containing Activity's lifecycle.
+	 * Called when the fragment is visible to the user and actively running. This is generally tied
+	 * to {@link Activity#onResume() Activity.onResume} of the containing Activity's lifecycle.
 	 */
 	public void onResume() {
 		mCalled = true;
 	}
 
 	/**
-	 * Called to ask the fragment to save its current dynamic state, so it can
-	 * later be reconstructed in a new instance of its process is restarted. If
-	 * a new instance of the fragment later needs to be created, the data you
-	 * place in the Bundle here will be available in the Bundle given to
-	 * {@link #onCreate(Bundle)},
+	 * Called to ask the fragment to save its current dynamic state, so it can later be
+	 * reconstructed in a new instance of its process is restarted. If a new instance of the
+	 * fragment later needs to be created, the data you place in the Bundle here will be available
+	 * in the Bundle given to {@link #onCreate(Bundle)},
 	 * {@link #onCreateView(LayoutInflater, ViewGroup, Bundle)}, and
 	 * {@link #onActivityCreated(Bundle)}.
 	 * 
 	 * <p>
 	 * This corresponds to {@link Activity#onSaveInstanceState(Bundle)
-	 * Activity.onSaveInstanceState(Bundle)} and most of the discussion there
-	 * applies here as well. Note however: <em>this method may be called
-	 * at any time before {@link #onDestroy()}</em>. There are many situations
-	 * where a fragment may be mostly torn down (such as when placed on the back
-	 * stack with no UI showing), but its state will not be saved until its
-	 * owning activity actually needs to save its state.
+	 * Activity.onSaveInstanceState(Bundle)} and most of the discussion there applies here as well.
+	 * Note however: <em>this method may be called
+	 * at any time before {@link #onDestroy()}</em>. There are many situations where a fragment may
+	 * be mostly torn down (such as when placed on the back stack with no UI showing), but its state
+	 * will not be saved until its owning activity actually needs to save its state.
 	 * 
 	 * @param outState
 	 *            Bundle in which to place your saved state.
@@ -1082,8 +1036,7 @@
 
 	/**
 	 * Called when the Fragment is no longer resumed. This is generally tied to
-	 * {@link Activity#onPause() Activity.onPause} of the containing Activity's
-	 * lifecycle.
+	 * {@link Activity#onPause() Activity.onPause} of the containing Activity's lifecycle.
 	 */
 	public void onPause() {
 		mCalled = true;
@@ -1091,8 +1044,7 @@
 
 	/**
 	 * Called when the Fragment is no longer started. This is generally tied to
-	 * {@link Activity#onStop() Activity.onStop} of the containing Activity's
-	 * lifecycle.
+	 * {@link Activity#onStop() Activity.onStop} of the containing Activity's lifecycle.
 	 */
 	public void onStop() {
 		mCalled = true;
@@ -1103,21 +1055,20 @@
 	}
 
 	/**
-	 * Called when the view previously created by {@link #onCreateView} has been
-	 * detached from the fragment. The next time the fragment needs to be
-	 * displayed, a new view will be created. This is called after
-	 * {@link #onStop()} and before {@link #onDestroy()}. It is called
-	 * <em>regardless</em> of whether {@link #onCreateView} returned a non-null
-	 * view. Internally it is called after the view's state has been saved but
-	 * before it has been removed from its parent.
+	 * Called when the view previously created by {@link #onCreateView} has been detached from the
+	 * fragment. The next time the fragment needs to be displayed, a new view will be created. This
+	 * is called after {@link #onStop()} and before {@link #onDestroy()}. It is called
+	 * <em>regardless</em> of whether {@link #onCreateView} returned a non-null view. Internally it
+	 * is called after the view's state has been saved but before it has been removed from its
+	 * parent.
 	 */
 	public void onDestroyView() {
 		mCalled = true;
 	}
 
 	/**
-	 * Called when the fragment is no longer in use. This is called after
-	 * {@link #onStop()} and before {@link #onDetach()}.
+	 * Called when the fragment is no longer in use. This is called after {@link #onStop()} and
+	 * before {@link #onDetach()}.
 	 */
 	public void onDestroy() {
 		mCalled = true;
@@ -1134,10 +1085,9 @@
 	}
 
 	/**
-	 * Called by the fragment manager once this fragment has been removed, so
-	 * that we don't have any left-over state if the application decides to
-	 * re-use the instance. This only clears state that the framework internally
-	 * manages, not things the application sets.
+	 * Called by the fragment manager once this fragment has been removed, so that we don't have any
+	 * left-over state if the application decides to re-use the instance. This only clears state
+	 * that the framework internally manages, not things the application sets.
 	 */
 	void initState() {
 		mIndex = -1;
@@ -1163,42 +1113,38 @@
 	}
 
 	/**
-	 * Called when the fragment is no longer attached to its activity. This is
-	 * called after {@link #onDestroy()}.
+	 * Called when the fragment is no longer attached to its activity. This is called after
+	 * {@link #onDestroy()}.
 	 */
 	public void onDetach() {
 		mCalled = true;
 	}
 
 	/**
-	 * Initialize the contents of the Activity's standard options menu. You
-	 * should place your menu items in to <var>menu</var>. For this method to be
-	 * called, you must have first called {@link #setHasOptionsMenu}. See
-	 * {@link Activity#onCreateOptionsMenu(Menu) Activity.onCreateOptionsMenu}
-	 * for more information.
+	 * Initialize the contents of the Activity's standard options menu. You should place your menu
+	 * items in to <var>menu</var>. For this method to be called, you must have first called
+	 * {@link #setHasOptionsMenu}. See {@link Activity#onCreateOptionsMenu(Menu)
+	 * Activity.onCreateOptionsMenu} for more information.
 	 * 
 	 * @param menu
 	 *            The options menu in which you place your items.
-	 * 
+	 * @param inflater
 	 * @see #setHasOptionsMenu
 	 * @see #onPrepareOptionsMenu
 	 * @see #onOptionsItemSelected
 	 */
-	@SuppressWarnings("unused")
 	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
 	}
 
 	/**
-	 * Prepare the Screen's standard options menu to be displayed. This is
-	 * called right before the menu is shown, every time it is shown. You can
-	 * use this method to efficiently enable/disable items or otherwise
-	 * dynamically modify the contents. See
-	 * {@link Activity#onPrepareOptionsMenu(Menu) Activity.onPrepareOptionsMenu}
-	 * for more information.
+	 * Prepare the Screen's standard options menu to be displayed. This is called right before the
+	 * menu is shown, every time it is shown. You can use this method to efficiently enable/disable
+	 * items or otherwise dynamically modify the contents. See
+	 * {@link Activity#onPrepareOptionsMenu(Menu) Activity.onPrepareOptionsMenu} for more
+	 * information.
 	 * 
 	 * @param menu
-	 *            The options menu as last shown or first initialized by
-	 *            onCreateOptionsMenu().
+	 *            The options menu as last shown or first initialized by onCreateOptionsMenu().
 	 * 
 	 * @see #setHasOptionsMenu
 	 * @see #onCreateOptionsMenu
@@ -1207,31 +1153,29 @@
 	}
 
 	/**
-	 * Called when this fragment's option menu items are no longer being
-	 * included in the overall options menu. Receiving this call means that the
-	 * menu needed to be rebuilt, but this fragment's items were not included in
-	 * the newly built menu (its
+	 * Called when this fragment's option menu items are no longer being included in the overall
+	 * options menu. Receiving this call means that the menu needed to be rebuilt, but this
+	 * fragment's items were not included in the newly built menu (its
 	 * {@link #onCreateOptionsMenu(Menu, MenuInflater)} was not called).
 	 */
 	public void onDestroyOptionsMenu() {
 	}
 
 	/**
-	 * This hook is called whenever an item in your options menu is selected.
-	 * The default implementation simply returns false to have the normal
-	 * processing happen (calling the item's Runnable or sending a message to
-	 * its Handler as appropriate). You can use this method for any items for
-	 * which you would like to do processing without those other facilities.
+	 * This hook is called whenever an item in your options menu is selected. The default
+	 * implementation simply returns false to have the normal processing happen (calling the item's
+	 * Runnable or sending a message to its Handler as appropriate). You can use this method for any
+	 * items for which you would like to do processing without those other facilities.
 	 * 
 	 * <p>
-	 * Derived classes should call through to the base class for it to perform
-	 * the default menu handling.
+	 * Derived classes should call through to the base class for it to perform the default menu
+	 * handling.
 	 * 
 	 * @param item
 	 *            The menu item that was selected.
 	 * 
-	 * @return boolean Return false to allow normal menu processing to proceed,
-	 *         true to consume it here.
+	 * @return boolean Return false to allow normal menu processing to proceed, true to consume it
+	 *         here.
 	 * 
 	 * @see #onCreateOptionsMenu
 	 */
@@ -1241,44 +1185,39 @@
 	}
 
 	/**
-	 * This hook is called whenever the options menu is being closed (either by
-	 * the user canceling the menu with the back/menu button, or when an item is
-	 * selected).
+	 * This hook is called whenever the options menu is being closed (either by the user canceling
+	 * the menu with the back/menu button, or when an item is selected).
 	 * 
 	 * @param menu
-	 *            The options menu as last shown or first initialized by
-	 *            onCreateOptionsMenu().
+	 *            The options menu as last shown or first initialized by onCreateOptionsMenu().
 	 */
 	public void onOptionsMenuClosed(Menu menu) {
 	}
 
 	/**
-	 * Called when a context menu for the {@code view} is about to be shown.
-	 * Unlike {@link #onCreateOptionsMenu}, this will be called every time the
-	 * context menu is about to be shown and should be populated for the view
-	 * (or item inside the view for {@link AdapterView} subclasses, this can be
-	 * found in the {@code menuInfo})).
-	 * <p>
-	 * Use {@link #onContextItemSelected(android.view.MenuItem)} to know when an
-	 * item has been selected.
-	 * <p>
-	 * The default implementation calls up to
-	 * {@link Activity#onCreateContextMenu Activity.onCreateContextMenu}, though
-	 * you can not call this implementation if you don't want that behavior.
-	 * <p>
-	 * It is not safe to hold onto the context menu after this method returns.
-	 * {@inheritDoc}
+	 * Called when a context menu for the {@code view} is about to be shown. Unlike
+	 * {@link #onCreateOptionsMenu}, this will be called every time the context menu is about to be
+	 * shown and should be populated for the view (or item inside the view for {@link AdapterView}
+	 * subclasses, this can be found in the {@code menuInfo})).
+	 * <p>
+	 * Use {@link #onContextItemSelected(android.view.MenuItem)} to know when an item has been
+	 * selected.
+	 * <p>
+	 * The default implementation calls up to {@link Activity#onCreateContextMenu
+	 * Activity.onCreateContextMenu}, though you can not call this implementation if you don't want
+	 * that behavior.
+	 * <p>
+	 * It is not safe to hold onto the context menu after this method returns. {@inheritDoc}
 	 */
 	public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
 		this.mActivity.onCreateContextMenu(menu, v, menuInfo);
 	}
 
 	/**
-	 * Registers a context menu to be shown for the given view (multiple views
-	 * can show the context menu). This method will set the
-	 * {@link OnCreateContextMenuListener} on the view to this fragment, so
-	 * {@link #onCreateContextMenu(ContextMenu, View, ContextMenuInfo)} will be
-	 * called when it is time to show the context menu.
+	 * Registers a context menu to be shown for the given view (multiple views can show the context
+	 * menu). This method will set the {@link OnCreateContextMenuListener} on the view to this
+	 * fragment, so {@link #onCreateContextMenu(ContextMenu, View, ContextMenuInfo)} will be called
+	 * when it is time to show the context menu.
 	 * 
 	 * @see #unregisterForContextMenu(View)
 	 * @param view
@@ -1289,8 +1228,8 @@
 	}
 
 	/**
-	 * Prevents a context menu to be shown for the given view. This method will
-	 * remove the {@link OnCreateContextMenuListener} on the view.
+	 * Prevents a context menu to be shown for the given view. This method will remove the
+	 * {@link OnCreateContextMenuListener} on the view.
 	 * 
 	 * @see #registerForContextMenu(View)
 	 * @param view
@@ -1302,22 +1241,21 @@
 	}
 
 	/**
-	 * This hook is called whenever an item in a context menu is selected. The
-	 * default implementation simply returns false to have the normal processing
-	 * happen (calling the item's Runnable or sending a message to its Handler
-	 * as appropriate). You can use this method for any items for which you
-	 * would like to do processing without those other facilities.
-	 * <p>
-	 * Use {@link MenuItem#getMenuInfo()} to get extra information set by the
-	 * View that added this menu item.
-	 * <p>
-	 * Derived classes should call through to the base class for it to perform
-	 * the default menu handling.
+	 * This hook is called whenever an item in a context menu is selected. The default
+	 * implementation simply returns false to have the normal processing happen (calling the item's
+	 * Runnable or sending a message to its Handler as appropriate). You can use this method for any
+	 * items for which you would like to do processing without those other facilities.
+	 * <p>
+	 * Use {@link MenuItem#getMenuInfo()} to get extra information set by the View that added this
+	 * menu item.
+	 * <p>
+	 * Derived classes should call through to the base class for it to perform the default menu
+	 * handling.
 	 * 
 	 * @param item
 	 *            The context menu item that was selected.
-	 * @return boolean Return false to allow normal context menu processing to
-	 *         proceed, true to consume it here.
+	 * @return boolean Return false to allow normal context menu processing to proceed, true to
+	 *         consume it here.
 	 */
 	@SuppressWarnings("static-method")
 	public boolean onContextItemSelected(MenuItem item) {
@@ -1332,8 +1270,8 @@
 	 * @param fd
 	 *            The raw file descriptor that the dump is being sent to.
 	 * @param writer
-	 *            The PrintWriter to which you should dump your state. This will
-	 *            be closed for you after you return.
+	 *            The PrintWriter to which you should dump your state. This will be closed for you
+	 *            after you return.
 	 * @param args
 	 *            additional arguments to the dump request.
 	 */

=== modified file 'NarauCupcake/src/android/support/v4/app/FragmentActivity.java'
--- NarauCupcake/src/android/support/v4/app/FragmentActivity.java	2012-12-16 19:16:57 +0000
+++ NarauCupcake/src/android/support/v4/app/FragmentActivity.java	2012-12-18 18:47:22 +0000
@@ -75,6 +75,7 @@
  * </p>
  * </ul>
  */
+@SuppressWarnings("unqualified-field-access")
 public abstract class FragmentActivity extends Activity {
 	private static final String TAG = "FragmentActivity";
 

=== modified file 'NarauCupcake/src/android/support/v4/app/FragmentManager.java'
--- NarauCupcake/src/android/support/v4/app/FragmentManager.java	2012-12-15 23:46:16 +0000
+++ NarauCupcake/src/android/support/v4/app/FragmentManager.java	2012-12-18 18:47:22 +0000
@@ -59,6 +59,7 @@
  * <p>
  * Your activity must derive from {@link FragmentActivity} to use this.
  */
+@SuppressWarnings("unqualified-field-access")
 public abstract class FragmentManager {
 	/**
 	 * Representation of an entry on the fragment back stack, as created with
@@ -360,6 +361,7 @@
 	}
 }
 
+@SuppressWarnings("unqualified-field-access")
 final class FragmentManagerState implements Parcelable {
 	FragmentState[] mActive;
 	int[] mAdded;
@@ -398,6 +400,7 @@
 /**
  * Container for fragments associated with an activity.
  */
+@SuppressWarnings("unqualified-field-access")
 final class FragmentManagerImpl extends FragmentManager {
 	static boolean DEBUG = false;
 	static final String TAG = "FragmentManager";

=== modified file 'NarauCupcake/src/android/support/v4/app/ListFragment.java'
--- NarauCupcake/src/android/support/v4/app/ListFragment.java	2012-12-15 23:46:16 +0000
+++ NarauCupcake/src/android/support/v4/app/ListFragment.java	2012-12-18 18:47:22 +0000
@@ -39,6 +39,7 @@
  * to switch to the framework's implementation.  See the framework SDK
  * documentation for a class overview.
  */
+@SuppressWarnings("unqualified-field-access")
 public class ListFragment extends Fragment {
     static final int INTERNAL_EMPTY_ID = 0x00ff0001;
     static final int INTERNAL_PROGRESS_CONTAINER_ID = 0x00ff0002;

=== modified file 'NarauCupcake/src/android/support/v4/app/LoaderManager.java'
--- NarauCupcake/src/android/support/v4/app/LoaderManager.java	2012-11-21 00:38:43 +0000
+++ NarauCupcake/src/android/support/v4/app/LoaderManager.java	2012-12-18 18:47:22 +0000
@@ -207,6 +207,7 @@
 	}
 }
 
+@SuppressWarnings("unqualified-field-access")
 class LoaderManagerImpl extends LoaderManager {
 	static final String TAG = "LoaderManager";
 	static boolean DEBUG = false;

=== modified file 'NarauCupcake/src/android/support/v4/app/NotificationCompat.java'
--- NarauCupcake/src/android/support/v4/app/NotificationCompat.java	2012-11-21 00:38:43 +0000
+++ NarauCupcake/src/android/support/v4/app/NotificationCompat.java	2012-12-18 18:47:22 +0000
@@ -107,6 +107,7 @@
      * Builder class for {@link Notification} objects.  Allows easier control over
      * all the flags, as well as help constructing the typical notification layouts.
      */
+    @SuppressWarnings("unqualified-field-access")
     public static class Builder {
         Context mContext;
 
@@ -503,6 +504,7 @@
      * An object that can apply a rich notification style to a {@link Notification.Builder}
      * object.
      */
+    @SuppressWarnings("unqualified-field-access")
     public static abstract class Style
     {
         Builder mBuilder;
@@ -545,6 +547,7 @@
      * 
      * @see Notification#bigContentView
      */
+    @SuppressWarnings("unqualified-field-access")
     public static class BigPictureStyle extends Style {
         Bitmap mPicture;
 
@@ -599,6 +602,7 @@
      * 
      * @see Notification#bigContentView
      */
+    @SuppressWarnings("unqualified-field-access")
     public static class BigTextStyle extends Style {
         CharSequence mBigText;
 
@@ -657,6 +661,7 @@
      * 
      * @see Notification#bigContentView
      */
+    @SuppressWarnings("unqualified-field-access")
     public static class InboxStyle extends Style {
         ArrayList<CharSequence> mTexts = new ArrayList<CharSequence>();
 

=== modified file 'NarauCupcake/src/android/support/v4/app/TaskStackBuilder.java'
--- NarauCupcake/src/android/support/v4/app/TaskStackBuilder.java	2012-11-21 00:38:43 +0000
+++ NarauCupcake/src/android/support/v4/app/TaskStackBuilder.java	2012-12-18 18:47:22 +0000
@@ -74,6 +74,7 @@
  * from the developer guide and <a href="{@docRoot}
  * design/patterns/navigation.html">Navigation</a> from the design guide. </div>
  */
+@SuppressWarnings("unqualified-field-access")
 public class TaskStackBuilder implements Iterable<Intent> {
 	private static final String TAG = "TaskStackBuilder";
 

=== modified file 'NarauCupcake/src/android/support/v4/content/Loader.java'
--- NarauCupcake/src/android/support/v4/content/Loader.java	2012-10-19 17:32:25 +0000
+++ NarauCupcake/src/android/support/v4/content/Loader.java	2012-12-18 18:47:22 +0000
@@ -31,6 +31,7 @@
  * to switch to the framework's implementation.  See the framework SDK
  * documentation for a class overview.
  */
+@SuppressWarnings("unqualified-field-access")
 public class Loader<D> {
     int mId;
     OnLoadCompleteListener<D> mListener;

=== modified file 'NarauCupcake/src/android/support/v4/util/LogWriter.java'
--- NarauCupcake/src/android/support/v4/util/LogWriter.java	2012-10-19 17:32:25 +0000
+++ NarauCupcake/src/android/support/v4/util/LogWriter.java	2012-12-18 18:47:22 +0000
@@ -26,6 +26,7 @@
  *
  * @hide
  */
+@SuppressWarnings("unqualified-field-access")
 public class LogWriter extends Writer {
     private final String mTag;
     private StringBuilder mBuilder = new StringBuilder(128);

=== modified file 'NarauCupcake/src/android/support/v4/util/SparseArrayCompat.java'
--- NarauCupcake/src/android/support/v4/util/SparseArrayCompat.java	2012-12-15 23:46:16 +0000
+++ NarauCupcake/src/android/support/v4/util/SparseArrayCompat.java	2012-12-18 18:47:22 +0000
@@ -22,6 +22,7 @@
  * A copy of Honeycomb's {@link android.util.SparseArray}, that provides a
  * removeAt() method.
  */
+@SuppressWarnings("unqualified-field-access")
 public class SparseArrayCompat<E> {
 	private static final Object DELETED = new Object();
 	private boolean mGarbage = false;

=== modified file 'NarauCupcake/src/org/vono/narau/Narau.java'
--- NarauCupcake/src/org/vono/narau/Narau.java	2012-12-16 19:16:57 +0000
+++ NarauCupcake/src/org/vono/narau/Narau.java	2012-12-18 18:47:22 +0000
@@ -253,9 +253,8 @@
 		Menu menu = MenuCompat.onKeyUp(this, keyCode, R.menu.main);
 		if (null != menu) {
 			return true;
-		} else {
-			return super.onKeyUp(keyCode, event);
 		}
+		return super.onKeyUp(keyCode, event);
 	}
 
 	@Override
@@ -341,7 +340,7 @@
 			final TextView tvSummary = (TextView) cView.findViewById(android.R.id.summary);
 			final ImageView ivIcon = (ImageView) cView.findViewById(android.R.id.icon);
 
-			final MenuActivity item = listActivities.get(position);
+			final MenuActivity item = this.listActivities.get(position);
 			tvTitle.setText(item.name);
 			ivIcon.setImageDrawable(item.icon);
 			tvSummary.setText(item.description);

=== modified file 'NarauCupcake/src/org/vono/narau/QuitThread.java'
--- NarauCupcake/src/org/vono/narau/QuitThread.java	2012-12-15 23:46:16 +0000
+++ NarauCupcake/src/org/vono/narau/QuitThread.java	2012-12-18 18:47:22 +0000
@@ -88,12 +88,12 @@
 
 		synchronized (this) {
 			try {
-				this.wait(exitTime);
+				this.wait(this.exitTime);
 			} catch (InterruptedException ie) {
 			}
 
 			if (this.haveToExit) {
-				Log.i(TAG, "Stop application after " + (exitTime / 1000) + "s of inactivity");
+				Log.i(TAG, "Stop application after " + (this.exitTime / 1000) + "s of inactivity");
 				System.exit(0);
 			}
 		}

=== modified file 'NarauCupcake/src/org/vono/narau/common/dictionary/EntryArrayAdapter.java'
--- NarauCupcake/src/org/vono/narau/common/dictionary/EntryArrayAdapter.java	2012-12-15 23:46:16 +0000
+++ NarauCupcake/src/org/vono/narau/common/dictionary/EntryArrayAdapter.java	2012-12-18 18:47:22 +0000
@@ -95,7 +95,8 @@
 			tvReading.setMovementMethod(LinkMovementMethod.getInstance());
 
 			tvSense.setText(Html.fromHtml(entry.getHTMLSenses()));
-			LayoutParams lp = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT, 1.0f);
+			LayoutParams lp = new LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
+					ViewGroup.LayoutParams.WRAP_CONTENT, 1.0f);
 			tvSense.setLayoutParams(lp);
 			tvSense.setMovementMethod(LinkMovementMethod.getInstance());
 			// Try to put the tvSense displayed

=== modified file 'NarauCupcake/src/org/vono/narau/common/dictionary/EntryListFragment.java'
--- NarauCupcake/src/org/vono/narau/common/dictionary/EntryListFragment.java	2012-12-15 23:46:16 +0000
+++ NarauCupcake/src/org/vono/narau/common/dictionary/EntryListFragment.java	2012-12-18 18:47:22 +0000
@@ -70,7 +70,7 @@
 		View v = super.onCreateView(inflater, container, savedInstanceState);
 
 		if (0 != this.headerLayoutId) {
-			View header = super.getLayoutInflater(savedInstanceState).inflate(headerLayoutId, null);
+			View header = super.getLayoutInflater(savedInstanceState).inflate(this.headerLayoutId, null);
 
 			// http://stackoverflow.com/a/4401369
 			LayoutParams lp = new ListView.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);

=== modified file 'NarauCupcake/src/org/vono/narau/common/kanji/KanjiListSelectActivity.java'
--- NarauCupcake/src/org/vono/narau/common/kanji/KanjiListSelectActivity.java	2012-12-16 19:16:57 +0000
+++ NarauCupcake/src/org/vono/narau/common/kanji/KanjiListSelectActivity.java	2012-12-18 18:47:22 +0000
@@ -115,7 +115,7 @@
 	// inflater.inflate(R.menu.kanji_list_select, menu);
 	// return true;
 	// }
-	
+
 	@Override
 	protected void onStop() {
 		MenuCompat.closeMenu(R.menu.kanji_list_select);
@@ -127,9 +127,8 @@
 		Menu menu = MenuCompat.onKeyUp(this, keyCode, R.menu.kanji_list_select);
 		if (null != menu) {
 			return true;
-		} else {
-			return super.onKeyUp(keyCode, event);
 		}
+		return super.onKeyUp(keyCode, event);
 	}
 
 	@Override
@@ -390,6 +389,11 @@
 			dest.writeByte((byte) (this.noMatch ? 1 : 0));
 		}
 
+		@Override
+		public int hashCode() {
+			return this.codepoint;
+		}
+
 		public static final Parcelable.Creator<Radical> CREATOR = new Parcelable.Creator<Radical>() {
 			public Radical createFromParcel(Parcel in) {
 				return new Radical(in);
@@ -461,16 +465,16 @@
 
 		@Override
 		public void handleMessage(Message msg) {
-			if (LOAD_DONE == msg.what && null != activity) {
-				if (null != activity.progressDialog) {
-					activity.progressDialog.dismiss();
-					activity.progressDialog = null;
+			if (LOAD_DONE == msg.what && null != this.activity) {
+				if (null != this.activity.progressDialog) {
+					this.activity.progressDialog.dismiss();
+					this.activity.progressDialog = null;
 				}
-				activity.kanjiList = KanjiListSelectActivity.thread.tKanjiList;
-				activity.radicalsList = KanjiListSelectActivity.thread.tRadicalsList;
+				this.activity.kanjiList = KanjiListSelectActivity.thread.tKanjiList;
+				this.activity.radicalsList = KanjiListSelectActivity.thread.tRadicalsList;
 
-				activity.initUI();
-				activity.updateKanjiList();
+				this.activity.initUI();
+				this.activity.updateKanjiList();
 
 				KanjiListSelectActivity.thread = null;
 				KanjiListSelectActivity.handler = null;

=== modified file 'NarauCupcake/src/org/vono/narau/common/kanji/KanjiView.java'
--- NarauCupcake/src/org/vono/narau/common/kanji/KanjiView.java	2012-12-15 23:46:16 +0000
+++ NarauCupcake/src/org/vono/narau/common/kanji/KanjiView.java	2012-12-18 18:47:22 +0000
@@ -219,9 +219,9 @@
 		switch (event.getAction()) {
 		case MotionEvent.ACTION_DOWN:
 			if (this.svgDrawing.isPointInDrawing(x, y)) {
-				drawable = this.svgDrawing;
+				this.drawable = this.svgDrawing;
 			} else if (this.userDrawing.isPointInDrawing(x, y)) {
-				drawable = this.userDrawing;
+				this.drawable = this.userDrawing;
 			}
 			if (null != this.drawable) {
 				this.drawable.touchDown(x, y);
@@ -493,7 +493,7 @@
 			this.touchX = x;
 			this.touchY = y;
 			this.path = new Path();
-			this.paths.add(path);
+			this.paths.add(this.path);
 			this.path.moveTo(x, y);
 			super.strokesNumberPos.add(new PointF(x, y));
 		}
@@ -745,7 +745,7 @@
 				char c = svgPath.charAt(i);
 				boolean isLetter = Character.isLetter(c);
 
-				if (((intPartTen > 1 && c == '-') || c == ',' || (i > 0 && isLetter))) {
+				if (((intPartTen > 1 && c == '-') || c == ',' || (i > 0 && isLetter)) && null != params) {
 					// end of the number, start of the new one
 					float f = intPart;
 					if (0 != floatPartTen) {
@@ -795,7 +795,7 @@
 					}
 				}
 
-				if (i == lastPos) {
+				if (i == lastPos && null != params) {
 					// The last number
 					float f = intPart;
 					if (0 != floatPartTen) {
@@ -828,7 +828,7 @@
 		public String toString() {
 			StringBuilder sb = new StringBuilder();
 
-			sb.append(cmd);
+			sb.append(this.cmd);
 			int numF = this.params.size();
 
 			for (int i = 0; i < numF; i++) {
@@ -846,7 +846,7 @@
 
 		boolean valid() {
 			boolean ret = true;
-			int numParams = params.size();
+			int numParams = this.params.size();
 
 			switch (this.cmd) {
 			case 'c':

=== modified file 'NarauCupcake/src/org/vono/narau/common/kanji/KanjiViewDialogSeekBar.java'
--- NarauCupcake/src/org/vono/narau/common/kanji/KanjiViewDialogSeekBar.java	2012-12-15 23:46:16 +0000
+++ NarauCupcake/src/org/vono/narau/common/kanji/KanjiViewDialogSeekBar.java	2012-12-18 18:47:22 +0000
@@ -112,7 +112,7 @@
 		this.dismiss();
 		Preferences.setFloat(this.idPrefName, this.fValue);
 		if (null != this.dismissListener) {
-			dismissListener.onDialogDismiss(this);
+			this.dismissListener.onDialogDismiss(this);
 		}
 	}
 

=== modified file 'NarauCupcake/src/org/vono/narau/db/DictionaryDB.java'
--- NarauCupcake/src/org/vono/narau/db/DictionaryDB.java	2012-12-15 23:46:16 +0000
+++ NarauCupcake/src/org/vono/narau/db/DictionaryDB.java	2012-12-18 18:47:22 +0000
@@ -470,8 +470,8 @@
 		public Entry next() {
 			Entry entry = null;
 
-			if (null != super.cursor && !super.cursor.isClosed() && cursor.moveToNext()) {
-				int id = cursor.getInt(0);
+			if (null != super.cursor && !super.cursor.isClosed() && super.cursor.moveToNext()) {
+				int id = super.cursor.getInt(0);
 				entry = DictionaryDB.loadEntry(id);
 			}
 			return entry;
@@ -531,9 +531,9 @@
 		public Entry next() {
 			if (null != this.cursor && this.cursor.moveToNext()) {
 
-				final int id = cursor.getInt(0);
-				final String keb = cursor.getString(1);
-				final String pri = cursor.getString(2);
+				final int id = super.cursor.getInt(0);
+				final String keb = super.cursor.getString(1);
+				final String pri = super.cursor.getString(2);
 
 				// The kanji element
 				Entry entry = new Entry(id);

=== modified file 'NarauCupcake/src/org/vono/narau/db/InfosDB.java'
--- NarauCupcake/src/org/vono/narau/db/InfosDB.java	2012-12-15 23:46:16 +0000
+++ NarauCupcake/src/org/vono/narau/db/InfosDB.java	2012-12-18 18:47:22 +0000
@@ -189,6 +189,11 @@
 		return false;
 	}
 
+	@Override
+	public int hashCode() {
+		return this.dbName.hashCode();
+	}
+
 	/**
 	 * Parse a single line in narau_db_infos.txt file<br/>
 	 * 

=== modified file 'NarauCupcake/src/org/vono/narau/db/KanjiDB.java'
--- NarauCupcake/src/org/vono/narau/db/KanjiDB.java	2012-12-15 23:46:16 +0000
+++ NarauCupcake/src/org/vono/narau/db/KanjiDB.java	2012-12-18 18:47:22 +0000
@@ -604,7 +604,7 @@
 		public Kanji first() {
 			Kanji kanji = null;
 			if (this.cursor.moveToFirst()) {
-				kanji = KanjiDB.cursorToKanji(cursor, null, this.listLangDB, this.loadMeaning, this.loadSVG,
+				kanji = KanjiDB.cursorToKanji(this.cursor, null, this.listLangDB, this.loadMeaning, this.loadSVG,
 						this.loadReading);
 				this.current = 0;
 			}
@@ -618,7 +618,7 @@
 		public Kanji next() {
 			Kanji kanji = null;
 			if (!this.cursor.isClosed() && this.cursor.moveToNext()) {
-				kanji = KanjiDB.cursorToKanji(cursor, null, this.listLangDB, this.loadMeaning, this.loadSVG,
+				kanji = KanjiDB.cursorToKanji(this.cursor, null, this.listLangDB, this.loadMeaning, this.loadSVG,
 						this.loadReading);
 				this.current++;
 			}
@@ -632,7 +632,7 @@
 		public Kanji previous() {
 			Kanji kanji = null;
 			if (this.cursor.moveToPrevious()) {
-				kanji = KanjiDB.cursorToKanji(cursor, null, this.listLangDB, this.loadMeaning, this.loadSVG,
+				kanji = KanjiDB.cursorToKanji(this.cursor, null, this.listLangDB, this.loadMeaning, this.loadSVG,
 						this.loadReading);
 				this.current--;
 			}
@@ -646,7 +646,7 @@
 		public Kanji last() {
 			Kanji kanji = null;
 			if (this.cursor.moveToLast()) {
-				kanji = KanjiDB.cursorToKanji(cursor, null, this.listLangDB, this.loadMeaning, this.loadSVG,
+				kanji = KanjiDB.cursorToKanji(this.cursor, null, this.listLangDB, this.loadMeaning, this.loadSVG,
 						this.loadReading);
 				this.current = this.count;
 			}
@@ -666,7 +666,7 @@
 			if (!this.cursor.isClosed() && newPosition >= 0 && newPosition < this.count) {
 				if (this.cursor.moveToPosition(newPosition)) {
 					this.current = newPosition;
-					kanji = KanjiDB.cursorToKanji(cursor, null, this.listLangDB, this.loadMeaning, this.loadSVG,
+					kanji = KanjiDB.cursorToKanji(this.cursor, null, this.listLangDB, this.loadMeaning, this.loadSVG,
 							this.loadReading);
 				}
 			}
@@ -683,7 +683,7 @@
 		public Kanji get(int index) {
 			Kanji kanji = null;
 			if (this.cursor.moveToPosition(index)) {
-				kanji = KanjiDB.cursorToKanji(cursor, null, this.listLangDB, this.loadMeaning, this.loadSVG,
+				kanji = KanjiDB.cursorToKanji(this.cursor, null, this.listLangDB, this.loadMeaning, this.loadSVG,
 						this.loadReading);
 				this.cursor.moveToPosition(this.current);
 			}
@@ -763,8 +763,8 @@
 		public Integer next() {
 			this.codepoint = -1;
 			if (!this.cursor.isAfterLast() && !this.cursor.isClosed()) {
-				if (cursor.moveToNext()) {
-					this.codepoint = cursor.getInt(0);
+				if (this.cursor.moveToNext()) {
+					this.codepoint = this.cursor.getInt(0);
 					this.current++;
 				}
 			}
@@ -779,8 +779,8 @@
 		public Integer previous() {
 			this.codepoint = -1;
 			if (!this.cursor.isBeforeFirst() && !this.cursor.isClosed()) {
-				if (cursor.moveToPrevious()) {
-					this.codepoint = cursor.getInt(0);
+				if (this.cursor.moveToPrevious()) {
+					this.codepoint = this.cursor.getInt(0);
 					this.current--;
 				}
 			}
@@ -795,8 +795,8 @@
 		public Integer first() {
 			this.codepoint = -1;
 			if (!this.cursor.isClosed()) {
-				if (cursor.moveToFirst()) {
-					this.codepoint = cursor.getInt(0);
+				if (this.cursor.moveToFirst()) {
+					this.codepoint = this.cursor.getInt(0);
 					this.current = 0;
 				}
 			}
@@ -811,8 +811,8 @@
 		public Integer last() {
 			this.codepoint = -1;
 			if (!this.cursor.isClosed()) {
-				if (cursor.moveToLast()) {
-					this.codepoint = cursor.getInt(0);
+				if (this.cursor.moveToLast()) {
+					this.codepoint = this.cursor.getInt(0);
 					this.current = this.count;
 				}
 			}
@@ -832,7 +832,7 @@
 			if (!this.cursor.isClosed() && newPosition >= 0 && newPosition < this.count) {
 				if (this.cursor.moveToPosition(newPosition)) {
 					this.current = newPosition;
-					this.codepoint = cursor.getInt(0);
+					this.codepoint = this.cursor.getInt(0);
 				}
 			}
 			return this.codepoint;

=== modified file 'NarauCupcake/src/org/vono/narau/dictionary/DictionaryBase.java'
--- NarauCupcake/src/org/vono/narau/dictionary/DictionaryBase.java	2012-12-16 19:16:57 +0000
+++ NarauCupcake/src/org/vono/narau/dictionary/DictionaryBase.java	2012-12-18 18:47:22 +0000
@@ -183,6 +183,7 @@
 	 */
 	public abstract void onClickSearch(View button);
 
+	@SuppressWarnings("static-method")
 	public void onClickZoom(final View buttonZoom) {
 		// float value = Float.NaN;
 		final int id = buttonZoom.getId();
@@ -328,6 +329,7 @@
 		}
 	}
 
+	@SuppressWarnings("static-method")
 	protected void addSearchResult(SearchResult sr) {
 		if (sr instanceof OfflineResult) {
 			HistoryDB.getHistoryDB().addOffileResult((OfflineResult) sr);

=== modified file 'NarauCupcake/src/org/vono/narau/dictionary/DictionaryOfflineActivity.java'
--- NarauCupcake/src/org/vono/narau/dictionary/DictionaryOfflineActivity.java	2012-12-16 19:16:57 +0000
+++ NarauCupcake/src/org/vono/narau/dictionary/DictionaryOfflineActivity.java	2012-12-18 18:47:22 +0000
@@ -94,9 +94,10 @@
 
 		final ArrayList<Language> languagesDictionary = Preferences.getLangsPriorities(DatabaseType.dictonary);
 		final int numLangs = languagesDictionary.size();
-		final ArrayList<Language> languagesDisplay = new ArrayList<Language>(numLangs + 1);
+		final ArrayList<Language> languagesDisplay = new ArrayList<Language>(numLangs + 2);
 		this.languageAuto = new Language(AUTO, AUTO, AUTO, super.getString(R.string.dictionaryOfflineAutoLang));
 		languagesDisplay.add(this.languageAuto);
+		languagesDisplay.add(Language.JAPANESE);
 		for (int i = 0; i < numLangs; i++) {
 			languagesDisplay.add(languagesDictionary.get(i));
 		}
@@ -283,7 +284,7 @@
 	// updateMenuItemWordMatch(item, Preferences.getBoolean(R.string.prefNameDictionaryWordMatch));
 	// return true;
 	// }
-	
+
 	@Override
 	protected void onStop() {
 		MenuCompat.closeMenu(R.menu.dictionary_offline);
@@ -300,9 +301,8 @@
 
 			this.switchKeyboardVisible();
 			return true;
-		} else {
-			return super.onKeyUp(keyCode, event);
 		}
+		return super.onKeyUp(keyCode, event);
 	}
 
 	@Override
@@ -525,11 +525,11 @@
 				if (0 == numResult) {
 					toastMessage = this.activity.getString(R.string.dictionaryNoResult);
 				} else if (searchComplete) {
-					String toastMessageTemplate = activity.getString(R.string.toastNumWords);
+					String toastMessageTemplate = this.activity.getString(R.string.toastNumWords);
 					toastMessage = String.format(toastMessageTemplate, DictionaryOfflineActivity.thread.searchText,
 							numResult);
 				} else {
-					String toastMessageTemplate = activity.getString(R.string.toastNumWordsInterrupt);
+					String toastMessageTemplate = this.activity.getString(R.string.toastNumWordsInterrupt);
 					toastMessage = String.format(toastMessageTemplate, DictionaryOfflineActivity.thread.searchText,
 							numResult);
 				}

=== modified file 'NarauCupcake/src/org/vono/narau/dictionary/DictionaryOnlineActivity.java'
--- NarauCupcake/src/org/vono/narau/dictionary/DictionaryOnlineActivity.java	2012-12-16 19:16:57 +0000
+++ NarauCupcake/src/org/vono/narau/dictionary/DictionaryOnlineActivity.java	2012-12-18 18:47:22 +0000
@@ -146,6 +146,9 @@
 		this.buttonLangDest = (Button) super.findViewById(R.id.dictionaryOnlineButtonLanguageDest);
 		this.buttonLangSwap = (ImageButton) super.findViewById(R.id.dictionaryOnlineButtonLanguageSwap);
 
+		this.buttonLangSource.setOnClickListener(this);
+		this.buttonLangDest.setOnClickListener(this);
+		this.buttonLangSwap.setOnClickListener(this);
 		super.buttonSearch.setOnLongClickListener(this);
 	}
 
@@ -311,7 +314,7 @@
 		this.updateCurrentLangPair();
 		this.updateButtonSearchText();
 	}
-	
+
 	@Override
 	protected void onStop() {
 		MenuCompat.closeMenu(R.menu.dictionary_online);
@@ -324,9 +327,8 @@
 		if (null != menu) {
 			super.switchKeyboardVisible();
 			return true;
-		} else {
-			return super.onKeyUp(keyCode, event);
 		}
+		return super.onKeyUp(keyCode, event);
 	}
 
 	// @Override
@@ -338,8 +340,6 @@
 
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
-		Log.d(TAG, "onOptionsItemSelected " + item.getItemId() + " menuDictionarySelectService="
-				+ R.id.menuDictionarySelectService);
 		switch (item.getItemId()) {
 		case R.id.menuDictionarySelectService:
 			this.onLongClick(null);
@@ -426,8 +426,9 @@
 	private static StringBuilder getContent(InputStream iStream) throws IOException {
 		StringBuilder sb = new StringBuilder();
 
-		BufferedReader br = new BufferedReader(new InputStreamReader(iStream, "UTF-8"));
-		char[] buffer = new char[512];
+		final int bufSize = 512;
+		BufferedReader br = new BufferedReader(new InputStreamReader(iStream, "UTF-8"), bufSize);
+		final char[] buffer = new char[bufSize];
 
 		int read = br.read(buffer);
 
@@ -492,7 +493,7 @@
 			final String cookieURL = urisInfos[0];
 			if (null != cookieURL) {
 
-				final String serviceName = DictionaryOnlineActivity.this.getString(serviceId);
+				final String serviceName = DictionaryOnlineActivity.this.getString(this.serviceStringId);
 				HistoryDB historyDB = HistoryDB.getHistoryDB();
 
 				CookieStore cookieStore = historyDB.getCookies(serviceName);
@@ -577,6 +578,22 @@
 
 			DictionaryOnlineActivity.this.setWidgetEnabled(true);
 		}
+	}
 
+	@Override
+	public void onClick(View v) {
+		switch (v.getId()) {
+		case R.id.dictionaryOnlineButtonLanguageDest:
+			this.onClickButtonLanguageDest(v);
+			break;
+		case R.id.dictionaryOnlineButtonLanguageSource:
+			this.onClickButtonLanguageSource(v);
+			break;
+		case R.id.dictionaryOnlineButtonLanguageSwap:
+			this.onClickSwapLanguages(v);
+			break;
+		default:
+			super.onClick(v);
+		}
 	}
 }

=== modified file 'NarauCupcake/src/org/vono/narau/dictionary/HistoryFragment.java'
--- NarauCupcake/src/org/vono/narau/dictionary/HistoryFragment.java	2012-12-15 23:46:16 +0000
+++ NarauCupcake/src/org/vono/narau/dictionary/HistoryFragment.java	2012-12-18 18:47:22 +0000
@@ -92,7 +92,7 @@
 
 		public SearchAdapter(Context context, DictionaryType type) {
 			super(context, R.layout.dictionary_search_result_item);
-			mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+			this.mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
 			// if (android.os.Build.VERSION.SDK_INT >=
 			// android.os.Build.VERSION_CODES.HONEYCOMB) {
 			// super.addAll(HistoryDB.getHistoryDB().getAll());

=== modified file 'NarauCupcake/src/org/vono/narau/download/DownloaderActivity.java'
--- NarauCupcake/src/org/vono/narau/download/DownloaderActivity.java	2012-12-15 23:46:16 +0000
+++ NarauCupcake/src/org/vono/narau/download/DownloaderActivity.java	2012-12-18 18:47:22 +0000
@@ -394,7 +394,7 @@
 						}
 					}
 
-					if (numSubAvail == 0 && dbInfo.action == Action.none) {
+					if (numSubAvail == 0 && dbInfo.action == Action.none && null != firstSub) {
 						if (v != dbInfo.checkBox) {
 							// Mark the main db as to be deleted
 							// Rerun all
@@ -446,7 +446,7 @@
 							}
 						}
 
-						if (0 == numSubAvail) {
+						if (0 == numSubAvail && null != firstSub) {
 							if (firstSub.haveLatest()) {
 								firstSub.checkBox.setChecked(false);
 								firstSub.action = Action.none;
@@ -760,7 +760,7 @@
 					tvUpdate.setVisibility(View.GONE);
 				}
 
-			} else {
+			} else if (null != currentMainDB) {
 				viewGroup = (ViewGroup) inflater.inflate(R.layout.download_question_cb_sub, null);
 				DownloaderActivity.genNewViewIds(i, viewGroup);
 

=== modified file 'NarauCupcake/src/org/vono/narau/download/DownloaderGzipDB.java'
--- NarauCupcake/src/org/vono/narau/download/DownloaderGzipDB.java	2012-12-15 23:46:16 +0000
+++ NarauCupcake/src/org/vono/narau/download/DownloaderGzipDB.java	2012-12-18 18:47:22 +0000
@@ -118,7 +118,7 @@
 
 		@Override
 		public int read() throws IOException {
-			int readByte = in.read();
+			int readByte = this.in.read();
 			if (readByte != -1) {
 				this.readCount++;
 				if (null != this.messageDigest) {
@@ -302,7 +302,7 @@
 
 			} // for
 
-			if (!success && requestStop) {
+			if (!this.success && requestStop) {
 				dbInfo.file.delete();
 			}
 

=== modified file 'NarauCupcake/src/org/vono/narau/exercise/DrillCharActivity.java'
--- NarauCupcake/src/org/vono/narau/exercise/DrillCharActivity.java	2012-12-15 23:46:16 +0000
+++ NarauCupcake/src/org/vono/narau/exercise/DrillCharActivity.java	2012-12-18 18:47:22 +0000
@@ -42,11 +42,11 @@
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
+import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.ProgressBar;
 import android.widget.TableLayout;
 import android.widget.TableRow;
-import android.widget.TableRow.LayoutParams;
 import android.widget.TextView;
 
 /**
@@ -103,7 +103,7 @@
 			DrillCharActivity.progressHandler = new ProgressHandler();
 		}
 
-		testState = TestState.ERROR;
+		this.testState = TestState.ERROR;
 		if (savedInstanceState == null) {
 			// New start
 			if (DrillCharActivity.threadLoadKanji != null) {
@@ -122,7 +122,7 @@
 			final Serializable sIC = extra.getSerializable(KanjiArrayAdapter.ITEM_CATEGORY);
 			final String direction = extra.getString(DrillMenuActivity.DRILL_DIRECTION);
 			if (initDrillQA(sIC, direction)) {
-				testState = TestState.NEW;
+				this.testState = TestState.NEW;
 			}
 		} else {
 			// Pass here when there is for example a screen rotation
@@ -130,7 +130,7 @@
 			this.testState = TestState.valueOf(savedInstanceState.getString(ST_TS));
 			this.testType = TestType.valueOf(savedInstanceState.getString(ST_TT));
 
-			if (testState == TestState.IN_PROGRESS && DrillCharActivity.threadLoadKanji != null
+			if (this.testState == TestState.IN_PROGRESS && DrillCharActivity.threadLoadKanji != null
 					&& DrillCharActivity.progressHandler.activity != null) {
 				DrillCharActivity.progressHandler.setActivity(this);
 				DrillCharActivity.progressHandler.progressDialog = ProgressDialog.show(this, Common.EMPTY_STRING,
@@ -138,7 +138,7 @@
 			}
 		}
 
-		switch (testState) {
+		switch (this.testState) {
 		case DONE:
 			this.initUIResult();
 			break;
@@ -250,7 +250,7 @@
 	private void initUI(Bundle savedInstanceState) {
 		this.listButtons = new ArrayList<Button>(NUM_ANSWERS);
 
-		switch (testType) {
+		switch (this.testType) {
 		case KANA_ROMANJI:
 		case ROMANJI_KANA:
 			super.setContentView(R.layout.drill_kana);
@@ -291,7 +291,7 @@
 		this.textViewGood = (TextView) super.findViewById(R.id.drillTextViewGoodAnswer);
 		this.textViewBad = (TextView) super.findViewById(R.id.drillTextViewBadAnswer);
 
-		if (testType == TestType.ROMANJI_KANA) {
+		if (this.testType == TestType.ROMANJI_KANA) {
 			this.textViewQuestion.setTextAppearance(super.getApplicationContext(), android.R.attr.textAppearanceLarge);
 			this.textViewQuestion.setTextSize(30.0f);
 		}
@@ -355,8 +355,8 @@
 		final int max = DrillCharActivity.progressHandler.numKanji;
 		final Context context = super.getApplicationContext();
 		final ArrayList<DrillQA> drillQA = DrillCharActivity.progressHandler.drillQA;
-		final TableRow.LayoutParams lpTv = new TableRow.LayoutParams(LayoutParams.MATCH_PARENT,
-				LayoutParams.WRAP_CONTENT, 1 / 3.0f);
+		final TableRow.LayoutParams lpTv = new TableRow.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
+				ViewGroup.LayoutParams.WRAP_CONTENT, 1 / 3.0f);
 
 		lpTv.setMargins(0, 3, 0, 3);
 
@@ -416,7 +416,7 @@
 		Button button = (Button) v;
 		if (dqa.answer != button.getText().toString()) {
 			// Bad response
-			textViewBad.setText(dqa.question + " ≠ " + button.getText().toString());
+			this.textViewBad.setText(dqa.question + " ≠ " + button.getText().toString());
 			this.textViewBad.setVisibility(View.VISIBLE);
 			dqa.userAnswer = button.getText().toString();
 			DrillCharActivity.progressHandler.numBadResponse++;
@@ -458,6 +458,12 @@
 				dqa.see = true;
 			}
 		}
+
+		if (null == dqa) {
+			Log.e(TAG, "nextQuestion: dqa must not be null at this point");
+			return;
+		}
+
 		DrillCharActivity.progressHandler.currentTest = dqa;
 		this.textViewQuestion.setText(dqa.question);
 
@@ -541,12 +547,12 @@
 		super.onSaveInstanceState(savedInstanceState);
 		savedInstanceState.putString(ST_TS, this.testState.name());
 		savedInstanceState.putString(ST_TT, this.testType.name());
-		if (testState != TestState.DONE) {
+		if (this.testState != TestState.DONE) {
 			savedInstanceState.putCharSequence(ST_TG, this.textViewGood.getText());
 			savedInstanceState.putCharSequence(ST_TB, this.textViewBad.getText());
 			ArrayList<String> buttonsText = new ArrayList<String>(NUM_ANSWERS);
 			for (int i = 0; i < NUM_ANSWERS; i++) {
-				buttonsText.add(listButtons.get(i).getText().toString());
+				buttonsText.add(this.listButtons.get(i).getText().toString());
 			}
 			savedInstanceState.putStringArrayList(ST_BT, buttonsText);
 		}
@@ -584,8 +590,8 @@
 
 			DrillCharActivity.threadLoadKanji = this;
 
-			KanjiDB.KanjiDBIterator kanjiIterator = KanjiDB.getKanjiIterator(selection, selectionArgs, true, false,
-					false);
+			KanjiDB.KanjiDBIterator kanjiIterator = KanjiDB.getKanjiIterator(this.selection, this.selectionArgs, true,
+					false, false);
 			kanjiIterator.first();
 			final int num = kanjiIterator.getCount();
 

=== modified file 'NarauCupcake/src/org/vono/narau/learn/reading/KanaChartActivity.java'
--- NarauCupcake/src/org/vono/narau/learn/reading/KanaChartActivity.java	2012-12-15 23:46:16 +0000
+++ NarauCupcake/src/org/vono/narau/learn/reading/KanaChartActivity.java	2012-12-18 18:47:22 +0000
@@ -49,9 +49,8 @@
 	// KanaChartActivity.class.getSimpleName();
 
 	static final int TYPE_MASK = KanjiData.KANA_CHART;
-	
+
 	private static HashMap<Common.KanaType, KanaChartActivity.TableScrollView> views;
-	
 
 	static {
 		KanaChartActivity.views = new HashMap<Common.KanaType, KanaChartActivity.TableScrollView>(2);
@@ -100,12 +99,12 @@
 			}
 
 			int count = kanaChartArray.length;
-			TableRow.LayoutParams lpOne = new TableRow.LayoutParams(
-					TableRow.LayoutParams.MATCH_PARENT, TableRow.LayoutParams.WRAP_CONTENT);
+			TableRow.LayoutParams lpOne = new TableRow.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
+					ViewGroup.LayoutParams.WRAP_CONTENT);
 			lpOne.span = 5;
 
-			TableRow.LayoutParams lpSix = new TableRow.LayoutParams(
-					TableRow.LayoutParams.MATCH_PARENT, TableRow.LayoutParams.WRAP_CONTENT);
+			TableRow.LayoutParams lpSix = new TableRow.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
+					ViewGroup.LayoutParams.WRAP_CONTENT);
 			lpSix.setMargins(0, 3, 0, 3);
 
 			for (int i = 0; i < count; i++) {
@@ -128,14 +127,13 @@
 							TextView tv = new TextView(context);
 							// tv.setBackgroundColor(Color.BLUE);
 
-							String romanji = Common.convertKana(line[j], wc.type,
-									Common.KanaType.ROMANJI);
+							String romanji = Common.convertKana(line[j], wc.type, Common.KanaType.ROMANJI);
 							tv.setTextSize(30);
 							tv.setGravity(Gravity.CENTER);
 
 							tv.setText(kana + "\n" + romanji);
-							LayoutParams lp = new LinearLayout.LayoutParams(
-									LayoutParams.WRAP_CONTENT, LayoutParams.MATCH_PARENT, 1.0f);
+							LayoutParams lp = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT,
+									ViewGroup.LayoutParams.MATCH_PARENT, 1.0f);
 							tv.setLayoutParams(lp);
 
 							row.addView(tv, lpSix);
@@ -184,7 +182,7 @@
 			// to make all the kana TextView's have the same size.
 			int tvW = w / 5;
 			if (w > 0) {
-				for (TextView tv : listTV) {
+				for (TextView tv : this.listTV) {
 					tv.setWidth(tvW);
 				}
 			}

=== modified file 'NarauCupcake/src/org/vono/narau/learn/reading/KanjiToWordActivity.java'
--- NarauCupcake/src/org/vono/narau/learn/reading/KanjiToWordActivity.java	2012-12-16 19:16:57 +0000
+++ NarauCupcake/src/org/vono/narau/learn/reading/KanjiToWordActivity.java	2012-12-18 18:47:22 +0000
@@ -47,11 +47,12 @@
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.View.OnClickListener;
 import android.widget.ImageButton;
 import android.widget.TextView;
 import android.widget.Toast;
 
-public class KanjiToWordActivity extends FragmentActivity {
+public class KanjiToWordActivity extends FragmentActivity implements OnClickListener {
 	private static final String TAG = KanjiToWordActivity.class.getSimpleName();
 	private static final String CURRENT_POSITION = "CP";
 	private static final String LOAD_KANJIS_DONE = "lkd";
@@ -242,21 +243,20 @@
 	// inflater.inflate(R.menu.kanji_to_words, menu);
 	// return true;
 	// }
-	
+
 	@Override
 	protected void onStop() {
 		MenuCompat.closeMenu(R.menu.kanji_to_words);
 		super.onStop();
 	}
-	
+
 	@Override
 	public boolean onKeyUp(int keyCode, KeyEvent event) {
 		Menu menu = MenuCompat.onKeyUp(this, keyCode, R.menu.kanji_to_words);
 		if (null != menu) {
 			return true;
-		} else {
-			return super.onKeyUp(keyCode, event);
 		}
+		return super.onKeyUp(keyCode, event);
 	}
 
 	@Override
@@ -289,6 +289,9 @@
 		this.entryListFragment = (EntryListFragment) super.getSupportFragmentManager().findFragmentById(
 				R.id.kanjiToWordsEntryList);
 
+		this.buttonNext.setOnClickListener(this);
+		this.buttonPrevious.setOnClickListener(this);
+
 	}
 
 	private void showAllKanjis() {
@@ -502,8 +505,8 @@
 		@Override
 		public void run() {
 
-			final KanjiDB.KanjiDBIterator kanjiIterator = KanjiDB.getKanjiIterator(selection, selectionArgs, true,
-					false, true);
+			final KanjiDB.KanjiDBIterator kanjiIterator = KanjiDB.getKanjiIterator(this.selection, this.selectionArgs,
+					true, false, true);
 
 			Kanji kanji = kanjiIterator.first();
 			int count = 0;
@@ -795,4 +798,16 @@
 		}
 	}
 
+	public void onClick(View button) {
+		switch (button.getId()) {
+		case R.id.kanjiToWordsButtonNext:
+			this.nextKanji(button);
+			break;
+		case R.id.kanjiToWordsButtonPrevious:
+			this.previousKanji(button);
+			break;
+		}
+
+	}
+
 }

=== modified file 'NarauCupcake/src/org/vono/narau/learn/writing/LearnWritingActivity.java'
--- NarauCupcake/src/org/vono/narau/learn/writing/LearnWritingActivity.java	2012-12-16 19:16:57 +0000
+++ NarauCupcake/src/org/vono/narau/learn/writing/LearnWritingActivity.java	2012-12-18 18:47:22 +0000
@@ -43,6 +43,7 @@
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.View.OnClickListener;
 import android.widget.ImageButton;
 import android.widget.TextView;
 
@@ -50,7 +51,8 @@
  * 
  *
  */
-public class LearnWritingActivity extends FragmentActivity implements KanjiViewDialogSeekBar.OnDismissListener {
+public class LearnWritingActivity extends FragmentActivity implements KanjiViewDialogSeekBar.OnDismissListener,
+		OnClickListener {
 	private static final String TAG = LearnWritingActivity.class.getSimpleName();
 	private static final String CURRENT_POSITION = "CP";
 	static final int TYPE_MASK = KanjiData.KANA_CHAR | KanjiData.KANJI_JLPT | KanjiData.KANJI_GRADE
@@ -123,6 +125,13 @@
 			this.buttonNext = (ImageButton) super.findViewById(R.id.learnWritingButtonNext);
 			this.buttonPrevious = (ImageButton) super.findViewById(R.id.learnWritingButtonPrevious);
 
+			ImageButton buttonErase = (ImageButton) super.findViewById(R.id.learnWritingButtonClear);
+			ImageButton buttonPlay = (ImageButton) super.findViewById(R.id.learnWritingButtonPlay);
+			this.buttonNext.setOnClickListener(this);
+			this.buttonPrevious.setOnClickListener(this);
+			buttonErase.setOnClickListener(this);
+			buttonPlay.setOnClickListener(this);
+
 			String selection = sbSelection.toString();
 			String[] selectionArgs = selectionArgsList.toArray(new String[0]);
 
@@ -187,9 +196,8 @@
 			}
 
 			return true;
-		} else {
-			return super.onKeyUp(keyCode, event);
 		}
+		return super.onKeyUp(keyCode, event);
 	}
 
 	@Override
@@ -482,7 +490,7 @@
 
 		@Override
 		public void run() {
-			final KanjiDB.KanjiSVGIterator kanjiIteratorUnicode = KanjiDB.getKanjiSVGIterator(selection, selectionArgs);
+			final KanjiDB.KanjiSVGIterator kanjiIteratorUnicode = KanjiDB.getKanjiSVGIterator(this.selection, this.selectionArgs);
 
 			int codepoint = kanjiIteratorUnicode.first();
 			while (codepoint != -1) {
@@ -522,15 +530,32 @@
 
 		@Override
 		public void handleMessage(Message msg) {
-			if (LOAD_DONE == msg.what && null != activity) {
-				if (null != activity.progressDialog) {
-					activity.progressDialog.dismiss();
-					activity.progressDialog = null;
+			if (LOAD_DONE == msg.what && null != this.activity) {
+				if (null != this.activity.progressDialog) {
+					this.activity.progressDialog.dismiss();
+					this.activity.progressDialog = null;
 				}
-				activity.currentPosition = 0;
-				activity.updateCurrentPosition();
+				this.activity.currentPosition = 0;
+				this.activity.updateCurrentPosition();
 			}
 		}
 	}
 
+	public void onClick(View v) {
+		switch (v.getId()) {
+		case R.id.learnWritingButtonClear:
+			this.clearUserDrawing(v);
+			break;
+		case R.id.learnWritingButtonNext:
+			this.nextKanji(v);
+			break;
+		case R.id.learnWritingButtonPlay:
+			this.playKanji(v);
+			break;
+		case R.id.learnWritingButtonPrevious:
+			this.previousKanji(v);
+			break;
+		}
+	}
+
 }

=== modified file 'NarauCupcake/src/org/vono/narau/models/dictionary/Entry.java'
--- NarauCupcake/src/org/vono/narau/models/dictionary/Entry.java	2012-12-15 23:46:16 +0000
+++ NarauCupcake/src/org/vono/narau/models/dictionary/Entry.java	2012-12-18 18:47:22 +0000
@@ -33,9 +33,8 @@
  * <p>
  * entry (ent_seq, k_ele*, r_ele+, info?, sense+)
  * </p>
- * Entries consist of kanji elements, reading elements, general information and
- * sense elements. Each entry must have at least one reading element and one
- * sense element. Others are optional.
+ * Entries consist of kanji elements, reading elements, general information and sense elements. Each
+ * entry must have at least one reading element and one sense element. Others are optional.
  * 
  */
 public class Entry implements Comparable<Entry>, Parcelable {
@@ -63,8 +62,7 @@
 	public ArrayList<ReadingElement> r_ele;
 
 	/**
-	 * The sense element will record the translational equivalent of the
-	 * Japanese word
+	 * The sense element will record the translational equivalent of the Japanese word
 	 */
 	public ArrayList<Sense> senses;
 
@@ -98,7 +96,7 @@
 
 	public boolean haveLang(String lang) {
 		if (null != this.senses) {
-			for (Sense s : senses) {
+			for (Sense s : this.senses) {
 				if (s.glosses.containsKey(lang)) {
 					return true;
 				}
@@ -124,7 +122,7 @@
 	public String getFirstGloss() {
 		if (null != this.senses) {
 			final ArrayList<Language> languages = Preferences.getLangsPriorities(DatabaseType.dictonary);
-			for (Sense s : senses) {
+			for (Sense s : this.senses) {
 				final HashMap<Language, String> glosses = s.glosses;
 				for (Language language : languages) {
 					if (glosses.containsKey(language)) {
@@ -353,8 +351,8 @@
 
 	/**
 	 * Sort for the KanjiToWords<br/>
-	 * This is not a very good sorting method, but it seems to work. At least
-	 * the result is better with than without :-)<br/>
+	 * This is not a very good sorting method, but it seems to work. At least the result is better
+	 * with than without :-)<br/>
 	 * This is an ugly code!
 	 */
 	private void makeSortOrder() {
@@ -404,6 +402,11 @@
 		return false;
 	}
 
+	@Override
+	public int hashCode() {
+		return this.sequence;
+	}
+
 	/**
 	 * <p>
 	 * Compare the frequencies of this Japanese entry.

=== modified file 'NarauCupcake/src/org/vono/narau/models/history/OnlineResult.java'
--- NarauCupcake/src/org/vono/narau/models/history/OnlineResult.java	2012-12-15 23:46:16 +0000
+++ NarauCupcake/src/org/vono/narau/models/history/OnlineResult.java	2012-12-18 18:47:22 +0000
@@ -86,6 +86,7 @@
 		return this.service + "\n" + this.sourceLang.displayName + "/" + this.destLang.displayName;
 	}
 
+	@SuppressWarnings("cast")
 	@Override
 	public long getId() {
 		return ((long) this.searchTerm.hashCode()) + ((long) this.sourceLang.langISO3.hashCode())

=== modified file 'NarauCupcake/src/org/vono/narau/models/history/SearchResult.java'
--- NarauCupcake/src/org/vono/narau/models/history/SearchResult.java	2012-12-15 23:46:16 +0000
+++ NarauCupcake/src/org/vono/narau/models/history/SearchResult.java	2012-12-18 18:47:22 +0000
@@ -77,6 +77,11 @@
 		return equal;
 	}
 
+	@Override
+	public int hashCode() {
+		return Long.valueOf(this.getId()).hashCode();
+	}
+
 	public abstract String getDisplayLanguage();
 
 	public abstract long getId();

=== modified file 'NarauCupcake/src/org/vono/narau/models/kanji/KanjiData.java'
--- NarauCupcake/src/org/vono/narau/models/kanji/KanjiData.java	2012-12-15 23:46:16 +0000
+++ NarauCupcake/src/org/vono/narau/models/kanji/KanjiData.java	2012-12-18 18:47:22 +0000
@@ -146,7 +146,7 @@
 
 		public void setSelection(boolean value) {
 			this.selected = value;
-			Preferences.getSP().edit().putBoolean(prefName, value).commit();
+			Preferences.getSP().edit().putBoolean(this.prefName, value).commit();
 		}
 
 		@Override

=== modified file 'NarauCupcake/src/org/vono/narau/preferences/Preferences.java'
--- NarauCupcake/src/org/vono/narau/preferences/Preferences.java	2012-12-15 23:46:16 +0000
+++ NarauCupcake/src/org/vono/narau/preferences/Preferences.java	2012-12-18 18:47:22 +0000
@@ -305,6 +305,8 @@
 			case kanji:
 				key = Common.getResourcesString(R.string.prefNameKanjiLangPrio);
 				break;
+			default:
+				return;
 			}
 
 			langsPriorities.put(database, values);

=== modified file 'NarauCupcake/src/org/vono/narau/preferences/PreferencesActivity.java'
--- NarauCupcake/src/org/vono/narau/preferences/PreferencesActivity.java	2012-12-16 19:16:57 +0000
+++ NarauCupcake/src/org/vono/narau/preferences/PreferencesActivity.java	2012-12-18 18:47:22 +0000
@@ -48,7 +48,7 @@
 	// inflater.inflate(R.menu.preferences, menu);
 	// return true;
 	// }
-	
+
 	@Override
 	protected void onStop() {
 		MenuCompat.closeMenu(R.menu.preferences);
@@ -60,9 +60,8 @@
 		Menu menu = MenuCompat.onKeyUp(this, keyCode, R.menu.preferences);
 		if (null != menu) {
 			return true;
-		} else {
-			return super.onKeyUp(keyCode, event);
 		}
+		return super.onKeyUp(keyCode, event);
 	}
 
 	@Override

=== modified file 'NarauCupcake/src/org/vono/narau/utils/FontFitTextView.java'
--- NarauCupcake/src/org/vono/narau/utils/FontFitTextView.java	2012-12-15 23:46:16 +0000
+++ NarauCupcake/src/org/vono/narau/utils/FontFitTextView.java	2012-12-18 18:47:22 +0000
@@ -64,10 +64,10 @@
 	 */
 	private void initComponent() {
 		// Context c, AttributeSet attrs, int defStyle
-		paint = new Paint();
-		paint.setTextSize(10);
-		paint.setTextAlign(Align.CENTER);
-		paint.setAntiAlias(true);
+		this.paint = new Paint();
+		this.paint.setTextSize(10);
+		this.paint.setTextAlign(Align.CENTER);
+		this.paint.setAntiAlias(true);
 
 		// FIXME: Get background/foreground colors from style
 
@@ -113,12 +113,12 @@
 		// TypedArray a = theme.obtainStyledAttributes(attrs, styles, defStyle,
 		// 0);
 
-		paint.setColor(Color.WHITE);
+		this.paint.setColor(Color.WHITE);
 	}
 
 	public void setFontColor(int c) {
 		// TODO use style to get the text color
-		paint.setColor(c);
+		this.paint.setColor(c);
 	}
 
 	/**
@@ -156,8 +156,8 @@
 		// DisplayMetrics metrics =
 		// super.getContext().getResources().getDisplayMetrics();
 
-		paint.setTextSize(fontSize);
-		paint.getTextBounds(s, 0, s.length(), rect);
+		this.paint.setTextSize(fontSize);
+		this.paint.getTextBounds(s, 0, s.length(), rect);
 		txtWidth = rect.width();
 		txtHeight = rect.height();
 		if (txtWidth > availableWidth || txtHeight > availableHeight) {
@@ -165,8 +165,8 @@
 		}
 
 		while (!gotIt) {
-			paint.setTextSize(fontSize);
-			paint.getTextBounds(s, 0, s.length(), rect);
+			this.paint.setTextSize(fontSize);
+			this.paint.getTextBounds(s, 0, s.length(), rect);
 			txtWidth = rect.width();
 			txtHeight = rect.height();
 
@@ -258,7 +258,7 @@
 		String text = getText().toString();
 		if (text.length() > 0) {
 			calcTextSize(text, canvas);
-			canvas.drawText(text, calcStartDrawingPosX(), calcStartDrawingPosY(), paint);
+			canvas.drawText(text, calcStartDrawingPosX(), calcStartDrawingPosY(), this.paint);
 		}
 	};
 

=== modified file 'NarauCupcake/src/org/vono/narau/utils/JsonReader.java'
--- NarauCupcake/src/org/vono/narau/utils/JsonReader.java	2012-12-15 23:46:16 +0000
+++ NarauCupcake/src/org/vono/narau/utils/JsonReader.java	2012-12-18 18:47:22 +0000
@@ -174,6 +174,7 @@
  * Each {@code JsonReader} may be used to read a single JSON stream. Instances of this class are not
  * thread safe.
  */
+@SuppressWarnings("unqualified-field-access")
 public final class JsonReader implements Closeable {
 
 	private static final String TRUE = "true";
@@ -321,16 +322,16 @@
 	 * Returns the type of the next token without consuming it.
 	 */
 	public JsonToken peek() throws IOException {
-		if (token != null) {
-			return token;
+		if (this.token != null) {
+			return this.token;
 		}
 
 		switch (peekStack()) {
 		case EMPTY_DOCUMENT:
 			replaceTop(JsonScope.NONEMPTY_DOCUMENT);
 			JsonToken firstToken = nextValue();
-			if (!lenient && token != JsonToken.BEGIN_ARRAY && token != JsonToken.BEGIN_OBJECT) {
-				throw new IOException("Expected JSON document to start with '[' or '{' but was " + token);
+			if (!this.lenient && this.token != JsonToken.BEGIN_ARRAY && this.token != JsonToken.BEGIN_OBJECT) {
+				throw new IOException("Expected JSON document to start with '[' or '{' but was " + this.token);
 			}
 			return firstToken;
 		case EMPTY_ARRAY:
@@ -484,7 +485,7 @@
 		} catch (NumberFormatException ignored) {
 			double asDouble = Double.parseDouble(value); // don't catch this NumberFormatException
 			result = (long) asDouble;
-			if ((double) result != asDouble) {
+			if (result != asDouble) {
 				throw new NumberFormatException(value);
 			}
 		}
@@ -516,7 +517,7 @@
 		} catch (NumberFormatException ignored) {
 			double asDouble = Double.parseDouble(value); // don't catch this NumberFormatException
 			result = (int) asDouble;
-			if ((double) result != asDouble) {
+			if (result != asDouble) {
 				throw new NumberFormatException(value);
 			}
 		}

=== modified file 'NarauCupcake/src/org/vono/narau/utils/Language.java'
--- NarauCupcake/src/org/vono/narau/utils/Language.java	2012-12-16 19:16:57 +0000
+++ NarauCupcake/src/org/vono/narau/utils/Language.java	2012-12-18 18:47:22 +0000
@@ -148,7 +148,7 @@
 
 	@Override
 	public int hashCode() {
-		return langISO3.hashCode() + displayName.hashCode();
+		return this.langISO3.hashCode() + this.displayName.hashCode();
 	}
 
 	@Override

=== modified file 'NarauCupcake/src/org/vono/narau/utils/StringPool.java'
--- NarauCupcake/src/org/vono/narau/utils/StringPool.java	2012-12-15 23:46:16 +0000
+++ NarauCupcake/src/org/vono/narau/utils/StringPool.java	2012-12-18 18:47:22 +0000
@@ -52,15 +52,15 @@
 		// Pick a bucket using Doug Lea's supplemental secondaryHash function (from HashMap)
 		hashCode ^= (hashCode >>> 20) ^ (hashCode >>> 12);
 		hashCode ^= (hashCode >>> 7) ^ (hashCode >>> 4);
-		int index = hashCode & (pool.length - 1);
+		int index = hashCode & (this.pool.length - 1);
 
-		String pooled = pool[index];
+		String pooled = this.pool[index];
 		if (pooled != null && contentEquals(pooled, array, start, length)) {
 			return pooled;
 		}
 
 		String result = new String(array, start, length);
-		pool[index] = result;
+		this.pool[index] = result;
 		return result;
 	}
 }
\ No newline at end of file

=== modified file 'NarauDBInfo/narau_db_infos.txt'
--- NarauDBInfo/narau_db_infos.txt	2012-12-16 22:11:21 +0000
+++ NarauDBInfo/narau_db_infos.txt	2012-12-18 18:47:22 +0000
@@ -31,3 +31,17 @@
 kanjis_por-4.db 1355688088862 115712 58587 e865471eadd478577ce385ff4b89e3b9 https://launchpad.net/narau/fdroid/0.8/+download/kanjis_por-4.db.gz https://www.dropbox.com/s/q4zv2qxeo4bophy/kanjis_por-4.db.gz?dl=1
 kanjis_spa-4.db 1355688089443 145408 72862 476b2f90535fd6954af4a8f25c8a9fde https://launchpad.net/narau/fdroid/0.8/+download/kanjis_spa-4.db.gz https://www.dropbox.com/s/jd0ue7bqtxcevki/kanjis_spa-4.db.gz?dl=1
 
+NarauVersionCode:6
+dict_deu-2.db 1355688597003 6544384 3170013 ca1a860990e4d5e4a7b78964a9d205a4 https://launchpad.net/narau/fdroid/0.8/+download/dict_deu-2.db.gz https://www.dropbox.com/s/v22joenidr6bd59/dict_deu-2.db.gz?dl=1
+dict_eng-2.db 1355688592508 10451968 4854830 5d7e27aa7f426c6f2c21f0f4f2db26fd https://launchpad.net/narau/fdroid/0.8/+download/dict_eng-2.db.gz https://www.dropbox.com/s/9foba5756ps8raf/dict_eng-2.db.gz?dl=1
+dict_fra-2.db 1355688600044 814080 403549 b8d9ebf3bbc6f9e7517f9b8477c2cefa https://launchpad.net/narau/fdroid/0.8/+download/dict_fra-2.db.gz https://www.dropbox.com/s/v4yjj2eo68kn3cw/dict_fra-2.db.gz?dl=1
+dict_jpn-2.db 1355688577773 22592512 9519117 64af59e3fa38d99b6260dfe46a6b4e51 https://launchpad.net/narau/fdroid/0.8/+download/dict_jpn-2.db.gz https://www.dropbox.com/s/8gev58w9r5fvy7v/dict_jpn-2.db.gz?dl=1
+dict_nld-2.db 1355688601719 2788352 1248072 e8ad3e36e7ab2bbf6bd202f868b6e06a https://launchpad.net/narau/fdroid/0.8/+download/dict_nld-2.db.gz https://www.dropbox.com/s/528i4es954f5syx/dict_nld-2.db.gz?dl=1
+dict_rus-2.db 1355688599474 408576 176448 b443dd4a241d6d55beee0e78e12378d1 https://launchpad.net/narau/fdroid/0.8/+download/dict_rus-2.db.gz https://www.dropbox.com/s/e9gccwvbhp9bmzs/dict_rus-2.db.gz?dl=1
+dict_spa-2.db 1355688600739 1448960 701111 807f21760137c67b180b588c3986a007 https://launchpad.net/narau/fdroid/0.8/+download/dict_spa-2.db.gz https://www.dropbox.com/s/tskw193dtotyxx6/dict_spa-2.db.gz?dl=1
+kanjis_eng-4.db 1355688088518 478208 247886 9b76634a3cd8b4a2f69b6c88190e0af2 https://launchpad.net/narau/fdroid/0.8/+download/kanjis_eng-4.db.gz https://www.dropbox.com/s/7vbc1rgzxktxiub/kanjis_eng-4.db.gz?dl=1
+kanjis_fra-4.db 1355688089141 129024 65118 70b513bf3ff61309edbe2e6e4b357081 https://launchpad.net/narau/fdroid/0.8/+download/kanjis_fra-4.db.gz https://www.dropbox.com/s/u07xrlludpfjxl4/kanjis_fra-4.db.gz?dl=1
+kanjis_jpn-4.db 1355688087507 13461504 5558501 a5d277bc30f5413f4969a0870dc7f5b0 https://launchpad.net/narau/fdroid/0.8/+download/kanjis_jpn-4.db.gz https://www.dropbox.com/s/qxx2ulk99ez9mwb/kanjis_jpn-4.db.gz?dl=1
+kanjis_por-4.db 1355688088862 115712 58587 e865471eadd478577ce385ff4b89e3b9 https://launchpad.net/narau/fdroid/0.8/+download/kanjis_por-4.db.gz https://www.dropbox.com/s/q4zv2qxeo4bophy/kanjis_por-4.db.gz?dl=1
+kanjis_spa-4.db 1355688089443 145408 72862 476b2f90535fd6954af4a8f25c8a9fde https://launchpad.net/narau/fdroid/0.8/+download/kanjis_spa-4.db.gz https://www.dropbox.com/s/jd0ue7bqtxcevki/kanjis_spa-4.db.gz?dl=1
+