diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-01-17 12:29:51 -0800 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2011-01-17 15:28:10 -0800 |
| commit | bf1d10af39eb23d68db69a8eda9e12e62f1a9682 (patch) | |
| tree | 2c15eb9dceb371fd0008c0e6900aff9d0fb95f20 | |
| parent | 1d676b6d3080ea2e8206e2a601be8390f1bbd0ed (diff) | |
| download | packages_apps_Browser-bf1d10af39eb23d68db69a8eda9e12e62f1a9682.zip packages_apps_Browser-bf1d10af39eb23d68db69a8eda9e12e62f1a9682.tar.gz packages_apps_Browser-bf1d10af39eb23d68db69a8eda9e12e62f1a9682.tar.bz2 | |
Follow API changes.
Change-Id: I1003044245db558c0c2ccfabd06fb7a9b9c94403
4 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/browser/BrowserBookmarksPage.java b/src/com/android/browser/BrowserBookmarksPage.java index 2df0561..dfb0b77 100644 --- a/src/com/android/browser/BrowserBookmarksPage.java +++ b/src/com/android/browser/BrowserBookmarksPage.java @@ -647,7 +647,7 @@ public class BrowserBookmarksPage extends Fragment implements View.OnCreateConte private void copy(CharSequence text) { ClipboardManager cm = (ClipboardManager) getActivity().getSystemService( Context.CLIPBOARD_SERVICE); - cm.setPrimaryClip(ClipData.newRawUri(null, null, Uri.parse(text.toString()))); + cm.setPrimaryClip(ClipData.newRawUri(null, Uri.parse(text.toString()))); } @Override diff --git a/src/com/android/browser/BrowserPreferencesPage.java b/src/com/android/browser/BrowserPreferencesPage.java index 2b42951..dae838f 100644 --- a/src/com/android/browser/BrowserPreferencesPage.java +++ b/src/com/android/browser/BrowserPreferencesPage.java @@ -70,7 +70,7 @@ public class BrowserPreferencesPage extends PreferenceActivity { public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { case android.R.id.home: - if (getFragmentManager().countBackStackEntries() > 0) { + if (getFragmentManager().getBackStackEntryCount() > 0) { getFragmentManager().popBackStack(); } else { finish(); diff --git a/src/com/android/browser/CombinedBookmarkHistoryView.java b/src/com/android/browser/CombinedBookmarkHistoryView.java index f4b2e9c..5731c37 100644 --- a/src/com/android/browser/CombinedBookmarkHistoryView.java +++ b/src/com/android/browser/CombinedBookmarkHistoryView.java @@ -241,7 +241,7 @@ public class CombinedBookmarkHistoryView extends LinearLayout protected void onDetachedFromWindow() { super.onDetachedFromWindow(); FragmentManager fm = mActivity.getFragmentManager(); - FragmentTransaction transaction = fm.openTransaction(); + FragmentTransaction transaction = fm.beginTransaction(); if (mCurrentFragment == FRAGMENT_ID_BOOKMARKS) { transaction.remove(mBookmarks); } else if (mCurrentFragment == FRAGMENT_ID_HISTORY) { diff --git a/src/com/android/browser/preferences/GeneralPreferencesFragment.java b/src/com/android/browser/preferences/GeneralPreferencesFragment.java index 7545ba8..99a4ec9 100644 --- a/src/com/android/browser/preferences/GeneralPreferencesFragment.java +++ b/src/com/android/browser/preferences/GeneralPreferencesFragment.java @@ -195,7 +195,7 @@ public class GeneralPreferencesFragment extends PreferenceFragment frag = new ImportWizardDialog(); } frag.setArguments(preference.getExtras()); - getFragmentManager().openTransaction() + getFragmentManager().beginTransaction() .add(frag, null) .commit(); return true; |