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

Commit 5685a5be authored by Amith Yamasani's avatar Amith Yamasani Committed by Android Git Automerger
Browse files

am a6a7e53b: am 2d25d467: Merge "Fixes PreferenceScreen padding and scrollbar... 

am a6a7e53b: am 2d25d467: Merge "Fixes PreferenceScreen padding and scrollbar position." into jb-dev

* commit 'a6a7e53b':
  Fixes PreferenceScreen padding and scrollbar position.
parents 772bf5f6 a6a7e53b

core/java/android/preference/PreferenceScreen.java

+8 −2
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.os.Parcel; 
import android.os.Parcelable;

import android.text.TextUtils;

import android.util.AttributeSet;

import android.view.LayoutInflater;

import android.view.View;

import android.view.Window;

import android.widget.AbsListView;
@@ -153,7 +154,12 @@ public final class PreferenceScreen extends PreferenceGroup implements AdapterVi 
        if (mListView != null) {

            mListView.setAdapter(null);

        }

        mListView = new ListView(context);



        LayoutInflater inflater = (LayoutInflater)

                context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);

        View childPrefScreen = inflater.inflate(

                com.android.internal.R.layout.preference_list_fragment, null);

        mListView = (ListView) childPrefScreen.findViewById(android.R.id.list);

        bind(mListView);



        // Set the title bar if title is available, else no title bar
@@ -164,7 +170,7 @@ public final class PreferenceScreen extends PreferenceGroup implements AdapterVi 
        } else {

            dialog.setTitle(title);

        }

        dialog.setContentView(mListView);

        dialog.setContentView(childPrefScreen);

        dialog.setOnDismissListener(this);

        if (state != null) {

            dialog.onRestoreInstanceState(state);

core/res/res/values-h720dp/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -25,6 +25,6 @@ 
    <dimen name="preference_screen_header_padding_side">0dip</dimen>



    <integer name="preference_screen_header_scrollbarStyle">0x0</integer> <!-- insideOverlay -->

    <integer name="preference_fragment_scrollbarStyle">0x0</integer> <!-- insideOverlay -->

    <integer name="preference_fragment_scrollbarStyle">0x02000000</integer> <!-- outsideOverlay -->



</resources>

core/res/res/values-w720dp/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -33,5 +33,5 @@ 
    <dimen name="preference_screen_header_padding_side">0dip</dimen>



    <integer name="preference_screen_header_scrollbarStyle">0x0</integer> <!-- insideOverlay -->

    <integer name="preference_fragment_scrollbarStyle">0x0</integer> <!-- insideOverlay -->

    <integer name="preference_fragment_scrollbarStyle">0x02000000</integer> <!-- outsideOverlay -->

</resources>