Changeset 35756a5 in orbit
- Timestamp:
- 10/10/13 15:56:27 (9 years ago)
- Branches:
- pyramid
- Parents:
- 0d2b1fc
- Location:
- android
- Files:
-
- 2 added
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
android/res/values/strings.xml
rf3d6504 r35756a5 12 12 <string name="tab_advanced_small">Options</string> 13 13 <string name="tab_advanced_large">Advanced</string> 14 <string name="tab_pyramid">Pyramid</string> 15 <string name="tab_pyramid_small">Pyramid</string> 16 <string name="tab_pyramid_large">Pyramid</string> 14 17 <string name="tab_support">Support</string> 15 18 <string name="tab_support_small">Help</string> -
android/src/info/puzzlebox/orbit/OrbitTabActivity.java
r0d2b1fc r35756a5 67 67 * Configuration 68 68 */ 69 int minAPIVersion = 1 1;69 int minAPIVersion = 14; 70 70 String versionName; 71 71 int eegAttention = 0; … … 78 78 boolean generateAudio = true; 79 79 boolean invertControlSignal = false; 80 // boolean pluginPyramid = false; 81 boolean pluginPyramid = true; 80 82 81 83 … … 89 91 String idTabFragmentFlight; 90 92 String idTabFragmentAdvanced; 93 String idTabFragmentPyramid; 91 94 String idTabFragmentSupport; 92 95 … … 111 114 */ 112 115 /** set to "false" for production releases */ 113 //boolean DEBUG = true;114 boolean DEBUG = false;116 boolean DEBUG = true; 117 // boolean DEBUG = false; 115 118 String TAG = "OrbitTabActivity"; 116 119 … … 205 208 String tabFlightLabel = getResources().getString(R.string.tab_flight); 206 209 String tabAdvancedLabel = getResources().getString(R.string.tab_advanced); 210 String tabPyramidLabel = getResources().getString(R.string.tab_pyramid); 207 211 String tabSupportLabel = getResources().getString(R.string.tab_support); 208 212 … … 216 220 tabFlightLabel = getResources().getString(R.string.tab_flight_small); 217 221 tabAdvancedLabel = getResources().getString(R.string.tab_advanced_small); 222 tabPyramidLabel = getResources().getString(R.string.tab_pyramid_small); 218 223 tabSupportLabel = getResources().getString(R.string.tab_support_small); 219 224 break; … … 225 230 tabFlightLabel = getResources().getString(R.string.tab_flight_large); 226 231 tabAdvancedLabel = getResources().getString(R.string.tab_advanced_large); 232 tabPyramidLabel = getResources().getString(R.string.tab_pyramid_large); 227 233 tabSupportLabel = getResources().getString(R.string.tab_support_large); 228 234 break; … … 231 237 tabFlightLabel = getResources().getString(R.string.tab_flight_large); 232 238 tabAdvancedLabel = getResources().getString(R.string.tab_advanced_large); 239 tabPyramidLabel = getResources().getString(R.string.tab_pyramid_large); 233 240 tabSupportLabel = getResources().getString(R.string.tab_support_large); 234 241 break; … … 261 268 mTabsAdapter.addTab(mTabHost.newTabSpec("Orbit").setIndicator(tabAdvancedLabel), 262 269 FragmentTabAdvanced.class, null); 270 271 mTabsAdapter.addTab(mTabHost.newTabSpec("Orbit").setIndicator(tabPyramidLabel), 272 FragmentTabPyramid.class, null); 263 273 264 274 mTabsAdapter.addTab(mTabHost.newTabSpec("Orbit").setIndicator(tabSupportLabel), … … 364 374 // ################################################################ 365 375 366 367 368 369 370 371 372 373 374 375 376 // ################################################################ 377 378 379 380 381 382 383 384 385 386 387 388 389 376 public boolean onCreateOptionsMenu(Menu menu) { 377 378 SubMenu sub = menu.addSubMenu("About"); 379 sub.getItem().setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT); 380 381 return true; 382 383 } // onCreateOptionsMenu 384 385 386 // ################################################################ 387 388 public boolean onOptionsItemSelected(MenuItem item) { 389 if (item.getItemId() == android.R.id.home || item.getItemId() == 0) { 390 // Toast.makeText(this, "About menu: \"" + item.getTitle() + "\"", Toast.LENGTH_SHORT).show(); 391 Toast.makeText(this, "Puzzlebox Orbit\n Version: " + versionName, Toast.LENGTH_SHORT).show(); 392 return false; 393 } 394 //// THEME = item.getItemId(); 395 // Toast.makeText(this, "Theme changed to \"" + item.getTitle() + "\"", Toast.LENGTH_SHORT).show(); 396 Toast.makeText(this, "About menu: \"" + item.getTitle() + "\"", Toast.LENGTH_SHORT).show(); 397 return true; 398 399 } // onOptionsItemSelected 390 400 391 401 … … 618 628 idTabFragmentAdvanced = t; 619 629 } 630 public void setTabFragmentPyramid(String t) { 631 idTabFragmentPyramid = t; 632 } 620 633 public void setTabFragmentSupport(String t) { 621 634 idTabFragmentSupport = t; … … 630 643 public String getTabFragmentAdvanced() { 631 644 return idTabFragmentAdvanced; 645 } 646 public String getTabFragmentPyramid() { 647 return idTabFragmentPyramid; 632 648 } 633 649 public String getTabFragmentSupport() { … … 857 873 fragmentFlight.parseEEG(msg); 858 874 } 875 876 877 FragmentTabPyramid fragmentPyramid = 878 (FragmentTabPyramid) getSupportFragmentManager().findFragmentByTag( getTabFragmentPyramid() ); 879 880 if (fragmentPyramid != null){ 881 fragmentPyramid.parseEEG(msg); 882 } 883 859 884 860 885 switch (msg.what) { … … 1007 1032 tgDevice.close(); 1008 1033 } 1009 1034 1010 1035 stopControl(); 1011 1036 … … 1063 1088 if (fragmentFlight != null) 1064 1089 eegPower = fragmentFlight.updatePower(); 1090 1091 1092 FragmentTabPyramid fragmentPyramid = 1093 (FragmentTabPyramid) getSupportFragmentManager().findFragmentByTag( getTabFragmentPyramid() ); 1094 1095 if (fragmentPyramid != null) 1096 fragmentPyramid.updatePower(eegPower); 1097 1065 1098 1066 1099 String command = ""; … … 1136 1169 else 1137 1170 updateAudioHandlerLoopNumberWhileMindControl(4500); 1138 1171 1139 1172 updateAudioHandlerChannel(channel); 1140 1173 1141 1174 audioHandler.mutexNotify(); 1142 1175 }
Note: See TracChangeset
for help on using the changeset viewer.