Pulling out predictions into another row view.
Change-Id: Iba0d74457a1314cf0c00a88f9b07df049334e542
diff --git a/res/layout/all_apps_button.xml b/res/layout/all_apps_button.xml
index 9d6d82b..68cc109 100644
--- a/res/layout/all_apps_button.xml
+++ b/res/layout/all_apps_button.xml
@@ -15,5 +15,5 @@
-->
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
- style="@style/WorkspaceIcon"
+ style="@style/Icon"
android:focusable="true" />
diff --git a/res/layout/application.xml b/res/layout/application.xml
index c21dea0..831cee5 100644
--- a/res/layout/application.xml
+++ b/res/layout/application.xml
@@ -15,5 +15,5 @@
-->
<com.android.launcher3.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android"
- style="@style/WorkspaceIcon"
+ style="@style/Icon"
android:focusable="true" />
diff --git a/res/layout/apps_grid_row_icon_view.xml b/res/layout/apps_grid_icon_view.xml
similarity index 96%
rename from res/layout/apps_grid_row_icon_view.xml
rename to res/layout/apps_grid_icon_view.xml
index acb3da3..67d7d50 100644
--- a/res/layout/apps_grid_row_icon_view.xml
+++ b/res/layout/apps_grid_icon_view.xml
@@ -16,7 +16,7 @@
<com.android.launcher3.BubbleTextView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:launcher="http://schemas.android.com/apk/res-auto"
- style="@style/WorkspaceIcon.AppsCustomize"
+ style="@style/Icon.AllApps"
android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/res/layout/apps_list_view.xml b/res/layout/apps_list_view.xml
index ddcb639..ef20323 100644
--- a/res/layout/apps_list_view.xml
+++ b/res/layout/apps_list_view.xml
@@ -13,20 +13,37 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<LinearLayout
+<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/apps_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:orientation="vertical"
android:elevation="15dp"
android:visibility="gone"
android:focusableInTouchMode="true">
+ <com.android.launcher3.AppsContainerRecyclerView
+ android:id="@+id/apps_list_view"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginTop="@dimen/apps_search_bar_height"
+ android:layout_gravity="center_horizontal|top"
+ android:clipToPadding="false"
+ android:focusable="true"
+ android:descendantFocusability="afterDescendants" />
+ <LinearLayout
+ android:id="@+id/prediction_bar"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/apps_search_bar_height"
+ android:orientation="horizontal"
+ android:visibility="invisible">
+ </LinearLayout>
+
+ <!-- We always want the search bar on top, so it goes last. -->
<FrameLayout
android:id="@+id/header"
android:layout_width="match_parent"
android:layout_height="@dimen/apps_search_bar_height"
- android:orientation="horizontal"
android:background="@drawable/apps_search_bg">
<LinearLayout
android:id="@+id/app_search_container"
@@ -40,8 +57,8 @@
android:layout_height="wrap_content"
android:layout_gravity="start|center_vertical"
android:layout_marginStart="4dp"
- android:paddingTop="12dp"
- android:paddingBottom="12dp"
+ android:paddingTop="13dp"
+ android:paddingBottom="13dp"
android:contentDescription="@string/all_apps_button_label"
android:src="@drawable/ic_arrow_back_grey" />
<com.android.launcher3.AppsContainerSearchEditTextView
@@ -69,19 +86,9 @@
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"
android:layout_marginEnd="6dp"
- android:paddingTop="12dp"
- android:paddingBottom="12dp"
+ android:paddingTop="13dp"
+ android:paddingBottom="13dp"
android:contentDescription="@string/apps_view_search_bar_hint"
android:src="@drawable/ic_search_grey" />
</FrameLayout>
- <com.android.launcher3.AppsContainerRecyclerView
- android:id="@+id/apps_list_view"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_gravity="center"
- android:paddingTop="12dp"
- android:paddingBottom="12dp"
- android:clipToPadding="false"
- android:focusable="true"
- android:descendantFocusability="afterDescendants" />
-</LinearLayout>
\ No newline at end of file
+</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/apps_grid_row_icon_view.xml b/res/layout/apps_prediction_bar_icon_view.xml
similarity index 77%
copy from res/layout/apps_grid_row_icon_view.xml
copy to res/layout/apps_prediction_bar_icon_view.xml
index acb3da3..4a6f157 100644
--- a/res/layout/apps_grid_row_icon_view.xml
+++ b/res/layout/apps_prediction_bar_icon_view.xml
@@ -16,13 +16,12 @@
<com.android.launcher3.BubbleTextView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:launcher="http://schemas.android.com/apk/res-auto"
- style="@style/WorkspaceIcon.AppsCustomize"
+ style="@style/Icon.AllApps"
android:id="@+id/icon"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="left|center_vertical"
- android:paddingTop="@dimen/apps_icon_top_bottom_padding"
- android:paddingBottom="@dimen/apps_icon_top_bottom_padding"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_gravity="center"
+ android:layout_weight="1"
android:focusable="true"
android:background="@drawable/focusable_view_bg"
launcher:deferShadowGeneration="true"
diff --git a/res/layout/folder_application.xml b/res/layout/folder_application.xml
index b48b613..4d00331 100644
--- a/res/layout/folder_application.xml
+++ b/res/layout/folder_application.xml
@@ -15,5 +15,5 @@
-->
<com.android.launcher3.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android"
- style="@style/WorkspaceIcon.Folder"
+ style="@style/Icon.Folder"
android:focusable="true" />
diff --git a/res/layout/folder_icon.xml b/res/layout/folder_icon.xml
index fd45d76..d9a7671 100644
--- a/res/layout/folder_icon.xml
+++ b/res/layout/folder_icon.xml
@@ -28,7 +28,7 @@
android:antialias="true"
android:src="@drawable/portal_ring_inner_holo"/>
<com.android.launcher3.BubbleTextView
- style="@style/WorkspaceIcon"
+ style="@style/Icon"
android:id="@+id/folder_icon_name"
android:layout_gravity="top"
android:layout_width="match_parent"
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 90d7098..1a92545 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -60,6 +60,7 @@
<dimen name="apps_view_fast_scroll_text_size">48dp</dimen>
<dimen name="apps_search_bar_height">52dp</dimen>
<dimen name="apps_icon_top_bottom_padding">8dp</dimen>
+ <dimen name="apps_prediction_icon_top_bottom_padding">12dp</dimen>
<!-- Note: This needs to match the fixed insets for the search box. -->
<dimen name="container_fixed_bounds_inset">8dp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 16d4cbe..78cc083 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -19,7 +19,7 @@
<resources>
- <style name="WorkspaceIcon">
+ <style name="Icon">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">match_parent</item>
<item name="android:layout_gravity">center</item>
@@ -32,11 +32,7 @@
<item name="android:fontFamily">sans-serif-condensed</item>
</style>
- <style name="WorkspaceIcon.Portrait"></style>
-
- <style name="WorkspaceIcon.Landscape"></style>
-
- <style name="WorkspaceIcon.AppsCustomize">
+ <style name="Icon.AllApps">
<item name="android:background">@null</item>
<item name="android:textColor">@color/quantum_panel_text_color</item>
<item name="android:drawablePadding">@dimen/dynamic_grid_icon_drawable_padding</item>
@@ -44,7 +40,7 @@
<item name="customShadows">false</item>
</style>
- <style name="WorkspaceIcon.Folder">
+ <style name="Icon.Folder">
<item name="android:background">@null</item>
<item name="android:textColor">@color/quantum_panel_text_color</item>
<item name="android:shadowRadius">0</item>