Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f3f9185 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "More TabWidget and padding tweaks to match spec."

parents d664985e b654cbb8

res/layout-h720dp/tab_widget.xml

0 → 100644
+29 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2011 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.

-->



<HorizontalScrollView xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:scrollbars="none">



    <TabWidget

        android:id="@android:id/tabs"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:orientation="horizontal"

        style="?android:attr/tabWidgetStyle" />



</HorizontalScrollView>

res/layout-w720dp/tab_widget.xml

0 → 100644
+29 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2011 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.

-->



<HorizontalScrollView xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:scrollbars="none">



    <TabWidget

        android:id="@android:id/tabs"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:orientation="horizontal"

        style="?android:attr/tabWidgetStyle" />



</HorizontalScrollView>

res/layout/data_usage_chart.xml

+2 −2
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ 
    android:id="@+id/chart"

    android:layout_width="match_parent"

    android:layout_height="@dimen/data_usage_chart_height"

    android:paddingLeft="@*android:dimen/preference_item_padding_side"

    android:paddingRight="@*android:dimen/preference_item_padding_side"

    android:paddingLeft="16dip"

    android:paddingRight="16dip"

    android:paddingTop="16dip"

    android:paddingBottom="16dip"

    settings:optimalWidth="@dimen/data_usage_chart_optimalWidth"

res/layout/data_usage_header.xml

+3 −1
Original line number Diff line number Diff line
@@ -17,7 +17,9 @@ 
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical">

    android:orientation="vertical"

    android:clipChildren="false"

    android:clipToPadding="false">



    <FrameLayout

        android:id="@+id/network_switches_container"

res/layout/data_usage_summary.xml

+4 −14
Original line number Diff line number Diff line
@@ -25,20 +25,7 @@ 
        android:layout_height="match_parent"

        android:orientation="vertical">



        <HorizontalScrollView

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_weight="0"

            android:scrollbars="none">



            <TabWidget

                android:id="@android:id/tabs"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:orientation="horizontal"

                style="?android:attr/tabWidgetStyle" />



        </HorizontalScrollView>

        <include layout="@layout/tab_widget" />



        <!-- give an empty content area to make tabhost happy -->

        <FrameLayout
@@ -51,6 +38,9 @@ 
            android:layout_width="match_parent"

            android:layout_height="0dip"

            android:layout_weight="1"

            android:scrollbarStyle="@*android:integer/preference_fragment_scrollbarStyle"

            android:clipChildren="false"

            android:clipToPadding="false"

            android:smoothScrollbar="false" />



    </LinearLayout>