diff --git a/pandora_agents/android/AndroidManifest.xml b/pandora_agents/android/AndroidManifest.xml
index 90cf3d1196..21e9d9b97f 100755
--- a/pandora_agents/android/AndroidManifest.xml
+++ b/pandora_agents/android/AndroidManifest.xml
@@ -18,12 +18,29 @@
package="pandroid.agent"
android:versionCode="2"
android:versionName="1.5">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -69,20 +86,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pandora_agents/android/ChangeLog b/pandora_agents/android/ChangeLog
index 2f5c2e90c7..e6206a6052 100644
--- a/pandora_agents/android/ChangeLog
+++ b/pandora_agents/android/ChangeLog
@@ -1,3 +1,20 @@
+2013-04-28 Mark Holland
+
+ * AndroidMainfest.xml: Set theme to themes.xml, moved permissions
+ and uses to top of file.
+
+ * layout/spinner.xml: Theme for spinner that sets text
+ color to grey.
+
+ * values/themes.xml: For setting theme on devices < sdk 11
+ (android 3.0)
+
+ * values-v11/themes.xml: For setting theme on device above
+ sdk 11
+
+ * src/pandroid/agent/Setup.java: Set spinnner to use new
+ theme for setting text color
+
2013-04-28 Mark Holland
* assets/database/pandroid.zip: Removed as no longer needed
diff --git a/pandora_agents/android/Pandroid Agent v3.0_iso-8859-1.apk b/pandora_agents/android/Pandroid Agent v3.0_iso-8859-1.apk
index 866c9467d1..14ce60823d 100644
Binary files a/pandora_agents/android/Pandroid Agent v3.0_iso-8859-1.apk and b/pandora_agents/android/Pandroid Agent v3.0_iso-8859-1.apk differ
diff --git a/pandora_agents/android/project.properties b/pandora_agents/android/project.properties
index a026ea8441..d6659d5383 100644
--- a/pandora_agents/android/project.properties
+++ b/pandora_agents/android/project.properties
@@ -11,4 +11,4 @@
#proguard.config=${sdk.dir}\tools\proguard\proguard-android.txt:proguard-project.txt
# Project target.
-target=android-8
+target=android-17
diff --git a/pandora_agents/android/res/layout/password_choose.xml b/pandora_agents/android/res/layout/password_choose.xml
index 4cc08419ec..c1d0b3d073 100644
--- a/pandora_agents/android/res/layout/password_choose.xml
+++ b/pandora_agents/android/res/layout/password_choose.xml
@@ -12,8 +12,7 @@
// 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.
--->
+// GNU General Public License for more details.-->
-
+
+
-
+
+ android:textSize="14sp"
+ android:paddingTop="5sp"/>
+ />
+
+ android:textSize="14sp"
+ android:paddingTop="5sp"/>
+
+
\ No newline at end of file
diff --git a/pandora_agents/android/res/values-v11/themes.xml b/pandora_agents/android/res/values-v11/themes.xml
new file mode 100644
index 0000000000..b63de87cc9
--- /dev/null
+++ b/pandora_agents/android/res/values-v11/themes.xml
@@ -0,0 +1,7 @@
+
+
+
+
\ No newline at end of file
diff --git a/pandora_agents/android/res/values/themes.xml b/pandora_agents/android/res/values/themes.xml
new file mode 100644
index 0000000000..4a7fe079d0
--- /dev/null
+++ b/pandora_agents/android/res/values/themes.xml
@@ -0,0 +1,7 @@
+
+
+
+
\ No newline at end of file
diff --git a/pandora_agents/android/src/pandroid/agent/Core.java b/pandora_agents/android/src/pandroid/agent/Core.java
index bf4cc72660..0b4a1d654a 100644
--- a/pandora_agents/android/src/pandroid/agent/Core.java
+++ b/pandora_agents/android/src/pandroid/agent/Core.java
@@ -56,7 +56,6 @@ public class Core {
static volatile public String defaultDeviceUpTimeReport = "enabled"; // "disabled" or "enabled"
static volatile public String defaultInventoryReport = "disabled"; // "disabled" or "enabled"
static volatile public String defaultHelloSignalReport = "enabled"; // "disabled" or "enabled"
- //TODO
static volatile public String defaultNotificationCheck = "enabled"; // "disabled" or "enabled"
static volatile public boolean defaultHasSim = false;
@@ -136,7 +135,6 @@ public class Core {
static volatile public String InventoryReport = defaultRoamingReport;
static volatile public String HelloSignalReport = defaultHelloSignalReport;
static volatile public String RoamingReport = defaultRoamingReport;
- //TODO
static volatile public String NotificationCheck = defaultNotificationCheck;
//hasSim values
@@ -298,7 +296,6 @@ public class Core {
HelloSignalReport = agentPreferences.getString("HelloSignalReport", defaultHelloSignalReport);
password = agentPreferences.getString("password", defaultPassword);
passwordCheck = agentPreferences.getString("passwordCheck", defaultPasswordCheck);
- //TODO
NotificationCheck = agentPreferences.getString("NotificationCheck", defaultNotificationCheck);
hasSim = agentPreferences.getBoolean("hasSim", defaultHasSim);
//hasSim values
@@ -329,7 +326,6 @@ public class Core {
signalStrength, SignalStrengthReport, SMSReceived, ReceivedSMSReport, SMSSent, SentSMSReport,
incomingCalls, IncomingCallsReport, missedCalls, MissedCallsReport, outgoingCalls, OutgoingCallsReport,
receiveBytes, BytesReceivedReport, transmitBytes, BytesSentReport, RoamingReport, roaming,
- //TODO
NotificationCheck
);
@@ -368,7 +364,6 @@ public class Core {
editor.putString("gpsStatus", _gpsStatus);
editor.putString("BatteryLevelReport", _BatteryLevelReport);
editor.putString("memoryStatus", _memoryStatus);
- //TODO
editor.putLong("UpTime", _upTime);
editor.putString("DeviceUpTimeReport", _DeviceUpTimeReport);
editor.putString("InventoryReport", _InventoryReport);
@@ -405,7 +400,6 @@ public class Core {
editor.putString("BytesSentReport", _BytesSentReport);
editor.putString("RoamingReport", _RoamingReport);
editor.putInt("roaming", _roaming);
- //TODO
editor.putString("NotificationCheck", _NotificationCheck);
diff --git a/pandora_agents/android/src/pandroid/agent/PandroidAgentListener.java b/pandora_agents/android/src/pandroid/agent/PandroidAgentListener.java
index 12e67eda55..d503d4cc67 100644
--- a/pandora_agents/android/src/pandroid/agent/PandroidAgentListener.java
+++ b/pandora_agents/android/src/pandroid/agent/PandroidAgentListener.java
@@ -1129,7 +1129,6 @@ public class PandroidAgentListener extends Service {
return humanDateTime;
}
- //TODO
public static void CancelNotification(Context ctx, int notifyId) {
String ns = Context.NOTIFICATION_SERVICE;
NotificationManager nMgr = (NotificationManager) ctx.getSystemService(ns);
diff --git a/pandora_agents/android/src/pandroid/agent/Setup.java b/pandora_agents/android/src/pandroid/agent/Setup.java
index acb2d3d6c1..525994c6ca 100644
--- a/pandora_agents/android/src/pandroid/agent/Setup.java
+++ b/pandora_agents/android/src/pandroid/agent/Setup.java
@@ -29,6 +29,7 @@ import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.net.Uri;
import android.os.AsyncTask;
+import android.os.Build;
import android.os.Bundle;
import android.text.TextUtils;
import android.util.Log;
@@ -241,7 +242,7 @@ public class Setup extends Activity {
}
ArrayAdapter spinnerArrayAdapter = new ArrayAdapter(getApplicationContext(),
- android.R.layout.simple_spinner_item, listProcessHuman);
+ R.layout.spinner, listProcessHuman);
combo.setAdapter(spinnerArrayAdapter);
combo.setSelection(position);
@@ -799,7 +800,6 @@ public class Setup extends Activity {
ParentActivity.switchTab(indexTabToSwitchTo);
}
- //TODO
public static void CancelNotification(Context ctx, int notifyId) {
String ns = Context.NOTIFICATION_SERVICE;
NotificationManager nMgr = (NotificationManager) ctx.getSystemService(ns);