aboutsummaryrefslogtreecommitdiffstats
path: root/templates/activities
diff options
context:
space:
mode:
Diffstat (limited to 'templates/activities')
-rw-r--r--[-rwxr-xr-x]templates/activities/FullscreenActivity/root/res/layout/activity_fullscreen.xml.ftl4
-rw-r--r--templates/activities/FullscreenActivity/root/res/values/strings.xml.ftl3
-rw-r--r--[-rwxr-xr-x]templates/activities/FullscreenActivity/root/src/app_package/FullscreenActivity.java.ftl2
3 files changed, 4 insertions, 5 deletions
diff --git a/templates/activities/FullscreenActivity/root/res/layout/activity_fullscreen.xml.ftl b/templates/activities/FullscreenActivity/root/res/layout/activity_fullscreen.xml.ftl
index b96ad1e..39f801a 100755..100644
--- a/templates/activities/FullscreenActivity/root/res/layout/activity_fullscreen.xml.ftl
+++ b/templates/activities/FullscreenActivity/root/res/layout/activity_fullscreen.xml.ftl
@@ -33,12 +33,12 @@
android:orientation="horizontal"
tools:ignore="UselessParent">
- <Button android:id="@+id/button1"
+ <Button android:id="@+id/dummy_button"
style="?buttonBarButtonStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:text="@string/dummy_button1" />
+ android:text="@string/dummy_button" />
</LinearLayout>
</FrameLayout>
diff --git a/templates/activities/FullscreenActivity/root/res/values/strings.xml.ftl b/templates/activities/FullscreenActivity/root/res/values/strings.xml.ftl
index 5a43acf..00043bd 100644
--- a/templates/activities/FullscreenActivity/root/res/values/strings.xml.ftl
+++ b/templates/activities/FullscreenActivity/root/res/values/strings.xml.ftl
@@ -3,8 +3,7 @@
<#if !isNewProject>
<string name="title_${simpleName}">${escapeXmlString(activityTitle)}</string>
</#if>
- <string name="dummy_button1">Button 1</string>
- <string name="dummy_button2">Button 2</string>
+ <string name="dummy_button">Dummy Button</string>
<string name="dummy_content">DUMMY\nCONTENT</string>
</resources>
diff --git a/templates/activities/FullscreenActivity/root/src/app_package/FullscreenActivity.java.ftl b/templates/activities/FullscreenActivity/root/src/app_package/FullscreenActivity.java.ftl
index 729cbec..4714244 100755..100644
--- a/templates/activities/FullscreenActivity/root/src/app_package/FullscreenActivity.java.ftl
+++ b/templates/activities/FullscreenActivity/root/src/app_package/FullscreenActivity.java.ftl
@@ -118,7 +118,7 @@ public class ${activityClass} extends Activity {
// Upon interacting with UI controls, delay any scheduled hide()
// operations to prevent the jarring behavior of controls going away
// while interacting with the UI.
- findViewById(R.id.button1).setOnTouchListener(mDelayHideTouchListener);
+ findViewById(R.id.dummy_button).setOnTouchListener(mDelayHideTouchListener);
}
@Override