solve merge conflicts

prey · Jan 7, 2015 · 08d2aab · 08d2aab
2 parents c1b1065 + 3f7fa4d
commit 08d2aab
Show file tree

Hide file tree

Showing 41 changed files with 574 additions and 700 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -8,8 +8,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.prey"
     android:installLocation="internalOnly"
-    android:versionCode="95"
-    android:versionName="1.2.0" >
+    android:versionCode="98"
+    android:versionName="1.2.2" >
+
 
     <uses-sdk
         android:minSdkVersion="4"
@@ -35,24 +36,21 @@
 
  	<uses-feature android:name="android.hardware.microphone" android:required="false" />
 
-    <!--  <uses-permission android:name="android.permission.RECORD_AUDIO"  />-->
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
 
 
+
 
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.ACTION_SHUTDOWN" />
-    <uses-permission android:name="android.permission.RECEIVE_SMS" />
-    <uses-permission android:name="android.permission.READ_CONTACTS" />
+
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
     <uses-permission android:name="android.permission.READ_SMS" />
-	<uses-permission android:name="android.permission.WRITE_SMS" />
-	<uses-permission android:name="android.permission.SEND_SMS" />
 	<uses-permission android:name="android.permission.RECEIVE_SMS" />
 	<uses-permission android:name="android.permission.RECEIVE_MMS" />
 
@@ -76,8 +74,7 @@
 
     <uses-permission android:name="android.permission.USES_POLICY_FORCE_LOCK" /> 
 
-    <!-- <uses-permission android:name="android.permission.PROCESS_OUTGOING_CALLS" /> --> 
-    <!-- <uses-permission android:name="android.permission.CALL_PHONE" /> --> 
+
 
 
 
@@ -89,16 +86,16 @@
         android:theme="@style/PreyTheme"
         android:configChanges="keyboardHidden|orientation"
 		android:screenOrientation="portrait"
-		android:allowBackup="false"
- >
+		android:allowBackup="false" >
+
 
         <!-- Activities -->
         <activity
             android:name="com.prey.activities.LoginActivity"
             android:clearTaskOnLaunch="true"
             android:configChanges="keyboardHidden|orientation"
             android:label="@string/preyForAndroid_name"
-            android:launchMode="singleInstance"
+            android:launchMode="singleInstance" 
             android:screenOrientation="portrait" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -120,8 +117,7 @@
             android:noHistory="true" 
             android:windowSoftInputMode="stateHidden|adjustResize"
             android:configChanges="keyboardHidden|orientation"
-            android:screenOrientation="portrait"
-            />
+            android:screenOrientation="portrait" />
         <activity
             android:name="com.prey.activities.PreyConfigurationActivity"
             android:configChanges="orientation|keyboardHidden"
@@ -160,7 +156,7 @@
             android:configChanges="orientation|keyboardHidden"
             android:screenOrientation="portrait"
             android:label="@string/preyForAndroid_name"
-            android:launchMode="singleTask" />        
+            android:launchMode="singleTask" />       
         <activity
             android:name="com.prey.activities.SMSContactActivity"
             android:configChanges="orientation|keyboardHidden"
@@ -175,27 +171,20 @@
             android:name="com.prey.activities.CreateAccountActivity"
             android:configChanges="keyboardHidden|orientation"
  			android:windowSoftInputMode="stateHidden|adjustResize"
- 			android:screenOrientation="portrait"
-
-
-            />
+ 			android:screenOrientation="portrait" />
         <activity
             android:name="com.prey.activities.AddDeviceToAccountActivity"
             android:configChanges="keyboardHidden|orientation"
     		android:windowSoftInputMode="stateHidden|adjustResize"
-    		android:screenOrientation="portrait"
-
-             />
+    		android:screenOrientation="portrait" />
         <activity
             android:name="com.prey.activities.CongratulationsActivity"
             android:configChanges="keyboardHidden|orientation"
-            android:screenOrientation="portrait"
-             />   
+			android:screenOrientation="portrait" />   
        <activity
             android:name="com.prey.activities.DisableButtonActivity"
             android:configChanges="keyboardHidden|orientation"
-            android:screenOrientation="portrait"
-             />
+            android:screenOrientation="portrait" /> 
         <activity
             android:name="com.prey.activities.SimpleCameraActivity"
             android:theme="@style/Theme.Transparent" 
@@ -213,19 +202,11 @@
         <activity
             android:name="com.prey.activities.PermissionInformationActivity"
             android:configChanges="keyboardHidden|orientation"
-            android:screenOrientation="portrait"
-            />
+            android:screenOrientation="portrait" />
         <activity
             android:name="com.prey.activities.PermissionInformationBatchActivity"
             android:configChanges="keyboardHidden|orientation"
-            android:screenOrientation="portrait"
-            />
-
-        <!--
-        <activity
-            android:name="com.prey.activities.SMSContactActivity"
-            android:configChanges="keyboardHidden" />
-        -->
+            android:screenOrientation="portrait" />
         <activity
             android:name="com.prey.activities.StatusActivity"
             android:configChanges="orientation|keyboardHidden"
@@ -248,7 +229,8 @@
         <service android:name="com.prey.services.PreyRunnerService" />
         <service android:name="com.prey.services.PreyDisablePowerOptionsService" />
         <service android:name="com.prey.beta.services.PreyBetaRunnerService" />
-
+        <service android:name="com.prey.actions.report.ReportService" />
+
         <!-- Receivers -->
         <receiver android:name="com.prey.receivers.SmsReceiver">
             <intent-filter android:priority="2147483647" >
