summaryrefslogtreecommitdiff
path: root/packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java
diff options
context:
space:
mode:
authorMady Mellor <madym@google.com>2018-05-23 15:04:47 -0700
committerMady Mellor <madym@google.com>2018-05-24 10:56:34 -0700
commit78f04efae5f656fdda368703b5083f4be5f7a959 (patch)
treebeed7630822b08d3fbe9115c3337cccc9b43b402 /packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java
parentb2b69629b6e67ddb0b10d8ecc7bec110cc524708 (diff)
Add a primary action to slices from keyguard slice provider
We'll be enforcing requiring a primary action on slices. There isn't a clear action that makes sense for these slices... which is unfortunate but add a dummy one for now. Test: atest KeyguardSliceProviderTest Bug: 77855834 Change-Id: Ic37f9a8eba463654b3b2b93c1df9cb97d6d688a2
Diffstat (limited to 'packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java')
-rw-r--r--packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java11
1 files changed, 10 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java
index 97cf1e51e1df..12ac805a2b05 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java
@@ -52,6 +52,7 @@ import com.android.systemui.statusbar.policy.ConfigurationController;
import com.android.systemui.tuner.TunerService;
import com.android.systemui.util.wakelock.KeepAwakeAnimationListener;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.function.Consumer;
@@ -156,7 +157,15 @@ public class KeyguardSliceView extends LinearLayout implements View.OnClickListe
ListContent lc = new ListContent(getContext(), mSlice);
mHasHeader = lc.hasHeader();
- List<SliceItem> subItems = lc.getRowItems();
+ List<SliceItem> subItems = new ArrayList<SliceItem>();
+ for (int i = 0; i < lc.getRowItems().size(); i++) {
+ SliceItem subItem = lc.getRowItems().get(i);
+ String itemUri = subItem.getSlice().getUri().toString();
+ // Filter out the action row
+ if (!KeyguardSliceProvider.KEYGUARD_ACTION_URI.equals(itemUri)) {
+ subItems.add(subItem);
+ }
+ }
if (!mHasHeader) {
mTitle.setVisibility(GONE);
} else {