Merge "Various icon size changes" into ub-launcher3-burnaby

4 files changed, 6 insertions, 57 deletions

diff --git a/res/layout/apps_customize_application.xml b/res/layout/apps_customize_application.xml
deleted file mode 100644
index c56cdf3d2..000000000
--- a/res/layout/apps_customize_application.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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.
--->
-
-<com.android.launcher3.BubbleTextView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    style="@style/WorkspaceIcon.AppsCustomize"
-    android:id="@+id/application_icon"
-    android:focusable="true" />
diff --git a/res/layout/apps_grid_row_icon_view.xml b/res/layout/apps_grid_row_icon_view.xml
index 149e28e2d..acb3da334 100644
--- a/res/layout/apps_grid_row_icon_view.xml
+++ b/res/layout/apps_grid_row_icon_view.xml
@@ -25,5 +25,6 @@
     android:paddingBottom="@dimen/apps_icon_top_bottom_padding"
     android:focusable="true"
     android:background="@drawable/focusable_view_bg"
-    launcher:deferShadowGeneration="true" />
+    launcher:deferShadowGeneration="true"
+    launcher:iconDisplay="all_apps" />
 
diff --git a/res/layout/apps_list_row_view.xml b/res/layout/apps_list_row_view.xml
deleted file mode 100644
index e80285b95..000000000
--- a/res/layout/apps_list_row_view.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 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:layout_width="match_parent"
-    android:layout_height="@dimen/apps_view_row_height"
-    android:orientation="horizontal"
-    android:focusable="true"
-    android:background="@drawable/focusable_view_bg"
-    android:descendantFocusability="afterDescendants">
-    <TextView
-        android:id="@+id/section"
-        android:layout_width="64dp"
-        android:layout_height="match_parent"
-        android:paddingLeft="16dp"
-        android:gravity="start|center_vertical"
-        android:textColor="@color/apps_view_section_text_color"
-        android:textSize="@dimen/apps_view_section_text_size"
-        android:focusable="false" />
-</LinearLayout>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index a1f28452a..fee3417b0 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -22,8 +22,10 @@
     <declare-styleable name="BubbleTextView">
         <attr name="layoutHorizontal" format="boolean" />
         <attr name="iconSizeOverride" format="dimension" />
-        <attr name="iconPaddingOverride" format="dimension" />
-        <attr name="textSizeOverride" format="dimension" />
+        <attr name="iconDisplay" format="integer">
+            <enum name="workspace" value="0" />
+            <enum name="all_apps" value="1" />
+        </attr>
         <attr name="deferShadowGeneration" format="boolean" />
         <attr name="customShadows" format="boolean" />
     </declare-styleable>