Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80ad0b0a authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Fix a bunch of API review bugs." into honeycomb

parents 6e3212a3 327fbd2c
Loading
Loading
Loading
Loading
+278 −323

File changed.

Preview size limit exceeded, changes collapsed.

+277 −322

File changed.

Preview size limit exceeded, changes collapsed.

+8 −0
Original line number Diff line number Diff line
@@ -267,6 +267,14 @@ final class BackStackRecord extends FragmentTransaction implements
        return mIndex;
    }

    public int getBreadCrumbTitleRes() {
        return mBreadCrumbTitleRes;
    }

    public int getBreadCrumbShortTitleRes() {
        return mBreadCrumbShortTitleRes;
    }

    public CharSequence getBreadCrumbTitle() {
        if (mBreadCrumbTitleRes != 0) {
            return mManager.mActivity.getText(mBreadCrumbTitleRes);
+1 −1
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ public class DialogFragment extends Fragment
    /**
     * Return the current value of {@link #setCancelable(boolean)}.
     */
    public boolean getCancelable() {
    public boolean isCancelable() {
        return mCancelable;
    }

+2 −2
Original line number Diff line number Diff line
@@ -204,13 +204,13 @@ public class FragmentBreadCrumbs extends ViewGroup

    void updateCrumbs() {
        FragmentManager fm = mActivity.getFragmentManager();
        int numEntries = fm.countBackStackEntries();
        int numEntries = fm.getBackStackEntryCount();
        int numPreEntries = getPreEntryCount();
        int numViews = mContainer.getChildCount();
        for (int i = 0; i < numEntries + numPreEntries; i++) {
            BackStackEntry bse = i < numPreEntries
                    ? getPreEntry(i)
                    : fm.getBackStackEntry(i - numPreEntries);
                    : fm.getBackStackEntryAt(i - numPreEntries);
            if (i < numViews) {
                View v = mContainer.getChildAt(i);
                Object tag = v.getTag();
Loading