2013-04-28 Mark Holland <mark@mark-holland.me.uk>
* 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 git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8076 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
parent
8f086d85c8
commit
b1e465ada0
|
@ -18,12 +18,29 @@
|
|||
package="pandroid.agent"
|
||||
android:versionCode="2"
|
||||
android:versionName="1.5">
|
||||
|
||||
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
|
||||
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
|
||||
<uses-permission android:name="android.permission.INTERNET" />
|
||||
<uses-permission android:name="android.permission.WAKE_LOCK" />
|
||||
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
|
||||
<uses-permission android:name="android.permission.GET_TASKS"/>
|
||||
<uses-permission android:name="android.permission.BATTERY_STATS"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_SMS"/>
|
||||
<uses-permission android:name="android.permission.READ_CONTACTS"/>
|
||||
<uses-permission android:name="android.permission.READ_CALL_LOG"/>
|
||||
<uses-permission android:name="android.permission.READ_SMS"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
|
||||
|
||||
<uses-feature android:name="android.hardware.sensor.light" />
|
||||
<uses-feature android:name="android.hardware.location" />
|
||||
|
||||
<application android:icon="@drawable/ic_launcher" android:label="@string/app_name">
|
||||
<activity
|
||||
android:name=".PandroidAgent"
|
||||
android:label="@string/app_name"
|
||||
android:configChanges="keyboardHidden|orientation"
|
||||
android:theme="@android:style/Theme.NoTitleBar"
|
||||
android:theme="@style/MainTheme"
|
||||
>
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.MAIN" />
|
||||
|
@ -69,20 +86,7 @@
|
|||
|
||||
</application>
|
||||
|
||||
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
|
||||
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
|
||||
<uses-permission android:name="android.permission.INTERNET" />
|
||||
<uses-permission android:name="android.permission.WAKE_LOCK" />
|
||||
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
|
||||
<uses-permission android:name="android.permission.GET_TASKS"/>
|
||||
<uses-permission android:name="android.permission.BATTERY_STATS"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_SMS"/>
|
||||
<uses-permission android:name="android.permission.READ_CONTACTS"/>
|
||||
<uses-permission android:name="android.permission.READ_SMS"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
|
||||
|
||||
<uses-feature android:name="android.hardware.sensor.light" />
|
||||
<uses-feature android:name="android.hardware.location" />
|
||||
|
||||
<uses-sdk android:minSdkVersion="8"/>
|
||||
</manifest>
|
|
@ -1,3 +1,20 @@
|
|||
2013-04-28 Mark Holland <mark@mark-holland.me.uk>
|
||||
|
||||
* 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 <mark@mark-holland.me.uk>
|
||||
|
||||
* assets/database/pandroid.zip: Removed as no longer needed
|
||||
|
|
Binary file not shown.
|
@ -11,4 +11,4 @@
|
|||
#proguard.config=${sdk.dir}\tools\proguard\proguard-android.txt:proguard-project.txt
|
||||
|
||||
# Project target.
|
||||
target=android-8
|
||||
target=android-17
|
||||
|
|
|
@ -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.-->
|
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:id="@+id/p"
|
||||
android:layout_width="fill_parent"
|
||||
|
@ -26,9 +25,10 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentTop="true"
|
||||
android:layout_centerHorizontal="true"
|
||||
android:layout_marginTop="88dp"
|
||||
android:layout_marginTop="50dp"
|
||||
android:text="@string/yes" />
|
||||
|
||||
|
||||
|
||||
<Button
|
||||
android:id="@+id/no_button"
|
||||
style="?android:attr/buttonStyleSmall"
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
|
||||
<requestFocus />
|
||||
</EditText>
|
||||
|
||||
|
||||
<Button
|
||||
android:id="@+id/password_create_button"
|
||||
android:layout_width="match_parent"
|
||||
|
|
|
@ -39,7 +39,8 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:text="@string/notificationCheck"
|
||||
android:textColor="#bbbbbb"
|
||||
android:textSize="14sp" />
|
||||
android:textSize="14sp"
|
||||
android:paddingTop="5sp"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/field1"
|
||||
|
@ -146,7 +147,8 @@
|
|||
android:id="@+id/processes_combo"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:visibility="gone" />
|
||||
/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<CheckBox
|
||||
|
|
|
@ -38,7 +38,8 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:text="@string/notificationCheck"
|
||||
android:textColor="#bbbbbb"
|
||||
android:textSize="14sp" />
|
||||
android:textSize="14sp"
|
||||
android:paddingTop="5sp"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/field1"
|
||||
|
|
|
@ -0,0 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:textColor="#bdbdbd">
|
||||
</TextView>
|
|
@ -0,0 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<style name="MainTheme" parent="@android:style/Theme.Holo.NoActionBar">
|
||||
<item name="android:typeface">normal</item>
|
||||
<item name="android:textSize">15sp</item>
|
||||
</style>
|
||||
</resources>
|
|
@ -0,0 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<style name="MainTheme" parent="@android:style/Theme.NoTitleBar">
|
||||
<item name="android:typeface">normal</item>
|
||||
<item name="android:textSize">15sp</item>
|
||||
</style>
|
||||
</resources>
|
|
@ -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);
|
||||
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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<String> spinnerArrayAdapter = new ArrayAdapter<String>(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);
|
||||
|
|
Loading…
Reference in New Issue