Changeset 3e9f39e in galcon-client for res


Ignore:
Timestamp:
May 28, 2010, 12:47:31 AM (15 years ago)
Author:
Zero Cool <devnull@…>
Branches:
master
Children:
1291908
Parents:
1a91f0d (diff), 8a4e64f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge with a30e7e8b565e27d0defe9bba05b1e60e10906df6

Location:
res
Files:
7 added
2 edited

Legend:

Unmodified
Added
Removed

  • res/layout/main.xml

    r1a91f0d r3e9f39e  
    11<?xml version="1.0" encoding="utf-8"?>
    2 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    3     android:orientation="vertical"
     2<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
    43    android:layout_width="fill_parent"
    5     android:layout_height="fill_parent"
    6     >
    7 <TextView 
    8     android:layout_width="fill_parent"
    9     android:layout_height="wrap_content"
    10     android:text="@string/hello"
    11     />
    12 </LinearLayout>
     4    android:layout_height="fill_parent">
     5   
     6    <com.example.helloandroid.GameView
     7      android:id="@+id/lunar"
     8      android:layout_width="fill_parent"
     9      android:layout_height="fill_parent"/>
     10   
     11    <RelativeLayout
     12        android:layout_width="fill_parent"
     13        android:layout_height="fill_parent" >
     14        <TextView
     15          android:id="@+id/text"
     16                  android:text="@string/lunar_layout_text_text"
     17                  android:visibility="visible"
     18          android:layout_width="wrap_content"
     19          android:layout_height="wrap_content"
     20          android:layout_centerInParent="true"
     21          android:gravity="center_horizontal"
     22          android:textColor="#88ffffff"
     23          android:textSize="24sp"/>
     24     </RelativeLayout>
     25         
     26</FrameLayout>

  • res/values/strings.xml

    r1a91f0d r3e9f39e  
    11<?xml version="1.0" encoding="utf-8"?>
     2
    23<resources>
     4        <string name="app_name">Lunar Lander</string>
     5       
     6    <string name="menu_start">Start</string>
     7    <string name="menu_stop">Stop</string>
     8    <string name="menu_pause">Pause</string>
     9    <string name="menu_resume">Resume</string>
     10    <string name="menu_easy">Easy</string>
     11    <string name="menu_medium">Medium</string>
     12    <string name="menu_hard">Hard</string>
     13   
     14    <string name="mode_ready">Lunar Lander\nPress Up To Play</string>
     15        <string name="mode_pause">Paused\nPress Up To Resume</string>
     16        <string name="mode_lose">Game Over\nPress Up To Play</string>
     17        <string name="mode_win_prefix">Success!\n</string>
     18        <string name="mode_win_suffix">in a row\nPress Up to Play</string>
     19       
     20        <string name="message_stopped">Stopped</string>
     21        <string name="message_off_pad">Off Landing Pad</string>
     22        <string name="message_too_fast">Too Fast</string>
     23        <string name="message_bad_angle">Bad Angle</string>
     24
     25    <string name="lunar_layout_text_text"></string>
     26   
    327    <string name="hello">Hello World, HelloAndroid!</string>
    4     <string name="app_name">Hello, Android</string>
    528</resources>
Note: See TracChangeset for help on using the changeset viewer.