| commit | 8cadd8cbdc55b3f6eb6a0adc3b2fd0bf977b580c | [log] [tgz] |
|---|---|---|
| author | Tony Mantler <nicoya@google.com> | Tue Aug 18 21:19:36 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Aug 18 21:19:36 2015 +0000 |
| tree | ff16456af93f39ca1a42aa2a559df7db72d275ea | |
| parent | b2fa36a16edfbf46997946526361085e721c2d66 [diff] | |
| parent | 8d75353a08464f1a0a333981289d226210b52275 [diff] |
Merge "Condense ALL the text in leanback-prefs" into mnc-ub-dev
diff --git a/v17/leanback/src/android/support/v17/leanback/app/DetailsFragment.java b/v17/leanback/src/android/support/v17/leanback/app/DetailsFragment.java index d415de0..50240a0 100644 --- a/v17/leanback/src/android/support/v17/leanback/app/DetailsFragment.java +++ b/v17/leanback/src/android/support/v17/leanback/app/DetailsFragment.java
@@ -394,7 +394,6 @@ super.onStart(); setupChildFragmentLayout(); setupFocusSearchListener(); - mRowsFragment.getView().requestFocus(); if (isEntranceTransitionEnabled()) { // make sure recycler view animation is disabled mRowsFragment.onTransitionPrepare();
diff --git a/v17/leanback/src/android/support/v17/leanback/app/DetailsSupportFragment.java b/v17/leanback/src/android/support/v17/leanback/app/DetailsSupportFragment.java index afaf5a8..c73bd65 100644 --- a/v17/leanback/src/android/support/v17/leanback/app/DetailsSupportFragment.java +++ b/v17/leanback/src/android/support/v17/leanback/app/DetailsSupportFragment.java
@@ -396,7 +396,6 @@ super.onStart(); setupChildFragmentLayout(); setupFocusSearchListener(); - mRowsSupportFragment.getView().requestFocus(); if (isEntranceTransitionEnabled()) { // make sure recycler view animation is disabled mRowsSupportFragment.onTransitionPrepare();
diff --git a/v17/preference-leanback/res/layout/leanback_preference_category.xml b/v17/preference-leanback/res/layout/leanback_preference_category.xml index 953bdcb..39e8821 100644 --- a/v17/preference-leanback/res/layout/leanback_preference_category.xml +++ b/v17/preference-leanback/res/layout/leanback_preference_category.xml
@@ -18,6 +18,7 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="@dimen/lb_preference_category_height" + android:clipToPadding="false" android:paddingStart="@dimen/lb_preference_item_padding_start" android:paddingEnd="@dimen/lb_preference_item_padding_end">