diff options
author | Erik Gilling <konkers@android.com> | 2011-04-04 10:52:10 -0700 |
---|---|---|
committer | Erik Gilling <konkers@android.com> | 2011-04-04 10:52:10 -0700 |
commit | ed8357a0cb5a7bc354f0fd01c1bba63cc3f7568f (patch) | |
tree | 9ad8e905ab2761c55e4dc84b821c667c00a95e16 | |
parent | b3da9f94f8b64954ec63142f1121bb84d9b6ce17 (diff) | |
download | demokit-ed8357a0cb5a7bc354f0fd01c1bba63cc3f7568f.tar.gz |
add joystick button support
Change-Id: I0a1754cd26fdaf4364f727203a979ca4756fc247
-rw-r--r-- | demokit/app/res/layout/main.xml | 6 | ||||
-rw-r--r-- | demokit/app/res/values/strings.xml | 1 | ||||
-rw-r--r-- | demokit/app/src/com/google/DemoKit/DemoKitActivity.java | 6 |
3 files changed, 13 insertions, 0 deletions
diff --git a/demokit/app/res/layout/main.xml b/demokit/app/res/layout/main.xml index 6f093cf..8fdf685 100644 --- a/demokit/app/res/layout/main.xml +++ b/demokit/app/res/layout/main.xml @@ -78,6 +78,12 @@ <TextView android:layout_width="wrap_content" android:id="@+id/textView12" android:layout_height="wrap_content" android:text="@string/y" android:layout_marginRight="8dip"></TextView> <TextView android:layout_width="wrap_content" android:id="@+id/joyY" android:layout_height="wrap_content"></TextView> </LinearLayout> + <LinearLayout android:id="@+id/linearLayout5" android:layout_width="wrap_content" android:layout_height="wrap_content"> + <TextView android:layout_width="wrap_content" android:id="@+id/textViewJoyButton" android:layout_height="wrap_content" android:text="@string/button" android:layout_marginRight="8dip"></TextView> + <ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/droid_off" android:id="@+id/joyButtonImage"></ImageView> + </LinearLayout> + + </TableRow> <TableRow android:layout_width="match_parent" android:id="@+id/tableRow9" android:layout_height="wrap_content"> <TextView android:id="@+id/textView11" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:text="@string/cap"></TextView> diff --git a/demokit/app/res/values/strings.xml b/demokit/app/res/values/strings.xml index 54be6eb..3080b76 100644 --- a/demokit/app/res/values/strings.xml +++ b/demokit/app/res/values/strings.xml @@ -2,6 +2,7 @@ <resources> <string name="hello">Hello World, DemoKitActivity!</string> <string name="app_name">DemoKit</string> + <string name="button">button</string> <string name="button1">1</string> <string name="button2">2</string> <string name="button3">3</string> diff --git a/demokit/app/src/com/google/DemoKit/DemoKitActivity.java b/demokit/app/src/com/google/DemoKit/DemoKitActivity.java index bb1ec3a..a43fea2 100644 --- a/demokit/app/src/com/google/DemoKit/DemoKitActivity.java +++ b/demokit/app/src/com/google/DemoKit/DemoKitActivity.java @@ -85,6 +85,8 @@ public class DemoKitActivity extends Activity implements Runnable, SeekBar.OnSee TextView mJoyX; TextView mJoyY; + ImageView mJoyButtonImage; + ImageView mCap; @@ -239,6 +241,7 @@ public class DemoKitActivity extends Activity implements Runnable, SeekBar.OnSee mJoyX = (TextView)findViewById(R.id.joyX); mJoyY = (TextView)findViewById(R.id.joyY); + mJoyButtonImage = (ImageView)findViewById(R.id.joyButtonImage); mCap = (ImageView)findViewById(R.id.cap); @@ -320,6 +323,7 @@ public class DemoKitActivity extends Activity implements Runnable, SeekBar.OnSee mButton1Image.setImageDrawable(mSwitchOff); mButton2Image.setImageDrawable(mSwitchOff); mButton3Image.setImageDrawable(mSwitchOff); + mJoyButtonImage.setImageDrawable(mSwitchOff); mCap.setImageDrawable(mSwitchOff); mLed1Red.setProgress(0); mLed1Green.setProgress(0); @@ -454,6 +458,8 @@ public class DemoKitActivity extends Activity implements Runnable, SeekBar.OnSee mButton3Image.setImageDrawable(o.getState() != 0 ? mSwitchOn : mSwitchOff); else if (o.getSw() == 3) mCap.setImageDrawable(o.getState() != 0 ? mSwitchOn : mSwitchOff); + else if (o.getSw() == 4) + mJoyButtonImage.setImageDrawable(o.getState() != 0 ? mSwitchOn : mSwitchOff); break; case MESSAGE_TEMPERATURE: |