Changeset d5fbc16 in orbit
- Timestamp:
- 12/11/13 15:11:27 (9 years ago)
- Branches:
- master, Servo
- Children:
- 9769326
- Parents:
- 490c673
- Location:
- android/res
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
android/res/layout/fragment_flight_emotiv.xml
r490c673 rd5fbc16 174 174 title="EEG Raw Wave" /> --> 175 175 176 176 <LinearLayout 177 android:layout_width="fill_parent" 178 android:layout_height="40dp" 179 android:layout_weight="1" 180 android:orientation="horizontal" > 181 182 <Spinner 183 android:id="@+id/spinnerAction" 184 android:layout_width="0dp" 185 android:layout_weight="1" 186 android:layout_height="fill_parent" /> 187 188 <Button 189 android:id="@+id/buttonStartTraining" 190 android:layout_width="0dp" 191 android:layout_weight="1" 192 android:layout_height="fill_parent" 193 android:enabled="true" 194 android:text="@string/button_start_training" 195 android:textSize="12sp" 196 android:textStyle="bold" /> 197 </LinearLayout> 198 199 <LinearLayout 200 android:layout_width="fill_parent" 201 android:layout_height="40dp" 202 android:layout_weight="1" 203 android:orientation="horizontal" > 204 205 <TextView 206 android:layout_width="0dp" 207 android:layout_weight="1" 208 android:layout_height="fill_parent" 209 android:text="@string/textview_detection_status_label" 210 android:textStyle="bold" 211 android:textSize="14sp" /> 212 213 <TextView 214 android:id="@+id/DetectionStatus" 215 android:layout_width="0dp" 216 android:layout_weight="1.7" 217 android:layout_height="fill_parent" 218 android:text="@string/textview_detection_status" 219 android:textSize="14sp" /> 220 221 <TextView 222 android:layout_width="0dp" 223 android:layout_weight="1" 224 android:layout_height="fill_parent" 225 android:text="@string/textview_current_action_label" 226 android:textStyle="bold" 227 android:textSize="14sp" /> 228 229 <TextView 230 android:id="@+id/CurrentAction" 231 android:layout_width="0dp" 232 android:layout_weight="1.7" 233 android:layout_height="fill_parent" 234 android:text="@string/textview_current_action" 235 android:textSize="14sp" /> 236 </LinearLayout> 237 238 <ScrollView 239 android:layout_width="fill_parent" 240 android:layout_height="0dp" 241 android:layout_weight="9" > 242 243 <TextView 244 android:id="@+id/text" 245 android:layout_width="wrap_content" 246 android:layout_height="wrap_content" > 247 </TextView> 248 </ScrollView> 177 249 178 250 </LinearLayout> -
android/res/values/strings.xml
r490c673 rd5fbc16 27 27 <string name="button_demo">Test Helicopter</string> 28 28 <string name="button_hover">Hover</string> 29 <string name="button_start_training">Start Training</string> 30 <string name="textview_detection_status_label">Detection Status : </string> 31 <string name="textview_detection_status">Not Active</string> 32 <string name="textview_current_action_label">Current Action : </string> 33 <string name="textview_current_action">Neutral</string> 29 34 <string name="seekbar_tracking_on">Tracking on</string> 30 35 <string name="seekbar_tracking_off">Tracking off</string>
Note: See TracChangeset
for help on using the changeset viewer.