diff options
| author | Kirill Grouchnikov <kirillg@google.com> | 2015-06-29 11:55:11 -0400 |
|---|---|---|
| committer | Kirill Grouchnikov <kirillg@google.com> | 2015-06-29 11:55:11 -0400 |
| commit | 8827c235e0058fd4a32a94cdafff5b708b55f8e0 (patch) | |
| tree | 9496af63d82fb1070e1fd24f23971ef3817345cb /current/support/v17/leanback/res | |
| parent | e616deed93ea1962cb50ca91b63a7f07a8e08cef (diff) | |
| download | prebuilts_sdk-8827c235e0058fd4a32a94cdafff5b708b55f8e0.zip prebuilts_sdk-8827c235e0058fd4a32a94cdafff5b708b55f8e0.tar.gz prebuilts_sdk-8827c235e0058fd4a32a94cdafff5b708b55f8e0.tar.bz2 | |
DO NOT MERGE ANYWHERE. update support lib to build id 2050913 from mnc-dev.
Change-Id: I3b9aa609fc5978c3757352e5300f4fc9f12ac3b8
Diffstat (limited to 'current/support/v17/leanback/res')
| -rw-r--r-- | current/support/v17/leanback/res/layout/lb_fullwidth_details_overview.xml | 59 | ||||
| -rw-r--r-- | current/support/v17/leanback/res/values/dimens.xml | 1 |
2 files changed, 33 insertions, 27 deletions
diff --git a/current/support/v17/leanback/res/layout/lb_fullwidth_details_overview.xml b/current/support/v17/leanback/res/layout/lb_fullwidth_details_overview.xml index 27c4258..614fc59 100644 --- a/current/support/v17/leanback/res/layout/lb_fullwidth_details_overview.xml +++ b/current/support/v17/leanback/res/layout/lb_fullwidth_details_overview.xml @@ -30,7 +30,6 @@ android:layout_width="match_parent" android:layout_height="@dimen/lb_details_v2_card_height" android:layout_marginTop="@dimen/lb_details_v2_blank_height" - android:paddingStart="@dimen/lb_details_v2_left" android:clipToPadding="false" android:foreground="#ffffff" android:elevation="@dimen/lb_details_overview_z" @@ -42,34 +41,40 @@ android:orientation="vertical" > - <android.support.v17.leanback.widget.HorizontalGridView - android:id="@+id/details_overview_actions" - android:layout_width="match_parent" - android:layout_height="@dimen/lb_details_v2_actions_height" - android:gravity="center" - android:clipToPadding="false" - android:focusable="true" - android:focusableInTouchMode="true" - android:paddingStart="@dimen/lb_details_v2_description_margin_start" - android:paddingEnd="@dimen/lb_details_v2_description_margin_end" - lb:horizontalMargin="@dimen/lb_details_overview_action_items_margin" - lb:rowHeight="@dimen/lb_details_v2_actions_height" /> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:id="@+id/details_overview_actions_background" + android:orientation="vertical" > - <android.support.v17.leanback.widget.NonOverlappingFrameLayout - android:id="@+id/details_overview_description" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:focusable="true" - android:focusableInTouchMode="true" - android:descendantFocusability="afterDescendants" - android:gravity="top" - android:paddingStart="@dimen/lb_details_v2_description_margin_start" - android:paddingEnd="@dimen/lb_details_v2_description_margin_end" - android:paddingTop="@dimen/lb_details_v2_description_margin_top" - android:clipToPadding="false" - android:clipChildren="false" - /> + <android.support.v17.leanback.widget.HorizontalGridView + android:id="@+id/details_overview_actions" + android:layout_width="match_parent" + android:layout_height="@dimen/lb_details_v2_actions_height" + android:gravity="center" + android:clipToPadding="false" + android:focusable="true" + android:focusableInTouchMode="true" + android:paddingStart="@dimen/lb_details_v2_description_margin_start" + android:paddingEnd="@dimen/lb_details_v2_description_margin_end" + lb:horizontalMargin="@dimen/lb_details_overview_action_items_margin" + lb:rowHeight="@dimen/lb_details_v2_actions_height" /> + </LinearLayout> + <android.support.v17.leanback.widget.NonOverlappingFrameLayout + android:id="@+id/details_overview_description" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:focusable="true" + android:focusableInTouchMode="true" + android:descendantFocusability="afterDescendants" + android:gravity="top" + android:paddingStart="@dimen/lb_details_v2_description_margin_start" + android:paddingEnd="@dimen/lb_details_v2_description_margin_end" + android:paddingTop="@dimen/lb_details_v2_description_margin_top" + android:clipToPadding="false" + android:clipChildren="false" + /> </LinearLayout> </FrameLayout> </FrameLayout> diff --git a/current/support/v17/leanback/res/values/dimens.xml b/current/support/v17/leanback/res/values/dimens.xml index c7664b9..275612e 100644 --- a/current/support/v17/leanback/res/values/dimens.xml +++ b/current/support/v17/leanback/res/values/dimens.xml @@ -105,6 +105,7 @@ <dimen name="lb_details_v2_blank_height">160dp</dimen> <dimen name="lb_details_v2_card_height">540dp</dimen> <dimen name="lb_details_v2_left">270dip</dimen> + <dimen name="lb_details_v2_logo_margin_start">128dp</dimen> <dimen name="lb_details_v2_actions_height">56dip</dimen> <dimen name="lb_details_v2_description_margin_start">24dp</dimen> <dimen name="lb_details_v2_description_margin_end">54dp</dimen> |