Merge "Add a primary action to slices from keyguard slice provider" into pi-dev am: 1031bf5f76

am: 6f4f0da87e

Change-Id: I0a9c0243b87bad281776b5560c8c57945934f855

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 5a84fa523f67..b7a562bfac5d 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;
@@ -158,7 +159,15 @@ public class KeyguardSliceView extends LinearLayout implements View.OnClickListe
 
         ListContent lc = new ListContent(getContext(), mSlice, null, 0, 0);
         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 {