modif noms activites et pdf rapport

Author: Liakha

RapportProjet/projetAndroid.odt

@@ -22,7 +22,7 @@
         <!-- Menu d'accueil -->
         <activity
             android:name="MenuApp"
-            android:label="@string/menu" >
+            android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />

RapportProjet/projetAndroid.pdf

@@ -5,7 +5,7 @@
 
     <string name="app_name">Brain Waves</string>
     <string name="hello_world">Hello world!</string>
-    <string name="action_settings">Settings</string>
+    <string name="action_settings">Paramètres</string>
 
    <!-- Main Activity-->
 
@@ -19,21 +19,21 @@
     <string name="recherche"> La recherche est en cours &#8230;</string> <!-- &#8230; est le unicode de "..."   -->
 
 	    <!-- Buttons -->
-	    <string name="on">On</string>
-	    <string name="off">Turn Off</string>
-	    <string name="Visible">Get Visible</string>
-	    <string name="buttonPairedDevices">List Paired Devices</string>
-	    <string name="buttonAroundDevices">List Device(s) Around</string>
-	    <string name="ListPairedDevices">List of Paired Devices :</string>
-	    <string name="ListAroundDevices">List of the bluetooth devices around :</string>
+	    <string name="on">Activé</string>
+	    <string name="off">Désactivé</string>
+	    <string name="Visible">Rendre visible</string>
+	    <string name="buttonPairedDevices">Afficher les appareils appairés</string>
+	    <string name="buttonAroundDevices">Afficher les appareils environnants</string>
+	    <string name="ListPairedDevices">Liste des appareils appairés:</string>
+	    <string name="ListAroundDevices">Liste des appareils Bluetooth environnants :</string>
 
 	 <!-- Paramètres -->   
 
     <string name="settings">Paramètres</string>
     <string name="aide">Aide</string>
     <string name="propos">A propos</string>
     <string name="quitter">Quitter</string>
-    <string name="title_activity_aide">AideActivity</string>
+    <string name="title_activity_aide">Explications</string>
     <string name="aideTitre1"><u>Méditation et Attention :</u></string>
     <string name="meditation_attention_content">
         Voici comment interpréter les données concernant la méditation et l\'attention :\n

bin/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <resources>
 
-    <string name="title_activity_settings">Settings</string>
+    <string name="title_activity_settings">Parametres</string>
 
     <!-- Strings related to Settings -->
 
@@ -13,18 +13,7 @@
     <string name="pref_title_time_record">Temps d\'enregistrement (secondes)</string>
     <string name="pref_title_values_record">Débuter l\'enregistrement</string>
     <string name="pref_title_freqRawData">Frequence Raw Data</string>
-    <string name="pref_title_add_friends_to_messages">Example</string>
 
-    <string-array name="pref_example_list_titles">
-        <item>Always</item>
-        <item>When possible</item>
-        <item>Never</item>
-    </string-array>
-    <string-array name="pref_example_list_values">
-        <item>1</item>
-        <item>0</item>
-        <item>-1</item>
-    </string-array>
 
     <!-- Example settings for Data & Sync -->
     <string name="pref_header_data_sync">Data &amp; sync</string>

bin/classes/com/example/testapp/AideActivity.class

@@ -42,14 +42,5 @@
          NOTE: Hide buttons to simplify the UI. Users can touch outside the dialog to
          dismiss it.
     -->
-    <!-- NOTE: ListPreference's summary should be set to its value by the activity code. -->
-    <ListPreference
-        android:defaultValue="-1"
-        android:entries="@array/pref_example_list_titles"
-        android:entryValues="@array/pref_example_list_values"
-        android:key="example_list"
-        android:negativeButtonText="@null"
-        android:positiveButtonText="@null"
-        android:title="@string/pref_title_add_friends_to_messages" />
 
 </PreferenceScreen>