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

Commit a94c8183 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix misc style issue in "Open by default" screen."

parents 1f5fdab6 1c1d1100

res/layout/app_preferred_settings.xml

+20 −29
Original line number Diff line number Diff line
@@ -14,18 +14,11 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->



<ScrollView

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:clipToPadding="false"

    android:scrollbarStyle="@integer/preference_scrollbar_style">



<LinearLayout

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

        android:paddingStart="?android:attr/listPreferredItemPaddingStart"

    android:paddingStart="@dimen/preference_no_icon_padding_start"

    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

    android:paddingBottom="5dip"

    android:orientation="vertical">
@@ -45,5 +38,3 @@ 
        android:text="@string/clear_activities" />



</LinearLayout>
 


</ScrollView>

res/xml/installed_app_launch_settings.xml

+1 −2
Original line number Diff line number Diff line
@@ -37,8 +37,7 @@ 
                        android:title="@string/app_launch_other_defaults_title">



        <com.android.settings.applications.ClearDefaultsPreference

                android:key="app_launch_clear_defaults"

                />

                android:key="app_launch_clear_defaults" />



    </PreferenceCategory>

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

+4 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.os.IBinder; 
import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.UserHandle;

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

import android.support.v7.preference.Preference;

import android.support.v7.preference.PreferenceViewHolder;

import android.text.SpannableString;
@@ -68,7 +69,9 @@ public class ClearDefaultsPreference extends Preference { 
    }



    public ClearDefaultsPreference(Context context, AttributeSet attrs) {

        this(context, attrs, 0);

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

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

                android.R.attr.preferenceStyle));

    }



    public ClearDefaultsPreference(Context context) {