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

Commit 2b383419 authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am 68dac84c: Merge "Fix padding for PagerTabStrip on large screen devices" into jb-mr1-dev

* commit '68dac84c':
  Fix padding for PagerTabStrip on large screen devices
parents 7f9b5681 68dac84c
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -35,7 +35,9 @@
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:layout_gravity="top"
                android:textAppearance="@style/TextAppearance.PagerTabs">
                android:textAppearance="@style/TextAppearance.PagerTabs"
                android:paddingLeft="@dimen/pager_tabs_padding"
                android:paddingRight="@dimen/pager_tabs_padding">
        </android.support.v4.view.PagerTabStrip>
    </android.support.v4.view.ViewPager>

+19 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- 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.
     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.
-->

<resources>
    <dimen name="pager_tabs_padding">@*android:dimen/preference_fragment_padding_side</dimen>
</resources>
+3 −0
Original line number Diff line number Diff line
@@ -51,4 +51,7 @@
    <dimen name="header_icon_width">28dp</dimen>
    <dimen name="appwidget_min_width">260dip</dimen>
    <dimen name="appwidget_min_height">40dip</dimen>

    <dimen name="pager_tabs_padding">0dp</dimen>

</resources>