devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

android: Fix FS#12670, regressed back button behavior.

Browse source 
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
This commit is contained in:
Thomas Martitz 2012-05-13 20:20:50 +02:00
parent 8689bcc186
commit 5f7d5b854b
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
android/src/org/rockbox/RockboxActivity.java
View file

@ -60,11 +60,14 @@ public class RockboxActivity extends Activity
@Override @Override
protected void onReceiveResult(final int resultCode, final Bundle resultData) protected void onReceiveResult(final int resultCode, final Bundle resultData)
{ {
RockboxFramebuffer fb;
switch (resultCode) { switch (resultCode) {
case RockboxService.RESULT_INVOKING_MAIN: case RockboxService.RESULT_INVOKING_MAIN:
if (loadingdialog != null) if (loadingdialog != null)
loadingdialog.dismiss(); loadingdialog.dismiss();
setContentView(new RockboxFramebuffer(RockboxActivity.this)); fb = new RockboxFramebuffer(RockboxActivity.this);
setContentView(fb);
fb.requestFocus();
break; break;
case RockboxService.RESULT_LIB_LOAD_PROGRESS: case RockboxService.RESULT_LIB_LOAD_PROGRESS:
if (loadingdialog == null) if (loadingdialog == null)
@ -78,7 +81,11 @@ public class RockboxActivity extends Activity
break; break;
case RockboxService.RESULT_SERVICE_RUNNING: case RockboxService.RESULT_SERVICE_RUNNING:
if (!unzip) /* defer to RESULT_INVOKING_MAIN */ if (!unzip) /* defer to RESULT_INVOKING_MAIN */
setContentView(new RockboxFramebuffer(RockboxActivity.this)); {
fb = new RockboxFramebuffer(RockboxActivity.this);
setContentView(fb);
fb.requestFocus();
}
setServiceActivity(true); setServiceActivity(true);
break; break;
case RockboxService.RESULT_ERROR_OCCURED: case RockboxService.RESULT_ERROR_OCCURED: