Remove Log functions from Gingerbread

Change-Id: I0ab19726a6bfaf14b42c05903f38dfb74cbd0d37

java/res/values/strings.xml

@@ -332,9 +332,9 @@
     <!-- Inform the user that a particular language has an available dictionary -->
     <string name="has_dictionary">Dictionary available</string>
 
-    <!-- Option to send logs -->
+    <!-- Preferences item for enabling to send user statistics to Google.   -->
     <string name="prefs_enable_log">Enable user feedback</string>
-    <!-- Description for sending logs -->
+    <!-- Description for enabling to send user statistics to Google. -->
     <string name="prefs_description_log">Help improve this input method editor by automatically sending usage statistics and crash reports to Google.</string>
 
     <string name="keyboard_layout">Keyboard Theme</string>
@@ -357,8 +357,6 @@
         <item>3</item>
     </string-array>
 
-    <string name="prefs_debug_mode">Debug (Temporary)</string>
-
     <string name="subtype_mode_keyboard">keyboard</string>
     <string name="subtype_mode_voice">voice</string>
 </resources>

java/res/xml/prefs.xml

@@ -107,10 +107,4 @@
             />
     </PreferenceCategory>            
 
-<CheckBoxPreference
-            android:key="debug_mode"
-            android:title="@string/prefs_debug_mode"
-            android:persistent="true"
-            android:defaultValue="false"
-            />
 </PreferenceScreen>

java/src/com/android/inputmethod/latin/LatinIMESettings.java

@@ -76,7 +76,7 @@ public class LatinIMESettings extends PreferenceActivity
         mLogger = VoiceInputLogger.getLogger(this);
 
         mDebugMode = (CheckBoxPreference) findPreference(DEBUG_MODE_KEY);
-        updateDebugMode(mDebugMode.isChecked());
+        updateDebugMode();
     }
 
     @Override
@@ -111,16 +111,20 @@ public class LatinIMESettings extends PreferenceActivity
                 showVoiceConfirmation();
             }
         } else if (key.equals(DEBUG_MODE_KEY)) {
-            updateDebugMode(prefs.getBoolean(DEBUG_MODE_KEY, false));
+            if (mDebugMode != null) {
+                mDebugMode.setChecked(prefs.getBoolean(DEBUG_MODE_KEY, false));
+                updateDebugMode();
+            }
         }
         mVoiceOn = !(prefs.getString(VOICE_SETTINGS_KEY, mVoiceModeOff).equals(mVoiceModeOff));
         updateVoiceModeSummary();
     }
 
-    private void updateDebugMode(boolean isDebugMode) {
+    private void updateDebugMode() {
         if (mDebugMode == null) {
             return;
         }
+        boolean isDebugMode = mDebugMode.isChecked();
         String version = "";
         try {
             PackageInfo info = getPackageManager().getPackageInfo(getPackageName(), 0);
@@ -134,8 +138,8 @@ public class LatinIMESettings extends PreferenceActivity
             mDebugMode.setSummary("");
         } else {
             mDebugMode.setEnabled(true);
-            mDebugMode.setTitle(getResources().getString(R.string.prefs_debug_mode));
             mDebugMode.setSummary(version);
+            mDebugMode.setSummary("");
         }
     }
 

java/src/com/android/inputmethod/latin/LatinIMEUtil.java

@@ -54,9 +54,6 @@ public class LatinIMEUtil {
         }
 
         public boolean tryGCOrWait(String metaData, Throwable t) {
-            if (LatinImeLogger.sDBG) {
-                Log.d(TAG, "Encountered Exception or Error. Try GC.");
-            }
             if (mGCTryCount == 0) {
                 System.gc();
             }