From 27b0ef6eb399dd0ed4c7fb4e8bd75744c7eea0bc Mon Sep 17 00:00:00 2001
From: Tim Peng <timhypeng@google.com>
Date: Wed, 10 Jun 2020 14:48:37 +0800
Subject: [PATCH] Output switcher panel requires large title icon for Slice
 slider style

-Add "VIEW_TYPE_SLIDER_LARGE_ICON" to be a new panel type which would enlarge its title icon
-Set "VIEW_TYPE_SLIDER_LARGE_ICON" to MediaOutputPanel and MediaOutputGroupPanel
-Extend slider style and add customized icon size
-Add test cases

Bug: 157208551
Test: make -j42 RunSettingsRoboTests
Change-Id: I9b4de4aa552e8b26e766411f7eff93ea1a2d1910
---
 .../panel_slice_slider_row_large_icon.xml     | 31 +++++++++++++++++++
 res/values/styles.xml                         |  9 ++++++
 .../settings/panel/MediaOutputGroupPanel.java |  2 +-
 .../settings/panel/MediaOutputPanel.java      |  2 +-
 .../android/settings/panel/PanelContent.java  |  1 +
 .../settings/panel/PanelSlicesAdapter.java    |  2 ++
 .../panel/MediaOutputGroupPanelTest.java      |  5 +++
 .../settings/panel/MediaOutputPanelTest.java  |  5 +++
 .../panel/PanelSlicesAdapterTest.java         | 14 +++++++++
 .../settings/panel/VolumePanelTest.java       |  5 +++
 10 files changed, 74 insertions(+), 2 deletions(-)
 create mode 100644 res/layout/panel_slice_slider_row_large_icon.xml

diff --git a/res/layout/panel_slice_slider_row_large_icon.xml b/res/layout/panel_slice_slider_row_large_icon.xml
new file mode 100644
index 00000000000..fa5c4cd53ec
--- /dev/null
+++ b/res/layout/panel_slice_slider_row_large_icon.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2020 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.
+-->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/slice_slider_layout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <androidx.slice.widget.SliceView
+        android:id="@+id/slice_view"
+        style="@style/Widget.SliceView.Panel.Slider.LargeIcon"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingStart="0dp"
+        android:paddingEnd="0dp"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/values/styles.xml b/res/values/styles.xml
index a60fbd5eadf..f212eb3b348 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -533,6 +533,10 @@
         <item name="rowStyle">@style/SliceRow.Slider</item>
     </style>
 
+    <style name="Widget.SliceView.Panel.Slider.LargeIcon">
+        <item name="rowStyle">@style/SliceRow.Slider.LargeIcon</item>
+    </style>
+
     <style name="SliceRow">
         <!-- 2dp start padding for the start icon -->
         <item name="titleItemStartPadding">2dp</item>
@@ -576,6 +580,11 @@
         <item name="subContentStartPadding">11dp</item>
     </style>
 
+    <style name="SliceRow.Slider.LargeIcon">
+        <!-- Layout is 48dp and actual icon size is 48-(iconSize/2) -->
+        <item name="iconSize">12dp</item>
+    </style>
+
     <style name="DisclaimerPositiveButton" parent="@style/SudGlifButton.Primary">
         <item name="android:layout_margin">16dp</item>
         <item name="android:paddingStart">8dp</item>
diff --git a/src/com/android/settings/panel/MediaOutputGroupPanel.java b/src/com/android/settings/panel/MediaOutputGroupPanel.java
index d98c0b101e0..36f779be173 100644
--- a/src/com/android/settings/panel/MediaOutputGroupPanel.java
+++ b/src/com/android/settings/panel/MediaOutputGroupPanel.java
@@ -159,6 +159,6 @@ public class MediaOutputGroupPanel implements PanelContent, LocalMediaManager.De
 
     @Override
     public int getViewType() {
-        return PanelContent.VIEW_TYPE_SLIDER;
+        return PanelContent.VIEW_TYPE_SLIDER_LARGE_ICON;
     }
 }
