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

Commit 48c72676 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android (Google) Code Review
Browse files

Merge "Apps tabs align to title on 2-pane settings." into jb-dev

parents fc363380 f0b05de3

res/layout-h720dp/tab_widget.xml→res/layout-sw720dp/tab_widget.xml

+6 −3
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2011 The Android Open Source Project

<!-- Copyright (C) 2012 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.
@@ -17,13 +17,16 @@ 
<HorizontalScrollView xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:scrollbars="none">

    android:scrollbars="none"

    android:fillViewport="true">



    <TabWidget

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

        android:layout_width="wrap_content"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="horizontal"

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

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

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



</HorizontalScrollView>

res/layout-w720dp/tab_widget.xml

deleted100644 → 0
+0 −29
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/manage_applications.xml

+5 −1
Original line number Diff line number Diff line
@@ -49,7 +49,9 @@ 
                android:paddingTop="30dp"

                android:paddingLeft="4dp"

                android:paddingRight="4dp"

                android:paddingBottom="1dp">

                android:paddingBottom="1dp"

                android:layout_marginLeft="@*android:dimen/preference_fragment_padding_side"

                android:layout_marginRight="@*android:dimen/preference_fragment_padding_side">

            <TextView android:id="@+id/usedStorageText"

                android:layout_width="0px"

                android:layout_height="wrap_content"
@@ -91,6 +93,8 @@ 
            android:orientation="vertical"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:layout_marginLeft="@*android:dimen/preference_fragment_padding_side"

            android:layout_marginRight="@*android:dimen/preference_fragment_padding_side"

            android:visibility="gone"

            android:gravity="center">

res/layout/manage_apps_tab_content.xml

+4 −3
Original line number Diff line number Diff line
@@ -27,7 +27,8 @@ 
    <LinearLayout

        android:orientation="vertical"

        android:layout_width="match_parent"

        android:layout_height="match_parent">

        android:layout_height="match_parent"

        >



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

res/layout/running_processes_view.xml

+6 −1
Original line number Diff line number Diff line
@@ -26,7 +26,10 @@ 
        <ListView android:id="@android:id/list"

                android:layout_width="match_parent" 

                android:layout_height="match_parent"

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

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

                android:drawSelectorOnTop="false"

                android:scrollbarStyle="outsideOverlay"

                android:fastScrollEnabled="true" />

        <TextView android:id="@android:id/empty"

                android:layout_width="match_parent"
@@ -46,7 +49,9 @@ 
            android:paddingTop="30dp"

            android:paddingLeft="4dp"

            android:paddingRight="4dp"

            android:paddingBottom="1dp">

            android:paddingBottom="1dp"

            android:layout_marginLeft="@*android:dimen/preference_fragment_padding_side"

            android:layout_marginRight="@*android:dimen/preference_fragment_padding_side">

        <TextView android:id="@+id/foregroundText"

            android:layout_width="0px"

            android:layout_height="wrap_content"