Merge branch 'master' of https://github.com/jonatkins/ingress-intel-total-conversion

Conflicts:
	website/page/code/desktop-download.php

mobile/src/com/cradle/iitc_mobile/IITC_PluginPreference.java

@@ -0,0 +1,34 @@
+package com.cradle.iitc_mobile;
+
+import android.content.Context;
+import android.preference.CheckBoxPreference;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+// multiline checkbox preference
+public class IITC_PluginPreference extends CheckBoxPreference {
+
+    public IITC_PluginPreference(Context context) {
+        super(context);
+    }
+
+    protected void onBindView(View view) {
+        super.onBindView(view);
+        makeMultiline(view);
+    }
+
+    protected void makeMultiline(View view) {
+        if (view instanceof ViewGroup) {
+            ViewGroup grp = (ViewGroup) view;
+            for (int index = 0; index < grp.getChildCount(); index++) {
+                makeMultiline(grp.getChildAt(index));
+            }
+        } else if (view instanceof TextView) {
+            TextView t = (TextView) view;
+            t.setSingleLine(false);
+            t.setEllipsize(null);
+        }
+    }
+
+}

mobile/src/com/cradle/iitc_mobile/IITC_SettingsFragment.java

@@ -175,7 +175,7 @@ public class IITC_SettingsFragment extends PreferenceFragment {
         }
 
         // now build a new checkable preference for the plugin
-        CheckBoxPreference plugin_pref = new CheckBoxPreference(pref_screen.getContext());
+        IITC_PluginPreference plugin_pref = new IITC_PluginPreference(pref_screen.getContext());
         plugin_pref.setKey(plugin_key);
         plugin_pref.setTitle(plugin_name);
         plugin_pref.setSummary(plugin_desc);

website/page/code/desktop-download.php

@@ -21,7 +21,7 @@ function iitcDesktopPluginDownloadTable ( $build )
 		'Info' => "Display additional information",
 		'Keys' => "Manual key management",
 		'Controls' => "Map controls/widgets",
-		'Highlighter' => "Portal highliters",
+		'Highlighter' => "Portal highlighters",
 		'Layer' => "Additional map layers",
 		'Map Tiles' => "Alternative map layers",
 		'Tweaks' => "Adjust IITC settings",