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

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

Merge "Preferences padding and scrollbars to match spec."

parents 0197d825 ce4a193e

core/java/android/preference/PreferenceActivity.java

+0 −2
Original line number Diff line number Diff line
@@ -589,8 +589,6 @@ public abstract class PreferenceActivity extends ListActivity implements 
            mPreferenceManager.setOnPreferenceTreeClickListener(this);

        }



        getListView().setScrollBarStyle(View.SCROLLBARS_INSIDE_OVERLAY);



        // see if we should show Back/Next buttons

        Intent intent = getIntent();

        if (intent.getBooleanExtra(EXTRA_PREFS_SHOW_BUTTON_BAR, false)) {

core/java/android/preference/PreferenceFragment.java

+0 −1
Original line number Diff line number Diff line
@@ -159,7 +159,6 @@ public abstract class PreferenceFragment extends Fragment implements 
    @Override

    public void onActivityCreated(Bundle savedInstanceState) {

        super.onActivityCreated(savedInstanceState);

        getListView().setScrollBarStyle(View.SCROLLBARS_INSIDE_OVERLAY);



        if (mHavePrefs) {

            bindPreferences();

core/res/res/layout-sw600dp/preference_list_content.xml

+5 −2
Original line number Diff line number Diff line
@@ -44,8 +44,11 @@ 
                android:layout_width="match_parent"

                android:layout_height="0px"

                android:layout_weight="1"

                android:paddingTop="16dp"

                android:paddingBottom="16dp"

                android:paddingLeft="@dimen/preference_screen_header_padding_side"

                android:paddingRight="@dimen/preference_screen_header_padding_side"

                android:paddingTop="@dimen/preference_screen_header_vertical_padding"

                android:paddingBottom="@dimen/preference_screen_header_vertical_padding"

                android:scrollbarStyle="@integer/preference_screen_header_scrollbarStyle"

                android:drawSelectorOnTop="false"

                android:cacheColorHint="@android:color/transparent"

                android:listPreferredItemHeight="48dp"

core/res/res/layout/breadcrumbs_in_fragment.xml

+5 −5
Original line number Diff line number Diff line
@@ -13,10 +13,10 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->



<!-- This layout disables breadcrumbs in the fragment area and causes PreferenceActivity to

    put the breadcrumbs in the action bar. -->

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

        android:orientation="vertical"

        android:layout_height="@dimen/preference_fragment_padding_side"

        android:layout_width="match_parent">

</LinearLayout>
 
 No newline at end of file
 
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="0dip"

    android:layout_height="0dip"

    android:visibility="gone" />

core/res/res/layout/preference_list_content.xml

+3 −0
Original line number Diff line number Diff line
@@ -44,8 +44,11 @@ 
                android:layout_width="match_parent"

                android:layout_height="0px"

                android:layout_weight="1"

                android:paddingLeft="@dimen/preference_screen_header_padding_side"

                android:paddingRight="@dimen/preference_screen_header_padding_side"

                android:paddingTop="@dimen/preference_screen_header_vertical_padding"

                android:paddingBottom="@dimen/preference_screen_header_vertical_padding"

                android:scrollbarStyle="@integer/preference_screen_header_scrollbarStyle"

                android:drawSelectorOnTop="false"

                android:cacheColorHint="@android:color/transparent"

                android:listPreferredItemHeight="48dp"