diff --git a/src/com/android/settings/panel/MediaOutputPanel.java b/src/com/android/settings/panel/MediaOutputPanel.java
index 3a4d3410cd1..d8dbb34d0e1 100644
--- a/src/com/android/settings/panel/MediaOutputPanel.java
+++ b/src/com/android/settings/panel/MediaOutputPanel.java
@@ -246,7 +246,7 @@ public class MediaOutputPanel implements PanelContent, LocalMediaManager.DeviceC
 
     @Override
     public int getViewType() {
-        return PanelContent.VIEW_TYPE_SLIDER;
+        return PanelContent.VIEW_TYPE_SLIDER_LARGE_ICON;
     }
 
     private final MediaController.Callback mCb = new MediaController.Callback() {
diff --git a/src/com/android/settings/panel/PanelContent.java b/src/com/android/settings/panel/PanelContent.java
index 6c271fd11d9..9fa43164ecd 100644
--- a/src/com/android/settings/panel/PanelContent.java
+++ b/src/com/android/settings/panel/PanelContent.java
@@ -31,6 +31,7 @@ import java.util.List;
 public interface PanelContent extends Instrumentable {
 
     int VIEW_TYPE_SLIDER = 1;
+    int VIEW_TYPE_SLIDER_LARGE_ICON = 2;
 
     /**
      * @return a icon for the title of the Panel.
diff --git a/src/com/android/settings/panel/PanelSlicesAdapter.java b/src/com/android/settings/panel/PanelSlicesAdapter.java
index f0a7745acef..34de834d807 100644
--- a/src/com/android/settings/panel/PanelSlicesAdapter.java
+++ b/src/com/android/settings/panel/PanelSlicesAdapter.java
@@ -75,6 +75,8 @@ public class PanelSlicesAdapter
         View view;
         if (viewType == PanelContent.VIEW_TYPE_SLIDER) {
             view = inflater.inflate(R.layout.panel_slice_slider_row, viewGroup, false);
+        } else if (viewType == PanelContent.VIEW_TYPE_SLIDER_LARGE_ICON) {
+            view = inflater.inflate(R.layout.panel_slice_slider_row_large_icon, viewGroup, false);
         } else {
             view = inflater.inflate(R.layout.panel_slice_row, viewGroup, false);
         }
diff --git a/tests/robotests/src/com/android/settings/panel/MediaOutputGroupPanelTest.java b/tests/robotests/src/com/android/settings/panel/MediaOutputGroupPanelTest.java
index 632d10c1ae4..003fda71df7 100644
--- a/tests/robotests/src/com/android/settings/panel/MediaOutputGroupPanelTest.java
+++ b/tests/robotests/src/com/android/settings/panel/MediaOutputGroupPanelTest.java
@@ -72,4 +72,9 @@ public class MediaOutputGroupPanelTest {
     public void getSeeMoreIntent_isNull() {
         assertThat(mPanel.getSeeMoreIntent()).isNull();
     }
+
+    @Test
+    public void getViewType_checkType() {
+        assertThat(mPanel.getViewType()).isEqualTo(PanelContent.VIEW_TYPE_SLIDER_LARGE_ICON);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/panel/MediaOutputPanelTest.java b/tests/robotests/src/com/android/settings/panel/MediaOutputPanelTest.java
index cdfa87f05fd..2ab428d9b75 100644
--- a/tests/robotests/src/com/android/settings/panel/MediaOutputPanelTest.java
+++ b/tests/robotests/src/com/android/settings/panel/MediaOutputPanelTest.java
@@ -312,4 +312,9 @@ public class MediaOutputPanelTest {
 
         verify(mCallback).forceClose();
     }
+
+    @Test
+    public void getViewType_checkType() {
+        assertThat(mPanel.getViewType()).isEqualTo(PanelContent.VIEW_TYPE_SLIDER_LARGE_ICON);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/panel/PanelSlicesAdapterTest.java b/tests/robotests/src/com/android/settings/panel/PanelSlicesAdapterTest.java
index 9e682f62ff9..f0567c89db9 100644
--- a/tests/robotests/src/com/android/settings/panel/PanelSlicesAdapterTest.java
+++ b/tests/robotests/src/com/android/settings/panel/PanelSlicesAdapterTest.java
@@ -17,6 +17,7 @@
 package com.android.settings.panel;
 
 import static com.android.settings.panel.PanelContent.VIEW_TYPE_SLIDER;
+import static com.android.settings.panel.PanelContent.VIEW_TYPE_SLIDER_LARGE_ICON;
 import static com.android.settings.panel.PanelSlicesAdapter.MAX_NUM_OF_SLICES;
 import static com.android.settings.slices.CustomSliceRegistry.MEDIA_OUTPUT_GROUP_SLICE_URI;
 import static com.android.settings.slices.CustomSliceRegistry.MEDIA_OUTPUT_INDICATOR_SLICE_URI;
@@ -206,6 +207,19 @@ public class PanelSlicesAdapterTest {
         assertThat(intArgumentCaptor.getValue()).isEqualTo(R.layout.panel_slice_slider_row);
     }
 
+    @Test
+    public void onCreateViewHolder_viewTypeSliderLargeIcon_verifyLayout() {
+        final PanelSlicesAdapter adapter = new PanelSlicesAdapter(mPanelFragment, mData, 0);
+        final ViewGroup view = new FrameLayout(mContext);
+        final ArgumentCaptor<Integer> intArgumentCaptor = ArgumentCaptor.forClass(Integer.class);
+
+        adapter.onCreateViewHolder(view, VIEW_TYPE_SLIDER_LARGE_ICON);
+
+        verify(sLayoutInflater).inflate(intArgumentCaptor.capture(), eq(view), eq(false));
+        assertThat(intArgumentCaptor.getValue()).isEqualTo(
+                R.layout.panel_slice_slider_row_large_icon);
+    }
+
     @Test
     public void onCreateViewHolder_viewTypeDefault_verifyLayout() {
         final PanelSlicesAdapter adapter =
diff --git a/tests/robotests/src/com/android/settings/panel/VolumePanelTest.java b/tests/robotests/src/com/android/settings/panel/VolumePanelTest.java
index 4edc2c7c1e7..6c0e131e2e0 100644
--- a/tests/robotests/src/com/android/settings/panel/VolumePanelTest.java
+++ b/tests/robotests/src/com/android/settings/panel/VolumePanelTest.java
@@ -70,4 +70,9 @@ public class VolumePanelTest {
     public void getSeeMoreIntent_notNull() {
         assertThat(mPanel.getSeeMoreIntent()).isNotNull();
     }
+
+    @Test
+    public void getViewType_checkType() {
+        assertThat(mPanel.getViewType()).isEqualTo(PanelContent.VIEW_TYPE_SLIDER);
+    }
 }