From c18a56debd8df68c5bd823576346e048fc8788ef Mon Sep 17 00:00:00 2001 From: Tim Redfern Date: Wed, 4 Dec 2013 13:00:22 +0000 Subject: text overlay and layout reorganised --- bin/classes/com/example/rotorm/R$id.class | Bin 524 -> 624 bytes bin/classes/com/example/rotorm/R$layout.class | Bin 394 -> 394 bytes bin/classes/com/example/rotorm/R$menu.class | Bin 388 -> 388 bytes bin/classes/com/example/rotorm/R$string.class | Bin 472 -> 472 bytes bin/classes/com/example/rotorm/R$style.class | Bin 431 -> 431 bytes gen/com/example/rotorm/R.java | 7 +++++-- res/layout/main.xml | 29 ++++++++++++++++++++++---- 7 files changed, 30 insertions(+), 6 deletions(-) diff --git a/bin/classes/com/example/rotorm/R$id.class b/bin/classes/com/example/rotorm/R$id.class index 3a3dc17..9f7c352 100644 Binary files a/bin/classes/com/example/rotorm/R$id.class and b/bin/classes/com/example/rotorm/R$id.class differ diff --git a/bin/classes/com/example/rotorm/R$layout.class b/bin/classes/com/example/rotorm/R$layout.class index d5f016a..ca72178 100644 Binary files a/bin/classes/com/example/rotorm/R$layout.class and b/bin/classes/com/example/rotorm/R$layout.class differ diff --git a/bin/classes/com/example/rotorm/R$menu.class b/bin/classes/com/example/rotorm/R$menu.class index 88bf13a..c610fe8 100644 Binary files a/bin/classes/com/example/rotorm/R$menu.class and b/bin/classes/com/example/rotorm/R$menu.class differ diff --git a/bin/classes/com/example/rotorm/R$string.class b/bin/classes/com/example/rotorm/R$string.class index bff6cf5..d961e03 100644 Binary files a/bin/classes/com/example/rotorm/R$string.class and b/bin/classes/com/example/rotorm/R$string.class differ diff --git a/bin/classes/com/example/rotorm/R$style.class b/bin/classes/com/example/rotorm/R$style.class index 54c540c..e690261 100644 Binary files a/bin/classes/com/example/rotorm/R$style.class and b/bin/classes/com/example/rotorm/R$style.class differ diff --git a/gen/com/example/rotorm/R.java b/gen/com/example/rotorm/R.java index 3371583..db9d489 100644 --- a/gen/com/example/rotorm/R.java +++ b/gen/com/example/rotorm/R.java @@ -24,11 +24,14 @@ public final class R { public static final int ic_launcher=0x7f020000; } public static final class id { - public static final int action_settings=0x7f080004; - public static final int buttonClick=0x7f080003; + public static final int action_settings=0x7f080007; + public static final int buttonClick=0x7f080006; + public static final int buttonholder=0x7f080005; public static final int layout=0x7f080000; public static final int preview=0x7f080001; public static final int surfaceView=0x7f080002; + public static final int textView=0x7f080004; + public static final int timecode=0x7f080003; } public static final class layout { public static final int main=0x7f030000; diff --git a/res/layout/main.xml b/res/layout/main.xml index 2041418..63b569b 100644 --- a/res/layout/main.xml +++ b/res/layout/main.xml @@ -17,10 +17,31 @@ android:layout_height="wrap_content" /> -