Merge branch 'master' of github:jsmaniac/2011-m1s2-ter

code/PtiClic/AndroidManifest.xml

@@ -3,16 +3,16 @@
       package="org.pticlic"
       android:versionCode="1"
       android:versionName="1.0">
-    <application android:icon="@drawable/icon" android:label="@string/app_name">
-        <activity android:name=".Main"
-                  android:label="@string/app_name">
+    <application android:icon="@drawable/icon" android:label="@string/app_name" android:theme="@android:style/Theme.NoTitleBar">
+        <activity android:name=".Main">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
 
-    </application>
+    <activity android:name=".Preference" android:label="Préférence"></activity>
+</application>
 
 
 </manifest> 

code/PtiClic/res/layout/main.xml

@@ -1,12 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    >
-<TextView  
-    android:layout_width="fill_parent" 
-    android:layout_height="wrap_content" 
-    android:text="@string/hello"
-    />
+	android:layout_width="fill_parent" android:layout_height="fill_parent"
+	android:orientation="vertical">
+
+	<TextView android:text="@string/app_name" android:id="@+id/logo"
+		android:layout_width="fill_parent" android:layout_height="wrap_content"
+		android:textSize="50px" android:layout_weight="3" />
+
+	<RelativeLayout android:layout_height="wrap_content"
+		android:id="@+id/RelativeLayout01" android:layout_width="wrap_content"
+		android:layout_gravity="bottom|center_horizontal">
+
+		<Button android:layout_height="wrap_content" android:id="@+id/games"
+			android:text="@string/games_name" android:layout_width="wrap_content"
+			android:paddingLeft="60px" android:paddingRight="60px"
+			android:enabled="false"></Button>
+
+		<Button android:layout_height="wrap_content"
+			android:layout_width="wrap_content" android:id="@+id/prefs"
+			android:text="@string/prefs_name" android:layout_below="@+id/games"
+			android:layout_alignLeft="@+id/games" android:layout_alignRight="@+id/games"></Button>
+
+	
+</RelativeLayout>
+<ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/info" android:layout_weight="1" android:src="@android:drawable/ic_dialog_info" android:layout_gravity="right"></ImageView>
 </LinearLayout>

code/PtiClic/res/values/strings.xml

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="hello">Hello World, Main!</string>
+    
     <string name="app_name">PtiClic</string>
+<string name="prefs_name">Préférences</string>
+<string name="games_name">Jeux</string>
 </resources>

code/PtiClic/res/xml/prefs.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+	<PreferenceCategory android:title="Connexion">
+
+		<EditTextPreference android:title="Login" android:key="login"></EditTextPreference>
+		<EditTextPreference android:title="Mot de Passe" android:key="passwd"></EditTextPreference>
+		
+	</PreferenceCategory>
+</PreferenceScreen>

code/PtiClic/src/org/pticlic/Main.java

@@ -1,13 +1,26 @@
 package org.pticlic;
 
 import android.app.Activity;
+import android.content.Intent;
 import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
 
-public class Main extends Activity {
+public class Main extends Activity implements OnClickListener {
     /** Called when the activity is first created. */
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.main);
+        ((Button)findViewById(R.id.prefs)).setOnClickListener(this);
+        
     }
+
+	@Override
+	public void onClick(View v) {
+		if (v.getId()==R.id.prefs) {
+			startActivity(new Intent(this, Preference.class));
+		}
+	}
 }

code/PtiClic/src/org/pticlic/Preference.java

@@ -0,0 +1,17 @@
+package org.pticlic;
+
+import android.os.Bundle;
+import android.preference.PreferenceActivity;
+
+public class Preference extends PreferenceActivity {
+
+	/* (non-Javadoc)
+	 * @see android.preference.PreferenceActivity#onCreate(android.os.Bundle)
+	 */
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		addPreferencesFromResource(R.xml.prefs);
+	}
+
+}

feuille-route/biblio.bib

@@ -0,0 +1,22 @@
+%% Bertrand : Source code optimization and profiling of energy consumption in embedded systems
+@inproceedings{citeulike:5700744,
+    abstract = {{This paper presents a source code optimization methodology and a profiling tool that have been developed to help designers in optimizing software performance and energy in embedded systems. Code optimizations are applied at three levels of abstraction: algorithmic, data and instruction-level. The profiler exploits a cycle-accurate energy consumption simulator [3] to relate the embedded system energy consumption and performance to the source code. Thus, it can be used for analysis (i.e., to find energy-critical sections of the code), and for validation (i.e., to assess the impact of each code optimization).Code optimizations and profiling tool are used to optimize and tune the implementation of an MPEG Layer III (MP3) audio decoder for the SmartBadge [2] portable embedded system. We show that using our methodology and tool we can quickly and easily redesign the MP3 audio decoder software to run in real time with low energy consumption. Performance increase of 92\% and energy consumption decrease of 77\% (over the original executable specification) has been achieved for MP3 audio decoding on the SmartBadge.}},
+    address = {Washington, DC, USA},
+    author = {\v{S}imuni\'{c}, Tajana and Benini, Luca and De Micheli, Giovanni and Hans, Mat},
+    booktitle = {ISSS '00: Proceedings of the 13th international symposium on System synthesis},
+    citeulike-article-id = {5700744},
+    citeulike-linkout-0 = {http://portal.acm.org/citation.cfm?id=501831},
+    citeulike-linkout-1 = {http://dx.doi.org/10.1145/501790.501831},
+    doi = {10.1145/501790.501831},
+    isbn = {1080-1082},
+    keywords = {embedded, energy-consumption},
+    location = {Madrid, Spain},
+    pages = {193--198},
+    posted-at = {2009-09-01 21:05:53},
+    priority = {2},
+    publisher = {IEEE Computer Society},
+    title = {{Source code optimization and profiling of energy consumption in embedded systems}},
+    url = {http://dx.doi.org/10.1145/501790.501831},
+    year = {2000}
+}
+

feuille-route/feuille-route.tex

@@ -50,7 +50,7 @@
 \section*{Répartition des lectures dans le groupe}
 \begin{description}
 \item[\textsc{Bonavero} Yoann] Nom de l'article%\ref{référence biblio}
-\item[\textsc{Brun} Bertrand] Nom de l'article%\ref{référence biblio}
+\item[\textsc{Brun} Bertrand] Source Code Optimization and Profiling of Energy Consumption in Embedded Systems \cite{citeulike:5700744}
 \item[\textsc{Charron} John] Nom de l'article%\ref{référence biblio}
 \item[\textsc{Dupéron} Georges] Nom de l'article%\ref{référence biblio}
 \end{description}
@@ -60,7 +60,10 @@
 \item[\textsc{Charron} John] Responsable de la communication
 \end{description}
 %% TODO : bibtex ici
-%
+
+\bibliographystyle{plain}
+\bibliography{biblio}
+
 \includepdf[pages=1,angle=-90]{gantt.pdf}
 \includepdf[pages=2,angle=-90]{gantt.pdf}
 \includepdf[pages=3,angle=-90]{gantt.pdf}