Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix missing arrows, a label, an edge flag, and undoing lights out.

  • Loading branch information...
commit e3d3d3531a0ea24c3a21bd066428b6f463f9dbe9 1 parent cb73787
@chrisboyle authored
View
2  res/values/strings.xml
@@ -100,7 +100,7 @@ Revision: %s"</string>
<string name="chooserStyleGrid">Grid (icons only)</string>
<string name="allGames">All games</string>
<string name="arrowKeys">Arrow keys</string>
- <string name="arrowKeysAlways">Always</string>
+ <string name="arrowKeysAlways">Always, except Untangle</string>
<string name="arrowKeysAuto">When no trackball/D-pad</string>
<string name="arrowKeysNever">Never</string>
<string name="fullscreen">Full screen</string>
View
5 src/name/boyle/chris/sgtpuzzles/SGTPuzzles.java
@@ -492,7 +492,7 @@ void startGame(final int which, final String savedGame)
customVisible = false;
setStatusBarVisibility(false);
}
- setKeys("", SmallKeyboard.NO_ARROWS);
+ setKeys("", SmallKeyboard.ARROWS_LEFT_RIGHT_CLICK);
if( typeMenu != null ) for( Integer i : gameTypes.keySet() ) typeMenu.removeItem(i);
gameTypes.clear();
gameRunning = true;
@@ -851,8 +851,11 @@ void applyFullscreen(boolean alreadyStarted) {
}
} else {
if (hasActionBar) {
+ final boolean fAlreadyStarted = alreadyStarted;
handler.post(new Runnable(){ public void run() {
actionBarCompat.lightsOut(gameView, false);
+ // This shouldn't be necessary but is on Galaxy Tab 10.1
+ if (fAlreadyStarted) restartOnResume = true;
}});
} else if (alreadyStarted) {
// This is the only way to change the theme
View
2  src/name/boyle/chris/sgtpuzzles/SmallKeyboard.java
@@ -259,7 +259,7 @@ public KeyboardModel(Context context, CharSequence characters,
key.y = arrowsBottomEdge - 3*keyPlusPad;
key.icon = context.getResources().getDrawable(
R.drawable.arrow_nw);
- key.edgeFlags = maybeLeft;
+ key.edgeFlags = maybeTop | maybeLeft;
break;
case GameView.MOD_NUM_KEYPAD | '1':
key.x = arrowsRightEdge - 3*keyPlusPad;
Please sign in to comment.
Something went wrong with that request. Please try again.