diff options
author | John Reck <jreck@google.com> | 2010-12-07 17:38:34 -0800 |
---|---|---|
committer | John Reck <jreck@google.com> | 2010-12-07 17:40:03 -0800 |
commit | d4893b0263f751f188f62ee3d64b3c5e129c98ed (patch) | |
tree | a06e70c71950c3cdd0cfea75605b68728641457c /src/com/android/browser/BrowserBookmarksPage.java | |
parent | ffce12cded5227cc94752de75e3f00acdbf9c90f (diff) | |
download | packages_apps_browser-d4893b0263f751f188f62ee3d64b3c5e129c98ed.zip packages_apps_browser-d4893b0263f751f188f62ee3d64b3c5e129c98ed.tar.gz packages_apps_browser-d4893b0263f751f188f62ee3d64b3c5e129c98ed.tar.bz2 |
Adds a cancel button to ShortcutActivity dialog
Bug: 3167402
Adds a cancel button to the ShortcutActivity when it is being
shown as a dialog (when large)
Change-Id: I6e47db8770cd18f69d534c361ff8fc90128e8dad
Diffstat (limited to 'src/com/android/browser/BrowserBookmarksPage.java')
-rw-r--r-- | src/com/android/browser/BrowserBookmarksPage.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/com/android/browser/BrowserBookmarksPage.java b/src/com/android/browser/BrowserBookmarksPage.java index 1410ce8..ccacee8 100644 --- a/src/com/android/browser/BrowserBookmarksPage.java +++ b/src/com/android/browser/BrowserBookmarksPage.java @@ -16,6 +16,8 @@ package com.android.browser; +import com.android.browser.BreadCrumbView.Crumb; + import android.app.Activity; import android.app.AlertDialog; import android.app.Fragment; @@ -698,14 +700,18 @@ public class BrowserBookmarksPage extends Fragment implements View.OnCreateConte } public boolean onBackPressed() { - if (mCrumbs != null && - mCrumbs.size() > 0) { + if (canGoBack()) { mCrumbs.popView(); return true; } return false; } + private boolean canGoBack() { + Crumb c = mCrumbs.getTopCrumb(); + return c != null && c.canGoBack; + } + public void setCallbackListener(BookmarksPageCallbacks callbackListener) { mCallbacks = callbackListener; } |