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

Commit c57406cd authored by Jim Miller's avatar Jim Miller
Browse files

Fix 3148496: Update PreferenceActivity to handle single-pane fragments. 

This fixes a couple of bugs I found while updating SecuritySettings.

Change-Id: I9881cff71799ddf3c1d1493c2f7f3bfb31ca7774
parent d2112306

core/java/android/preference/PreferenceActivity.java

+6 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import com.android.internal.util.XmlUtils; 
import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlPullParserException;



import android.app.ActionBar;

import android.app.Fragment;

import android.app.FragmentBreadCrumbs;

import android.app.FragmentManager;
@@ -991,7 +992,11 @@ public abstract class PreferenceActivity extends ListActivity implements 
        if (mFragmentBreadCrumbs == null) {

            mFragmentBreadCrumbs = new FragmentBreadCrumbs(this);

            mFragmentBreadCrumbs.setActivity(this);

            getActionBar().setCustomNavigationMode(mFragmentBreadCrumbs);



            ActionBar actionBar = getActionBar();

            if (actionBar != null) {

                actionBar.setCustomNavigationMode(mFragmentBreadCrumbs);

            }

        }

        mFragmentBreadCrumbs.setTitle(title, shortTitle);

    }

core/java/android/preference/PreferenceFrameLayout.java

+3 −1
Original line number Diff line number Diff line
@@ -89,7 +89,9 @@ public class PreferenceFrameLayout extends FrameLayout { 
        int borderLeft = getPaddingLeft();

        int borderRight = getPaddingRight();



        LayoutParams layoutParams = (PreferenceFrameLayout.LayoutParams) child.getLayoutParams();

        android.view.ViewGroup.LayoutParams params = child.getLayoutParams();

        LayoutParams layoutParams = params instanceof PreferenceFrameLayout.LayoutParams

            ? (PreferenceFrameLayout.LayoutParams) child.getLayoutParams() : null;

        // Check on the id of the child before adding it.

        if (layoutParams != null && layoutParams.removeBorders) {

            if (mPaddingApplied) {