Skip to content
Browse files

Move Finch Framework to library project

  • Loading branch information...
1 parent b478a00 commit bba2d4180114bdf0b020d66fe80f0625af4a39d8 @bmeike committed Feb 25, 2012
Showing with 227 additions and 117 deletions.
  1. +1 −1 AndroidUIDemo/src/com/oreilly/demo/android/pa/uidemo/TouchMe.java
  2. +28 −0 FinchChat/AndroidManifest.xml
  3. 0 {FinchFramework → FinchChat}/TODO
  4. 0 {FinchFrameworkTest → FinchChat}/proguard.cfg
  5. +1 −0 {FinchFrameworkTest → FinchChat}/project.properties
  6. +10 −0 FinchChat/res/anim/flip.xml
  7. BIN FinchChat/res/drawable-hdpi/ic_menu_preferences.png
  8. 0 {FinchFrameworkTest → FinchChat}/res/drawable-hdpi/icon.png
  9. 0 {FinchFrameworkTest → FinchChat}/res/drawable-ldpi/icon.png
  10. BIN FinchChat/res/drawable-mdpi/ic_menu_preferences.png
  11. 0 {FinchFrameworkTest → FinchChat}/res/drawable-mdpi/icon.png
  12. BIN FinchChat/res/drawable/pine_grosbeak.png
  13. 0 {FinchFramework → FinchChat}/res/layout/animate_activity.xml
  14. 0 {FinchFramework → FinchChat}/res/layout/bt_console.xml
  15. 0 {FinchFramework → FinchChat}/res/layout/checkbox_example.xml
  16. 0 {FinchFramework → FinchChat}/res/layout/custom_title.xml
  17. 0 {FinchFramework → FinchChat}/res/layout/device_list.xml
  18. 0 {FinchFramework → FinchChat}/res/layout/device_name.xml
  19. 0 {FinchFramework → FinchChat}/res/layout/example_layout.xml
  20. 0 {FinchFrameworkTest → FinchChat}/res/layout/main.xml
  21. 0 {FinchFramework → FinchChat}/res/layout/message.xml
  22. 0 {FinchFramework → FinchChat}/res/layout/video_list_item.xml
  23. 0 {FinchFramework → FinchChat}/res/layout/video_query_activity.xml
  24. 0 {FinchFramework → FinchChat}/res/menu/bt_console_option_menu.xml
  25. +14 −0 FinchChat/res/menu/finch_option_menu.xml
  26. 0 {FinchFramework → FinchChat}/res/menu/finchwelcomemenu.xml
  27. 0 {FinchFramework → FinchChat}/res/raw/yt_query_json.json
  28. 0 {FinchFramework → FinchChat}/res/raw/yt_query_rss.xml
  29. +5 −0 FinchChat/res/values/colors.xml
  30. 0 {FinchFramework → FinchChat}/res/values/dimens.xml
  31. +44 −0 FinchChat/res/values/strings.xml
  32. 0 {FinchFramework → FinchChat}/src/animate/AnimateActivity.java
  33. 0 {FinchFramework → FinchChat}/src/com/finchframework/bluetooth/BtConsoleActivity.java
  34. 0 {FinchFramework → FinchChat}/src/com/finchframework/bluetooth/BtHelperHandler.java
  35. 0 {FinchFramework → FinchChat}/src/com/finchframework/bluetooth/BtSPPHelper.java
  36. 0 {FinchFramework → FinchChat}/src/com/finchframework/bluetooth/DeviceListActivity.java
  37. 0 {FinchFramework → FinchChat}/src/com/finchframework/finch/FinchWelcome.java
  38. +79 −0 FinchChat/tools/ant
  39. +1 −0 {FinchFrameworkTest/tools/ide/eclipse → FinchChat/tools/ide}/classpath
  40. +0 −1 {FinchFrameworkTest/tools/ide → FinchChat/tools/ide/eclipse}/classpath
  41. +1 −1 {FinchFrameworkTest → FinchChat}/tools/ide/eclipse/project
  42. +1 −1 {FinchFrameworkTest → FinchChat}/tools/ide/eclipse/settings/org.eclipse.jdt.core.prefs
  43. +1 −2 {FinchFrameworkTest → FinchChat}/tools/ide/project
  44. +5 −11 FinchFramework/AndroidManifest.xml
  45. +10 −9 FinchFramework/res/anim/flip.xml
  46. +0 −12 FinchFramework/res/layout/main.xml
  47. +14 −11 FinchFramework/res/menu/finch_option_menu.xml
  48. +2 −0 FinchFramework/res/values/colors.xml
  49. +5 −37 FinchFramework/res/values/strings.xml
  50. 0 FinchFramework/{lib-src → src}/com/finchframework/finch/Finch.java
  51. 0 FinchFramework/{lib-src → src}/com/finchframework/finch/FinchApplication.java
  52. 0 FinchFramework/{lib-src → src}/com/finchframework/finch/rest/FileHandler.java
  53. 0 FinchFramework/{lib-src → src}/com/finchframework/finch/rest/FileHandlerFactory.java
  54. 0 FinchFramework/{lib-src → src}/com/finchframework/finch/rest/RESTfulContentProvider.java
  55. 0 FinchFramework/{lib-src → src}/com/finchframework/finch/rest/RawResponse.java
  56. 0 FinchFramework/{lib-src → src}/com/finchframework/finch/rest/ResponseHandler.java
  57. 0 FinchFramework/{lib-src → src}/com/finchframework/finch/rest/UriRequestTask.java
  58. 0 FinchFramework/{lib-src → src}/com/finchframework/finch/views/MesgEditText.java
  59. +1 −1 FinchFramework/tools/ide/eclipse/classpath
  60. +0 −20 FinchFrameworkTest/AndroidManifest.xml
  61. +0 −3 FinchFrameworkTest/TODO
  62. +0 −5 FinchFrameworkTest/res/values/strings.xml
  63. +1 −0 FinchLifecycle/tools/ide/eclipse/classpath
  64. +1 −0 FinchLifecycleBackport/project.properties
  65. +2 −1 FinchLifecycleBackport/tools/ide/eclipse/classpath
  66. +0 −1 FinchVideo/tools/ide/eclipse/classpath
