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

Commit 56f51a89 authored by Amith Yamasani's avatar Amith Yamasani
Browse files

Single pane for 10" Settings 

Change-Id: I960e4be3cfb19ffec4100f8766742d6fb17dda4a
parent 8a181dd0

AndroidManifest.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -70,7 +70,7 @@ 
    <application android:label="@string/settings_label"

    <application android:label="@string/settings_label"

            android:icon="@mipmap/ic_launcher_settings"

            android:icon="@mipmap/ic_launcher_settings"

            android:taskAffinity=""

            android:taskAffinity=""

            android:theme="@android:style/Theme.Holo"

            android:theme="@style/Theme.Settings"

            android:hardwareAccelerated="true"

            android:hardwareAccelerated="true"

            android:requiredForAllUsers="true"

            android:requiredForAllUsers="true"

            android:supportsRtl="true">

            android:supportsRtl="true">

res/layout-sw720dp/tab_widget.xml

+4 −4
Original line number Original line Diff line number Diff line
@@ -25,8 +25,8 @@ 
        android:layout_width="match_parent"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        android:orientation="horizontal"

        android:orientation="horizontal"

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

        style="?android:attr/tabWidgetStyle"

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

        android:paddingStart="@dimen/settings_side_margin"

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

        android:paddingEnd="@dimen/settings_side_margin"



    />

</HorizontalScrollView>
 
</HorizontalScrollView>

res/layout/account_sync_screen.xml

+3 −3
Original line number Original line Diff line number Diff line
@@ -27,8 +27,8 @@ 
    <ImageView

    <ImageView

        android:layout_width="match_parent"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

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

        android:layout_marginStart="@dimen/settings_side_margin"

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

        android:layout_marginEnd="@dimen/settings_side_margin"

        android:scaleType="fitXY"

        android:scaleType="fitXY"

        android:src="?android:attr/listDivider" />

        android:src="?android:attr/listDivider" />
@@ -38,7 +38,7 @@ 
        android:layout_height="0dip"

        android:layout_height="0dip"

        android:layout_weight="1"

        android:layout_weight="1"

        android:clipToPadding="false"

        android:clipToPadding="false"

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

        android:scrollbarStyle="outsideOverlay" />





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

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

        android:layout_width="match_parent"

        android:layout_width="match_parent"

res/layout/app_ops_details.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -21,7 +21,7 @@ 
    android:layout_width="match_parent"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_height="match_parent"

    android:clipToPadding="false"

    android:clipToPadding="false"

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

    android:scrollbarStyle="@integer/preference_scrollbar_style">





    <LinearLayout

    <LinearLayout

        android:id="@+id/all_details"

        android:id="@+id/all_details"

res/layout/data_usage_summary.xml

+2 −1
Original line number Original line Diff line number Diff line
@@ -29,16 +29,17 @@ 




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

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

        <FrameLayout

        <FrameLayout

            style="@style/PreferenceFragmentListSinglePane"

            android:id="@android:id/tabcontent"

            android:id="@android:id/tabcontent"

            android:layout_width="0dip"

            android:layout_width="0dip"

            android:layout_height="0dip" />

            android:layout_height="0dip" />





        <ListView

        <ListView

            android:id="@android:id/list"

            android:id="@android:id/list"

            style="@style/PreferenceFragmentListSinglePane"

            android:layout_width="match_parent"

            android:layout_width="match_parent"

            android:layout_height="0dip"

            android:layout_height="0dip"

            android:layout_weight="1"

            android:layout_weight="1"

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

            android:clipChildren="false"

            android:clipChildren="false"

            android:clipToPadding="false"

            android:clipToPadding="false"

            android:smoothScrollbar="false" />

            android:smoothScrollbar="false" />