[FE training-materials-updates] Update Android's versions
Maxime Ripard
maxime.ripard at free-electrons.com
Fri Nov 22 10:52:00 CET 2013
Repository : git://git.free-electrons.com/training-materials.git
On branch : master
Link : http://git.free-electrons.com/training-materials/commit/?id=09f888f9345cf64a4af25172870305630e189f1e
>---------------------------------------------------------------
commit 09f888f9345cf64a4af25172870305630e189f1e
Author: Maxime Ripard <maxime.ripard at free-electrons.com>
Date: Thu Nov 21 10:53:15 2013 +0100
Update Android's versions
Signed-off-by: Maxime Ripard <maxime.ripard at free-electrons.com>
>---------------------------------------------------------------
09f888f9345cf64a4af25172870305630e189f1e
.../android-introduction-history.tex | 4 +-
slides/android-introduction-history/history.dia | 120 +++++++++++++++++---
2 files changed, 109 insertions(+), 15 deletions(-)
diff --git a/slides/android-introduction-history/android-introduction-history.tex b/slides/android-introduction-history/android-introduction-history.tex
index 88f5d02..6f63c56 100644
--- a/slides/android-introduction-history/android-introduction-history.tex
+++ b/slides/android-introduction-history/android-introduction-history.tex
@@ -55,8 +55,8 @@
\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
+ \item Android 4.1/4.2/4.3 Jelly Bean
+ \item Android 4.4 KitKat
\end{itemize}
\end{itemize}
\end{frame}
diff --git a/slides/android-introduction-history/history.dia b/slides/android-introduction-history/history.dia
index d5756c3..57e41da 100644
--- a/slides/android-introduction-history/history.dia
+++ b/slides/android-introduction-history/history.dia
@@ -97,7 +97,7 @@
<dia:point val="25,3"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="24.4913,2.59822;25.5274,3.40178"/>
+ <dia:rectangle val="24.4913,2.62625;25.5087,3.37375"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -111,7 +111,7 @@
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="25,3.21191"/>
+ <dia:point val="25,3.22125"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -220,7 +220,7 @@
<dia:point val="25,6"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="23.1837,5.19822;26.8349,6.80178"/>
+ <dia:rectangle val="23.1841,5.22625;26.8159,6.77375"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -235,7 +235,7 @@
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="25,5.81191"/>
+ <dia:point val="25,5.82125"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -257,7 +257,7 @@
<dia:point val="25,9"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="23.3313,8.22625;26.6687,9.77375"/>
+ <dia:rectangle val="23.3314,8.22625;26.6686,9.77375"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -426,7 +426,7 @@
<dia:point val="25,18"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="22.545,17.2263;27.455,18.7737"/>
+ <dia:rectangle val="22.5441,17.2263;27.4559,18.7737"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -492,7 +492,7 @@
<dia:point val="25,21"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="22.7087,20.2263;27.2912,21.7737"/>
+ <dia:rectangle val="22.7083,20.2263;27.2917,21.7737"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -827,7 +827,7 @@
<dia:point val="25,29"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="21.4462,28.2263;28.5538,29.7737"/>
+ <dia:rectangle val="21.4458,28.2263;28.5542,29.7737"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -993,7 +993,7 @@
<dia:point val="37,4.5"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="37,4.12625;41.81,4.87375"/>
+ <dia:rectangle val="37,4.12625;41.8091,4.87375"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -1058,7 +1058,7 @@
<dia:point val="37,6.5"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="37,6.12625;44.2,6.87375"/>
+ <dia:rectangle val="37,6.12625;44.1991,6.87375"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -1151,12 +1151,12 @@
<dia:point val="25,32"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="23.1275,31.2263;26.8725,32.7737"/>
+ <dia:rectangle val="23.1275,31.1982;26.8912,32.8018"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
<dia:attribute name="string">
- <dia:string>#4.1/4.2
+ <dia:string>#4.1/4.2/4.3
"Jelly Bean"#</dia:string>
</dia:attribute>
<dia:attribute name="font">
@@ -1166,7 +1166,7 @@
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="25,31.8212"/>
+ <dia:point val="25,31.8119"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -1244,5 +1244,99 @@
<dia:enum val="3"/>
</dia:attribute>
</dia:object>
+ <dia:object type="Standard - Box" version="0" id="O37">
+ <dia:attribute name="obj_pos">
+ <dia:point val="21,34"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="20.95,33.95;29.05,36.05"/>
+ </dia:attribute>
+ <dia:attribute name="elem_corner">
+ <dia:point val="21,34"/>
+ </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 - Text" version="1" id="O38">
+ <dia:attribute name="obj_pos">
+ <dia:point val="25,35"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="23.7556,34.1982;26.2631,35.8018"/>
+ </dia:attribute>
+ <dia:attribute name="text">
+ <dia:composite type="text">
+ <dia:attribute name="string">
+ <dia:string>#4.4
+"KitKat"#</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="25,34.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="O37" connection="8"/>
+ </dia:connections>
+ </dia:object>
+ <dia:object type="Standard - Line" version="0" id="O39">
+ <dia:attribute name="obj_pos">
+ <dia:point val="25,33"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="24.6382,32.95;25.3618,34.1118"/>
+ </dia:attribute>
+ <dia:attribute name="conn_endpoints">
+ <dia:point val="25,33"/>
+ <dia:point val="25,34"/>
+ </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="6"/>
+ <dia:connection handle="1" to="O37" connection="1"/>
+ </dia:connections>
+ </dia:object>
</dia:layer>
</dia:diagram>
More information about the training-materials-updates
mailing list