Remove hairline in account setup flow
b/13675117 Change-Id: I499929c4b4dd05c26aa24e5bd4c29fd89c6da963
This commit is contained in:
parent
41e3f37b50
commit
e27e24e9f2
@ -33,10 +33,6 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/account_setup_options_headline"
|
||||
style="@style/account_setup_headline" />
|
||||
<View
|
||||
android:id="@+id/top_divider"
|
||||
android:layout_width="match_parent"
|
||||
style="@style/account_setup_top_divider" />
|
||||
|
||||
<!-- Primary Content -->
|
||||
<FrameLayout
|
||||
|
@ -1,56 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (C) 2010 The Android Open Source Project
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
|
||||
<!-- Account Names - XL - portrait - see layout/ for small-screen version -->
|
||||
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:fillViewport="true" >
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical" >
|
||||
|
||||
<!-- Headline and hairline divider -->
|
||||
<!-- Set headline for first fragment, change in code as we progress through screens -->
|
||||
<TextView
|
||||
android:id="@+id/headline"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/account_setup_options_headline"
|
||||
style="@style/account_setup_headline" />
|
||||
<View
|
||||
android:id="@+id/top_divider"
|
||||
android:layout_width="match_parent"
|
||||
style="@style/account_setup_top_divider" />
|
||||
|
||||
<!-- Primary Content -->
|
||||
<FrameLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/setup_fragment_content"
|
||||
style="@style/account_setup_fragment_container"
|
||||
/>
|
||||
<View
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight="1"/>
|
||||
|
||||
<!-- Buttons below that -->
|
||||
<include layout="@layout/account_setup_buttons" />
|
||||
</LinearLayout>
|
||||
</ScrollView>
|
@ -49,11 +49,6 @@
|
||||
<dimen name="setup_headline_padding_top">24dp</dimen>
|
||||
<dimen name="setup_headline_padding_side">24dp</dimen>
|
||||
|
||||
<!-- Account setup hairline -->
|
||||
<dimen name="setup_top_divider_margin_top">8dp</dimen>
|
||||
<dimen name="setup_top_divider_margin_bottom">16dp</dimen>
|
||||
<dimen name="setup_top_divider_margin_side">24dp</dimen>
|
||||
|
||||
<!-- inset distance for settings buttons -->
|
||||
<dimen name="settings_buttons_padding_top">48dp</dimen>
|
||||
<dimen name="settings_buttons_padding_bottom">48dp</dimen>
|
||||
|
@ -30,16 +30,6 @@
|
||||
<item name="android:paddingRight">@dimen/setup_headline_padding_side</item>
|
||||
</style>
|
||||
|
||||
<!-- The divider hairline below the headline in account setup screens -->
|
||||
<style name="account_setup_top_divider">
|
||||
<item name="android:layout_marginTop">@dimen/setup_top_divider_margin_top</item>
|
||||
<item name="android:layout_marginLeft">@dimen/setup_top_divider_margin_side</item>
|
||||
<item name="android:layout_marginRight">@dimen/setup_top_divider_margin_side</item>
|
||||
<item name="android:layout_marginBottom">@dimen/setup_top_divider_margin_bottom</item>
|
||||
<item name="android:background">@color/account_setup_divider_color</item>
|
||||
<item name="android:layout_height">1px</item>
|
||||
</style>
|
||||
|
||||
<style name="account_setup_fragment_container">
|
||||
<item name="android:paddingTop">@dimen/setup_fragment_padding_top</item>
|
||||
<item name="android:paddingLeft">@dimen/setup_fragment_padding_side</item>
|
||||
|
Loading…
Reference in New Issue
Block a user