PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Updates to match prebuilts drop" into pi-dev am: b299122e08

Browse Source 
am: 8e51db884e

Change-Id: I790d275e30bccd446a00615149a90440d172e163
This commit is contained in:
Jason Monk
2018-04-04 16:45:09 -07:00
committed by android-build-merger
parent 6027d42a5a 8e51db884e
commit 8a485f0ada
5 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Android.mk
View File

@@ -24,6 +24,7 @@ LOCAL_STATIC_ANDROID_LIBRARIES := \
android-slices-builders \ android-slices-builders \
android-slices-core \ android-slices-core \
android-slices-view \ android-slices-view \
android-support-compat \
android-support-v4 \ android-support-v4 \
android-support-v13 \ android-support-v13 \
android-support-v7-appcompat \ android-support-v7-appcompat \

3
AndroidManifest.xml
View File

@@ -105,7 +105,8 @@
android:allowBackup="false" android:allowBackup="false"
android:usesCleartextTraffic="true" android:usesCleartextTraffic="true"
android:defaultToDeviceProtectedStorage="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" /> <uses-library android:name="org.apache.http.legacy" />
<!-- Settings --> <!-- Settings -->

1
proguard.flags
View File

@@ -55,3 +55,4 @@
public static ** SEARCH_INDEX_DATA_PROVIDER; public static ** SEARCH_INDEX_DATA_PROVIDER;
public static ** SUMMARY_PROVIDER_FACTORY; public static ** SUMMARY_PROVIDER_FACTORY;
} }
-keep class android.support.v4.app.CoreComponentFactory

4
src/com/android/settings/slices/SettingsSliceProvider.java
View File

@@ -24,6 +24,7 @@ import android.graphics.drawable.Icon;
import android.net.Uri; import android.net.Uri;
import android.net.wifi.WifiManager; import android.net.wifi.WifiManager;
import android.support.annotation.VisibleForTesting; import android.support.annotation.VisibleForTesting;
import android.support.v4.graphics.drawable.IconCompat;
import android.util.Log; import android.util.Log;
import com.android.settings.R; import com.android.settings.R;
@@ -203,7 +204,8 @@ public class SettingsSliceProvider extends SliceProvider {
.addEndItem(new SliceAction(getBroadcastIntent(ACTION_WIFI_CHANGED), .addEndItem(new SliceAction(getBroadcastIntent(ACTION_WIFI_CHANGED),
null, finalWifiEnabled)) null, finalWifiEnabled))
.setPrimaryAction( .setPrimaryAction(
new SliceAction(getIntent(Intent.ACTION_MAIN), null, null))) new SliceAction(getIntent(Intent.ACTION_MAIN),
(IconCompat) null, null)))
.build(); .build();
} }

14
src/com/android/settings/slices/SliceBuilderUtils.java
View File

@@ -46,6 +46,7 @@ import com.android.settings.overlay.FeatureFactory;
import com.android.settings.search.DatabaseIndexingUtils; import com.android.settings.search.DatabaseIndexingUtils;
import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.AbstractPreferenceController;
import android.support.v4.graphics.drawable.IconCompat;
import androidx.slice.Slice; import androidx.slice.Slice;
import androidx.slice.builders.ListBuilder; import androidx.slice.builders.ListBuilder;
import androidx.slice.builders.SliceAction; import androidx.slice.builders.SliceAction;
@@ -170,7 +171,7 @@ public class SliceBuilderUtils {
.setTitle(sliceData.getTitle()) .setTitle(sliceData.getTitle())
.setTitleItem(icon, ICON_IMAGE) .setTitleItem(icon, ICON_IMAGE)
.setSubtitle(subtitleText) .setSubtitle(subtitleText)
.setPrimaryAction(new SliceAction(contentIntent, null, null)) .setPrimaryAction(new SliceAction(contentIntent, (IconCompat) null, null))
.addEndItem(sliceAction)) .addEndItem(sliceAction))
.build(); .build();
} }
@@ -186,7 +187,7 @@ public class SliceBuilderUtils {
.setTitle(sliceData.getTitle()) .setTitle(sliceData.getTitle())
.setTitleItem(icon, ICON_IMAGE) .setTitleItem(icon, ICON_IMAGE)
.setSubtitle(subtitleText) .setSubtitle(subtitleText)
.setPrimaryAction(new SliceAction(contentIntent, null, null))) .setPrimaryAction(new SliceAction(contentIntent, (IconCompat) null, null)))
.build(); .build();
} }
@@ -290,24 +291,25 @@ public class SliceBuilderUtils {
switch (controller.getAvailabilityStatus()) { switch (controller.getAvailabilityStatus()) {
case DISABLED_UNSUPPORTED: case DISABLED_UNSUPPORTED:
summary = context.getString(R.string.unsupported_setting_summary); 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 */); null /* actionTitle */);
break; break;
case DISABLED_FOR_USER: case DISABLED_FOR_USER:
summary = context.getString(R.string.disabled_for_user_setting_summary); summary = context.getString(R.string.disabled_for_user_setting_summary);
primaryAction = new SliceAction(getContentIntent(context, data), primaryAction = new SliceAction(getContentIntent(context, data),
null /* actionIcon */, null /* actionTitle */); (IconCompat) null /* actionIcon */, null /* actionTitle */);
break; break;
case DISABLED_DEPENDENT_SETTING: case DISABLED_DEPENDENT_SETTING:
summary = context.getString(R.string.disabled_dependent_setting_summary); summary = context.getString(R.string.disabled_dependent_setting_summary);
primaryAction = new SliceAction(getContentIntent(context, data), primaryAction = new SliceAction(getContentIntent(context, data),
null /* actionIcon */, null /* actionTitle */); (IconCompat) null /* actionIcon */, null /* actionTitle */);
break; break;
case UNAVAILABLE_UNKNOWN: case UNAVAILABLE_UNKNOWN:
default: default:
summary = context.getString(R.string.unknown_unavailability_setting_summary); summary = context.getString(R.string.unknown_unavailability_setting_summary);
primaryAction = new SliceAction(getSettingsIntent(context), primaryAction = new SliceAction(getSettingsIntent(context),
null /* actionIcon */, null /* actionTitle */); (IconCompat) null /* actionIcon */, null /* actionTitle */);
} }
return new ListBuilder(context, data.getUri()) return new ListBuilder(context, data.getUri())