diff options
| author | Amith Yamasani <yamasani@google.com> | 2012-10-03 16:02:51 -0700 |
|---|---|---|
| committer | Amith Yamasani <yamasani@google.com> | 2012-10-03 16:21:42 -0700 |
| commit | 3ec7bac9a0c262882d6ca2985f4dc3ecc42489c0 (patch) | |
| tree | c1c250d5298343319274e0be69d3d320b7968978 | |
| parent | 891a216102f39a10c5a16714213bf46c58b043ec (diff) | |
| download | frameworks_base-3ec7bac9a0c262882d6ca2985f4dc3ecc42489c0.zip frameworks_base-3ec7bac9a0c262882d6ca2985f4dc3ecc42489c0.tar.gz frameworks_base-3ec7bac9a0c262882d6ca2985f4dc3ecc42489c0.tar.bz2 | |
No breadcrumbs for single-pane preferences
Bug: 7274530
Change-Id: I6a4b6321a72ad38a757098ea470ac58d4294639b
| -rw-r--r-- | core/java/android/preference/PreferenceActivity.java | 6 | ||||
| -rw-r--r-- | core/res/res/layout-xlarge/breadcrumbs_in_fragment.xml | 1 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 1 |
3 files changed, 8 insertions, 0 deletions
diff --git a/core/java/android/preference/PreferenceActivity.java b/core/java/android/preference/PreferenceActivity.java index 9bfa8c0..09ff7be 100644 --- a/core/java/android/preference/PreferenceActivity.java +++ b/core/java/android/preference/PreferenceActivity.java @@ -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); } diff --git a/core/res/res/layout-xlarge/breadcrumbs_in_fragment.xml b/core/res/res/layout-xlarge/breadcrumbs_in_fragment.xml index 0fb3443..8e86427 100644 --- a/core/res/res/layout-xlarge/breadcrumbs_in_fragment.xml +++ b/core/res/res/layout-xlarge/breadcrumbs_in_fragment.xml @@ -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" diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 8ac0ad5..6803c20 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -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" /> |