Changeset 9201730 in orbit
- Timestamp:
- 12/16/13 16:58:42 (9 years ago)
- Branches:
- master, Servo
- Children:
- a988489
- Parents:
- ef67954
- Location:
- android
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
android/res/layout/fragment_flight_emotiv.xml
rd5fbc16 r9201730 11 11 android:src="@+raw/status_default" /> 12 12 13 <!-- <TextView14 android:id="@+id/textViewLabelAttention"15 style="@android:style/TextAppearance.Small"16 android:layout_width="wrap_content"17 android:layout_height="wrap_content"18 android:paddingLeft="@dimen/padding_medium"19 android:text="@string/label_attention" />20 21 <ProgressBar22 android:id="@+id/progressBarAttention"23 style="?android:attr/progressBarStyleHorizontal"24 android:layout_width="match_parent"25 android:layout_height="25dip"26 android:paddingLeft="@dimen/padding_large"27 android:paddingRight="@dimen/padding_large" />28 29 <SeekBar30 android:id="@+id/seekBarAttention"31 android:layout_width="match_parent"32 android:layout_height="wrap_content"33 android:max="100"34 android:progress="72" /> -->35 36 <!-- <TextView37 android:id="@+id/textViewLabelMeditation"38 style="@android:style/TextAppearance.Small"39 android:layout_width="wrap_content"40 android:layout_height="wrap_content"41 android:paddingLeft="@dimen/padding_medium"42 android:text="@string/label_meditation" />43 44 <ProgressBar45 android:id="@+id/progressBarMeditation"46 style="?android:attr/progressBarStyleHorizontal"47 android:layout_width="match_parent"48 android:layout_height="25dip"49 android:paddingLeft="@dimen/padding_large"50 android:paddingRight="@dimen/padding_large" />51 52 <SeekBar53 android:id="@+id/seekBarMeditation"54 android:layout_width="match_parent"55 android:layout_height="wrap_content"56 android:max="100"57 android:progress="0" /> -->58 59 13 <TextView 60 14 android:id="@+id/textViewLabelCognitiv" … … 129 83 </View> 130 84 131 <Button85 <!-- <Button 132 86 android:id="@+id/buttonConnect" 133 87 style="@android:style/TextAppearance.Small" … … 135 89 android:layout_height="wrap_content" 136 90 android:onClick="connectHeadset" 137 android:text="@string/button_connect" /> 138 139 <!-- 140 <Button 141 android:id="@+id/buttonConnectServer" 142 style="@android:style/TextAppearance.Small" 143 android:layout_width="wrap_content" 144 android:layout_height="wrap_content" 145 android:onClick="connectServer" 146 android:text="@string/button_connect_server" /> 147 --> 91 android:text="@string/button_connect" /> --> 148 92 149 93 <Button … … 163 107 android:text="@string/button_stop_test" /> 164 108 </LinearLayout> 165 166 <!-- <com.androidplot.xy.XYPlot167 android:id="@+id/eegRawHistoryPlot"168 android:layout_width="fill_parent"169 android:layout_height="fill_parent"170 android:layout_marginLeft="0dp"171 android:layout_marginRight="0dp"172 android:layout_marginTop="0dp"173 android:layout_weight="1"174 title="EEG Raw Wave" /> -->175 109 176 110 <LinearLayout -
android/src/info/puzzlebox/orbit/OrbitActivity.java
rf3d6504 r9201730 171 171 172 172 @Override 173 @SuppressWarnings("deprecation") 173 174 public void onCreate(Bundle savedInstanceState) { 174 175
Note: See TracChangeset
for help on using the changeset viewer.