diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-11-29 00:20:48 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-11-29 00:20:48 +0000 |
| commit | 7b32e8a67561a7989dbfc0f1d3480dca162c6769 (patch) | |
| tree | d31e2adc1f9cce4f27ca07d30bee921032e33a3c /common/res/layout/fragment_setup_multi_pane.xml | |
| parent | bc7f430decab0bc34a533811efe457d4615f28aa (diff) | |
| parent | bb2e798ef4d546dd54cd9e95796403062b860c15 (diff) | |
| download | TV-7b32e8a67561a7989dbfc0f1d3480dca162c6769.tar.gz | |
Snap for 4448085 from bb2e798ef4d546dd54cd9e95796403062b860c15 to oc-m3-releaseandroid-8.1.0_r9android-8.1.0_r7android-8.1.0_r22android-8.1.0_r21android-8.1.0_r18android-8.1.0_r17android-8.1.0_r14android-8.1.0_r13oreo-m5-releaseoreo-m3-release
Change-Id: I0aff16fbf430ba5e4dbba83b8e06e4a23b38060a
Diffstat (limited to 'common/res/layout/fragment_setup_multi_pane.xml')
| -rw-r--r-- | common/res/layout/fragment_setup_multi_pane.xml | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/common/res/layout/fragment_setup_multi_pane.xml b/common/res/layout/fragment_setup_multi_pane.xml index 45aff132..e3ff8d83 100644 --- a/common/res/layout/fragment_setup_multi_pane.xml +++ b/common/res/layout/fragment_setup_multi_pane.xml @@ -40,11 +40,13 @@ android:clipChildren="false" android:clipToPadding="false" /> <!-- TODO: Use button action list in GuidedStepFragment --> - <FrameLayout + <LinearLayout android:id="@+id/done_button_container" android:layout_width="@dimen/setup_done_button_container_width" android:layout_height="match_parent" android:layout_gravity="end" + android:orientation="vertical" + android:paddingTop="190dp" style="?attr/doneButtonContainerStyle" android:transitionGroup="true" android:transitionName="buttonDoneTransition"> @@ -54,7 +56,6 @@ android:layout_height="45dp" android:layout_marginStart="24dp" android:layout_marginEnd="40dp" - android:layout_marginTop="190dp" android:elevation="0dp" android:focusable="true" android:fontFamily="sans-serif-condensed" @@ -65,5 +66,23 @@ android:text="@string/action_text_done" android:textColor="#EEEEEE" android:textSize="14sp" /> - </FrameLayout> + <TextView + android:id="@+id/button_skip" + android:layout_width="match_parent" + android:layout_height="45dp" + android:layout_marginStart="24dp" + android:layout_marginEnd="40dp" + android:layout_marginTop="8dp" + android:elevation="0dp" + android:focusable="true" + android:fontFamily="sans-serif-condensed" + android:paddingEnd="12dp" + android:paddingStart="12dp" + android:background="@drawable/setup_action_button_done" + android:gravity="center_vertical|start" + android:visibility="gone" + android:text="@string/action_text_skip" + android:textColor="#EEEEEE" + android:textSize="14sp" /> + </LinearLayout> </FrameLayout> |