@@ -294,7 +276,6 @@
 
         <receiver android:name="com.prey.receivers.PreyOutgoingCallReceiver">
             <intent-filter>
-                <!-- <action android:name="android.intent.action.NEW_OUTGOING_CALL" /> -->
                 <category android:name="android.intent.category.DEFAULT" />
                 <action android:name="android.media.VOLUME_CHANGED_ACTION" />
             </intent-filter>
@@ -320,7 +301,7 @@
                 <!-- BATTERY LOW -->   
 
                 <action android:name="android.intent.action.BATTERY_LOW" />
-                <action android:name="android.intent.action.BATTERY_OKAY" />
+                <!-- <action android:name="android.intent.action.BATTERY_OKAY" />-->
 
                 <!-- WIFI CHANGED -->
                 <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
@@ -329,23 +310,16 @@
                 <!-- SIM CHANGED AND  BOOT COMPLETED -->
                 <action android:name="android.intent.action.BOOT_COMPLETED" />          
 
-                <!-- (UN)PLUGGED -->              
-
-                <action android:name="android.intent.action.BATTERY_CHANGED" />
-
                 <!-- AIRPLANE -->
         		<action android:name="android.intent.action.AIRPLANE_MODE" />
-
-
-        		<!--
-        		<action android:name="android.intent.action.ACTION_POWER_CONNECTED"/>
-    			<action android:name="android.intent.action.ACTION_POWER_DISCONNECTED"/>
-    			-->
-
 
             </intent-filter>
         </receiver>
 
+        <receiver
+            android:name="com.prey.receivers.AlarmReceiver"
+            > 
+        </receiver>
         <!--
         <receiver android:name="com.prey.install.PreyInstallRemoteReceiver">
             <intent-filter>

diff --git a/project.properties b/project.properties
@@ -18,4 +18,4 @@ split.density=false
 # Project target.
 target=android-10
 apk-configurations=
-android.library.reference.1=../adt-bundle-mac-x86_64-20140702/sdk/extras/google/google_play_services/libproject/google-play-services_lib
+android.library.reference.1=../adt-bundle-mac-x86_64-20140702/sdk/extras/google/google_play_services_fit_preview/libproject/google-play-services_lib
diff --git a/res/layout-large-port/password.xml b/res/layout-large-port/password.xml
@@ -16,16 +16,16 @@
  	<RelativeLayout
         android:id="@+id/linear_back"
         android:layout_width="fill_parent"
-        android:layout_height="80dp"
+        android:layout_height="50dp"
         android:layout_alignParentTop="true"
         android:layout_centerHorizontal="true"
         android:layout_marginTop="0dp"
 
         android:orientation="horizontal" >
          <ImageView
         android:id="@+id/logo_img_reversed"
-        android:layout_width="80dp"
-        android:layout_height="80dp"
+        android:layout_width="wrap_content"
+        android:layout_height="50dp"
         android:src="@drawable/icon_back" />
     </RelativeLayout>
 

diff --git a/res/layout-port/password.xml b/res/layout-port/password.xml
@@ -13,30 +13,45 @@
     android:gravity="center_horizontal"
     android:orientation="vertical" >
 
-
+   <RelativeLayout
+        android:id="@+id/linear_back"
+        android:layout_width="fill_parent"
+        android:layout_height="25dp"
+        android:layout_alignParentTop="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="0dp"
+
+        android:orientation="horizontal" >
+         <ImageView
+        android:id="@+id/logo_img_reversed"
+        android:layout_width="wrap_content"
+        android:layout_height="25dp"
+        android:src="@drawable/icon_back" />
+    </RelativeLayout>
+
     <ImageView
-        android:id="@+id/logo_reversed"
+        android:id="@+id/logo_img_reverse"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_above="@+id/imagen_icon_extra"
+        android:layout_above="@+id/logo_img_extra"
         android:layout_alignParentLeft="true"
         android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
         android:layout_marginBottom="30dp"
         android:src="@drawable/logo_reversed" />
     <ImageView
-        android:id="@+id/imagen_icon_extra"
+        android:id="@+id/logo_img_extra"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_above="@+id/login_setting_h1_text"
+        android:layout_above="@+id/device_ready_h1_text"
         android:layout_alignParentLeft="true"
         android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
         android:layout_marginBottom="20dp"
         android:src="@drawable/icon_extra" />
 
     <TextView
-        android:id="@+id/login_setting_h1_text"
+        android:id="@+id/device_ready_h1_text"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
@@ -45,13 +60,13 @@
         android:layout_marginBottom="20dp"
         android:gravity="center"
         android:text="@string/login_setting_h1_text"
-        android:layout_above="@+id/login_setting_h2_text"
+        android:layout_above="@+id/device_ready_h2_text"
         android:textColor="@color/white"
         android:textSize="20sp"
         android:textStyle="bold" />
 
     <TextView
-        android:id="@+id/login_setting_h2_text"
+        android:id="@+id/device_ready_h2_text"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"

diff --git a/res/layout-small-port/password.xml b/res/layout-small-port/password.xml
@@ -13,7 +13,22 @@
     android:gravity="center_horizontal"
     android:orientation="vertical" >
 
-     <ImageView
+    <RelativeLayout
+        android:id="@+id/linear_back"
+        android:layout_width="fill_parent"
+        android:layout_height="20dp"
+        android:layout_alignParentTop="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="0dp"
+        android:orientation="horizontal" >
+        <ImageView
+            android:id="@+id/logo_img_reversed"
+            android:layout_width="wrap_content"
+            android:layout_height="20dp"
+            android:src="@drawable/icon_back" />
+    </RelativeLayout>
+
+    <ImageView
         android:id="@+id/logo_img_reverse"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"