Skip to content

Commit

Permalink
move automatonbrain into its own package so its not installed as
Browse files Browse the repository at this point in the history
se.forskningsavd
  • Loading branch information
Toby Collett committed Nov 24, 2012
1 parent 9f31b14 commit aae8d68
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 11 deletions.
4 changes: 2 additions & 2 deletions AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="se.forskningsavd"
package="se.forskningsavd.automatonbrain"
android:versionCode="1"
android:versionName="1.0">
<uses-sdk android:minSdkVersion="11" android:targetSdkVersion="15"/>
<uses-permission android:name="android.permission.INTERNET"/>
<application android:label="@string/app_name" android:theme="@style/Theme.Sherlock">
<application android:label="@string/app_name" android:theme="@style/Theme.Sherlock" android:allowBackup="true">
<activity android:name="MainActivity"
android:label="@string/app_name"
android:configChanges="orientation|keyboard|keyboardHidden|screenSize">
Expand Down
4 changes: 2 additions & 2 deletions jni/decoder-jni.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ AVPacket avpkt; // Used in the decoding process
int temp; // Various uses


bool Java_se_forskningsavd_Decoder_init(JNIEnv* env, jobject thiz) {
bool Java_se_forskningsavd_automatonbrain_Decoder_init(JNIEnv* env, jobject thiz) {
avcodec_init();
avcodec_register_all();
pCodecCtx = avcodec_alloc_context();
Expand All @@ -30,7 +30,7 @@ bool Java_se_forskningsavd_Decoder_init(JNIEnv* env, jobject thiz) {
return true;
}

bool Java_se_forskningsavd_Decoder_decode(JNIEnv *env, jobject thiz, jbyteArray frame, jobject bitmap) {
bool Java_se_forskningsavd_automatonbrain_Decoder_decode(JNIEnv *env, jobject thiz, jbyteArray frame, jobject bitmap) {
AndroidBitmapInfo bitmapInfo;
if (AndroidBitmap_getInfo(env, bitmap, &bitmapInfo) != 0) {
return false;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package se.forskningsavd;
package se.forskningsavd.automatonbrain;

import android.graphics.Bitmap;
import android.os.Handler;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package se.forskningsavd;
package se.forskningsavd.automatonbrain;

import android.graphics.Bitmap;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package se.forskningsavd;
package se.forskningsavd.automatonbrain;

import java.util.List;

import se.forskningsavd.automatonbrain.R;
import android.app.AlertDialog;
import android.content.DialogInterface;
import android.content.SharedPreferences;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package se.forskningsavd;
package se.forskningsavd.automatonbrain;

import android.content.Context;
import android.graphics.Canvas;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package se.forskningsavd;
package se.forskningsavd.automatonbrain;

class Navigator {
public boolean left = false;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package se.forskningsavd;
package se.forskningsavd.automatonbrain;

import java.util.Locale;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package se.forskningsavd;
package se.forskningsavd.automatonbrain;

import java.util.Iterator;
import java.util.LinkedHashSet;
Expand Down

0 comments on commit aae8d68

Please sign in to comment.