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

Commit 8e51db88 authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

Merge "Updates to match prebuilts drop" into pi-dev 

am: b299122e

Change-Id: I7e4013fb1e3e4ffd193a83dca8ba24deefe1119b
parents e0d42982 b299122e

Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ LOCAL_STATIC_ANDROID_LIBRARIES := \ 
    android-slices-builders \

    android-slices-core \

    android-slices-view \

    android-support-compat \

    android-support-v4 \

    android-support-v13 \

    android-support-v7-appcompat \

AndroidManifest.xml

+2 −1
Original line number Diff line number Diff line
@@ -105,7 +105,8 @@ 
            android:allowBackup="false"

            android:usesCleartextTraffic="true"

            android:defaultToDeviceProtectedStorage="true"

            android:directBootAware="true">

            android:directBootAware="true"

            android:appComponentFactory="android.support.v4.app.CoreComponentFactory">



        <uses-library android:name="org.apache.http.legacy" />

        <!-- Settings -->

proguard.flags

+1 −0
Original line number Diff line number Diff line
@@ -51,3 +51,4 @@ 
    public static ** SEARCH_INDEX_DATA_PROVIDER;

    public static ** SUMMARY_PROVIDER_FACTORY;

}

-keep class android.support.v4.app.CoreComponentFactory

src/com/android/settings/slices/SettingsSliceProvider.java

+3 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.graphics.drawable.Icon; 
import android.net.Uri;

import android.net.wifi.WifiManager;

import android.support.annotation.VisibleForTesting;

import android.support.v4.graphics.drawable.IconCompat;

import android.util.Log;



import com.android.settings.R;
@@ -203,7 +204,8 @@ public class SettingsSliceProvider extends SliceProvider { 
                        .addEndItem(new SliceAction(getBroadcastIntent(ACTION_WIFI_CHANGED),

                                null, finalWifiEnabled))

                        .setPrimaryAction(

                                new SliceAction(getIntent(Intent.ACTION_MAIN), null, null)))

                                new SliceAction(getIntent(Intent.ACTION_MAIN),

                                        (IconCompat) null, null)))

                .build();

    }

src/com/android/settings/slices/SliceBuilderUtils.java

+8 −6
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ import com.android.settings.overlay.FeatureFactory; 
import com.android.settings.search.DatabaseIndexingUtils;

import com.android.settingslib.core.AbstractPreferenceController;



import android.support.v4.graphics.drawable.IconCompat;

import androidx.slice.Slice;

import androidx.slice.builders.ListBuilder;

import androidx.slice.builders.SliceAction;
@@ -170,7 +171,7 @@ public class SliceBuilderUtils { 
                        .setTitle(sliceData.getTitle())

                        .setTitleItem(icon, ICON_IMAGE)

                        .setSubtitle(subtitleText)

                        .setPrimaryAction(new SliceAction(contentIntent, null, null))

                        .setPrimaryAction(new SliceAction(contentIntent, (IconCompat) null, null))

                        .addEndItem(sliceAction))

                .build();

    }
@@ -186,7 +187,7 @@ public class SliceBuilderUtils { 
                        .setTitle(sliceData.getTitle())

                        .setTitleItem(icon, ICON_IMAGE)

                        .setSubtitle(subtitleText)

                        .setPrimaryAction(new SliceAction(contentIntent, null, null)))

                        .setPrimaryAction(new SliceAction(contentIntent, (IconCompat) null, null)))

                .build();

    }
@@ -290,24 +291,25 @@ public class SliceBuilderUtils { 
        switch (controller.getAvailabilityStatus()) {

            case DISABLED_UNSUPPORTED:

                summary = context.getString(R.string.unsupported_setting_summary);

                primaryAction = new SliceAction(getSettingsIntent(context), null /* actionIcon */,

                primaryAction = new SliceAction(getSettingsIntent(context),

                        (IconCompat) null /* actionIcon */,

                        null /* actionTitle */);

                break;

            case DISABLED_FOR_USER:

                summary = context.getString(R.string.disabled_for_user_setting_summary);

                primaryAction = new SliceAction(getContentIntent(context, data),

                        null /* actionIcon */, null /* actionTitle */);

                        (IconCompat) null /* actionIcon */, null /* actionTitle */);

                break;

            case DISABLED_DEPENDENT_SETTING:

                summary = context.getString(R.string.disabled_dependent_setting_summary);

                primaryAction = new SliceAction(getContentIntent(context, data),

                        null /* actionIcon */, null /* actionTitle */);

                        (IconCompat) null /* actionIcon */, null /* actionTitle */);

                break;

            case UNAVAILABLE_UNKNOWN:

            default:

                summary = context.getString(R.string.unknown_unavailability_setting_summary);

                primaryAction = new SliceAction(getSettingsIntent(context),

                        null /* actionIcon */, null /* actionTitle */);

                        (IconCompat) null /* actionIcon */, null /* actionTitle */);

        }



        return new ListBuilder(context, data.getUri())