b4b7725937
This reverts commit 9e98b8cf0f.
We have to set clipToPadding false on scrollView to make it extend below
navbar. But the side effect is it stops clipping to padding. So it
overlaps with sibling views. In this case anything pinned on top of
screen (switchbar, pinned header for most UIs, and preview indicator for
font size page).
To fix them:
1. in preview pages, just revert back to clipTo*. Their UI doesn't scroll
so it they don't need to special clip flag to begin with.
2. For pinned to top headers, we need to change the "z-order" by setting
elevation and make sure background is not transparent.
Fixes: 132182711
Fixes: 132672399
Test: visually on normal screen, font size scree, wifi main setting UI,
wifi data usage screen
Reason for revert: Rollforward with fix.
Change-Id: Ib6f7c4167b9a680a336f2a7310d82340094d3aac
93 lines
3.3 KiB
XML
93 lines
3.3 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!--
|
|
/*
|
|
** Copyright 2014, 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.
|
|
*/
|
|
-->
|
|
|
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
android:id="@+id/container_material"
|
|
android:orientation="vertical"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:background="@android:color/transparent">
|
|
|
|
<FrameLayout android:id="@+id/pinned_header"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:background="?android:attr/windowBackground"
|
|
android:elevation="1dp"
|
|
android:visibility="gone"/>
|
|
|
|
<FrameLayout
|
|
android:id="@android:id/list_container"
|
|
android:layout_height="0px"
|
|
android:layout_weight="1"
|
|
android:layout_width="match_parent">
|
|
|
|
<include layout="@layout/loading_container" />
|
|
|
|
</FrameLayout>
|
|
|
|
<TextView android:id="@android:id/empty"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="match_parent"
|
|
android:padding="@*android:dimen/preference_fragment_padding_side"
|
|
android:layout_gravity="center"
|
|
android:gravity="center_vertical"
|
|
android:visibility="gone" />
|
|
|
|
<RelativeLayout android:id="@+id/button_bar"
|
|
android:layout_height="wrap_content"
|
|
android:layout_width="match_parent"
|
|
android:layout_weight="0"
|
|
android:visibility="gone">
|
|
|
|
<Button android:id="@+id/back_button"
|
|
style="?android:attr/buttonBarButtonStyle"
|
|
android:layout_width="150dip"
|
|
android:layout_height="wrap_content"
|
|
android:layout_margin="5dip"
|
|
android:layout_alignParentStart="true"
|
|
android:text="@*android:string/back_button_label" />
|
|
|
|
<LinearLayout
|
|
android:orientation="horizontal"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_alignParentEnd="true">
|
|
|
|
<Button android:id="@+id/skip_button"
|
|
style="?android:attr/buttonBarButtonStyle"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_margin="5dip"
|
|
android:text="@*android:string/skip_button_label"
|
|
android:visibility="gone" />
|
|
|
|
<Button android:id="@+id/next_button"
|
|
style="?android:attr/buttonBarButtonStyle"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_margin="5dip"
|
|
android:text="@*android:string/next_button_label" />
|
|
|
|
</LinearLayout>
|
|
|
|
</RelativeLayout>
|
|
|
|
</LinearLayout>
|
|
|