View
2 AndroidUIDemo/src/com/oreilly/demo/android/pa/uidemo/TouchMe.java
@@ -176,8 +176,8 @@ public boolean onKey(View v, int keyCode, KeyEvent event) {
}
makeDot(dotModel, dotView, color);
- return true;
+ return true;
} });
View
28 FinchChat/AndroidManifest.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.finchframework.finch"
+ android:versionCode="1"
+ android:versionName="1.0">
+ <application android:icon="@drawable/icon"
+ android:label="@string/app_name"
+ android:debuggable="true">
+ <activity android:name=".FinchWelcome"
+ android:label="@string/app_name">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.LAUNCHER" />
+ </intent-filter>
+ </activity>
+ <activity android:name="com.finchframework.bluetooth.BtConsoleActivity" />
+ <activity android:name="com.finchframework.bluetooth.DeviceListActivity"
+ android:label="@string/select_device"
+ android:configChanges="orientation|keyboardHidden"/>
+ <activity android:name="animate.AnimateActivity"></activity>
+ </application>
+
+ <uses-permission android:name="android.permission.INTERNET" />
+ <uses-permission android:name="android.permission.BLUETOOTH" />
+ <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+
+ <uses-sdk android:minSdkVersion="7" />
+</manifest>
View
0 FinchFramework/TODO → FinchChat/TODO
File renamed without changes.
View
0 FinchFrameworkTest/proguard.cfg → FinchChat/proguard.cfg
File renamed without changes.
View
1 FinchFrameworkTest/project.properties → FinchChat/project.properties
@@ -9,3 +9,4 @@
# Project target.
target=android-14
+android.library=false
View
10 FinchChat/res/anim/flip.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+<rotate
+android:fromDegrees="0.0"
+android:toDegrees="180.0"
+android:pivotX="50%"
+android:pivotY="50%"
+android:duration="2000"
+/>
+</set>
View
BIN FinchChat/res/drawable-hdpi/ic_menu_preferences.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 ...hFrameworkTest/res/drawable-hdpi/icon.png → FinchChat/res/drawable-hdpi/icon.png
File renamed without changes
View
0 ...hFrameworkTest/res/drawable-ldpi/icon.png → FinchChat/res/drawable-ldpi/icon.png
File renamed without changes
View
BIN FinchChat/res/drawable-mdpi/ic_menu_preferences.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 ...hFrameworkTest/res/drawable-mdpi/icon.png → FinchChat/res/drawable-mdpi/icon.png
File renamed without changes
View
BIN FinchChat/res/drawable/pine_grosbeak.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 ...Framework/res/layout/animate_activity.xml → FinchChat/res/layout/animate_activity.xml
File renamed without changes.
View
0 FinchFramework/res/layout/bt_console.xml → FinchChat/res/layout/bt_console.xml
File renamed without changes.
View
0 ...Framework/res/layout/checkbox_example.xml → FinchChat/res/layout/checkbox_example.xml
File renamed without changes.
View
0 FinchFramework/res/layout/custom_title.xml → FinchChat/res/layout/custom_title.xml
File renamed without changes.
View
0 FinchFramework/res/layout/device_list.xml → FinchChat/res/layout/device_list.xml
File renamed without changes.
View
0 FinchFramework/res/layout/device_name.xml → FinchChat/res/layout/device_name.xml
File renamed without changes.
View
0 FinchFramework/res/layout/example_layout.xml → FinchChat/res/layout/example_layout.xml
File renamed without changes.
View
0 FinchFrameworkTest/res/layout/main.xml → FinchChat/res/layout/main.xml
File renamed without changes.
View
0 FinchFramework/res/layout/message.xml → FinchChat/res/layout/message.xml
File renamed without changes.
View
0 ...hFramework/res/layout/video_list_item.xml → FinchChat/res/layout/video_list_item.xml
File renamed without changes.
View
0 ...ework/res/layout/video_query_activity.xml → ...hChat/res/layout/video_query_activity.xml
File renamed without changes.
View
0 ...ework/res/menu/bt_console_option_menu.xml → ...hChat/res/menu/bt_console_option_menu.xml
File renamed without changes.
View
14 FinchChat/res/menu/finch_option_menu.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:id="@+id/menu_lifecycle"
+ android:icon="@android:drawable/ic_menu_manage"
+ android:title="@string/lifecycle_explorer" />
+ <item android:id="@+id/menu_bluetooth"
+ android:icon="@android:drawable/ic_menu_manage"
+ android:title="@string/bluetooth_tools" />
+ <item android:id="@+id/menu_animation"
+ android:icon="@android:drawable/ic_menu_rotate"
+ android:title="@string/animation_example" />
+</menu>
+
View
0 FinchFramework/res/menu/finchwelcomemenu.xml → FinchChat/res/menu/finchwelcomemenu.xml
File renamed without changes.
View
0 FinchFramework/res/raw/yt_query_json.json → FinchChat/res/raw/yt_query_json.json
File renamed without changes.
View
0 FinchFramework/res/raw/yt_query_rss.xml → FinchChat/res/raw/yt_query_rss.xml
File renamed without changes.
View
5 FinchChat/res/values/colors.xml
@@ -0,0 +1,5 @@
+<resources>
+ <color name="white">#ffffff</color>
+ <color name="medium_gray">#444444</color>
+ <color name="blue">#0000bb</color>
+</resources>
View
0 FinchFramework/res/values/dimens.xml → FinchChat/res/values/dimens.xml
File renamed without changes.
View
44 FinchChat/res/values/strings.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="hello">Hello World, FinchWelcome!</string>
+ <string name="app_name">Finch</string>
+
+ <string name="finch_video_app_name">Finch Video</string>
+ <string name="finch_video_update_content">Update Content</string>
+ <string name="finch_video_search">Search Videos</string>
+ <string name="checkbox_app_name">Checkbox App</string>
+
+ <dimen name="finch_video_padding">2px</dimen>
+
+ <string-array name="finchwelcomemenustrings">
+ <item>"Preferences"</item>
+ </string-array>
+
+ <string name="send">Send</string>
+ <string name="not_connected">You are not connected to a device</string>
+ <string name="bt_not_enabled_leaving">Bluetooth was not enabled. Leaving Bluetooth Chat.</string>
+ <string name="title_connecting">connecting...</string>
+ <string name="title_connected_to">connected: </string>
+ <string name="title_not_connected">not connected</string>
+
+ <!-- DeviceListActivity -->
+ <string name="scanning">scanning for devices...</string>
+ <string name="select_device">select a device to connect</string>
+ <string name="none_paired">No devices have been paired</string>
+ <string name="none_found">No devices found</string>
+ <string name="title_paired_devices">Paired Devices</string>
+ <string name="title_other_devices">Other Available Devices</string>
+ <string name="button_scan">Scan for devices</string>
+
+ <!-- Options Menu -->
+ <string name="bluetooth_tools">Bluetooth tools</string>
+ <string name="lifecycle_explorer">Lifecycle explorer</string>
+ <string name="animation_example">Animation</string>
+
+ <string name="connect">Connect a device</string>
+ <string name="discoverable">Make discoverable</string>
+
+ <!-- Bluetooth errors -->
+ <string name="bt_connection_lost">Connection lost</string>
+ <string name="bt_unable">Unable to connect</string>
+</resources>
View
0 ...ramework/src/animate/AnimateActivity.java → FinchChat/src/animate/AnimateActivity.java
File renamed without changes.
View
0 ...ramework/bluetooth/BtConsoleActivity.java → ...ramework/bluetooth/BtConsoleActivity.java
File renamed without changes.
View
0 ...hframework/bluetooth/BtHelperHandler.java → ...hframework/bluetooth/BtHelperHandler.java
File renamed without changes.
View
0 ...finchframework/bluetooth/BtSPPHelper.java → ...finchframework/bluetooth/BtSPPHelper.java
File renamed without changes.
View
0 ...amework/bluetooth/DeviceListActivity.java → ...amework/bluetooth/DeviceListActivity.java
File renamed without changes.
View
0 ...om/finchframework/finch/FinchWelcome.java → ...om/finchframework/finch/FinchWelcome.java
File renamed without changes.
View
79 FinchChat/tools/ant
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="FinchWelcome" default="help">
+
+<!-- The local.properties file is created and updated by the 'android'
+ tool.
+ It contains the path to the SDK. It should *NOT* be checked into
+ Version Control Systems. -->
+ <property file="local.properties" />
+
+ <!-- The build.properties file can be created by you and is never touched
+ by the 'android' tool. This is the place to change some of the
+ default property values used by the Ant rules.
+ Here are some properties you may want to change/update:
+
+ source.dir
+ The name of the source directory. Default is 'src'.
+ out.dir
+ The name of the output directory. Default is 'bin'.
+
+ Properties related to the SDK location or the project target should
+ be updated using the 'android' tool with the 'update' action.
+
+ This file is an integral part of the build system for your
+ application and should be checked into Version Control Systems.
+
+ -->
+ <property file="build.properties" />
+
+ <!-- The default.properties file is created and updated by the 'android'
+ tool, as well as ADT.
+ This file is an integral part of the build system for your
+ application and should be checked into Version Control Systems. -->
+ <property file="default.properties" />
+
+
+ <!-- Required pre-setup import -->
+ <import file="${sdk.dir}/tools/ant/pre_setup.xml" />
+
+
+<!-- extension targets. Uncomment the ones where you want to do custom work
+ in between standard targets -->
+<!--
+ <target name="-pre-build">
+ </target>
+ <target name="-pre-compile">
+ </target>
+
+ [This is typically used for code obfuscation.
+ Compiled code location: ${out.classes.absolute.dir}
+ If this is not done in place, override ${out.dex.input.absolute.dir}]
+ <target name="-post-compile">
+ </target>
+-->
+
+ <!-- Execute the Android Setup task that will setup some properties
+ specific to the target, and import the build rules files.
+
+ The rules file is imported from
+ <SDK>/tools/ant/
+ Depending on the project type it can be either:
+ - main_rules.xml
+ - lib_rules.xml
+ - test_rules.xml
+
+ To customize existing targets, there are two options:
+ - Customize only one target:
+ - copy/paste the target into this file, *before* the
+ <setup> task.
+ - customize it to your needs.
+ - Customize the whole script.
+ - copy/paste the content of the rules files (minus the top node)
+ into this file, *after* the <setup> task
+ - disable the import of the rules by changing the setup task
+ below to <setup import="false" />.
+ - customize to your needs.
+ -->
+ <setup />
+
+</project>
View
1 ...FrameworkTest/tools/ide/eclipse/classpath → FinchChat/tools/ide/classpath
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="lib-src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry kind="output" path="bin/classes"/>
View
1 FinchFrameworkTest/tools/ide/classpath → FinchChat/tools/ide/eclipse/classpath
@@ -2,7 +2,6 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
- <classpathentry combineaccessrules="false" kind="src" path="/FinchFramework"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry kind="output" path="bin/classes"/>
View
2 FinchFrameworkTest/tools/ide/eclipse/project → FinchChat/tools/ide/eclipse/project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>FinchFrameworkTest</name>
+ <name>FinchChat</name>
<comment></comment>
<projects>
</projects>
View
2 ...lipse/settings/org.eclipse.jdt.core.prefs → ...lipse/settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Sun Jan 15 16:56:08 PST 2012
+#Sun Jan 15 16:56:46 PST 2012
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
View
3 FinchFrameworkTest/tools/ide/project → FinchChat/tools/ide/project
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>FinchFrameworkTest</name>
+ <name>FinchFramework</name>
<comment></comment>
<projects>
- <project>FinchFramework</project>
</projects>
<buildSpec>
<buildCommand>
View
16 FinchFramework/AndroidManifest.xml
@@ -3,6 +3,11 @@
package="com.finchframework.finch"
android:versionCode="1"
android:versionName="1.0">
+
+ <uses-sdk android:minSdkVersion="7" />
+
+ <uses-permission android:name="android.permission.INTERNET" />
+
<application android:icon="@drawable/icon"
android:label="@string/app_name"
android:debuggable="true">
@@ -13,16 +18,5 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
- <activity android:name="com.finchframework.bluetooth.BtConsoleActivity" />
- <activity android:name="com.finchframework.bluetooth.DeviceListActivity"
- android:label="@string/select_device"
- android:configChanges="orientation|keyboardHidden"/>
- <activity android:name="animate.AnimateActivity"></activity>
</application>
-
- <uses-permission android:name="android.permission.INTERNET" />
- <uses-permission android:name="android.permission.BLUETOOTH" />
- <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
-
- <uses-sdk android:minSdkVersion="7" />
</manifest>
View
19 FinchFramework/res/anim/flip.xml
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-<rotate
-android:fromDegrees="0.0"
-android:toDegrees="180.0"
-android:pivotX="50%"
-android:pivotY="50%"
-android:duration="2000"
-/>
-</set>
+<set xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <rotate
+ android:duration="2000"
+ android:fromDegrees="0.0"
+ android:pivotX="50%"
+ android:pivotY="50%"
+ android:toDegrees="180.0" />
+
+</set>
View
12 FinchFramework/res/layout/main.xml
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- >
-<TextView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/hello"
- />
-</LinearLayout>
View
25 FinchFramework/res/menu/finch_option_menu.xml
@@ -1,14 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:id="@+id/menu_lifecycle"
- android:icon="@android:drawable/ic_menu_manage"
- android:title="@string/lifecycle_explorer" />
- <item android:id="@+id/menu_bluetooth"
- android:icon="@android:drawable/ic_menu_manage"
- android:title="@string/bluetooth_tools" />
- <item android:id="@+id/menu_animation"
- android:icon="@android:drawable/ic_menu_rotate"
- android:title="@string/animation_example" />
-</menu>
+ <item
+ android:id="@+id/menu_lifecycle"
+ android:icon="@android:drawable/ic_menu_preferences"
+ android:title="@string/lifecycle_explorer"/>
+ <item
+ android:id="@+id/menu_bluetooth"
+ android:icon="@android:drawable/ic_menu_preferences"
+ android:title="@string/bluetooth_tools"/>
+ <item
+ android:id="@+id/menu_animation"
+ android:icon="@android:drawable/ic_menu_preferences"
+ android:title="@string/animation_example"/>
+</menu>
View
2 FinchFramework/res/values/colors.xml
@@ -1,5 +1,7 @@
<resources>
+
<color name="white">#ffffff</color>
<color name="medium_gray">#444444</color>
<color name="blue">#0000bb</color>
+
</resources>
View
42 FinchFramework/res/values/strings.xml
@@ -1,44 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="hello">Hello World, FinchWelcome!</string>
- <string name="app_name">Finch</string>
- <string name="finch_video_app_name">Finch Video</string>
- <string name="finch_video_update_content">Update Content</string>
- <string name="finch_video_search">Search Videos</string>
- <string name="checkbox_app_name">Checkbox App</string>
-
- <dimen name="finch_video_padding">2px</dimen>
-
- <string-array name="finchwelcomemenustrings">
- <item>"Preferences"</item>
- </string-array>
-
- <string name="send">Send</string>
- <string name="not_connected">You are not connected to a device</string>
- <string name="bt_not_enabled_leaving">Bluetooth was not enabled. Leaving Bluetooth Chat.</string>
- <string name="title_connecting">connecting...</string>
- <string name="title_connected_to">connected: </string>
- <string name="title_not_connected">not connected</string>
-
- <!-- DeviceListActivity -->
- <string name="scanning">scanning for devices...</string>
- <string name="select_device">select a device to connect</string>
- <string name="none_paired">No devices have been paired</string>
- <string name="none_found">No devices found</string>
- <string name="title_paired_devices">Paired Devices</string>
- <string name="title_other_devices">Other Available Devices</string>
- <string name="button_scan">Scan for devices</string>
+ <string name="connect">Connect a device</string>
+ <string name="discoverable">Make discoverable</string>
<!-- Options Menu -->
- <string name="bluetooth_tools">Bluetooth tools</string>
<string name="lifecycle_explorer">Lifecycle explorer</string>
+ <string name="bluetooth_tools">Bluetooth tools</string>
<string name="animation_example">Animation</string>
-
- <string name="connect">Connect a device</string>
- <string name="discoverable">Make discoverable</string>
-
- <!-- Bluetooth errors -->
- <string name="bt_connection_lost">Connection lost</string>
- <string name="bt_unable">Unable to connect</string>
-</resources>
+
+</resources>
View
0 ...b-src/com/finchframework/finch/Finch.java → ...k/src/com/finchframework/finch/Finch.java
File renamed without changes.
View
0 ...inchframework/finch/FinchApplication.java → ...inchframework/finch/FinchApplication.java
File renamed without changes.
View
0 ...inchframework/finch/rest/FileHandler.java → ...inchframework/finch/rest/FileHandler.java
File renamed without changes.
View
0 ...mework/finch/rest/FileHandlerFactory.java → ...mework/finch/rest/FileHandlerFactory.java
File renamed without changes.
View
0 ...rk/finch/rest/RESTfulContentProvider.java → ...rk/finch/rest/RESTfulContentProvider.java
File renamed without changes.
View
0 ...inchframework/finch/rest/RawResponse.java → ...inchframework/finch/rest/RawResponse.java
File renamed without changes.
View
0 ...framework/finch/rest/ResponseHandler.java → ...framework/finch/rest/ResponseHandler.java
File renamed without changes.
View
0 ...hframework/finch/rest/UriRequestTask.java → ...hframework/finch/rest/UriRequestTask.java
File renamed without changes.
View
0 ...chframework/finch/views/MesgEditText.java → ...chframework/finch/views/MesgEditText.java
File renamed without changes.
View
2 FinchFramework/tools/ide/eclipse/classpath
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="lib-src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+ <classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>
View
20 FinchFrameworkTest/AndroidManifest.xml
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.finchframework.finch.test"
- android:versionCode="1"
- android:versionName="1.0" >
-
- <uses-sdk android:minSdkVersion="14" />
-
- <instrumentation
- android:name="android.test.InstrumentationTestRunner"
- android:targetPackage="com.finchframework.finch" />
-
- <application
- android:icon="@drawable/icon"
- android:label="@string/app_name" >
- <uses-library android:name="android.test.runner" />
- </application>
-
-</manifest>
-
View
3 FinchFrameworkTest/TODO
@@ -1,3 +0,0 @@
-
-- This example of a test should get filled out
-
View
5 FinchFrameworkTest/res/values/strings.xml
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string name="hello">Hello World!</string>
- <string name="app_name">FinchTest</string>
-</resources>
View
1 FinchLifecycle/tools/ide/eclipse/classpath
@@ -3,5 +3,6 @@
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+ <classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>
View
1 FinchLifecycleBackport/project.properties
@@ -9,3 +9,4 @@
# Project target.
target=android-6
+android.library.reference.1=../FinchFramework
View
3 FinchLifecycleBackport/tools/ide/eclipse/classpath
@@ -3,6 +3,7 @@
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
- <classpathentry kind="lib" path="libs/android-support-v4.jar" sourcepath="/home/zigurd/android-sdk-linux_86/extras/android/compatibility/v4/src/java/android/support/v4"/>
+ <classpathentry kind="lib" path="libs/android-support-v4.jar"/>
+ <classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>
View
1 FinchVideo/tools/ide/eclipse/classpath
@@ -3,7 +3,6 @@
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
- <classpathentry kind="src" path="FinchWelcome_lib-src"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>

0 comments on commit bba2d41

Please sign in to comment.
Something went wrong with that request. Please try again.