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

Commit 696afbc1 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 

am: e440fdb7

Change-Id: I2b393b0583f295524eaaa79032f73abc0724469d
parents f050ab93 e440fdb7

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

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




import android.content.Context;

import android.content.Context;

import android.content.res.TypedArray;

import android.content.res.TypedArray;

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

import android.support.v7.preference.Preference;

import android.support.v7.preference.Preference;

import android.support.v7.preference.PreferenceViewHolder;

import android.support.v7.preference.PreferenceViewHolder;

import android.util.AttributeSet;

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

    private int mHeight;





    public SpacePreference(Context context, AttributeSet attrs) {

    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) {

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