commit f55336277810171b23ca96e99fad4b13dce89370
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Sep 21 01:40:29 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 21 01:40:29 2018 +0000
tree 40b261cae368bac5b6afda25ce5eb3b59f8c556d
parent 68956715d451a0595b4b8ead15a03a19243fc71d
parent 1e207e1ab47e1ec0f11b3894b601c47991e65043

Merge changes from topic "mobile_select_migration"

* changes:
  Fix compile error in NetwotkSelectSettings
  Copy NetworkSelectSettings to settings app

res/layout/preference_volume_slider.xml

diff --git a/res/layout/preference_volume_slider.xml b/res/layout/preference_volume_slider.xml
index 5e5d595..da3a028 100644
--- a/res/layout/preference_volume_slider.xml
+++ b/res/layout/preference_volume_slider.xml
@@ -45,8 +45,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:layout_marginTop="16dip"
-        android:layout_marginBottom="16dip">
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -75,15 +75,14 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:layout_marginTop="6dp">
+            android:orientation="vertical">
 
             <SeekBar
                 android:id="@*android:id/seekbar"
                 android:layout_gravity="center_vertical"
                 android:paddingStart="12dp"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
+                android:layout_height="48dp"/>
 
             <TextView
                 android:id="@+id/suppression_text"

src/com/android/settings/homepage/slices/SliceContextualCardRenderer.java

diff --git a/src/com/android/settings/homepage/slices/SliceContextualCardRenderer.java b/src/com/android/settings/homepage/slices/SliceContextualCardRenderer.java
index 983b4aa..705b990 100644
--- a/src/com/android/settings/homepage/slices/SliceContextualCardRenderer.java
+++ b/src/com/android/settings/homepage/slices/SliceContextualCardRenderer.java
@@ -84,7 +84,7 @@
 
         cardHolder.sliceView.setTag(uri);
         //TODO(b/114009676): We will soon have a field to decide what slice mode we should set.
-        cardHolder.sliceView.setMode(SliceView.MODE_SHORTCUT);
+        cardHolder.sliceView.setMode(SliceView.MODE_LARGE);
         LiveData<Slice> sliceLiveData = mSliceLiveDataMap.get(uri.toString());
 
         if (sliceLiveData == null) {