Changeset f3d6504 in orbit


Ignore:
Timestamp:
10/07/13 10:24:13 (6 years ago)
Author:
Steve Castellotti <sc@…>
Branches:
master, Servo, pyramid
Children:
0a60a15
Parents:
2d817de
Message:

OrbitTabActivity?:

Location:
android
Files:
12 added
12 edited

Legend:

Unmodified
Added
Removed
  • android/.classpath

    r4f3fd92 rf3d6504  
    11<?xml version="1.0" encoding="UTF-8"?> 
    22<classpath> 
    3         <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/> 
    4         <classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/> 
     3        <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/> 
     4        <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/> 
    55        <classpathentry exported="true" kind="lib" path="libs/ThinkGear.jar"/> 
    66        <classpathentry kind="lib" path="libs/usb-serial-for-android-v010.jar"/> 
    77        <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/> 
     8        <classpathentry exported="true" kind="lib" path="libs/androidplot-core-0.6.0.jar"/> 
    89        <classpathentry kind="src" path="src"/> 
    910        <classpathentry kind="src" path="gen"/> 
    10         <classpathentry exported="true" kind="lib" path="libs/androidplot-core-0.6.0.jar"/> 
    1111        <classpathentry kind="output" path="bin/classes"/> 
    1212</classpath> 
  • android/AndroidManifest.xml

    r81fb7d8 rf3d6504  
    22<manifest xmlns:android="http://schemas.android.com/apk/res/android" 
    33    package="info.puzzlebox.orbit" 
    4     android:versionCode="3" 
    5     android:versionName="1.2.2" > 
     4    android:versionCode="5" 
     5    android:versionName="1.4.1" > 
    66 
    77    <uses-sdk 
    8         android:minSdkVersion="8" 
    9         android:targetSdkVersion="17" /> 
     8        android:minSdkVersion="7" 
     9        android:targetSdkVersion="18" /> 
    1010 
     11    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> 
    1112    <uses-permission android:name="android.permission.BLUETOOTH" /> 
    12     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" /> 
    13  
     13    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />    
     14    <uses-permission android:name="android.permission.INTERNET"/> 
     15     
     16    <uses-feature android:name="android.hardware.touchscreen" android:required="false"/> 
    1417    <!-- <uses-feature android:name="android.hardware.usb.host" /> --> 
    1518 
     
    1821        android:label="@string/app_name" 
    1922        android:theme="@style/AppTheme" 
     23        android:hardwareAccelerated="true" 
    2024        android:allowBackup="true" > 
    21          
    22         <activity 
     25       
     26        <!-- <activity 
    2327            android:name=".OrbitActivity" 
    24             android:label="@string/app_name" > 
     28            android:label="@string/app_name" >--> 
     29        <activity android:label="@string/label_debug_console" android:name=".OrbitTabActivity" > 
     30 
    2531            <intent-filter> 
    2632                <action android:name="android.intent.action.MAIN" /> 
    27  
    2833                <category android:name="android.intent.category.DEFAULT" /> 
    2934                <category android:name="android.intent.category.LAUNCHER" /> 
     35                <category android:name="info.puzzlebox.orbit.fragments.TABSPAGER"/> 
    3036            </intent-filter> 
     37             
    3138            <!-- <intent-filter> --> 
    3239            <!-- <action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" /> --> 
    3340            <!-- </intent-filter> --> 
    3441 
    35  
    3642            <!-- <meta-data --> 
    3743            <!-- android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" --> 
    3844            <!-- android:resource="@xml/device_filter" /> --> 
     45             
    3946        </activity> 
     47         
     48        <!--   
     49        <activity android:label="@string/app_name" android:name=".OrbitActivity" > 
    4050 
    41         <service android:name=".AudioService" /> 
     51            <intent-filter> 
     52                <action android:name="android.intent.action.MAIN" /> 
     53                <category android:name="android.intent.category.DEFAULT" /> 
     54                <category android:name="android.intent.category.LAUNCHER" /> 
     55                <category android:name="info.puzzlebox.orbit.OrbitActivity"/> 
     56            </intent-filter> 
     57             
     58        </activity> 
     59         
     60        <activity android:label="@string/app_name" android:name=".OrbitUSBActivity" > 
     61 
     62            <intent-filter> 
     63                <action android:name="android.intent.action.MAIN" /> 
     64                <category android:name="android.intent.category.DEFAULT" /> 
     65                <category android:name="android.intent.category.LAUNCHER" /> 
     66                <category android:name="info.puzzlebox.orbit.OrbitUSBActivity"/> 
     67            </intent-filter> 
     68             
     69            <intent-filter> 
     70            <action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" /> 
     71            </intent-filter> 
     72 
     73            <meta-data 
     74            android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" 
     75            android:resource="@xml/device_filter" /> 
     76             
     77        </activity> 
     78        --> 
     79         
     80         
     81        <!-- <service android:name=".AudioService" /> --> 
     82         
    4283    </application> 
    4384 
  • android/project.properties

    ra763394 rf3d6504  
    1212 
    1313# Project target. 
    14 target=android-17 
     14target=android-18 
  • android/res/values/strings.xml

    r136014a rf3d6504  
    33 
    44    <string name="app_name">Orbit</string> 
     5    <string name="tab_welcome">Welcome</string> 
     6    <string name="tab_welcome_small">Start</string> 
     7    <string name="tab_welcome_large">Welcome</string> 
     8    <string name="tab_flight">Flight</string> 
     9    <string name="tab_flight_small">Flight</string> 
     10    <string name="tab_flight_large">Flight</string> 
     11    <string name="tab_advanced">Options</string> 
     12    <string name="tab_advanced_small">Options</string> 
     13    <string name="tab_advanced_large">Advanced</string> 
     14    <string name="tab_support">Support</string> 
     15    <string name="tab_support_small">Help</string> 
     16    <string name="tab_support_large">Support</string> 
    517    <string name="menu_settings">Settings</string> 
    618    <string name="label_attention">Attention</string> 
     
    1022    <string name="label_debug_console">Puzzlebox Orbit</string> 
    1123    <string name="button_connect">Connect</string> 
     24    <string name="button_connect_server">Cloud</string> 
    1225    <string name="button_disconnect">Disconnect</string> 
    1326    <string name="button_demo">Test Helicopter</string> 
     
    2235    <string name="radio_b">B</string> 
    2336    <string name="radio_c">C</string> 
     37    <string name="label_advanced_presets">Presets:</string> 
     38    <string name="button_advanced_reset">Reset</string> 
     39    <string name="button_advanced_hover">Hover</string> 
     40    <string name="button_advanced_forward">Forward</string> 
     41    <string name="button_advanced_left">Left</string> 
     42    <string name="button_advanced_right">Right</string> 
    2443    <string name="checkbox_advanced_options">Advanced Options</string> 
    2544    <string name="checkbox_generate_audio">Generate Control Signal</string> 
     45    <string name="checkbox_generate_audio_small">Generate Signal</string> 
    2646    <string name="checkbox_invert_control_signal">Invert Control Signal</string> 
     47    <string name="checkbox_invert_control_signal_small">Invert Signal</string> 
    2748    <string name="textview_throttle">Throttle</string> 
    2849    <string name="textview_yaw">Yaw</string> 
     
    3556    <string name="menu_search">Search</string> 
    3657    <string name="menu_share">Share</string> 
     58    <string name="label_support_title">Questions, Comments, or Ideas?</string> 
     59    <string name="label_support_name">Name:</string> 
     60    <string name="label_support_email">Email:</string> 
     61    <string name="label_support_message">Message:</string> 
     62    <string name="button_support_send">Send to Puzzlebox</string> 
    3763 
    3864</resources> 
  • android/res/values/styles.xml

    r34ba659 rf3d6504  
    11<resources> 
     2<!--  <style name="AppTheme" parent="android:Theme.Light" /> --> 
     3<!--  <style name="AppTheme" parent="android:Theme.Black" /> --> 
     4<!--  <style name="AppTheme" parent="android:Theme.Holo" /> -->     
    25 
    3 <!--     <style name="AppTheme" parent="android:Theme.Light" /> --> 
    4 <!--     <style name="AppTheme" parent="android:Theme.Black" /> --> 
    5     <style name="AppTheme" parent="android:Theme.Holo" /> 
    6      
     6<style name="AppTheme" parent="android:Theme.Holo.Light" /> 
     7 
    78</resources> 
  • android/src/info/puzzlebox/orbit/AudioService.java

    r548a60f rf3d6504  
    1616         * default field values. 
    1717         */ 
     18         
    1819        AudioTrack track; 
    1920//      public int sampleRate = 44100; 
  • android/src/info/puzzlebox/orbit/OrbitActivity.java

    r4da9757 rf3d6504  
    418418        // ################################################################ 
    419419 
     420        protected void onStop() { 
     421                 
     422            setResult(2); 
     423            super.onStop(); 
     424             
     425        } // onStop 
     426 
     427 
     428        // ################################################################ 
     429 
    420430        @Override 
    421431        public void onDestroy() { 
     
    426436 
    427437                tgDevice.close(); 
     438                 
     439                setResult(2); 
    428440 
    429441                super.onDestroy(); 
Note: See TracChangeset for help on using the changeset viewer.