[FE training-materials-updates] Fix misplaced arrows in the diagrams
maxime.ripard at free-electrons.com
maxime.ripard at free-electrons.com
Tue Jun 19 14:31:49 CEST 2012
- Log -----------------------------------------------------------------
http://git.free-electrons.com/training-materials/commit/?id=eea63ad4dc4e2fc6a950c19d273102a62236abeb
commit eea63ad4dc4e2fc6a950c19d273102a62236abeb
Author: Maxime Ripard <maxime.ripard at free-electrons.com>
Date: Tue Jun 19 14:31:24 2012 +0200
Fix misplaced arrows in the diagrams
Signed-off-by: Maxime Ripard <maxime.ripard at free-electrons.com>
diff --git a/slides/android-adb-examples/adb-forward-jdwp.dia b/slides/android-adb-examples/adb-forward-jdwp.dia
index f1ac2f4..bd5c556 100644
--- a/slides/android-adb-examples/adb-forward-jdwp.dia
+++ b/slides/android-adb-examples/adb-forward-jdwp.dia
@@ -295,227 +295,7 @@
<dia:boolean val="true"/>
</dia:attribute>
</dia:object>
- <dia:object type="Standard - ZigZagLine" version="1" id="O8">
- <dia:attribute name="obj_pos">
- <dia:point val="10,15.5"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="9.3882,15.1382;18.1118,15.8618"/>
- </dia:attribute>
- <dia:attribute name="orth_points">
- <dia:point val="10,15.5"/>
- <dia:point val="10,15.5"/>
- <dia:point val="18,15.5"/>
- <dia:point val="18,15.5"/>
- </dia:attribute>
- <dia:attribute name="orth_orient">
- <dia:enum val="0"/>
- <dia:enum val="1"/>
- <dia:enum val="0"/>
- </dia:attribute>
- <dia:attribute name="autorouting">
- <dia:boolean val="true"/>
- </dia:attribute>
- <dia:attribute name="start_arrow">
- <dia:enum val="22"/>
- </dia:attribute>
- <dia:attribute name="start_arrow_length">
- <dia:real val="0.5"/>
- </dia:attribute>
- <dia:attribute name="start_arrow_width">
- <dia:real val="0.5"/>
- </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="O4" connection="4"/>
- <dia:connection handle="1" to="O6" connection="3"/>
- </dia:connections>
- </dia:object>
- <dia:object type="Standard - ZigZagLine" version="1" id="O9">
- <dia:attribute name="obj_pos">
- <dia:point val="21.5,14"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="20.8882,11.6382;21.6118,14.3618"/>
- </dia:attribute>
- <dia:attribute name="orth_points">
- <dia:point val="21.5,14"/>
- <dia:point val="21.5,14"/>
- <dia:point val="21.5,12"/>
- <dia:point val="21.5,12"/>
- </dia:attribute>
- <dia:attribute name="orth_orient">
- <dia:enum val="0"/>
- <dia:enum val="1"/>
- <dia:enum val="0"/>
- </dia:attribute>
- <dia:attribute name="autorouting">
- <dia:boolean val="true"/>
- </dia:attribute>
- <dia:attribute name="start_arrow">
- <dia:enum val="22"/>
- </dia:attribute>
- <dia:attribute name="start_arrow_length">
- <dia:real val="0.5"/>
- </dia:attribute>
- <dia:attribute name="start_arrow_width">
- <dia:real val="0.5"/>
- </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="O6" connection="1"/>
- <dia:connection handle="1" to="O7" connection="6"/>
- </dia:connections>
- </dia:object>
- <dia:object type="Standard - ZigZagLine" version="1" id="O10">
- <dia:attribute name="obj_pos">
- <dia:point val="21.5,7"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="20.8882,6.6382;21.6118,9.3618"/>
- </dia:attribute>
- <dia:attribute name="orth_points">
- <dia:point val="21.5,7"/>
- <dia:point val="21.5,7"/>
- <dia:point val="21.5,9"/>
- <dia:point val="21.5,9"/>
- </dia:attribute>
- <dia:attribute name="orth_orient">
- <dia:enum val="0"/>
- <dia:enum val="1"/>
- <dia:enum val="0"/>
- </dia:attribute>
- <dia:attribute name="autorouting">
- <dia:boolean val="true"/>
- </dia:attribute>
- <dia:attribute name="start_arrow">
- <dia:enum val="22"/>
- </dia:attribute>
- <dia:attribute name="start_arrow_length">
- <dia:real val="0.5"/>
- </dia:attribute>
- <dia:attribute name="start_arrow_width">
- <dia:real val="0.5"/>
- </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="O5" connection="6"/>
- <dia:connection handle="1" to="O7" connection="1"/>
- </dia:connections>
- </dia:object>
- <dia:object type="Standard - ZigZagLine" version="1" id="O11">
- <dia:attribute name="obj_pos">
- <dia:point val="6.5,7"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="5.8882,6.6382;6.6118,9.3618"/>
- </dia:attribute>
- <dia:attribute name="orth_points">
- <dia:point val="6.5,7"/>
- <dia:point val="6.5,7"/>
- <dia:point val="6.5,9"/>
- <dia:point val="6.5,9"/>
- </dia:attribute>
- <dia:attribute name="orth_orient">
- <dia:enum val="0"/>
- <dia:enum val="1"/>
- <dia:enum val="0"/>
- </dia:attribute>
- <dia:attribute name="autorouting">
- <dia:boolean val="true"/>
- </dia:attribute>
- <dia:attribute name="start_arrow">
- <dia:enum val="22"/>
- </dia:attribute>
- <dia:attribute name="start_arrow_length">
- <dia:real val="0.5"/>
- </dia:attribute>
- <dia:attribute name="start_arrow_width">
- <dia:real val="0.5"/>
- </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="O2" connection="6"/>
- <dia:connection handle="1" to="O3" connection="1"/>
- </dia:connections>
- </dia:object>
- <dia:object type="Standard - ZigZagLine" version="1" id="O12">
- <dia:attribute name="obj_pos">
- <dia:point val="6.5,12"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="5.8882,11.6382;6.6118,14.3618"/>
- </dia:attribute>
- <dia:attribute name="orth_points">
- <dia:point val="6.5,12"/>
- <dia:point val="6.5,12"/>
- <dia:point val="6.5,14"/>
- <dia:point val="6.5,14"/>
- </dia:attribute>
- <dia:attribute name="orth_orient">
- <dia:enum val="0"/>
- <dia:enum val="1"/>
- <dia:enum val="0"/>
- </dia:attribute>
- <dia:attribute name="autorouting">
- <dia:boolean val="true"/>
- </dia:attribute>
- <dia:attribute name="start_arrow">
- <dia:enum val="22"/>
- </dia:attribute>
- <dia:attribute name="start_arrow_length">
- <dia:real val="0.5"/>
- </dia:attribute>
- <dia:attribute name="start_arrow_width">
- <dia:real val="0.5"/>
- </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="O3" connection="6"/>
- <dia:connection handle="1" to="O4" connection="1"/>
- </dia:connections>
- </dia:object>
- <dia:object type="Standard - Text" version="1" id="O13">
+ <dia:object type="Standard - Text" version="1" id="O8">
<dia:attribute name="obj_pos">
<dia:point val="6.5,10.5"/>
</dia:attribute>
@@ -551,7 +331,7 @@
<dia:connection handle="0" to="O3" connection="8"/>
</dia:connections>
</dia:object>
- <dia:object type="Standard - Text" version="1" id="O14">
+ <dia:object type="Standard - Text" version="1" id="O9">
<dia:attribute name="obj_pos">
<dia:point val="21.5,10.5"/>
</dia:attribute>
@@ -587,7 +367,7 @@
<dia:connection handle="0" to="O7" connection="8"/>
</dia:connections>
</dia:object>
- <dia:object type="Standard - Text" version="1" id="O15">
+ <dia:object type="Standard - Text" version="1" id="O10">
<dia:attribute name="obj_pos">
<dia:point val="6.5,5.5"/>
</dia:attribute>
@@ -623,7 +403,7 @@
<dia:connection handle="0" to="O2" connection="8"/>
</dia:connections>
</dia:object>
- <dia:object type="Standard - Text" version="1" id="O16">
+ <dia:object type="Standard - Text" version="1" id="O11">
<dia:attribute name="obj_pos">
<dia:point val="21.5,5.5"/>
</dia:attribute>
@@ -659,7 +439,7 @@
<dia:connection handle="0" to="O5" connection="8"/>
</dia:connections>
</dia:object>
- <dia:object type="Standard - Text" version="1" id="O17">
+ <dia:object type="Standard - Text" version="1" id="O12">
<dia:attribute name="obj_pos">
<dia:point val="6.5,15.5"/>
</dia:attribute>
@@ -695,7 +475,7 @@
<dia:connection handle="0" to="O4" connection="8"/>
</dia:connections>
</dia:object>
- <dia:object type="Standard - Text" version="1" id="O18">
+ <dia:object type="Standard - Text" version="1" id="O13">
<dia:attribute name="obj_pos">
<dia:point val="21.5,15.5"/>
</dia:attribute>
@@ -731,7 +511,7 @@
<dia:connection handle="0" to="O6" connection="8"/>
</dia:connections>
</dia:object>
- <dia:object type="Standard - Text" version="1" id="O19">
+ <dia:object type="Standard - Text" version="1" id="O14">
<dia:attribute name="obj_pos">
<dia:point val="21.5,2"/>
</dia:attribute>
@@ -767,7 +547,7 @@
<dia:connection handle="0" to="O1" connection="1"/>
</dia:connections>
</dia:object>
- <dia:object type="Standard - Text" version="1" id="O20">
+ <dia:object type="Standard - Text" version="1" id="O15">
<dia:attribute name="obj_pos">
<dia:point val="6.5,2"/>
</dia:attribute>
@@ -803,5 +583,190 @@
<dia:connection handle="0" to="O0" connection="1"/>
</dia:connections>
</dia:object>
+ <dia:object type="Standard - Line" version="0" id="O16">
+ <dia:attribute name="obj_pos">
+ <dia:point val="21.5,7"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="21.1382,6.95;21.8618,9.05"/>
+ </dia:attribute>
+ <dia:attribute name="conn_endpoints">
+ <dia:point val="21.5,7"/>
+ <dia:point val="21.5,9"/>
+ </dia:attribute>
+ <dia:attribute name="numcp">
+ <dia:int val="1"/>
+ </dia:attribute>
+ <dia:attribute name="start_arrow">
+ <dia:enum val="22"/>
+ </dia:attribute>
+ <dia:attribute name="start_arrow_length">
+ <dia:real val="0.5"/>
+ </dia:attribute>
+ <dia:attribute name="start_arrow_width">
+ <dia:real val="0.5"/>
+ </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="O5" connection="6"/>
+ <dia:connection handle="1" to="O7" connection="1"/>
+ </dia:connections>
+ </dia:object>
+ <dia:object type="Standard - Line" version="0" id="O17">
+ <dia:attribute name="obj_pos">
+ <dia:point val="21.5,12"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="21.1382,11.95;21.8618,14.05"/>
+ </dia:attribute>
+ <dia:attribute name="conn_endpoints">
+ <dia:point val="21.5,12"/>
+ <dia:point val="21.5,14"/>
+ </dia:attribute>
+ <dia:attribute name="numcp">
+ <dia:int val="1"/>
+ </dia:attribute>
+ <dia:attribute name="start_arrow">
+ <dia:enum val="22"/>
+ </dia:attribute>
+ <dia:attribute name="start_arrow_length">
+ <dia:real val="0.5"/>
+ </dia:attribute>
+ <dia:attribute name="start_arrow_width">
+ <dia:real val="0.5"/>
+ </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="O7" connection="6"/>
+ <dia:connection handle="1" to="O6" connection="1"/>
+ </dia:connections>
+ </dia:object>
+ <dia:object type="Standard - Line" version="0" id="O18">
+ <dia:attribute name="obj_pos">
+ <dia:point val="10,15.5"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="9.95,15.1382;18.05,15.8618"/>
+ </dia:attribute>
+ <dia:attribute name="conn_endpoints">
+ <dia:point val="10,15.5"/>
+ <dia:point val="18,15.5"/>
+ </dia:attribute>
+ <dia:attribute name="numcp">
+ <dia:int val="1"/>
+ </dia:attribute>
+ <dia:attribute name="start_arrow">
+ <dia:enum val="22"/>
+ </dia:attribute>
+ <dia:attribute name="start_arrow_length">
+ <dia:real val="0.5"/>
+ </dia:attribute>
+ <dia:attribute name="start_arrow_width">
+ <dia:real val="0.5"/>
+ </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="O4" connection="4"/>
+ <dia:connection handle="1" to="O6" connection="3"/>
+ </dia:connections>
+ </dia:object>
+ <dia:object type="Standard - Line" version="0" id="O19">
+ <dia:attribute name="obj_pos">
+ <dia:point val="6.5,12"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="6.1382,11.95;6.8618,14.05"/>
+ </dia:attribute>
+ <dia:attribute name="conn_endpoints">
+ <dia:point val="6.5,12"/>
+ <dia:point val="6.5,14"/>
+ </dia:attribute>
+ <dia:attribute name="numcp">
+ <dia:int val="1"/>
+ </dia:attribute>
+ <dia:attribute name="start_arrow">
+ <dia:enum val="22"/>
+ </dia:attribute>
+ <dia:attribute name="start_arrow_length">
+ <dia:real val="0.5"/>
+ </dia:attribute>
+ <dia:attribute name="start_arrow_width">
+ <dia:real val="0.5"/>
+ </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="O3" connection="6"/>
+ <dia:connection handle="1" to="O4" connection="1"/>
+ </dia:connections>
+ </dia:object>
+ <dia:object type="Standard - Line" version="0" id="O20">
+ <dia:attribute name="obj_pos">
+ <dia:point val="6.5,7"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="6.1382,6.95;6.8618,9.05"/>
+ </dia:attribute>
+ <dia:attribute name="conn_endpoints">
+ <dia:point val="6.5,7"/>
+ <dia:point val="6.5,9"/>
+ </dia:attribute>
+ <dia:attribute name="numcp">
+ <dia:int val="1"/>
+ </dia:attribute>
+ <dia:attribute name="start_arrow">
+ <dia:enum val="22"/>
+ </dia:attribute>
+ <dia:attribute name="start_arrow_length">
+ <dia:real val="0.5"/>
+ </dia:attribute>
+ <dia:attribute name="start_arrow_width">
+ <dia:real val="0.5"/>
+ </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="O2" connection="6"/>
+ <dia:connection handle="1" to="O3" connection="1"/>
+ </dia:connections>
+ </dia:object>
</dia:layer>
</dia:diagram>
diff --git a/slides/android-adb-examples/adb-forward-tcp.dia b/slides/android-adb-examples/adb-forward-tcp.dia
index f364a66..45588dd 100644
--- a/slides/android-adb-examples/adb-forward-tcp.dia
+++ b/slides/android-adb-examples/adb-forward-tcp.dia
@@ -295,227 +295,7 @@
<dia:boolean val="true"/>
</dia:attribute>
</dia:object>
- <dia:object type="Standard - ZigZagLine" version="1" id="O8">
- <dia:attribute name="obj_pos">
- <dia:point val="10,15.5"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="9.3882,15.1382;18.1118,15.8618"/>
- </dia:attribute>
- <dia:attribute name="orth_points">
- <dia:point val="10,15.5"/>
- <dia:point val="10,15.5"/>
- <dia:point val="18,15.5"/>
- <dia:point val="18,15.5"/>
- </dia:attribute>
- <dia:attribute name="orth_orient">
- <dia:enum val="0"/>
- <dia:enum val="1"/>
- <dia:enum val="0"/>
- </dia:attribute>
- <dia:attribute name="autorouting">
- <dia:boolean val="true"/>
- </dia:attribute>
- <dia:attribute name="start_arrow">
- <dia:enum val="22"/>
- </dia:attribute>
- <dia:attribute name="start_arrow_length">
- <dia:real val="0.5"/>
- </dia:attribute>
- <dia:attribute name="start_arrow_width">
- <dia:real val="0.5"/>
- </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="O4" connection="4"/>
- <dia:connection handle="1" to="O6" connection="3"/>
- </dia:connections>
- </dia:object>
- <dia:object type="Standard - ZigZagLine" version="1" id="O9">
- <dia:attribute name="obj_pos">
- <dia:point val="21.5,14"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="20.8882,11.6382;21.6118,14.3618"/>
- </dia:attribute>
- <dia:attribute name="orth_points">
- <dia:point val="21.5,14"/>
- <dia:point val="21.5,14"/>
- <dia:point val="21.5,12"/>
- <dia:point val="21.5,12"/>
- </dia:attribute>
- <dia:attribute name="orth_orient">
- <dia:enum val="0"/>
- <dia:enum val="1"/>
- <dia:enum val="0"/>
- </dia:attribute>
- <dia:attribute name="autorouting">
- <dia:boolean val="true"/>
- </dia:attribute>
- <dia:attribute name="start_arrow">
- <dia:enum val="22"/>
- </dia:attribute>
- <dia:attribute name="start_arrow_length">
- <dia:real val="0.5"/>
- </dia:attribute>
- <dia:attribute name="start_arrow_width">
- <dia:real val="0.5"/>
- </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="O6" connection="1"/>
- <dia:connection handle="1" to="O7" connection="6"/>
- </dia:connections>
- </dia:object>
- <dia:object type="Standard - ZigZagLine" version="1" id="O10">
- <dia:attribute name="obj_pos">
- <dia:point val="21.5,7"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="20.8882,6.6382;21.6118,9.3618"/>
- </dia:attribute>
- <dia:attribute name="orth_points">
- <dia:point val="21.5,7"/>
- <dia:point val="21.5,7"/>
- <dia:point val="21.5,9"/>
- <dia:point val="21.5,9"/>
- </dia:attribute>
- <dia:attribute name="orth_orient">
- <dia:enum val="0"/>
- <dia:enum val="1"/>
- <dia:enum val="0"/>
- </dia:attribute>
- <dia:attribute name="autorouting">
- <dia:boolean val="true"/>
- </dia:attribute>
- <dia:attribute name="start_arrow">
- <dia:enum val="22"/>
- </dia:attribute>
- <dia:attribute name="start_arrow_length">
- <dia:real val="0.5"/>
- </dia:attribute>
- <dia:attribute name="start_arrow_width">
- <dia:real val="0.5"/>
- </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="O5" connection="6"/>
- <dia:connection handle="1" to="O7" connection="1"/>
- </dia:connections>
- </dia:object>
- <dia:object type="Standard - ZigZagLine" version="1" id="O11">
- <dia:attribute name="obj_pos">
- <dia:point val="6.5,7"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="5.8882,6.6382;6.6118,9.3618"/>
- </dia:attribute>
- <dia:attribute name="orth_points">
- <dia:point val="6.5,7"/>
- <dia:point val="6.5,7"/>
- <dia:point val="6.5,9"/>
- <dia:point val="6.5,9"/>
- </dia:attribute>
- <dia:attribute name="orth_orient">
- <dia:enum val="0"/>
- <dia:enum val="1"/>
- <dia:enum val="0"/>
- </dia:attribute>
- <dia:attribute name="autorouting">
- <dia:boolean val="true"/>
- </dia:attribute>
- <dia:attribute name="start_arrow">
- <dia:enum val="22"/>
- </dia:attribute>
- <dia:attribute name="start_arrow_length">
- <dia:real val="0.5"/>
- </dia:attribute>
- <dia:attribute name="start_arrow_width">
- <dia:real val="0.5"/>
- </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="O2" connection="6"/>
- <dia:connection handle="1" to="O3" connection="1"/>
- </dia:connections>
- </dia:object>
- <dia:object type="Standard - ZigZagLine" version="1" id="O12">
- <dia:attribute name="obj_pos">
- <dia:point val="6.5,12"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="5.8882,11.6382;6.6118,14.3618"/>
- </dia:attribute>
- <dia:attribute name="orth_points">
- <dia:point val="6.5,12"/>
- <dia:point val="6.5,12"/>
- <dia:point val="6.5,14"/>
- <dia:point val="6.5,14"/>
- </dia:attribute>
- <dia:attribute name="orth_orient">
- <dia:enum val="0"/>
- <dia:enum val="1"/>
- <dia:enum val="0"/>
- </dia:attribute>
- <dia:attribute name="autorouting">
- <dia:boolean val="true"/>
- </dia:attribute>
- <dia:attribute name="start_arrow">
- <dia:enum val="22"/>
- </dia:attribute>
- <dia:attribute name="start_arrow_length">
- <dia:real val="0.5"/>
- </dia:attribute>
- <dia:attribute name="start_arrow_width">
- <dia:real val="0.5"/>
- </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="O3" connection="6"/>
- <dia:connection handle="1" to="O4" connection="1"/>
- </dia:connections>
- </dia:object>
- <dia:object type="Standard - Text" version="1" id="O13">
+ <dia:object type="Standard - Text" version="1" id="O8">
<dia:attribute name="obj_pos">
<dia:point val="6.5,10.5"/>
</dia:attribute>
@@ -551,7 +331,7 @@
<dia:connection handle="0" to="O3" connection="8"/>
</dia:connections>
</dia:object>
- <dia:object type="Standard - Text" version="1" id="O14">
+ <dia:object type="Standard - Text" version="1" id="O9">
<dia:attribute name="obj_pos">
<dia:point val="21.5,10.5"/>
</dia:attribute>
@@ -587,7 +367,7 @@
<dia:connection handle="0" to="O7" connection="8"/>
</dia:connections>
</dia:object>
- <dia:object type="Standard - Text" version="1" id="O15">
+ <dia:object type="Standard - Text" version="1" id="O10">
<dia:attribute name="obj_pos">
<dia:point val="6.5,5.5"/>
</dia:attribute>
@@ -623,7 +403,7 @@
<dia:connection handle="0" to="O2" connection="8"/>
</dia:connections>
</dia:object>
- <dia:object type="Standard - Text" version="1" id="O16">
+ <dia:object type="Standard - Text" version="1" id="O11">
<dia:attribute name="obj_pos">
<dia:point val="21.5,5.5"/>
</dia:attribute>
@@ -659,7 +439,7 @@
<dia:connection handle="0" to="O5" connection="8"/>
</dia:connections>
</dia:object>
- <dia:object type="Standard - Text" version="1" id="O17">
+ <dia:object type="Standard - Text" version="1" id="O12">
<dia:attribute name="obj_pos">
<dia:point val="6.5,15.5"/>
</dia:attribute>
@@ -695,7 +475,7 @@
<dia:connection handle="0" to="O4" connection="8"/>
</dia:connections>
</dia:object>
- <dia:object type="Standard - Text" version="1" id="O18">
+ <dia:object type="Standard - Text" version="1" id="O13">
<dia:attribute name="obj_pos">
<dia:point val="21.5,15.5"/>
</dia:attribute>
@@ -731,7 +511,7 @@
<dia:connection handle="0" to="O6" connection="8"/>
</dia:connections>
</dia:object>
- <dia:object type="Standard - Text" version="1" id="O19">
+ <dia:object type="Standard - Text" version="1" id="O14">
<dia:attribute name="obj_pos">
<dia:point val="21.5,2"/>
</dia:attribute>
@@ -767,7 +547,7 @@
<dia:connection handle="0" to="O1" connection="1"/>
</dia:connections>
</dia:object>
- <dia:object type="Standard - Text" version="1" id="O20">
+ <dia:object type="Standard - Text" version="1" id="O15">
<dia:attribute name="obj_pos">
<dia:point val="6.5,2"/>
</dia:attribute>
@@ -803,5 +583,190 @@
<dia:connection handle="0" to="O0" connection="1"/>
</dia:connections>
</dia:object>
+ <dia:object type="Standard - Line" version="0" id="O16">
+ <dia:attribute name="obj_pos">
+ <dia:point val="6.5,7"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="6.1382,6.95;6.8618,9.05"/>
+ </dia:attribute>
+ <dia:attribute name="conn_endpoints">
+ <dia:point val="6.5,7"/>
+ <dia:point val="6.5,9"/>
+ </dia:attribute>
+ <dia:attribute name="numcp">
+ <dia:int val="1"/>
+ </dia:attribute>
+ <dia:attribute name="start_arrow">
+ <dia:enum val="22"/>
+ </dia:attribute>
+ <dia:attribute name="start_arrow_length">
+ <dia:real val="0.5"/>
+ </dia:attribute>
+ <dia:attribute name="start_arrow_width">
+ <dia:real val="0.5"/>
+ </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="O2" connection="6"/>
+ <dia:connection handle="1" to="O3" connection="1"/>
+ </dia:connections>
+ </dia:object>
+ <dia:object type="Standard - Line" version="0" id="O17">
+ <dia:attribute name="obj_pos">
+ <dia:point val="6.5,12"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="6.1382,11.95;6.8618,14.05"/>
+ </dia:attribute>
+ <dia:attribute name="conn_endpoints">
+ <dia:point val="6.5,12"/>
+ <dia:point val="6.5,14"/>
+ </dia:attribute>
+ <dia:attribute name="numcp">
+ <dia:int val="1"/>
+ </dia:attribute>
+ <dia:attribute name="start_arrow">
+ <dia:enum val="22"/>
+ </dia:attribute>
+ <dia:attribute name="start_arrow_length">
+ <dia:real val="0.5"/>
+ </dia:attribute>
+ <dia:attribute name="start_arrow_width">
+ <dia:real val="0.5"/>
+ </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="O3" connection="6"/>
+ <dia:connection handle="1" to="O4" connection="1"/>
+ </dia:connections>
+ </dia:object>
+ <dia:object type="Standard - Line" version="0" id="O18">
+ <dia:attribute name="obj_pos">
+ <dia:point val="10,15.5"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="9.95,15.1382;18.05,15.8618"/>
+ </dia:attribute>
+ <dia:attribute name="conn_endpoints">
+ <dia:point val="10,15.5"/>
+ <dia:point val="18,15.5"/>
+ </dia:attribute>
+ <dia:attribute name="numcp">
+ <dia:int val="1"/>
+ </dia:attribute>
+ <dia:attribute name="start_arrow">
+ <dia:enum val="22"/>
+ </dia:attribute>
+ <dia:attribute name="start_arrow_length">
+ <dia:real val="0.5"/>
+ </dia:attribute>
+ <dia:attribute name="start_arrow_width">
+ <dia:real val="0.5"/>
+ </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="O4" connection="4"/>
+ <dia:connection handle="1" to="O6" connection="3"/>
+ </dia:connections>
+ </dia:object>
+ <dia:object type="Standard - Line" version="0" id="O19">
+ <dia:attribute name="obj_pos">
+ <dia:point val="21.5,14"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="21.1382,11.95;21.8618,14.05"/>
+ </dia:attribute>
+ <dia:attribute name="conn_endpoints">
+ <dia:point val="21.5,14"/>
+ <dia:point val="21.5,12"/>
+ </dia:attribute>
+ <dia:attribute name="numcp">
+ <dia:int val="1"/>
+ </dia:attribute>
+ <dia:attribute name="start_arrow">
+ <dia:enum val="22"/>
+ </dia:attribute>
+ <dia:attribute name="start_arrow_length">
+ <dia:real val="0.5"/>
+ </dia:attribute>
+ <dia:attribute name="start_arrow_width">
+ <dia:real val="0.5"/>
+ </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="O6" connection="1"/>
+ <dia:connection handle="1" to="O7" connection="6"/>
+ </dia:connections>
+ </dia:object>
+ <dia:object type="Standard - Line" version="0" id="O20">
+ <dia:attribute name="obj_pos">
+ <dia:point val="21.5,9"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="21.1382,6.95;21.8618,9.05"/>
+ </dia:attribute>
+ <dia:attribute name="conn_endpoints">
+ <dia:point val="21.5,9"/>
+ <dia:point val="21.5,7"/>
+ </dia:attribute>
+ <dia:attribute name="numcp">
+ <dia:int val="1"/>
+ </dia:attribute>
+ <dia:attribute name="start_arrow">
+ <dia:enum val="22"/>
+ </dia:attribute>
+ <dia:attribute name="start_arrow_length">
+ <dia:real val="0.5"/>
+ </dia:attribute>
+ <dia:attribute name="start_arrow_width">
+ <dia:real val="0.5"/>
+ </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="O7" connection="1"/>
+ <dia:connection handle="1" to="O5" connection="6"/>
+ </dia:connections>
+ </dia:object>
</dia:layer>
</dia:diagram>
diff --git a/slides/android-adb-introduction/adb-arch.dia b/slides/android-adb-introduction/adb-arch.dia
index 2ee10b5..90e1361 100644
--- a/slides/android-adb-introduction/adb-arch.dia
+++ b/slides/android-adb-introduction/adb-arch.dia
@@ -278,7 +278,7 @@
</dia:attribute>
<dia:connections>
<dia:connection handle="0" to="O5" connection="3"/>
- <dia:connection handle="1" to="O15" connection="6"/>
+ <dia:connection handle="1" to="O14" connection="6"/>
</dia:connections>
</dia:object>
<dia:object type="Standard - ZigZagLine" version="1" id="O7">
@@ -490,42 +490,7 @@ Driver#</dia:string>
<dia:boolean val="true"/>
</dia:attribute>
</dia:object>
- <dia:object type="Standard - ZigZagLine" version="1" id="O13">
- <dia:attribute name="obj_pos">
- <dia:point val="35,18"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="34.3882,14.6382;35.1118,18"/>
- </dia:attribute>
- <dia:attribute name="orth_points">
- <dia:point val="35,18"/>
- <dia:point val="35,18"/>
- <dia:point val="35,15"/>
- <dia:point val="35,15"/>
- </dia:attribute>
- <dia:attribute name="orth_orient">
- <dia:enum val="0"/>
- <dia:enum val="1"/>
- <dia:enum val="0"/>
- </dia:attribute>
- <dia:attribute name="autorouting">
- <dia:boolean val="true"/>
- </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="O4" connection="1"/>
- <dia:connection handle="1" to="O12" connection="6"/>
- </dia:connections>
- </dia:object>
- <dia:object type="Standard - Text" version="1" id="O14">
+ <dia:object type="Standard - Text" version="1" id="O13">
<dia:attribute name="obj_pos">
<dia:point val="35,13"/>
</dia:attribute>
@@ -561,7 +526,7 @@ Driver#</dia:string>
<dia:connection handle="0" to="O12" connection="8"/>
</dia:connections>
</dia:object>
- <dia:object type="Standard - Box" version="0" id="O15">
+ <dia:object type="Standard - Box" version="0" id="O14">
<dia:attribute name="obj_pos">
<dia:point val="13,18"/>
</dia:attribute>
@@ -590,7 +555,7 @@ Driver#</dia:string>
<dia:boolean val="true"/>
</dia:attribute>
</dia:object>
- <dia:object type="Standard - Text" version="1" id="O16">
+ <dia:object type="Standard - Text" version="1" id="O15">
<dia:attribute name="obj_pos">
<dia:point val="14.5,19"/>
</dia:attribute>
@@ -623,10 +588,10 @@ Driver#</dia:string>
<dia:enum val="2"/>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O15" connection="8"/>
+ <dia:connection handle="0" to="O14" connection="8"/>
</dia:connections>
</dia:object>
- <dia:object type="Standard - Box" version="0" id="O17">
+ <dia:object type="Standard - Box" version="0" id="O16">
<dia:attribute name="obj_pos">
<dia:point val="19,8"/>
</dia:attribute>
@@ -655,7 +620,7 @@ Driver#</dia:string>
<dia:boolean val="true"/>
</dia:attribute>
</dia:object>
- <dia:object type="Standard - Text" version="1" id="O18">
+ <dia:object type="Standard - Text" version="1" id="O17">
<dia:attribute name="obj_pos">
<dia:point val="22,9.5"/>
</dia:attribute>
@@ -689,29 +654,50 @@ Clients#</dia:string>
<dia:enum val="2"/>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O17" connection="8"/>
+ <dia:connection handle="0" to="O16" connection="8"/>
</dia:connections>
</dia:object>
- <dia:object type="Standard - ZigZagLine" version="1" id="O19">
+ <dia:object type="Standard - Line" version="0" id="O18">
<dia:attribute name="obj_pos">
<dia:point val="22,11"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="21.3882,11;22.1118,15.3114"/>
+ <dia:rectangle val="21.6382,10.95;22.3618,15.1118"/>
</dia:attribute>
- <dia:attribute name="orth_points">
+ <dia:attribute name="conn_endpoints">
<dia:point val="22,11"/>
- <dia:point val="22,11"/>
- <dia:point val="22,14.9496"/>
- <dia:point val="22,14.9496"/>
+ <dia:point val="22,15"/>
</dia:attribute>
- <dia:attribute name="orth_orient">
- <dia:enum val="0"/>
- <dia:enum val="1"/>
- <dia:enum val="0"/>
+ <dia:attribute name="numcp">
+ <dia:int val="1"/>
</dia:attribute>
- <dia:attribute name="autorouting">
- <dia:boolean val="true"/>
+ <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="O16" connection="6"/>
+ <dia:connection handle="1" to="O5" connection="1"/>
+ </dia:connections>
+ </dia:object>
+ <dia:object type="Standard - Line" version="0" id="O19">
+ <dia:attribute name="obj_pos">
+ <dia:point val="35,18"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="34.6382,14.8882;35.3618,18.05"/>
+ </dia:attribute>
+ <dia:attribute name="conn_endpoints">
+ <dia:point val="35,18"/>
+ <dia:point val="35,15"/>
+ </dia:attribute>
+ <dia:attribute name="numcp">
+ <dia:int val="1"/>
</dia:attribute>
<dia:attribute name="end_arrow">
<dia:enum val="22"/>
@@ -723,8 +709,8 @@ Clients#</dia:string>
<dia:real val="0.5"/>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O17" connection="6"/>
- <dia:connection handle="1" to="O5" connection="8"/>
+ <dia:connection handle="0" to="O4" connection="1"/>
+ <dia:connection handle="1" to="O12" connection="6"/>
</dia:connections>
</dia:object>
</dia:layer>
diff --git a/slides/android-framework-ipc/binder-call-stack.dia b/slides/android-framework-ipc/binder-call-stack.dia
index aa4a279..ffd0249 100644
--- a/slides/android-framework-ipc/binder-call-stack.dia
+++ b/slides/android-framework-ipc/binder-call-stack.dia
@@ -455,21 +455,21 @@
</dia:object>
<dia:object type="Standard - ZigZagLine" version="1" id="O12">
<dia:attribute name="obj_pos">
- <dia:point val="20.5,10"/>
+ <dia:point val="20.5,15"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="19.8882,10;20.6118,13.3115"/>
+ <dia:rectangle val="20.45,14.95;22.3618,18.1118"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="20.5,10"/>
- <dia:point val="20.5,10"/>
- <dia:point val="20.5,12.9497"/>
- <dia:point val="20.5,12.9497"/>
+ <dia:point val="20.5,15"/>
+ <dia:point val="20.5,16.5"/>
+ <dia:point val="22,16.5"/>
+ <dia:point val="22,18"/>
</dia:attribute>
<dia:attribute name="orth_orient">
- <dia:enum val="0"/>
<dia:enum val="1"/>
<dia:enum val="0"/>
+ <dia:enum val="1"/>
</dia:attribute>
<dia:attribute name="autorouting">
<dia:boolean val="true"/>
@@ -484,22 +484,21 @@
<dia:real val="0.5"/>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O0" connection="6"/>
- <dia:connection handle="1" to="O2" connection="8"/>
+ <dia:connection handle="0" to="O2" connection="6"/>
</dia:connections>
</dia:object>
<dia:object type="Standard - ZigZagLine" version="1" id="O13">
<dia:attribute name="obj_pos">
- <dia:point val="20.5,15"/>
+ <dia:point val="31,18"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="20.45,14.95;22.3618,18.1118"/>
+ <dia:rectangle val="30.95,15.9385;32.8618,18.05"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="20.5,15"/>
- <dia:point val="20.5,16.5"/>
- <dia:point val="22,16.5"/>
- <dia:point val="22,18"/>
+ <dia:point val="31,18"/>
+ <dia:point val="31,17.0251"/>
+ <dia:point val="32.5,17.0251"/>
+ <dia:point val="32.5,16.0503"/>
</dia:attribute>
<dia:attribute name="orth_orient">
<dia:enum val="1"/>
@@ -519,29 +518,22 @@
<dia:real val="0.5"/>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O2" connection="6"/>
+ <dia:connection handle="1" to="O6" connection="8"/>
</dia:connections>
</dia:object>
- <dia:object type="Standard - ZigZagLine" version="1" id="O14">
+ <dia:object type="Standard - Line" version="0" id="O14">
<dia:attribute name="obj_pos">
- <dia:point val="31,18"/>
+ <dia:point val="20.5,10"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="30.95,15.9385;32.8618,18.05"/>
+ <dia:rectangle val="20.1382,9.95;20.8618,13.1118"/>
</dia:attribute>
- <dia:attribute name="orth_points">
- <dia:point val="31,18"/>
- <dia:point val="31,17.0251"/>
- <dia:point val="32.5,17.0251"/>
- <dia:point val="32.5,16.0503"/>
- </dia:attribute>
- <dia:attribute name="orth_orient">
- <dia:enum val="1"/>
- <dia:enum val="0"/>
- <dia:enum val="1"/>
+ <dia:attribute name="conn_endpoints">
+ <dia:point val="20.5,10"/>
+ <dia:point val="20.5,13"/>
</dia:attribute>
- <dia:attribute name="autorouting">
- <dia:boolean val="true"/>
+ <dia:attribute name="numcp">
+ <dia:int val="1"/>
</dia:attribute>
<dia:attribute name="end_arrow">
<dia:enum val="22"/>
@@ -553,29 +545,23 @@
<dia:real val="0.5"/>
</dia:attribute>
<dia:connections>
- <dia:connection handle="1" to="O6" connection="8"/>
+ <dia:connection handle="0" to="O0" connection="6"/>
+ <dia:connection handle="1" to="O2" connection="1"/>
</dia:connections>
</dia:object>
- <dia:object type="Standard - ZigZagLine" version="1" id="O15">
+ <dia:object type="Standard - Line" version="0" id="O15">
<dia:attribute name="obj_pos">
<dia:point val="32.5,14"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="31.8882,11.6382;32.6118,14"/>
+ <dia:rectangle val="32.1382,11.8882;32.8618,14.05"/>
</dia:attribute>
- <dia:attribute name="orth_points">
- <dia:point val="32.5,14"/>
+ <dia:attribute name="conn_endpoints">
<dia:point val="32.5,14"/>
<dia:point val="32.5,12"/>
- <dia:point val="32.5,12"/>
- </dia:attribute>
- <dia:attribute name="orth_orient">
- <dia:enum val="0"/>
- <dia:enum val="1"/>
- <dia:enum val="0"/>
</dia:attribute>
- <dia:attribute name="autorouting">
- <dia:boolean val="true"/>
+ <dia:attribute name="numcp">
+ <dia:int val="1"/>
</dia:attribute>
<dia:attribute name="end_arrow">
<dia:enum val="22"/>
@@ -591,26 +577,19 @@
<dia:connection handle="1" to="O8" connection="6"/>
</dia:connections>
</dia:object>
- <dia:object type="Standard - ZigZagLine" version="1" id="O16">
+ <dia:object type="Standard - Line" version="0" id="O16">
<dia:attribute name="obj_pos">
- <dia:point val="32.5,9.94974"/>
+ <dia:point val="32.5,10"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="31.8882,7.6382;32.6118,9.94974"/>
+ <dia:rectangle val="32.1382,7.8882;32.8618,10.05"/>
</dia:attribute>
- <dia:attribute name="orth_points">
- <dia:point val="32.5,9.94974"/>
- <dia:point val="32.5,9.94974"/>
- <dia:point val="32.5,8"/>
+ <dia:attribute name="conn_endpoints">
+ <dia:point val="32.5,10"/>
<dia:point val="32.5,8"/>
</dia:attribute>
- <dia:attribute name="orth_orient">
- <dia:enum val="0"/>
- <dia:enum val="1"/>
- <dia:enum val="0"/>
- </dia:attribute>
- <dia:attribute name="autorouting">
- <dia:boolean val="true"/>
+ <dia:attribute name="numcp">
+ <dia:int val="1"/>
</dia:attribute>
<dia:attribute name="end_arrow">
<dia:enum val="22"/>
@@ -622,7 +601,7 @@
<dia:real val="0.5"/>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O8" connection="8"/>
+ <dia:connection handle="0" to="O8" connection="1"/>
<dia:connection handle="1" to="O9" connection="6"/>
</dia:connections>
</dia:object>
diff --git a/slides/android-framework-native-services/system-server-boot.dia b/slides/android-framework-native-services/system-server-boot.dia
index 3475d1d..b940a6f 100644
--- a/slides/android-framework-native-services/system-server-boot.dia
+++ b/slides/android-framework-native-services/system-server-boot.dia
@@ -179,112 +179,7 @@
<dia:boolean val="true"/>
</dia:attribute>
</dia:object>
- <dia:object type="Standard - ZigZagLine" version="1" id="O4">
- <dia:attribute name="obj_pos">
- <dia:point val="21,8"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="20.3882,8;21.1118,10.3618"/>
- </dia:attribute>
- <dia:attribute name="orth_points">
- <dia:point val="21,8"/>
- <dia:point val="21,8"/>
- <dia:point val="21,10"/>
- <dia:point val="21,10"/>
- </dia:attribute>
- <dia:attribute name="orth_orient">
- <dia:enum val="0"/>
- <dia:enum val="1"/>
- <dia:enum val="0"/>
- </dia:attribute>
- <dia:attribute name="autorouting">
- <dia:boolean val="true"/>
- </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="O0" connection="6"/>
- <dia:connection handle="1" to="O1" connection="1"/>
- </dia:connections>
- </dia:object>
- <dia:object type="Standard - ZigZagLine" version="1" id="O5">
- <dia:attribute name="obj_pos">
- <dia:point val="21,12"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="20.3882,12;21.1118,14.3618"/>
- </dia:attribute>
- <dia:attribute name="orth_points">
- <dia:point val="21,12"/>
- <dia:point val="21,12"/>
- <dia:point val="21,14"/>
- <dia:point val="21,14"/>
- </dia:attribute>
- <dia:attribute name="orth_orient">
- <dia:enum val="0"/>
- <dia:enum val="1"/>
- <dia:enum val="0"/>
- </dia:attribute>
- <dia:attribute name="autorouting">
- <dia:boolean val="true"/>
- </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="O1" connection="6"/>
- <dia:connection handle="1" to="O2" connection="1"/>
- </dia:connections>
- </dia:object>
- <dia:object type="Standard - ZigZagLine" version="1" id="O6">
- <dia:attribute name="obj_pos">
- <dia:point val="21,16"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="20.3882,16;21.1118,18.3618"/>
- </dia:attribute>
- <dia:attribute name="orth_points">
- <dia:point val="21,16"/>
- <dia:point val="21,16"/>
- <dia:point val="21,18"/>
- <dia:point val="21,18"/>
- </dia:attribute>
- <dia:attribute name="orth_orient">
- <dia:enum val="0"/>
- <dia:enum val="1"/>
- <dia:enum val="0"/>
- </dia:attribute>
- <dia:attribute name="autorouting">
- <dia:boolean val="true"/>
- </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="O2" connection="6"/>
- <dia:connection handle="1" to="O3" connection="1"/>
- </dia:connections>
- </dia:object>
- <dia:object type="Standard - Text" version="1" id="O7">
+ <dia:object type="Standard - Text" version="1" id="O4">
<dia:attribute name="obj_pos">
<dia:point val="21,7"/>
</dia:attribute>
@@ -320,7 +215,7 @@
<dia:connection handle="0" to="O0" connection="8"/>
</dia:connections>
</dia:object>
- <dia:object type="Standard - Text" version="1" id="O8">
+ <dia:object type="Standard - Text" version="1" id="O5">
<dia:attribute name="obj_pos">
<dia:point val="21,11"/>
</dia:attribute>
@@ -356,7 +251,7 @@
<dia:connection handle="0" to="O1" connection="8"/>
</dia:connections>
</dia:object>
- <dia:object type="Standard - Text" version="1" id="O9">
+ <dia:object type="Standard - Text" version="1" id="O6">
<dia:attribute name="obj_pos">
<dia:point val="21,15"/>
</dia:attribute>
@@ -392,17 +287,17 @@
<dia:connection handle="0" to="O2" connection="8"/>
</dia:connections>
</dia:object>
- <dia:object type="Standard - ZigZagLine" version="1" id="O10">
+ <dia:object type="Standard - ZigZagLine" version="1" id="O7">
<dia:attribute name="obj_pos">
<dia:point val="25,19"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="24.8882,14.6382;26.05,19.05"/>
+ <dia:rectangle val="24.8882,14.6382;26.1,19.05"/>
</dia:attribute>
<dia:attribute name="orth_points">
<dia:point val="25,19"/>
- <dia:point val="26,19"/>
- <dia:point val="26,15"/>
+ <dia:point val="26.05,19"/>
+ <dia:point val="26.05,15"/>
<dia:point val="25,15"/>
</dia:attribute>
<dia:attribute name="orth_orient">
@@ -427,7 +322,7 @@
<dia:connection handle="1" to="O2" connection="4"/>
</dia:connections>
</dia:object>
- <dia:object type="Standard - Text" version="1" id="O11">
+ <dia:object type="Standard - Text" version="1" id="O8">
<dia:attribute name="obj_pos">
<dia:point val="21,19"/>
</dia:attribute>
@@ -463,7 +358,7 @@
<dia:connection handle="0" to="O3" connection="8"/>
</dia:connections>
</dia:object>
- <dia:object type="Standard - Text" version="1" id="O12">
+ <dia:object type="Standard - Text" version="1" id="O9">
<dia:attribute name="obj_pos">
<dia:point val="14,17"/>
</dia:attribute>
@@ -496,7 +391,7 @@
<dia:enum val="2"/>
</dia:attribute>
</dia:object>
- <dia:object type="Standard - Text" version="1" id="O13">
+ <dia:object type="Standard - Text" version="1" id="O10">
<dia:attribute name="obj_pos">
<dia:point val="27,17"/>
</dia:attribute>
@@ -529,5 +424,89 @@
<dia:enum val="2"/>
</dia:attribute>
</dia:object>
+ <dia:object type="Standard - Line" version="0" id="O11">
+ <dia:attribute name="obj_pos">
+ <dia:point val="21,8"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="20.6382,7.95;21.3618,10.1118"/>
+ </dia:attribute>
+ <dia:attribute name="conn_endpoints">
+ <dia:point val="21,8"/>
+ <dia:point val="21,10"/>
+ </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="O0" connection="6"/>
+ <dia:connection handle="1" to="O1" connection="1"/>
+ </dia:connections>
+ </dia:object>
+ <dia:object type="Standard - Line" version="0" id="O12">
+ <dia:attribute name="obj_pos">
+ <dia:point val="21,12"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="20.6382,11.95;21.3618,14.1118"/>
+ </dia:attribute>
+ <dia:attribute name="conn_endpoints">
+ <dia:point val="21,12"/>
+ <dia:point val="21,14"/>
+ </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="O1" connection="6"/>
+ <dia:connection handle="1" to="O2" connection="1"/>
+ </dia:connections>
+ </dia:object>
+ <dia:object type="Standard - Line" version="0" id="O13">
+ <dia:attribute name="obj_pos">
+ <dia:point val="21,16"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="20.6382,15.95;21.3618,18.1118"/>
+ </dia:attribute>
+ <dia:attribute name="conn_endpoints">
+ <dia:point val="21,16"/>
+ <dia:point val="21,18"/>
+ </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="O2" connection="6"/>
+ <dia:connection handle="1" to="O3" connection="1"/>
+ </dia:connections>
+ </dia:object>
</dia:layer>
</dia:diagram>
diff --git a/slides/android-native-layer-stagefright/stagefright.dia b/slides/android-native-layer-stagefright/stagefright.dia
index a6ed3ea..1c202a7 100644
--- a/slides/android-native-layer-stagefright/stagefright.dia
+++ b/slides/android-native-layer-stagefright/stagefright.dia
@@ -251,41 +251,6 @@
</dia:object>
<dia:object type="Standard - ZigZagLine" version="1" id="O6">
<dia:attribute name="obj_pos">
- <dia:point val="28,8"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="27.3882,8;28.1118,12.3618"/>
- </dia:attribute>
- <dia:attribute name="orth_points">
- <dia:point val="28,8"/>
- <dia:point val="28,8"/>
- <dia:point val="28,12"/>
- <dia:point val="28,12"/>
- </dia:attribute>
- <dia:attribute name="orth_orient">
- <dia:enum val="0"/>
- <dia:enum val="1"/>
- <dia:enum val="0"/>
- </dia:attribute>
- <dia:attribute name="autorouting">
- <dia:boolean val="true"/>
- </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="O0" connection="6"/>
- <dia:connection handle="1" to="O2" connection="1"/>
- </dia:connections>
- </dia:object>
- <dia:object type="Standard - ZigZagLine" version="1" id="O7">
- <dia:attribute name="obj_pos">
<dia:point val="31,8"/>
</dia:attribute>
<dia:attribute name="obj_bb">
@@ -318,7 +283,7 @@
<dia:connection handle="1" to="O3" connection="1"/>
</dia:connections>
</dia:object>
- <dia:object type="Standard - Text" version="1" id="O8">
+ <dia:object type="Standard - Text" version="1" id="O7">
<dia:attribute name="obj_pos">
<dia:point val="19,13.5"/>
</dia:attribute>
@@ -354,7 +319,7 @@
<dia:connection handle="0" to="O1" connection="8"/>
</dia:connections>
</dia:object>
- <dia:object type="Standard - Text" version="1" id="O9">
+ <dia:object type="Standard - Text" version="1" id="O8">
<dia:attribute name="obj_pos">
<dia:point val="28,13.5"/>
</dia:attribute>
@@ -390,7 +355,7 @@
<dia:connection handle="0" to="O2" connection="8"/>
</dia:connections>
</dia:object>
- <dia:object type="Standard - Text" version="1" id="O10">
+ <dia:object type="Standard - Text" version="1" id="O9">
<dia:attribute name="obj_pos">
<dia:point val="37,13.5"/>
</dia:attribute>
@@ -426,7 +391,7 @@
<dia:connection handle="0" to="O3" connection="8"/>
</dia:connections>
</dia:object>
- <dia:object type="Standard - Box" version="0" id="O11">
+ <dia:object type="Standard - Box" version="0" id="O10">
<dia:attribute name="obj_pos">
<dia:point val="45,12"/>
</dia:attribute>
@@ -455,17 +420,17 @@
<dia:boolean val="true"/>
</dia:attribute>
</dia:object>
- <dia:object type="Standard - ZigZagLine" version="1" id="O12">
+ <dia:object type="Standard - ZigZagLine" version="1" id="O11">
<dia:attribute name="obj_pos">
<dia:point val="41,13.5"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="41,13.1382;45.1118,13.8618"/>
+ <dia:rectangle val="40.95,13.1382;45.1118,13.8618"/>
</dia:attribute>
<dia:attribute name="orth_points">
<dia:point val="41,13.5"/>
- <dia:point val="41,13.5"/>
- <dia:point val="45,13.5"/>
+ <dia:point val="41.05,13.5"/>
+ <dia:point val="44.95,13.5"/>
<dia:point val="45,13.5"/>
</dia:attribute>
<dia:attribute name="orth_orient">
@@ -487,10 +452,10 @@
</dia:attribute>
<dia:connections>
<dia:connection handle="0" to="O3" connection="4"/>
- <dia:connection handle="1" to="O11" connection="3"/>
+ <dia:connection handle="1" to="O10" connection="3"/>
</dia:connections>
</dia:object>
- <dia:object type="Standard - Text" version="1" id="O13">
+ <dia:object type="Standard - Text" version="1" id="O12">
<dia:attribute name="obj_pos">
<dia:point val="49,13.5"/>
</dia:attribute>
@@ -523,10 +488,10 @@
<dia:enum val="2"/>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O11" connection="8"/>
+ <dia:connection handle="0" to="O10" connection="8"/>
</dia:connections>
</dia:object>
- <dia:object type="Standard - ZigZagLine" version="1" id="O14">
+ <dia:object type="Standard - ZigZagLine" version="1" id="O13">
<dia:attribute name="obj_pos">
<dia:point val="29,15"/>
</dia:attribute>
@@ -557,10 +522,10 @@
<dia:real val="0.5"/>
</dia:attribute>
<dia:connections>
- <dia:connection handle="1" to="O17" connection="1"/>
+ <dia:connection handle="1" to="O16" connection="1"/>
</dia:connections>
</dia:object>
- <dia:object type="Standard - ZigZagLine" version="1" id="O15">
+ <dia:object type="Standard - ZigZagLine" version="1" id="O14">
<dia:attribute name="obj_pos">
<dia:point val="27,15"/>
</dia:attribute>
@@ -591,10 +556,10 @@
<dia:real val="0.5"/>
</dia:attribute>
<dia:connections>
- <dia:connection handle="1" to="O16" connection="1"/>
+ <dia:connection handle="1" to="O15" connection="1"/>
</dia:connections>
</dia:object>
- <dia:object type="Standard - Box" version="0" id="O16">
+ <dia:object type="Standard - Box" version="0" id="O15">
<dia:attribute name="obj_pos">
<dia:point val="19,18"/>
</dia:attribute>
@@ -623,7 +588,7 @@
<dia:boolean val="true"/>
</dia:attribute>
</dia:object>
- <dia:object type="Standard - Box" version="0" id="O17">
+ <dia:object type="Standard - Box" version="0" id="O16">
<dia:attribute name="obj_pos">
<dia:point val="29,18"/>
</dia:attribute>
@@ -652,7 +617,7 @@
<dia:boolean val="true"/>
</dia:attribute>
</dia:object>
- <dia:object type="Standard - Text" version="1" id="O18">
+ <dia:object type="Standard - Text" version="1" id="O17">
<dia:attribute name="obj_pos">
<dia:point val="23,19.5"/>
</dia:attribute>
@@ -686,10 +651,10 @@ Decoders#</dia:string>
<dia:enum val="2"/>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O16" connection="8"/>
+ <dia:connection handle="0" to="O15" connection="8"/>
</dia:connections>
</dia:object>
- <dia:object type="Standard - Text" version="1" id="O19">
+ <dia:object type="Standard - Text" version="1" id="O18">
<dia:attribute name="obj_pos">
<dia:point val="33,19.5"/>
</dia:attribute>
@@ -723,7 +688,35 @@ Decoders#</dia:string>
<dia:enum val="2"/>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O17" connection="8"/>
+ <dia:connection handle="0" to="O16" connection="8"/>
+ </dia:connections>
+ </dia:object>
+ <dia:object type="Standard - Line" version="0" id="O19">
+ <dia:attribute name="obj_pos">
+ <dia:point val="28,8"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="27.6382,7.95;28.3618,12.1118"/>
+ </dia:attribute>
+ <dia:attribute name="conn_endpoints">
+ <dia:point val="28,8"/>
+ <dia:point val="28,12"/>
+ </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="O0" connection="6"/>
+ <dia:connection handle="1" to="O2" connection="1"/>
</dia:connections>
</dia:object>
</dia:layer>
-----------------------------------------------------------------------
Summary of changes:
slides/android-adb-examples/adb-forward-jdwp.dia | 421 +++++++++-----------
slides/android-adb-examples/adb-forward-tcp.dia | 421 +++++++++-----------
slides/android-adb-introduction/adb-arch.dia | 100 ++---
slides/android-framework-ipc/binder-call-stack.dia | 97 ++---
.../system-server-boot.dia | 209 +++++-----
.../stagefright.dia | 105 +++--
6 files changed, 610 insertions(+), 743 deletions(-)
More information about the training-materials-updates
mailing list