Commit 8c5e912a authored by Elodie Gauthier's avatar Elodie Gauthier

Merge work from Calliste and Guillaume

parents 7d46add9 7c2f17d5
*.class
*.json
aikuma-cloud-storage-*.jar
.metadata
*.swp
*~
......
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>MainActivity</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>com.android.ide.eclipse.adt.ApkBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.6
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.lp20.aikuma2"
android:versionCode="010005"
android:versionName="0.8.4">
<uses-sdk android:minSdkVersion="14"/>
<uses-permission android:name="android.permission.RECORD_AUDIO"/>
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.GET_ACCOUNTS" />
<uses-permission android:name="android.permission.CAMERA" />
<uses-feature android:name="android.hardware.camera" />
<application android:label="@string/app_name"
android:name="org.lp20.aikuma.Aikuma"
android:theme="@style/MyTheme"
android:icon="@drawable/ic_launcher">
<meta-data
android:name="com.google.android.gms.version"
android:value="@integer/google_play_services_version" />
<receiver android:name="org.lp20.aikuma.service.BootReceiver" >
<intent-filter>
<action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
</intent-filter>
</receiver>
<activity android:name="org.lp20.aikuma.MainActivity"
android:label="@string/app_name"
android:windowSoftInputMode="adjustPan">
android:parentActivityName="org.lp20.aikuma.ModeSelection">
</activity>
<activity android:name="org.lp20.aikuma.ui.ListenActivity"
android:configChanges="orientation"
android:label="@string/app_name"
android:parentActivityName="org.lp20.aikuma.MainActivity">
</activity>
<activity android:name="org.lp20.aikuma.ui.ListenRespeakingActivity"
android:configChanges="orientation"
android:label="@string/app_name"
android:parentActivityName="org.lp20.aikuma.MainActivity">
</activity>
<activity android:name="org.lp20.aikuma.ui.CloudSearchActivity"
android:configChanges="orientation"
android:label="@string/app_name"
android:parentActivityName="org.lp20.aikuma.MainActivity">
</activity>
<activity android:name="org.lp20.aikuma.ui.RecordActivity"
android:configChanges="orientation"
android:label="@string/app_name"
android:parentActivityName="org.lp20.aikuma.MainActivity">
</activity>
<activity android:name="org.lp20.aikuma.ui.RecordVideoActivity"
android:configChanges="orientation"
android:label="@string/app_name"
android:parentActivityName="org.lp20.aikuma.MainActivity">
</activity>
<activity android:name="org.lp20.aikuma.ui.SettingsActivity"
android:configChanges="orientation"
android:label="@string/app_name"
android:parentActivityName="org.lp20.aikuma.MainActivity">
</activity>
<activity android:name="org.lp20.aikuma.ui.RecordingMetadataActivity1"
android:configChanges="orientation"
android:label="@string/app_name"
android:parentActivityName="org.lp20.aikuma.MainActivity">
</activity>
<activity android:name="org.lp20.aikuma.ui.RecordingMetadataActivity2"
android:configChanges="orientation"
android:label="@string/app_name"
android:parentActivityName="org.lp20.aikuma.MainActivity">
</activity>
<activity android:name="org.lp20.aikuma.ui.RecordingMetadataActivity3"
android:configChanges="orientation"
android:label="@string/app_name"
android:parentActivityName="org.lp20.aikuma.MainActivity">
</activity>
<activity android:name="org.lp20.aikuma.ui.RecordingMetadataActivity4"
android:configChanges="orientation"
android:label="@string/app_name"
android:parentActivityName="org.lp20.aikuma.MainActivity">
</activity>
<activity android:name="org.lp20.aikuma.ui.LanguageFilterList"
android:configChanges="orientation"
android:label="@string/app_name"
android:parentActivityName="org.lp20.aikuma.MainActivity">
</activity>
<activity android:name="org.lp20.aikuma.ui.RecordingSpeakersActivity"
android:configChanges="orientation"
android:label="@string/app_name"
android:parentActivityName="org.lp20.aikuma.MainActivity">
</activity>
<activity android:name="org.lp20.aikuma.ui.MainSpeakersActivity"
android:configChanges="orientation"
android:label="@string/app_name"
android:parentActivityName="org.lp20.aikuma.MainActivity">
</activity>
<activity android:name="org.lp20.aikuma.ui.AddSpeakerActivity1"
android:configChanges="orientation"
android:label="@string/app_name"
android:parentActivityName="org.lp20.aikuma.MainActivity">
</activity>
<activity android:name="org.lp20.aikuma.ui.AddSpeakerActivity2"
android:configChanges="orientation"
android:label="@string/app_name"
android:parentActivityName="org.lp20.aikuma.MainActivity">
</activity>
<activity android:name="org.lp20.aikuma.ui.AddSpeakerActivity3"
android:configChanges="orientation"
android:label="@string/app_name"
android:parentActivityName="org.lp20.aikuma.MainActivity">
</activity>
<activity android:name="org.lp20.aikuma.ui.AddSpeakerActivity4"
android:configChanges="orientation"
android:label="@string/app_name"
android:parentActivityName="org.lp20.aikuma.MainActivity">
</activity>
<activity android:name="org.lp20.aikuma.ui.ThumbRespeakActivity"
android:configChanges="orientation"
android:label="@string/app_name"
android:parentActivityName="org.lp20.aikuma.MainActivity">
</activity>
<activity android:name="org.lp20.aikuma.ui.PhoneRespeakActivity"
android:configChanges="orientation"
android:label="@string/app_name"
android:parentActivityName="org.lp20.aikuma.MainActivity">
</activity>
<activity android:name="org.lp20.aikuma.ui.AddCustomLanguageActivity"
android:configChanges="orientation"
android:label="@string/app_name"
android:parentActivityName="org.lp20.aikuma.MainActivity">
</activity>
<activity android:name="org.lp20.aikuma.ui.DefaultLanguagesActivity"
android:configChanges="orientation"
android:label="@string/app_name"
android:parentActivityName="org.lp20.aikuma.MainActivity">
</activity>
<activity android:name="org.lp20.aikuma.ui.CloudSettingsActivity"
android:configChanges="orientation"
android:label="@string/app_name"
android:parentActivityName="org.lp20.aikuma.MainActivity">
</activity>
<activity android:name="org.lp20.aikuma.ui.SyncSettingsActivity"
android:configChanges="orientation"
android:label="@string/app_name"
android:parentActivityName="org.lp20.aikuma.MainActivity">
</activity>
<activity android:name="org.lp20.aikuma.ui.AboutActivity"
android:configChanges="orientation"
android:label="@string/app_name"
android:parentActivityName="org.lp20.aikuma.MainActivity">
</activity>
<activity android:name="org.lp20.aikuma.ui.HttpServerActivity"
android:label="@string/http_server_activity_title"
android:parentActivityName="org.lp20.aikuma.MainActivity" >
<meta-data android:name="android.support.PARENT_ACTIVITY"
android:value="org.lp20.aikuma.MainActivity" />
</activity>
<activity android:name="org.lp20.aikuma.ui.HowtoActivity"
android:label="@string/http_server_activity_title"
android:parentActivityName="org.lp20.aikuma.MainActivity" >
<meta-data android:name="android.support.PARENT_ACTIVITY"
android:value="org.lp20.aikuma.MainActivity" />
</activity>
<activity android:name="org.lp20.aikuma.ui.DebugInfo"
android:label="@string/title_activity_debug_info"
android:parentActivityName=".AikumaActivity" >
<meta-data android:name="android.support.PARENT_ACTIVITY"
android:value="AikumaActivity" />
</activity>
<service android:name="org.lp20.aikuma.service.GoogleCloudService" />
<activity android:name="org.lp20.aikuma.ModeSelection">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<activity android:name="org.lp20.aikuma.ui.RecordingMetadataLig"
android:configChanges="orientation|screenSize">
</activity>
<activity android:name="org.lp20.aikuma.ui.LanguageFilterListLIG"></activity>
<activity android:name="org.lp20.aikuma.ui.RecordActivityLig"
android:configChanges="orientation|screenSize" ></activity>
<activity android:name="org.lp20.aikuma.ui.RespeakingSelection"></activity>
<activity android:name="org.lp20.aikuma.ui.RespeakingMetadataLig"
android:configChanges="orientation|screenSize" ></activity>
<activity android:name="org.lp20.aikuma.ui.ThumbRespeakActivityLig"
android:configChanges="orientation|screenSize" ></activity>
<activity android:name="org.lp20.aikuma.ui.ThumbRespeakSummaryLig"
android:configChanges="orientation|screenSize">
</activity>
<activity android:name="org.lp20.aikuma.ui.ElicitationMode"
android:configChanges="orientation|screenSize" ></activity>
<activity android:name="org.lp20.aikuma.ui.TranslationSelection"></activity>
<activity android:name="org.lp20.aikuma.ui.RecordElicitation"
android:configChanges="orientation|screenSize"></activity>
<activity android:name="org.lp20.aikuma.ui.CheckMode"
android:configChanges="orientation|screenSize" ></activity>
<activity android:name="org.lp20.aikuma.ui.CheckWordVariant"
android:configChanges="orientation|screenSize"></activity>
<activity android:name="org.lp20.aikuma.ui.CheckTranscription"
android:configChanges="orientation|screenSize"></activity>
</application>
</manifest>
# This file is used to override default values used by the Ant build system.
#
# This file must be checked into Version Control Systems, as it is
# integral to the build system of your project.
# This file is only used by the Ant script.
# You can use this to override default values such as
# 'source.dir' for the location of your java source folder and
# 'out.dir' for the location of your output folder.
# You can also use it define how the release builds are signed by declaring
# the following properties:
# 'key.store' for the location of your keystore and
# 'key.alias' for the name of the key to use.
# The password will be asked during the build when you use the 'release' target.
<!doctype html>
<html>
<head>
<title>
</title>
<link href="transcriber.min.css" rel="stylesheet" media="screen">
<script src="transcriber.min.js"></script>
</head>
<body>
<div id="players">
<div id="player"></div>
</div>
<div class="container">
<div class="row">
<div class="col-md-1 dropdown">
<button class="btn dropdown-toggle" data-toggle="dropdown">
<span>File <b class="caret"></b></span>
</button>
<ul class="dropdown-menu">
<li><a href="#folder-dialog" data-toggle="modal">
Load Folder
</a></li>
<li><a id="open-from-aikuma" data-toggle="modal">
Load from Aikuma App
</a></li>
<li><a id="open-remote-trans" data-toggle="modal">
Load Sample from Web
</a></li>
<li class="divider"></li>
<li><a href="#" id="new-transcript-menu">
New Transcript
</a></li>
<li class="divider"></li>
<li><a href="#file-dialog" data-toggle="modal">
Open Local Transcript
</a></li>
<li><a href="#dialog-open-elan" data-toggle="modal">
Open Local ELAN Transcript
</a></li>
<li class="divider"></li>
<li><a href="#save-file-dialog" data-toggle="modal">
Save Transcript
</a></li>
<li class="divider"></li>
<li><a href="#download-file-dialog" data-toggle="modal">
Download Transcript
</a></li>
<li><a href="#download-elan-dialog" data-toggle="modal">
Download as ELAN Format
</a></li>
</ul>
</div>
<div class="col-md-8 btn-group">
<button id="play-btn" class="btn" disabled
data-play-text="Pause"
data-pause-text="Resume">
Play
</button>
<button id="stop-btn" class="btn" disabled>Stop</button>
<button id="create-seg-btn" class="btn" disabled>
Create Segment
</button>
<button id="remove-seg-btn" class="btn" disabled>
Remove Segment
</button>
<button id="play-rspk-btn" class="btn" disabled
data-play-text="Stop">
Play Respeaking
</button>
</div>
<div class="col-md-3">
<span class="badge alert-info">U</span>
<b><span id="person-name"></span></b> -
<small><span id="person-id"></span></small>
</div>
</div>
<div class="row">
<!-- Contents Column -->
<div class="col-md-9">
<br>
<!-- Waveform Row -->
<div class="row">
<div class="col-md-1">
<div id="pos"></div>
<div id="sel-beg"></div>
<div id="sel-dur"></div>
</div>
<div id="waveform-area" class="col-md-11"></div>
</div>
<br>
<!-- Swimlanes for speakers in original recording -->
<div class="row">
<div id="speakers" class="col-md-1"></div>
<div id="speaker-swimlanes" class="col-md-11"></div>