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

Commit e440fdb7 authored by Daniel Nishi's avatar Daniel Nishi Committed by android-build-merger
Browse files

Merge "Use the proper style for the SpacePreference." into oc-dr1-dev 

am: ff8312b3

Change-Id: I44d02a388a2d8c9dd8a797f78fce67a856bc22e5
parents d4075ea9 ff8312b3

src/com/android/settings/applications/SpacePreference.java

+4 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ package com.android.settings.applications; 


import android.content.Context;

import android.content.res.TypedArray;

import android.support.v4.content.res.TypedArrayUtils;

import android.support.v7.preference.Preference;

import android.support.v7.preference.PreferenceViewHolder;

import android.util.AttributeSet;
@@ -33,7 +34,9 @@ public class SpacePreference extends Preference { 
    private int mHeight;



    public SpacePreference(Context context, AttributeSet attrs) {

        this(context, attrs, com.android.internal.R.attr.preferenceStyle);

        this(context, attrs, TypedArrayUtils.getAttr(context,

                android.support.v7.preference.R.attr.preferenceStyle,

                android.R.attr.preferenceStyle));

    }



    public SpacePreference(Context context, AttributeSet attrs, int defStyleAttr) {