From 35209f6e6ce0f68bad4f845a1cf1277e8fe0ac1b Mon Sep 17 00:00:00 2001
From: jackqdyulei <jackqdyulei@google.com>
Date: Thu, 10 Jan 2019 14:15:59 -0800
Subject: [PATCH] Update height of SliceView

So it can display 6 items at most, not 4 items

Bug: 120803703
Test: Manual
Change-Id: Id34398903d0f81bebee3e02c024d21ad2e68578f
---
 res/layout/slice_preference_layout.xml                         | 2 +-
 res/values/dimens.xml                                          | 2 ++
 src/com/android/settings/slices/SlicePreference.java           | 1 +
 src/com/android/settings/slices/SlicePreferenceController.java | 1 -
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/res/layout/slice_preference_layout.xml b/res/layout/slice_preference_layout.xml
index 4cea9c04678..ae589014dd9 100644
--- a/res/layout/slice_preference_layout.xml
+++ b/res/layout/slice_preference_layout.xml
@@ -25,5 +25,5 @@
     <androidx.slice.widget.SliceView
         android:id="@+id/slice_view"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
+        android:layout_height="@dimen/slice_preference_group_height"/>
 </FrameLayout>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 1a3d6ffae1a..8b535e3f321 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -370,4 +370,6 @@
     <dimen name="qrcode_size">264dp</dimen>
     <dimen name="qrcode_preview_size">360dp</dimen>
 
+    <!-- Height for slice preference, which contains 6 items at most -->
+    <dimen name="slice_preference_group_height">360dp</dimen>
 </resources>
diff --git a/src/com/android/settings/slices/SlicePreference.java b/src/com/android/settings/slices/SlicePreference.java
index 37a53f4d581..a88ae768db6 100644
--- a/src/com/android/settings/slices/SlicePreference.java
+++ b/src/com/android/settings/slices/SlicePreference.java
@@ -44,6 +44,7 @@ public class SlicePreference extends LayoutPreference {
     private void init() {
         mSliceView = findViewById(R.id.slice_view);
         mSliceView.showTitleItems(true);
+        mSliceView.setScrollable(false);
     }
 
     public void onSliceUpdated(Slice slice) {
diff --git a/src/com/android/settings/slices/SlicePreferenceController.java b/src/com/android/settings/slices/SlicePreferenceController.java
index 93ba6520f3e..d7fcc18a832 100644
--- a/src/com/android/settings/slices/SlicePreferenceController.java
+++ b/src/com/android/settings/slices/SlicePreferenceController.java
@@ -50,7 +50,6 @@ public class SlicePreferenceController extends BasePreferenceController implemen
     @Override
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
-
         mSlicePreference = screen.findPreference(getPreferenceKey());
     }