[FE training-materials-updates] Mention Jelly Bean 4.1 and 4.2

Michael Opdenacker michael.opdenacker at free-electrons.com
Fri Dec 14 11:28:09 CET 2012


Repository : git://git.free-electrons.com/training-materials.git

On branch  : master
Link       : http://git.free-electrons.com/training-materials/commit/?id=961fe8102a4af30e0acb18ddb70bc23b3b3e9bb5

>---------------------------------------------------------------

commit 961fe8102a4af30e0acb18ddb70bc23b3b3e9bb5
Author: Michael Opdenacker <michael.opdenacker at free-electrons.com>
Date:   Fri Dec 14 11:27:32 2012 +0100

    Mention Jelly Bean 4.1 and 4.2


>---------------------------------------------------------------

961fe8102a4af30e0acb18ddb70bc23b3b3e9bb5
 .../android-introduction-history.tex               |    4 +-
 slides/android-introduction-history/history.dia    |  134 +++++++++++++++++++-
 2 files changed, 135 insertions(+), 3 deletions(-)

diff --git a/slides/android-introduction-history/android-introduction-history.tex b/slides/android-introduction-history/android-introduction-history.tex
index a9b3544..394d5df 100644
--- a/slides/android-introduction-history/android-introduction-history.tex
+++ b/slides/android-introduction-history/android-introduction-history.tex
@@ -50,11 +50,13 @@
   \begin{itemize}
   \item Each new version is given a dessert name
   \item Released in alphabetical order
-  \item Last releases:
+  \item Latest releases:
     \begin{itemize}
     \item Android 2.3 Gingerbread
     \item Android 3.X Honeycomb
     \item Android 4.0 Ice Cream Sandwich
+    \item Android 4.1 Jelly Bean 
+    \item Android 4.2 Jelly Bean
     \end{itemize}
   \end{itemize}
 \end{frame}
diff --git a/slides/android-introduction-history/history.dia b/slides/android-introduction-history/history.dia
index 07851db..0380421 100644
--- a/slides/android-introduction-history/history.dia
+++ b/slides/android-introduction-history/history.dia
@@ -1152,7 +1152,7 @@
         <dia:point val="25,32"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="23.1275,31.1982;26.8912,32.8018"/>
+        <dia:rectangle val="23.1275,31.2263;26.8725,32.7737"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -1167,7 +1167,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="25,31.8119"/>
+            <dia:point val="25,31.8212"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -1212,5 +1212,135 @@
         <dia:connection handle="1" to="O33" connection="1"/>
       </dia:connections>
     </dia:object>
+    <dia:object type="Standard - Box" version="0" id="O36">
+      <dia:attribute name="obj_pos">
+        <dia:point val="35,31"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="34.95,30.95;43.05,33.05"/>
+      </dia:attribute>
+      <dia:attribute name="elem_corner">
+        <dia:point val="35,31"/>
+      </dia:attribute>
+      <dia:attribute name="elem_width">
+        <dia:real val="8"/>
+      </dia:attribute>
+      <dia:attribute name="elem_height">
+        <dia:real val="2"/>
+      </dia:attribute>
+      <dia:attribute name="border_width">
+        <dia:real val="0.10000000149011612"/>
+      </dia:attribute>
+      <dia:attribute name="border_color">
+        <dia:color val="#6a8954"/>
+      </dia:attribute>
+      <dia:attribute name="inner_color">
+        <dia:color val="#c5e387"/>
+      </dia:attribute>
+      <dia:attribute name="show_background">
+        <dia:boolean val="true"/>
+      </dia:attribute>
+    </dia:object>
+    <dia:object type="Standard - Line" version="0" id="O37">
+      <dia:attribute name="obj_pos">
+        <dia:point val="29,32"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="28.95,31.6382;35.1118,32.3618"/>
+      </dia:attribute>
+      <dia:attribute name="conn_endpoints">
+        <dia:point val="29,32"/>
+        <dia:point val="35,32"/>
+      </dia:attribute>
+      <dia:attribute name="numcp">
+        <dia:int val="1"/>
+      </dia:attribute>
+      <dia:attribute name="end_arrow">
+        <dia:enum val="22"/>
+      </dia:attribute>
+      <dia:attribute name="end_arrow_length">
+        <dia:real val="0.5"/>
+      </dia:attribute>
+      <dia:attribute name="end_arrow_width">
+        <dia:real val="0.5"/>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O33" connection="4"/>
+        <dia:connection handle="1" to="O36" connection="3"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="Standard - Text" version="1" id="O38">
+      <dia:attribute name="obj_pos">
+        <dia:point val="39,32"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="37.1275,31.1982;40.8912,32.8018"/>
+      </dia:attribute>
+      <dia:attribute name="text">
+        <dia:composite type="text">
+          <dia:attribute name="string">
+            <dia:string>#4.2
+"Jelly Bean"#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="font">
+            <dia:font family="sans" style="0" name="Helvetica"/>
+          </dia:attribute>
+          <dia:attribute name="height">
+            <dia:real val="0.80000000000000004"/>
+          </dia:attribute>
+          <dia:attribute name="pos">
+            <dia:point val="39,31.8119"/>
+          </dia:attribute>
+          <dia:attribute name="color">
+            <dia:color val="#000000"/>
+          </dia:attribute>
+          <dia:attribute name="alignment">
+            <dia:enum val="1"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:attribute name="valign">
+        <dia:enum val="2"/>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O36" connection="8"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="Standard - Text" version="1" id="O39">
+      <dia:attribute name="obj_pos">
+        <dia:point val="39,32"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="39,31.405;39,32.1525"/>
+      </dia:attribute>
+      <dia:attribute name="text">
+        <dia:composite type="text">
+          <dia:attribute name="string">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="font">
+            <dia:font family="sans" style="0" name="Helvetica"/>
+          </dia:attribute>
+          <dia:attribute name="height">
+            <dia:real val="0.80000000000000004"/>
+          </dia:attribute>
+          <dia:attribute name="pos">
+            <dia:point val="39,32"/>
+          </dia:attribute>
+          <dia:attribute name="color">
+            <dia:color val="#000000"/>
+          </dia:attribute>
+          <dia:attribute name="alignment">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:attribute name="valign">
+        <dia:enum val="3"/>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O36" connection="8"/>
+      </dia:connections>
+    </dia:object>
   </dia:layer>
 </dia:diagram>



More information about the training-materials-updates mailing list