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

Commit 23243730 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android Git Automerger
Browse files

am f4809ebb: am 2e307a61: Merge "No breadcrumbs for single-pane preferences" into jb-mr1-dev 

* commit 'f4809ebb':
  No breadcrumbs for single-pane preferences
parents 7df0b260 f4809ebb

core/java/android/preference/PreferenceActivity.java

+6 −0
Original line number Diff line number Diff line
@@ -1083,6 +1083,12 @@ public abstract class PreferenceActivity extends ListActivity implements 
                }

                return;

            }

            if (mSinglePane) {

                mFragmentBreadCrumbs.setVisibility(View.GONE);

                // Hide the breadcrumb section completely for single-pane

                View bcSection = findViewById(com.android.internal.R.id.breadcrumb_section);

                if (bcSection != null) bcSection.setVisibility(View.GONE);

            }

            mFragmentBreadCrumbs.setMaxVisible(2);

            mFragmentBreadCrumbs.setActivity(this);

        }

core/res/res/layout-xlarge/breadcrumbs_in_fragment.xml

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
-->



<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

        android:id="@+android:id/breadcrumb_section"

        android:orientation="vertical"

        android:layout_height="wrap_content"

        android:layout_width="match_parent"

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -217,6 +217,7 @@ 
  <java-symbol type="id" name="sms_short_code_detail_message" />

  <java-symbol type="id" name="sms_short_code_remember_choice_checkbox" />

  <java-symbol type="id" name="sms_short_code_remember_undo_instruction" />

  <java-symbol type="id" name="breadcrumb_section" />



  <java-symbol type="attr" name="actionModeShareDrawable" />

  <java-symbol type="attr" name="alertDialogCenterButtons" />