merge heads

2012-04-06 12:59:38 -07:00
parent 6c7131f2a8
commit 70124b8465
21 changed files with 302 additions and 367 deletions
@@ -104,7 +104,7 @@ public class Api7Adapter implements ApiAdapter {
  }

  @Override
-  public void showActionBar(Activity activity) {
+  public void configureActionBarHomeAsUp(Activity activity) {
    // Action bar not available, just hide the title and let actions be shown
    // via the regular menu.
    activity.requestWindowFeature(Window.FEATURE_NO_TITLE);