Merge branch 'to-push' of github.com:nexushoratio/ingress-intel-total-conversion into to-push

Conflicts:
	plugins/portal-defense.user.js
	plugins/show-linked-portals.user.js

mobile/AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.cradle.iitc_mobile"
     android:installLocation="auto"
-    android:versionCode="60"
-    android:versionName="0.9">
+    android:versionCode="61"
+    android:versionName="0.10.0">
 
     <uses-sdk
         android:minSdkVersion="14"
@@ -11,8 +11,10 @@
 
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <!--
     <uses-permission android:name="android.permission.USE_CREDENTIALS"/>
     <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
+    -->
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
@@ -26,8 +28,7 @@
             android:name=".IITC_Mobile"
             android:configChanges="orientation|keyboard|keyboardHidden|screenSize"
             android:label="@string/app_name"
-            android:launchMode="singleTop"
-            android:theme="@style/AppBaseTheme">
+            android:launchMode="singleTop">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
 
@@ -78,19 +79,16 @@
         <activity
             android:name=".IITC_PreferenceActivity"
             android:configChanges="orientation|keyboard|keyboardHidden|screenSize"
-            android:label="@string/activity_settings"
-            android:theme="@style/AppBaseTheme"/>
+            android:label="@string/activity_settings"/>
         <activity
             android:name=".IITC_PluginPreferenceActivity"
             android:configChanges="orientation|keyboard|keyboardHidden|screenSize"
-            android:label="@string/activity_plugins"
-            android:theme="@style/AppBaseTheme"/>
+            android:label="@string/activity_plugins"/>
         <activity
             android:name=".share.ShareActivity"
             android:label="@string/activity_share"
             android:noHistory="true"
-            android:parentActivityName=".IITC_Mobile"
-            android:theme="@android:style/Theme.Holo.Light.DarkActionBar">
+            android:parentActivityName=".IITC_Mobile">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".IITC_Mobile"/>

mobile/res/xml/preferences.xml

@@ -40,12 +40,6 @@
         android:key="pref_mics"
         android:title="@string/pref_misc_cat">
 
-        <!-- summary is set in settings fragment -->
-        <EditTextPreference
-            android:defaultValue="local"
-            android:key="pref_iitc_source"
-            android:title="@string/pref_select_iitc"/>
-
         <PreferenceScreen
             android:fragment="com.cradle.iitc_mobile.fragments.PluginsFragment"
             android:key="pref_plugins"
@@ -85,6 +79,12 @@
                 android:summary="@string/pref_enable_dev_mode_sum"
                 android:title="@string/pref_enable_dev_mode"/>
 
+            <!-- summary is set in settings fragment -->
+            <EditTextPreference
+                android:defaultValue="local"
+                android:key="pref_iitc_source"
+                android:title="@string/pref_select_iitc"/>
+
             <PreferenceCategory
                 android:key="pref_advanced_ui_cat"
                 android:title="@string/pref_ui_cat">