diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2012-05-13 20:20:50 +0200 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2012-05-13 20:20:50 +0200 |
| commit | 5f7d5b854b966a9901e0fbc36dec7234b4ba9220 (patch) | |
| tree | 40b3c6473fe6b63288704989748ce9ccb4d132f9 /android | |
| parent | 8689bcc18635526a8af07c08e18e249ef41a2671 (diff) | |
| download | rockbox-5f7d5b854b966a9901e0fbc36dec7234b4ba9220.tar.gz rockbox-5f7d5b854b966a9901e0fbc36dec7234b4ba9220.tar.bz2 rockbox-5f7d5b854b966a9901e0fbc36dec7234b4ba9220.zip | |
android: Fix FS#12670, regressed back button behavior.
3f4be75 introduced this regression where the back button stopped working
as intended. Explicitely request the focus on the RockboxFramebuffer
object to fix.
Change-Id: Ibc67e3d02e076674a086d43c5967370c4524fd14
Diffstat (limited to 'android')
| -rw-r--r-- | android/src/org/rockbox/RockboxActivity.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/android/src/org/rockbox/RockboxActivity.java b/android/src/org/rockbox/RockboxActivity.java index 0e2daa76fb..a6604418ed 100644 --- a/android/src/org/rockbox/RockboxActivity.java +++ b/android/src/org/rockbox/RockboxActivity.java @@ -60,11 +60,14 @@ public class RockboxActivity extends Activity @Override protected void onReceiveResult(final int resultCode, final Bundle resultData) { + RockboxFramebuffer fb; switch (resultCode) { case RockboxService.RESULT_INVOKING_MAIN: if (loadingdialog != null) loadingdialog.dismiss(); - setContentView(new RockboxFramebuffer(RockboxActivity.this)); + fb = new RockboxFramebuffer(RockboxActivity.this); + setContentView(fb); + fb.requestFocus(); break; case RockboxService.RESULT_LIB_LOAD_PROGRESS: if (loadingdialog == null) @@ -78,7 +81,11 @@ public class RockboxActivity extends Activity break; case RockboxService.RESULT_SERVICE_RUNNING: if (!unzip) /* defer to RESULT_INVOKING_MAIN */ - setContentView(new RockboxFramebuffer(RockboxActivity.this)); + { + fb = new RockboxFramebuffer(RockboxActivity.this); + setContentView(fb); + fb.requestFocus(); + } setServiceActivity(true); break; case RockboxService.RESULT_ERROR_OCCURED: |