Fixed an error with permissions.

Nurgak · Dec 24, 2012 · 4f34b10 · 4f34b10
1 parent 5836a1d
commit 4f34b10
Show file tree

Hide file tree

Showing 25 changed files with 17 additions and 8 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.bluetooth"
-    android:versionCode="4"
+    android:versionCode="5"
     android:versionName="1.0" >
 
     <uses-sdk
@@ -22,11 +22,11 @@
     <uses-permission android:name="android.permission.INTERNET" />
 
     <uses-feature
-        android:name="android.hardware.accelerometer"
+        android:name="android.hardware.sensor.accelerometer"
         android:required="true" />
     <uses-feature
         android:name="android.hardware.screen.portrait"
-        android:required="false" />
+        android:required="true" />
 
     <application
         android:name=".BluetoothRemoteControlApp"

diff --git a/bin/AndroidManifest.xml b/bin/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.bluetooth"
-    android:versionCode="4"
+    android:versionCode="5"
     android:versionName="1.0" >
 
     <uses-sdk
@@ -22,11 +22,11 @@
     <uses-permission android:name="android.permission.INTERNET" />
 
     <uses-feature
-        android:name="android.hardware.accelerometer"
+        android:name="android.hardware.sensor.accelerometer"
         android:required="true" />
     <uses-feature
         android:name="android.hardware.screen.portrait"
-        android:required="false" />
+        android:required="true" />
 
     <application
         android:name=".BluetoothRemoteControlApp"

diff --git a/bin/classes/com/bluetooth/ActionListActivity$1.class b/bin/classes/com/bluetooth/ActionListActivity$1.class
diff --git a/bin/classes/com/bluetooth/ActionListActivity.class b/bin/classes/com/bluetooth/ActionListActivity.class
diff --git a/bin/classes/com/bluetooth/DeviceListBaseAdapter$ViewHolder.class b/bin/classes/com/bluetooth/DeviceListBaseAdapter$ViewHolder.class
diff --git a/bin/classes/com/bluetooth/DeviceListBaseAdapter.class b/bin/classes/com/bluetooth/DeviceListBaseAdapter.class
diff --git a/bin/classes/com/bluetooth/activities/AccelerometerControl$1.class b/bin/classes/com/bluetooth/activities/AccelerometerControl$1.class
diff --git a/bin/classes/com/bluetooth/activities/AccelerometerControl.class b/bin/classes/com/bluetooth/activities/AccelerometerControl.class
diff --git a/bin/classes/com/bluetooth/activities/KillAllHumans$1.class b/bin/classes/com/bluetooth/activities/KillAllHumans$1.class
diff --git a/bin/classes/com/bluetooth/activities/KillAllHumans$2.class b/bin/classes/com/bluetooth/activities/KillAllHumans$2.class
diff --git a/bin/classes/com/bluetooth/activities/KillAllHumans.class b/bin/classes/com/bluetooth/activities/KillAllHumans.class
diff --git a/bin/classes/com/bluetooth/activities/LineFollower$1.class b/bin/classes/com/bluetooth/activities/LineFollower$1.class
diff --git a/bin/classes/com/bluetooth/activities/LineFollower$2.class b/bin/classes/com/bluetooth/activities/LineFollower$2.class
diff --git a/bin/classes/com/bluetooth/activities/LineFollower$3.class b/bin/classes/com/bluetooth/activities/LineFollower$3.class
diff --git a/bin/classes/com/bluetooth/activities/LineFollower.class b/bin/classes/com/bluetooth/activities/LineFollower.class
diff --git a/bin/classes/com/bluetooth/activities/PIDSettings.class b/bin/classes/com/bluetooth/activities/PIDSettings.class
diff --git a/bin/classes/com/bluetooth/activities/VoiceControl.class b/bin/classes/com/bluetooth/activities/VoiceControl.class
diff --git a/src/com/bluetooth/ActionListActivity.java b/src/com/bluetooth/ActionListActivity.java
@@ -17,6 +17,8 @@
 
 import java.util.ArrayList;
 
+import com.bluetooth.R;
+
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Message;

diff --git a/src/com/bluetooth/DeviceListBaseAdapter.java b/src/com/bluetooth/DeviceListBaseAdapter.java
@@ -17,6 +17,8 @@
 
 import java.util.ArrayList;
 
+import com.bluetooth.R;
+
 import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;

diff --git a/src/com/bluetooth/DeviceSelectActivity.java b/src/com/bluetooth/DeviceSelectActivity.java
@@ -18,8 +18,8 @@
 import java.util.ArrayList;
 import java.util.Set;
 
-import com.bluetooth.DeviceListBaseAdapter;
 import com.bluetooth.Device;
+import com.bluetooth.DeviceListBaseAdapter;
 import com.bluetooth.R;
 
 import android.app.Activity;

diff --git a/src/com/bluetooth/activities/AccelerometerControl.java b/src/com/bluetooth/activities/AccelerometerControl.java
@@ -17,6 +17,7 @@
 
 import com.bluetooth.BluetoothActivity;
 import com.bluetooth.R;
+
 import android.content.Context;
 import android.graphics.PixelFormat;
 import android.hardware.Sensor;

diff --git a/src/com/bluetooth/activities/KillAllHumans.java b/src/com/bluetooth/activities/KillAllHumans.java
@@ -44,6 +44,7 @@
 import android.view.View.OnClickListener;
 import android.widget.Button;
 import android.widget.TextView;
+
 import com.bluetooth.BluetoothActivity;
 import com.bluetooth.BluetoothRemoteControlApp;
 import com.bluetooth.R;
@@ -320,7 +321,7 @@ private void setState(final int newState)
 				soundName = kill[randomInt.nextInt(kill.length)];
 				break;
 			}
-			
+
 			mediaPlayer = MediaPlayer.create(getApplicationContext(), getResources().getIdentifier(soundName, "raw", this.getPackageName()));
 			mediaPlayer.setOnCompletionListener(new OnCompletionListener()
 			{

diff --git a/src/com/bluetooth/activities/LineFollower.java b/src/com/bluetooth/activities/LineFollower.java
@@ -16,6 +16,7 @@
 package com.bluetooth.activities;
 
 import java.io.IOException;
+
 import com.bluetooth.BluetoothActivity;
 import com.bluetooth.BluetoothRemoteControlApp;
 import com.bluetooth.R;

diff --git a/src/com/bluetooth/activities/PIDSettings.java b/src/com/bluetooth/activities/PIDSettings.java
@@ -17,6 +17,7 @@
 
 import com.bluetooth.BluetoothRemoteControlApp;
 import com.bluetooth.R;
+
 import android.app.Dialog;
 import android.content.Context;
 import android.os.Handler;

diff --git a/src/com/bluetooth/activities/VoiceControl.java b/src/com/bluetooth/activities/VoiceControl.java
@@ -21,6 +21,7 @@
 import com.bluetooth.BluetoothActivity;
 import com.bluetooth.BluetoothRemoteControlApp;
 import com.bluetooth.R;
+
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;