Added the EmergencyInfoSlice for ContextualHomepage
- Generated a simple EmergencyInfo slice with fixed string in title and summary. - Moved hardcode string into strings.xml - Modified the contentProviderCall_returnCorrectSize test case for general version Bug: 114793520 Test: compile and manual test Change-Id: Ia3444c61b0f7e4c04794fe3590dc0731885cf062
This commit is contained in:
@@ -23,6 +23,7 @@ import android.annotation.Nullable;
|
||||
import com.android.settings.homepage.deviceinfo.DataUsageSlice;
|
||||
import com.android.settings.homepage.deviceinfo.DeviceInfoSlice;
|
||||
import com.android.settings.homepage.deviceinfo.StorageSlice;
|
||||
import com.android.settings.homepage.deviceinfo.EmergencyInfoSlice;
|
||||
import com.android.settings.intelligence.ContextualCardProto.ContextualCard;
|
||||
import com.android.settings.intelligence.ContextualCardProto.ContextualCardList;
|
||||
import com.android.settings.wifi.WifiSlice;
|
||||
@@ -57,11 +58,17 @@ public class SettingsContextualCardProvider extends ContextualCardProvider {
|
||||
.setSliceUri(StorageSlice.STORAGE_CARD_URI.toString())
|
||||
.setCardName(StorageSlice.PATH_STORAGE_INFO)
|
||||
.build();
|
||||
final ContextualCard emergencyInfoCard =
|
||||
ContextualCard.newBuilder()
|
||||
.setSliceUri(EmergencyInfoSlice.EMERGENCY_INFO_CARD_URI.toString())
|
||||
.setCardName(EmergencyInfoSlice.PATH_EMERGENCY_INFO_CARD)
|
||||
.build();
|
||||
final ContextualCardList cards = ContextualCardList.newBuilder()
|
||||
.addCard(wifiCard)
|
||||
.addCard(dataUsageCard)
|
||||
.addCard(deviceInfoCard)
|
||||
.addCard(storageInfoCard)
|
||||
.addCard(emergencyInfoCard)
|
||||
.build();
|
||||
|
||||
return cards;
|
||||
|
||||
@@ -0,0 +1,77 @@
|
||||
/*
|
||||
* Copyright (C) 2018 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.settings.homepage.deviceinfo;
|
||||
|
||||
import android.app.PendingIntent;
|
||||
import android.content.ContentResolver;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.net.Uri;
|
||||
|
||||
import androidx.core.graphics.drawable.IconCompat;
|
||||
import androidx.slice.Slice;
|
||||
import androidx.slice.builders.ListBuilder;
|
||||
import androidx.slice.builders.SliceAction;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.slices.SettingsSliceProvider;
|
||||
|
||||
// This is a slice helper class for EmergencyInfo
|
||||
public class EmergencyInfoSlice {
|
||||
/**
|
||||
* The path denotes the unique name of emergency info slice.
|
||||
*/
|
||||
public static final String PATH_EMERGENCY_INFO_CARD = "emergency_info_card";
|
||||
|
||||
/**
|
||||
* Backing Uri for the Emergency Info Slice.
|
||||
*/
|
||||
public static final Uri EMERGENCY_INFO_CARD_URI = new Uri.Builder()
|
||||
.scheme(ContentResolver.SCHEME_CONTENT)
|
||||
.authority(SettingsSliceProvider.SLICE_AUTHORITY)
|
||||
.appendPath(PATH_EMERGENCY_INFO_CARD)
|
||||
.build();
|
||||
|
||||
private static final String ACTION_EDIT_EMERGENCY_INFO = "android.settings.EDIT_EMERGENCY_INFO";
|
||||
|
||||
public static Slice getSlice(Context context) {
|
||||
final ListBuilder listBuilder = new ListBuilder(context, EMERGENCY_INFO_CARD_URI,
|
||||
ListBuilder.INFINITY);
|
||||
listBuilder.addRow(
|
||||
new ListBuilder.RowBuilder()
|
||||
.setTitle(context.getText(R.string.emergency_info_title))
|
||||
.setSubtitle(
|
||||
context.getText(R.string.emergency_info_contextual_card_summary))
|
||||
.setPrimaryAction(generatePrimaryAction(context)));
|
||||
return listBuilder.build();
|
||||
}
|
||||
|
||||
private static SliceAction generatePrimaryAction(Context context) {
|
||||
PendingIntent pendingIntent =
|
||||
PendingIntent.getActivity(
|
||||
context,
|
||||
0 /* requestCode */,
|
||||
new Intent(ACTION_EDIT_EMERGENCY_INFO),
|
||||
PendingIntent.FLAG_UPDATE_CURRENT);
|
||||
|
||||
return SliceAction.create(
|
||||
pendingIntent,
|
||||
IconCompat.createWithResource(context, R.drawable.empty_icon),
|
||||
ListBuilder.SMALL_IMAGE,
|
||||
context.getText(R.string.emergency_info_title));
|
||||
}
|
||||
}
|
||||
@@ -41,6 +41,7 @@ import com.android.settings.R;
|
||||
import com.android.settings.bluetooth.BluetoothSliceBuilder;
|
||||
import com.android.settings.core.BasePreferenceController;
|
||||
import com.android.settings.flashlight.FlashlightSliceBuilder;
|
||||
import com.android.settings.homepage.deviceinfo.EmergencyInfoSlice;
|
||||
import com.android.settings.location.LocationSliceBuilder;
|
||||
import com.android.settings.network.telephony.Enhanced4gLteSliceHelper;
|
||||
import com.android.settings.notification.ZenModeSliceBuilder;
|
||||
@@ -178,6 +179,8 @@ public class SettingsSliceProvider extends SliceProvider {
|
||||
registerIntentToUri(FlashlightSliceBuilder.INTENT_FILTER, sliceUri);
|
||||
mRegisteredUris.add(sliceUri);
|
||||
return;
|
||||
} else if (EmergencyInfoSlice.EMERGENCY_INFO_CARD_URI.equals(sliceUri)) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Start warming the slice, we expect someone will want it soon.
|
||||
@@ -241,6 +244,8 @@ public class SettingsSliceProvider extends SliceProvider {
|
||||
.createWifiCallingPreferenceSlice(sliceUri);
|
||||
} else if (FlashlightSliceBuilder.FLASHLIGHT_URI.equals(sliceUri)) {
|
||||
return FlashlightSliceBuilder.getSlice(getContext());
|
||||
} else if (EmergencyInfoSlice.EMERGENCY_INFO_CARD_URI.equals(sliceUri)) {
|
||||
return EmergencyInfoSlice.getSlice(getContext());
|
||||
}
|
||||
|
||||
SliceData cachedSliceData = mSliceWeakDataCache.get(sliceUri);
|
||||
|
||||
Reference in New Issue
Block a user