Moving all apps code into sub package.
- Renaming resources, dimens, etc to be more consistent
- Removing old AppsCustomize resources and other unused code
Change-Id: I15ce35e7cb7a9b9344fc7103963e4e4c9e45d89a
diff --git a/res/drawable-ldrtl/apps_list_fastscroll_bg.xml b/res/drawable-ldrtl/all_apps_fastscroll_bg.xml
similarity index 93%
rename from res/drawable-ldrtl/apps_list_fastscroll_bg.xml
rename to res/drawable-ldrtl/all_apps_fastscroll_bg.xml
index 772975a..4777f70 100644
--- a/res/drawable-ldrtl/apps_list_fastscroll_bg.xml
+++ b/res/drawable-ldrtl/all_apps_fastscroll_bg.xml
@@ -16,7 +16,7 @@
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
- <solid android:color="@color/apps_view_scrollbar_thumb_color" />
+ <solid android:color="@color/all_apps_scrollbar_thumb_color" />
<size
android:width="64dp"
android:height="64dp" />
diff --git a/res/drawable/apps_list_fastscroll_bg.xml b/res/drawable/all_apps_fastscroll_bg.xml
similarity index 93%
rename from res/drawable/apps_list_fastscroll_bg.xml
rename to res/drawable/all_apps_fastscroll_bg.xml
index 780d3b0..6b74484 100644
--- a/res/drawable/apps_list_fastscroll_bg.xml
+++ b/res/drawable/all_apps_fastscroll_bg.xml
@@ -16,7 +16,7 @@
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
- <solid android:color="@color/apps_view_scrollbar_thumb_color" />
+ <solid android:color="@color/all_apps_scrollbar_thumb_color" />
<size
android:width="64dp"
android:height="64dp" />
diff --git a/res/drawable/apps_list_scrollbar_thumb.xml b/res/drawable/all_apps_scrollbar_thumb.xml
similarity index 85%
rename from res/drawable/apps_list_scrollbar_thumb.xml
rename to res/drawable/all_apps_scrollbar_thumb.xml
index 318d406..649a963 100644
--- a/res/drawable/apps_list_scrollbar_thumb.xml
+++ b/res/drawable/all_apps_scrollbar_thumb.xml
@@ -16,6 +16,6 @@
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
- <solid android:color="@color/apps_view_scrollbar_thumb_color" />
- <size android:width="@dimen/apps_view_fast_scroll_bar_width" />
+ <solid android:color="@color/all_apps_scrollbar_thumb_color" />
+ <size android:width="@dimen/all_apps_fast_scroll_bar_width" />
</shape>
\ No newline at end of file
diff --git a/res/drawable/apps_search_bg.xml b/res/drawable/all_apps_search_bg.xml
similarity index 100%
rename from res/drawable/apps_search_bg.xml
rename to res/drawable/all_apps_search_bg.xml
diff --git a/res/drawable/apps_list_search_bg.xml b/res/drawable/apps_list_search_bg.xml
deleted file mode 100644
index 9bb6d81..0000000
--- a/res/drawable/apps_list_search_bg.xml
+++ /dev/null
@@ -1,23 +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.
--->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
- android:shape="rectangle">
- <solid android:color="@color/quantum_panel_bg_color" />
- <corners
- android:bottomLeftRadius="2dp"
- android:bottomRightRadius="2dp" />
-</shape>
\ No newline at end of file
diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml
index 113b319..bf9296f 100644
--- a/res/layout-land/launcher.xml
+++ b/res/layout-land/launcher.xml
@@ -61,7 +61,7 @@
android:layout_height="match_parent"
android:visibility="invisible" />
- <include layout="@layout/apps_view"
+ <include layout="@layout/all_apps"
android:id="@+id/apps_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml
index 7202f7b..8ff7762 100644
--- a/res/layout-port/launcher.xml
+++ b/res/layout-port/launcher.xml
@@ -71,7 +71,7 @@
android:layout_height="match_parent"
android:visibility="invisible" />
- <include layout="@layout/apps_view"
+ <include layout="@layout/all_apps"
android:id="@+id/apps_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
diff --git a/res/layout-sw600dp/apps_view.xml b/res/layout-sw600dp/all_apps.xml
similarity index 82%
rename from res/layout-sw600dp/apps_view.xml
rename to res/layout-sw600dp/all_apps.xml
index e6e0ec3..368e6ab 100644
--- a/res/layout-sw600dp/apps_view.xml
+++ b/res/layout-sw600dp/all_apps.xml
@@ -13,21 +13,21 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<com.android.launcher3.AppsContainerView
+<com.android.launcher3.allapps.AllAppsContainerView
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/apps_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:padding="@dimen/apps_container_inset"
+ android:padding="@dimen/all_apps_container_inset"
android:descendantFocusability="afterDescendants">
<include
- layout="@layout/apps_reveal_view"
+ layout="@layout/all_apps_reveal"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center" />
<include
- layout="@layout/apps_list_view"
+ layout="@layout/all_apps_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center" />
-</com.android.launcher3.AppsContainerView>
\ No newline at end of file
+</com.android.launcher3.allapps.AllAppsContainerView>
\ No newline at end of file
diff --git a/res/layout-sw720dp/launcher.xml b/res/layout-sw720dp/launcher.xml
index 8a9f3e9..b27f33b 100644
--- a/res/layout-sw720dp/launcher.xml
+++ b/res/layout-sw720dp/launcher.xml
@@ -71,7 +71,7 @@
android:layout_height="match_parent"
android:visibility="invisible" />
- <include layout="@layout/apps_view"
+ <include layout="@layout/all_apps"
android:id="@+id/apps_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
diff --git a/res/layout/apps_view.xml b/res/layout/all_apps.xml
similarity index 88%
rename from res/layout/apps_view.xml
rename to res/layout/all_apps.xml
index 7f09f77..b907c34 100644
--- a/res/layout/apps_view.xml
+++ b/res/layout/all_apps.xml
@@ -16,20 +16,20 @@
<!-- The top and bottom paddings are defined in this container, but since we want
the list view to span the full width (for touch interception purposes), we
will bake the left/right padding into that view's background itself. -->
-<com.android.launcher3.AppsContainerView
+<com.android.launcher3.allapps.AllAppsContainerView
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/apps_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:descendantFocusability="afterDescendants">
<include
- layout="@layout/apps_reveal_view"
+ layout="@layout/all_apps_reveal"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center" />
<include
- layout="@layout/apps_list_view"
+ layout="@layout/all_apps_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center" />
-</com.android.launcher3.AppsContainerView>
\ No newline at end of file
+</com.android.launcher3.allapps.AllAppsContainerView>
\ No newline at end of file
diff --git a/res/layout/apps_list_view.xml b/res/layout/all_apps_container.xml
similarity index 84%
rename from res/layout/apps_list_view.xml
rename to res/layout/all_apps_container.xml
index 0404983..a20ab46 100644
--- a/res/layout/apps_list_view.xml
+++ b/res/layout/all_apps_container.xml
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<com.android.launcher3.AppsRecyclerViewContainer
+<com.android.launcher3.allapps.AllAppsRecyclerViewContainerView
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/apps_list"
android:layout_width="match_parent"
@@ -23,12 +23,12 @@
android:focusableInTouchMode="true"
android:visibility="gone" >
- <com.android.launcher3.AppsContainerRecyclerView
+ <com.android.launcher3.allapps.AllAppsRecyclerView
android:id="@+id/apps_list_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center_horizontal|top"
- android:layout_marginTop="@dimen/apps_search_bar_height"
+ android:layout_marginTop="@dimen/all_apps_search_bar_height"
android:clipToPadding="false"
android:descendantFocusability="afterDescendants"
android:focusable="true" />
@@ -37,7 +37,7 @@
android:id="@+id/prediction_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/apps_search_bar_height"
+ android:layout_marginTop="@dimen/all_apps_search_bar_height"
android:orientation="horizontal"
android:descendantFocusability="afterDescendants"
android:focusable="true"
@@ -49,8 +49,8 @@
<FrameLayout
android:id="@+id/header"
android:layout_width="match_parent"
- android:layout_height="@dimen/apps_search_bar_height"
- android:background="@drawable/apps_search_bg" >
+ android:layout_height="@dimen/all_apps_search_bar_height"
+ android:background="@drawable/all_apps_search_bg" >
<LinearLayout
android:id="@+id/app_search_container"
@@ -71,14 +71,14 @@
android:paddingTop="13dp"
android:src="@drawable/ic_arrow_back_grey" />
- <com.android.launcher3.AppsContainerSearchEditTextView
- android:id="@+id/app_search_box"
+ <com.android.launcher3.allapps.AllAppsSearchEditView
+ android:id="@+id/apps_search_box"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/transparent"
android:focusableInTouchMode="true"
android:gravity="fill_horizontal"
- android:hint="@string/apps_view_search_bar_hint"
+ android:hint="@string/all_apps_search_bar_hint"
android:imeOptions="actionDone|flagNoExtractUi"
android:maxLines="1"
android:paddingBottom="16dp"
@@ -98,10 +98,10 @@
android:layout_gravity="end|center_vertical"
android:layout_marginEnd="6dp"
android:layout_marginRight="6dp"
- android:contentDescription="@string/apps_view_search_bar_hint"
+ android:contentDescription="@string/all_apps_search_bar_hint"
android:paddingBottom="13dp"
android:paddingTop="13dp"
android:src="@drawable/ic_search_grey" />
</FrameLayout>
-</com.android.launcher3.AppsRecyclerViewContainer>
\ No newline at end of file
+</com.android.launcher3.allapps.AllAppsRecyclerViewContainerView>
\ No newline at end of file
diff --git a/res/layout/apps_empty_view.xml b/res/layout/all_apps_empty_search.xml
similarity index 93%
rename from res/layout/apps_empty_view.xml
rename to res/layout/all_apps_empty_search.xml
index e4c4e2e..f60c4a0 100644
--- a/res/layout/apps_empty_view.xml
+++ b/res/layout/all_apps_empty_search.xml
@@ -21,7 +21,7 @@
android:gravity="center"
android:paddingTop="24dp"
android:paddingBottom="24dp"
- android:paddingRight="@dimen/apps_grid_view_start_margin"
+ android:paddingRight="@dimen/all_apps_grid_view_start_margin"
android:textSize="16sp"
android:textColor="#4c4c4c"
android:focusable="false" />
diff --git a/res/layout/apps_grid_icon_view.xml b/res/layout/all_apps_icon.xml
similarity index 89%
rename from res/layout/apps_grid_icon_view.xml
rename to res/layout/all_apps_icon.xml
index 7165f38..10ed25c 100644
--- a/res/layout/apps_grid_icon_view.xml
+++ b/res/layout/all_apps_icon.xml
@@ -21,8 +21,8 @@
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:paddingTop="@dimen/all_apps_icon_top_bottom_padding"
+ android:paddingBottom="@dimen/all_apps_icon_top_bottom_padding"
android:focusable="true"
android:background="@drawable/focusable_view_bg"
launcher:iconDisplay="all_apps" />
diff --git a/res/layout/apps_prediction_bar_icon_view.xml b/res/layout/all_apps_prediction_bar_icon.xml
similarity index 100%
rename from res/layout/apps_prediction_bar_icon_view.xml
rename to res/layout/all_apps_prediction_bar_icon.xml
diff --git a/res/layout/apps_reveal_view.xml b/res/layout/all_apps_reveal.xml
similarity index 100%
rename from res/layout/apps_reveal_view.xml
rename to res/layout/all_apps_reveal.xml
diff --git a/res/layout/application.xml b/res/layout/app_icon.xml
similarity index 100%
rename from res/layout/application.xml
rename to res/layout/app_icon.xml
diff --git a/res/layout/widgets_view.xml b/res/layout/widgets_view.xml
index 196dc45..2615ddb 100644
--- a/res/layout/widgets_view.xml
+++ b/res/layout/widgets_view.xml
@@ -34,7 +34,7 @@
android:focusable="false"
android:visibility="invisible" />
- <com.android.launcher3.widget.WidgetsContainerRecyclerView
+ <com.android.launcher3.widget.WidgetsRecyclerView
android:id="@+id/widgets_list_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
diff --git a/res/values-sw340dp-port/config.xml b/res/values-sw340dp-port/config.xml
deleted file mode 100644
index 5f71077..0000000
--- a/res/values-sw340dp-port/config.xml
+++ /dev/null
@@ -1,18 +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.
--->
-
-<resources>
-</resources>
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index c366ef3..994c192 100644
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -17,11 +17,11 @@
<resources>
<dimen name="app_icon_size">64dp</dimen>
-<!-- Apps view -->
- <dimen name="apps_container_inset">18dp</dimen>
- <dimen name="apps_grid_view_start_margin">0dp</dimen>
- <dimen name="apps_view_section_text_size">26sp</dimen>
- <dimen name="apps_icon_top_bottom_padding">12dp</dimen>
+<!-- All Apps -->
+ <dimen name="all_apps_container_inset">18dp</dimen>
+ <dimen name="all_apps_grid_view_start_margin">0dp</dimen>
+ <dimen name="all_apps_grid_section_text_size">26sp</dimen>
+ <dimen name="all_apps_icon_top_bottom_padding">12dp</dimen>
<!-- Cling -->
<dimen name="cling_migration_logo_height">400dp</dimen>
diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml
deleted file mode 100644
index bcbbafd..0000000
--- a/res/values-sw600dp/styles.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-* Copyright (C) 2012 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.
-*/
--->
-
-<resources>
-</resources>
diff --git a/res/values-sw720dp-land/dimens.xml b/res/values-sw720dp-land/dimens.xml
index ca13db0..514980f 100644
--- a/res/values-sw720dp-land/dimens.xml
+++ b/res/values-sw720dp-land/dimens.xml
@@ -15,10 +15,6 @@
-->
<resources>
-<!-- AppsCustomize -->
- <integer name="apps_customize_widget_cell_count_x">4</integer>
- <integer name="apps_customize_widget_cell_count_y">2</integer>
-
<!-- the area at the edge of the screen that makes the workspace go left
or right while you're dragging. -->
<dimen name="scroll_zone">100dip</dimen>
diff --git a/res/values-sw720dp/config.xml b/res/values-sw720dp/config.xml
index af6751e..94cffcb 100644
--- a/res/values-sw720dp/config.xml
+++ b/res/values-sw720dp/config.xml
@@ -2,7 +2,7 @@
<bool name="config_largeHeap">true</bool>
<bool name="is_large_tablet">true</bool>
-<!-- AllApps/Customize/AppsCustomize -->
+<!-- All Apps & Widgets -->
<!-- Out of 100, the percent to shrink the workspace during spring loaded mode. -->
<integer name="config_workspaceSpringLoadShrinkPercentage">90</integer>
diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml
index 39b0c80..89942f7 100644
--- a/res/values-sw720dp/dimens.xml
+++ b/res/values-sw720dp/dimens.xml
@@ -16,8 +16,10 @@
<resources>
<dimen name="app_icon_size">72dp</dimen>
- <dimen name="apps_search_bar_height">54dp</dimen>
- <dimen name="apps_icon_top_bottom_padding">16dp</dimen>
+
+<!-- All Apps -->
+ <dimen name="all_apps_search_bar_height">54dp</dimen>
+ <dimen name="all_apps_icon_top_bottom_padding">16dp</dimen>
<!-- QSB -->
<dimen name="toolbar_button_vertical_padding">8dip</dimen>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 782d050..827332a 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -72,16 +72,6 @@
<attr name="maxGap" format="dimension" />
</declare-styleable>
- <!-- StrokedTextView specific attributes. -->
- <declare-styleable name="StrokedTextView">
- <!-- The color of the stroke outline -->
- <attr name="strokeColor" format="color" />
- <!-- The color of the text -->
- <attr name="strokeTextColor" format="color" />
- <!-- The width of the stroke -->
- <attr name="strokeWidth" format="float" />
- </declare-styleable>
-
<!-- PagedView specific attributes. These attributes are used to customize
a PagedView view in XML files. -->
<declare-styleable name="PagedView">
@@ -93,23 +83,6 @@
<attr name="pageIndicator" format="reference" />
</declare-styleable>
- <!-- AppsCustomizePagedView specific attributes. These attributes are used to
- customize an AppsCustomizePagedView in xml files. -->
- <declare-styleable name="AppsCustomizePagedView">
- <!-- Max number of cells of applications horizontally -->
- <attr name="maxAppCellCountX" format="integer" />
- <!-- Max number of cells of applications vertically -->
- <attr name="maxAppCellCountY" format="integer" />
- <!-- Horizontal spacing between widgets and wallpapers -->
- <attr name="widgetCellWidthGap" format="dimension" />
- <!-- Vertical spacing between widgets -->
- <attr name="widgetCellHeightGap" format="dimension" />
- <!-- Number of widgets horizontally -->
- <attr name="widgetCountX" format="integer" />
- <!-- Number of widgets vertically -->
- <attr name="widgetCountY" format="integer" />
- </declare-styleable>
-
<!-- XML attributes used by default_workspace.xml -->
<declare-styleable name="Favorite">
<attr name="className" format="string" />
diff --git a/res/values/colors.xml b/res/values/colors.xml
index a5db2fc..e2b8a2e 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -36,9 +36,9 @@
<color name="outline_color">#FFFFFFFF</color>
<color name="widget_text_panel">#FF374248</color>
- <!-- Apps view -->
- <color name="apps_view_scrollbar_thumb_color">#009688</color>
- <color name="apps_view_section_text_color">#009688</color>
+ <!-- All Apps -->
+ <color name="all_apps_scrollbar_thumb_color">#009688</color>
+ <color name="all_apps_grid_section_text_color">#009688</color>
<!-- Widgets view -->
<color name="widgets_view_section_text_color">#FFFFFF</color>
diff --git a/res/values/config.xml b/res/values/config.xml
index b6e633c..fbce3a4 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -1,8 +1,5 @@
<resources>
<!-- Dynamic Grid -->
- <integer name="config_dynamic_grid_max_long_edge_cell_count">6</integer>
- <integer name="config_dynamic_grid_max_short_edge_cell_count">5</integer>
- <integer name="config_dynamic_grid_min_edge_cell_count">3</integer>
<!-- Out of 100, the percent of space the overview bar should try and take vertically. -->
<integer name="config_dynamic_grid_overview_icon_zone_percentage">20</integer>
<!-- Out of 100, the percent to shrink the workspace during overview mode. -->
@@ -24,21 +21,20 @@
<!-- DragController -->
<integer name="config_flingToDeleteMinVelocity">-1500</integer>
-<!-- AllApps/Customize/AppsCustomize -->
+<!-- AllApps & Launcher transitions -->
<!-- The alpha of the AppsCustomize bg in spring loaded mode -->
<integer name="config_workspaceScrimAlpha">55</integer>
- <integer name="config_workspaceUnshrinkTime">100</integer>
+ <integer name="config_allAppsTransitionTime">100</integer>
<integer name="config_overviewTransitionTime">250</integer>
<!-- Out of 100, the percent to shrink the workspace during spring loaded mode. -->
<integer name="config_workspaceSpringLoadShrinkPercentage">80</integer>
- <!-- Fade/zoom in/out duration & scale in the AllApps transition.
- Note: This should be less than the workspaceShrinkTime as they happen together. -->
- <integer name="config_appsCustomizeRevealTime">220</integer>
- <integer name="config_appsCustomizeWorkspaceShrinkTime">300</integer>
-
- <integer name="config_appsCustomizeItemsAlphaStagger">60</integer>
+ <!-- Fade/zoom in/out duration & scale in a Launcher overlay transition.
+ Note: This should be less than the config_overlayTransitionTime as they happen together. -->
+ <integer name="config_overlayRevealTime">220</integer>
+ <integer name="config_overlayTransitionTime">300</integer>
+ <integer name="config_overlayItemsAlphaStagger">60</integer>
<!-- This constant stores the ratio of the all apps button drawable which
is used for internal (baked-in) padding -->
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 3e5fe3a..246adcd 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -15,13 +15,14 @@
-->
<resources>
+ <dimen name="app_icon_size">48dp</dimen>
+
<!-- Dynamic Grid -->
<dimen name="dynamic_grid_edge_margin">6dp</dimen>
<dimen name="dynamic_grid_search_bar_max_width">500dp</dimen>
<dimen name="dynamic_grid_search_bar_height">56dp</dimen>
<dimen name="dynamic_grid_page_indicator_height">20dp</dimen>
<dimen name="dynamic_grid_icon_drawable_padding">4dp</dimen>
- <dimen name="dynamic_grid_all_apps_cell_padding">18dp</dimen>
<dimen name="dynamic_grid_workspace_page_spacing">8dp</dimen>
<dimen name="dynamic_grid_overview_min_icon_zone_height">80dp</dimen>
<dimen name="dynamic_grid_overview_max_icon_zone_height">120dp</dimen>
@@ -48,48 +49,29 @@
<dimen name="toolbar_button_vertical_padding">4dip</dimen>
<dimen name="toolbar_button_horizontal_padding">12dip</dimen>
-<!-- Apps view -->
- <dimen name="apps_container_width">0dp</dimen>
- <dimen name="apps_container_inset">8dp</dimen>
- <dimen name="apps_grid_view_start_margin">56dp</dimen>
- <dimen name="apps_grid_section_y_offset">8dp</dimen>
- <dimen name="apps_view_section_text_size">24sp</dimen>
- <dimen name="apps_view_fast_scroll_bar_width">4dp</dimen>
- <dimen name="apps_view_fast_scroll_bar_min_height">64dp</dimen>
- <dimen name="apps_view_fast_scroll_scrubber_touch_inset">-16dp</dimen>
- <dimen name="apps_view_fast_scroll_popup_size">72dp</dimen>
- <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>
-
+<!-- All Apps -->
<!-- Note: This needs to match the fixed insets for the search box. -->
<dimen name="container_fixed_bounds_inset">8dp</dimen>
-<!-- AllApps/Customize/AppsCustomize -->
- <dimen name="app_icon_size">48dp</dimen>
+ <dimen name="all_apps_container_inset">8dp</dimen>
+ <dimen name="all_apps_grid_view_start_margin">56dp</dimen>
+ <dimen name="all_apps_grid_section_y_offset">8dp</dimen>
+ <dimen name="all_apps_grid_section_text_size">24sp</dimen>
+ <dimen name="all_apps_search_bar_height">52dp</dimen>
+ <dimen name="all_apps_icon_top_bottom_padding">8dp</dimen>
+ <dimen name="all_apps_icon_left_right_padding">18dp</dimen>
+ <dimen name="all_apps_prediction_icon_top_bottom_padding">12dp</dimen>
- <!-- Drag padding to add to the bottom of drop targets -->
- <dimen name="drop_target_drag_padding">14dp</dimen>
- <dimen name="drop_target_text_size">14sp</dimen>
+ <dimen name="all_apps_fast_scroll_bar_width">4dp</dimen>
+ <dimen name="all_apps_fast_scroll_bar_min_height">64dp</dimen>
+ <dimen name="all_apps_fast_scroll_scrubber_touch_inset">-16dp</dimen>
+ <dimen name="all_apps_fast_scroll_popup_size">72dp</dimen>
+ <dimen name="all_apps_fast_scroll_text_size">48dp</dimen>
<dimen name="all_apps_header_max_elevation">4dp</dimen>
<dimen name="all_apps_header_scroll_to_elevation">16dp</dimen>
<dimen name="all_apps_header_shadow_height">6dp</dimen>
-<!-- Dragging -->
- <!-- the area at the edge of the screen that makes the workspace go left
- or right while you're dragging. -->
- <dimen name="scroll_zone">20dp</dimen>
-
- <!-- When dragging an item, how much bigger (fixed dps) the dragged view
- should be. If 0, it will not be scaled at all. -->
- <dimen name="dragViewScale">12dp</dimen>
-
- <!-- Elevation for the drag view. It should be larger than elevation of all other drag sources
- and drop targets like all-apps and folders -->
- <dimen name="drag_elevation">30dp</dimen>
-
<!-- Widget tray -->
<dimen name="widget_container_inset">8dp</dimen>
<dimen name="widget_preview_label_vertical_padding">8dp</dimen>
@@ -109,6 +91,23 @@
<dimen name="shortcut_preview_padding_right">0dp</dimen>
<dimen name="shortcut_preview_padding_top">0dp</dimen>
+<!-- Dragging -->
+ <!-- Drag padding to add to the bottom of drop targets -->
+ <dimen name="drop_target_drag_padding">14dp</dimen>
+ <dimen name="drop_target_text_size">14sp</dimen>
+
+ <!-- the area at the edge of the screen that makes the workspace go left
+ or right while you're dragging. -->
+ <dimen name="scroll_zone">20dp</dimen>
+
+ <!-- When dragging an item, how much bigger (fixed dps) the dragged view
+ should be. If 0, it will not be scaled at all. -->
+ <dimen name="dragViewScale">12dp</dimen>
+
+ <!-- Elevation for the drag view. It should be larger than elevation of all other drag sources
+ and drop targets like all-apps and folders -->
+ <dimen name="drag_elevation">30dp</dimen>
+
<!-- Theme -->
<dimen name="quantum_panel_outer_padding">4dp</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 18f97c8..a8c668d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -47,20 +47,20 @@
<string name="toggle_weight_watcher">Show Mem</string>
- <!-- AppsCustomize pane -->
+ <!-- Widgets -->
<!-- Message to tell the user to press and hold on a widget to add it [CHAR_LIMIT=50] -->
<string name="long_press_widget_to_add">Touch & hold to pick up a widget.</string>
<!-- The format string for the dimensions of a widget in the drawer -->
<!-- There is a special version of this format string for Farsi -->
<string name="widget_dims_format">%1$d \u00d7 %2$d</string>
- <!-- Apps view -->
+ <!-- All Apps -->
<!-- Search bar text in the apps view. [CHAR_LIMIT=50] -->
- <string name="apps_view_search_bar_hint">Search Apps</string>
+ <string name="all_apps_search_bar_hint">Search Apps</string>
<!-- Loading apps text. [CHAR_LIMIT=50] -->
- <string name="loading_apps_message">Loading Apps…</string>
+ <string name="all_apps_loading_message">Loading Apps…</string>
<!-- No-search-results text. [CHAR_LIMIT=50] -->
- <string name="apps_view_no_search_results">No Apps found matching \"<xliff:g id="query" example="Android">%1$s</xliff:g>\"</string>
+ <string name="all_apps_no_search_results">No Apps found matching \"<xliff:g id="query" example="Android">%1$s</xliff:g>\"</string>
<!-- Drag and drop -->
<skip />