diff options
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, 3 insertions, 22 deletions
diff --git a/common/res/layout/fragment_setup_multi_pane.xml b/common/res/layout/fragment_setup_multi_pane.xml index e3ff8d83..45aff132 100644 --- a/common/res/layout/fragment_setup_multi_pane.xml +++ b/common/res/layout/fragment_setup_multi_pane.xml @@ -40,13 +40,11 @@ android:clipChildren="false" android:clipToPadding="false" /> <!-- TODO: Use button action list in GuidedStepFragment --> - <LinearLayout + <FrameLayout 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"> @@ -56,6 +54,7 @@ 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" @@ -66,23 +65,5 @@ android:text="@string/action_text_done" android:textColor="#EEEEEE" android:textSize="14sp" /> - <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> </FrameLayout> |