Changeset e511c74 in orbit for android/res


Ignore:
Timestamp:
12/11/12 07:25:47 (9 years ago)
Author:
Steve Castellotti <sc@…>
Branches:
master, RawEEG, Raw_EEG_Plot, Servo, Tab_Interface, pyramid
Children:
46fb26f
Parents:
403fb9a
Message:
  • Log output controlled by "DEBUG" variable in preparation for production release
  • appendTextAndScroll disabled due to scrolling failure
  • stopControl checks that soundPool has been initialized
  • Removed legacy comments from XML files
Location:
android/res
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • android/res/layout/activity_main.xml

    r5b7f570 re511c74  
    7878        android:layout_height="wrap_content" /> 
    7979 
    80     <TextView 
    81         android:layout_width="fill_parent" 
    82         android:layout_height="wrap_content" 
    83         android:text="@string/hello" /> 
    84  
    8580    <ScrollView android:layout_width="fill_parent" android:id="@+id/scrollViewDebugConsole" android:fadeScrollbars="true" android:scrollbars="vertical" android:layout_height="0dip" android:layout_weight="1.00"> 
    8681            <TextView android:id="@+id/textViewDebugConsole" android:layout_width="fill_parent" android:text="@string/label_debug_console" android:layout_height="fill_parent"></TextView> 
     
    9287</LinearLayout> 
    9388 
    94  
    95 <!-- <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" --> 
    96 <!--     xmlns:tools="http://schemas.android.com/tools" --> 
    97 <!--     android:layout_width="match_parent" --> 
    98 <!--     android:layout_height="match_parent" > --> 
    99  
    100 <!--     <TextView --> 
    101 <!--         android:layout_width="wrap_content" --> 
    102 <!--         android:layout_height="wrap_content" --> 
    103 <!--         android:layout_centerHorizontal="true" --> 
    104 <!--         android:layout_centerVertical="true" --> 
    105 <!--         android:text="@string/hello_world" --> 
    106 <!--         tools:context=".MainActivity" /> --> 
    107  
    108 <!-- </RelativeLayout> --> 
  • android/res/values/strings.xml

    r403fb9a re511c74  
    11<?xml version="1.0" encoding="utf-8"?> 
    22<resources> 
    3     <string name="hello">Puzzlebox Orbit</string> 
    43    <string name="app_name">Orbit</string> 
    54    <string name="menu_settings">Settings</string> 
    6     <string name="label_attention">Concentration</string> 
    7     <string name="label_meditation">Mental Relaxation</string> 
     5    <string name="label_attention">Attention</string> 
     6    <string name="label_meditation">Meditationy</string> 
    87    <string name="label_signal">Signal</string> 
    98    <string name="label_power">Throttle</string> 
    10     <string name="label_debug_console">Remember to set volume at maximum</string> 
     9    <string name="label_debug_console">Puzzlebox Orbit</string> 
    1110    <string name="button_connect">Connect</string> 
    1211    <string name="button_disconnect">Disconnect</string> 
     
    1716    <string name="seekbar_from_touch">from touch</string> 
    1817</resources> 
    19  
    20 <!-- <resources> --> 
    21  
    22 <!--     <string name="app_name">Puzzlebox Orbit</string> --> 
    23 <!--     <string name="hello_world">Hello world!</string> --> 
    24 <!--     <string name="menu_settings">Settings</string> --> 
    25 <!--     <string name="title_activity_main">MainActivity</string> --> 
    26  
    27 <!-- </resources> --> 
Note: See TracChangeset for help on using the changeset viewer.