diff mbox

[Branch,~glmark2-dev/glmark2/trunk] Rev 237: Android: Use string resources for button labels.

Message ID 20120719101611.19448.66486.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

alexandros.frantzis@linaro.org July 19, 2012, 10:16 a.m. UTC 
------------------------------------------------------------
revno: 237
committer: Alexandros Frantzis <alexandros.frantzis@linaro.org>
branch nick: trunk
timestamp: Thu 2012-07-19 12:18:06 +0300
message:
  Android: Use string resources for button labels.
  
  This is required when building in-tree.
modified:
  android/res/layout/activity_editor.xml
  android/res/layout/activity_main.xml
  android/res/values/strings.xml


--
lp:glmark2
https://code.launchpad.net/~glmark2-dev/glmark2/trunk

You are subscribed to branch lp:glmark2.
To unsubscribe from this branch go to https://code.launchpad.net/~glmark2-dev/glmark2/trunk/+edit-subscription
diff mbox

Patch

=== modified file 'android/res/layout/activity_editor.xml'
--- android/res/layout/activity_editor.xml	2012-07-06 13:31:01 +0000
+++ android/res/layout/activity_editor.xml	2012-07-19 09:18:06 +0000
@@ -13,14 +13,14 @@ 
                 android:layout_height="wrap_content"
                 android:layout_weight="1.0"
                 android:layout_alignParentBottom="true"
-                android:text="Run" />
+                android:text="@string/runButtonText" />
 
         <Button android:id="@+id/saveButton"
                 android:layout_width="0dip"
                 android:layout_height="wrap_content"
                 android:layout_weight="1.0"
                 android:layout_alignParentBottom="true"
-                android:text="Save" />
+                android:text="@string/saveButtonText" />
 
     </LinearLayout>
 

=== modified file 'android/res/layout/activity_main.xml'
--- android/res/layout/activity_main.xml	2012-07-06 13:31:01 +0000
+++ android/res/layout/activity_main.xml	2012-07-19 09:18:06 +0000
@@ -7,7 +7,7 @@ 
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"
-            android:text="Run" />
+            android:text="@string/runButtonText" />
 
     <ListView android:id="@+id/benchmarkListView"
               android:layout_above="@id/runButton"

=== modified file 'android/res/values/strings.xml'
--- android/res/values/strings.xml	2012-07-03 14:19:27 +0000
+++ android/res/values/strings.xml	2012-07-19 09:18:06 +0000
@@ -4,4 +4,6 @@ 
     <string name="title_activity_main">GLMark2</string>
     <string name="title_activity_editor">GLMark2 Benchmark Editor</string>
     <string name="title_activity_glmark2">GLMark2</string>
+    <string name="runButtonText">Run</string>
+    <string name="saveButtonText">Save</string>
 </resources>