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

Merge "Fix DND crash from SpringboardActivity" into pi-dev am: 3f790b76b0

Browse Source 
am: 7fcbaf4ac9

Change-Id: I999288a61ebc780986ed108cd0b255db6ee4d791
This commit is contained in:
Matthew Fritze
2018-05-29 12:52:43 -07:00
committed by android-build-merger
parent 1ee0e670b0 7fcbaf4ac9
commit 111fc0344b
6 changed files with 132 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/location/LocationSliceBuilder.java
View File

@@ -78,15 +78,18 @@ public class LocationSliceBuilder {
.build();
}
private static PendingIntent getPrimaryAction(Context context) {
public static Intent getIntent(Context context) {
final String screenTitle = context.getText(R.string.location_settings_title).toString();
final Uri contentUri = new Uri.Builder().appendPath(KEY_LOCATION).build();
final Intent intent = DatabaseIndexingUtils.buildSearchResultPageIntent(context,
return DatabaseIndexingUtils.buildSearchResultPageIntent(context,
LocationSettings.class.getName(), KEY_LOCATION, screenTitle,
MetricsEvent.LOCATION)
.setClassName(context.getPackageName(), SubSettings.class.getName())
.setData(contentUri);
}
private static PendingIntent getPrimaryAction(Context context) {
final Intent intent = getIntent(context);
return PendingIntent.getActivity(context, 0 /* requestCode */,
intent, 0 /* flags */);
}