TnSb/android-calculatorpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Action bar icon as up

Browse Source
This commit is contained in:
serso 2015-02-01 20:25:13 +01:00
parent 9154f9b508
commit 2396de20a4
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
android-app/src/main/java/org/solovyev/android/calculator/ActivityUi.java
View File

@ -94,13 +94,16 @@ public class ActivityUi extends BaseUi {
onCreate((Activity) activity); onCreate((Activity) activity);
final ActionBar actionBar = activity.getSupportActionBar(); final ActionBar actionBar = activity.getSupportActionBar();
actionBar.setDisplayUseLogoEnabled(false); actionBar.setDisplayUseLogoEnabled(false);
actionBar.setDisplayHomeAsUpEnabled(false); final boolean homeAsUp = !(activity instanceof CalculatorActivity);
actionBar.setDisplayHomeAsUpEnabled(homeAsUp);
actionBar.setHomeButtonEnabled(false); actionBar.setHomeButtonEnabled(false);
actionBar.setDisplayShowHomeEnabled(true); actionBar.setDisplayShowHomeEnabled(true);
toggleTitle(activity, true); toggleTitle(activity, true);
actionBar.setIcon(R.drawable.ab_icon); if (!homeAsUp) {
actionBar.setIcon(R.drawable.ab_icon);
}
actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS); actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
} }

11
android-app/src/main/java/org/solovyev/android/calculator/BaseActivity.java
View File

@ -3,6 +3,7 @@ package org.solovyev.android.calculator;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.LayoutRes; import android.support.annotation.LayoutRes;
import android.support.v7.app.ActionBarActivity; import android.support.v7.app.ActionBarActivity;
import android.view.MenuItem;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
@ -70,4 +71,14 @@ public class BaseActivity extends ActionBarActivity {
super.onDestroy(); super.onDestroy();
ui.onDestroy(this); ui.onDestroy(this);
} }
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
finish();
return true;
}
return super.onOptionsItemSelected(item);
}
} }