diff options
Diffstat (limited to 'res')
46 files changed, 75 insertions, 956 deletions
diff --git a/res/drawable-hdpi/now_page.png b/res/drawable-hdpi/custom_content_page.png Binary files differindex 9eef50c92..9eef50c92 100644 --- a/res/drawable-hdpi/now_page.png +++ b/res/drawable-hdpi/custom_content_page.png diff --git a/res/drawable-mdpi/now_page.png b/res/drawable-mdpi/custom_content_page.png Binary files differindex cc4005ded..cc4005ded 100644 --- a/res/drawable-mdpi/now_page.png +++ b/res/drawable-mdpi/custom_content_page.png diff --git a/res/drawable-xhdpi/now_page.png b/res/drawable-xhdpi/custom_content_page.png Binary files differindex e1da91c61..e1da91c61 100644 --- a/res/drawable-xhdpi/now_page.png +++ b/res/drawable-xhdpi/custom_content_page.png diff --git a/res/layout-land/application.xml b/res/layout-land/application.xml deleted file mode 100644 index d20e1be1e..000000000 --- a/res/layout-land/application.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2008 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.Landscape" - android:focusable="true" - android:background="@drawable/focusable_view_bg" /> diff --git a/res/layout-land/folder_icon.xml b/res/layout-land/folder_icon.xml deleted file mode 100644 index 32d729802..000000000 --- a/res/layout-land/folder_icon.xml +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2008 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.FolderIcon - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:focusable="true" - android:background="@drawable/focusable_view_bg"> - <ImageView - android:id="@+id/preview_background" - android:layout_gravity="center_horizontal" - android:layout_width="@dimen/folder_preview_size" - android:layout_height="@dimen/folder_preview_size" - android:src="@drawable/portal_ring_inner_holo"/> - <com.android.launcher3.BubbleTextView - android:id="@+id/folder_icon_name" - style="@style/WorkspaceIcon.Landscape.Folder"/> -</com.android.launcher3.FolderIcon> diff --git a/res/layout-land/hotseat.xml b/res/layout-land/hotseat.xml deleted file mode 100644 index f2d2b00e7..000000000 --- a/res/layout-land/hotseat.xml +++ /dev/null @@ -1,36 +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.Hotseat - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" - launcher:cellCountX="1" - launcher:cellCountY="@integer/hotseat_cell_count"> - <com.android.launcher3.CellLayout - android:id="@+id/layout" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:paddingTop="@dimen/button_bar_width_left_padding" - android:paddingBottom="@dimen/button_bar_width_right_padding" - android:paddingStart="@dimen/button_bar_height_top_padding" - android:paddingEnd="@dimen/button_bar_height_bottom_padding" - - launcher:cellWidth="@dimen/hotseat_cell_width" - launcher:cellHeight="@dimen/hotseat_cell_height" - launcher:widthGap="@dimen/hotseat_width_gap" - launcher:heightGap="@dimen/hotseat_height_gap" - launcher:maxGap="@dimen/workspace_max_gap" /> -</com.android.launcher3.Hotseat> diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml index 3454ad49f..faf410be5 100644 --- a/res/layout-land/launcher.xml +++ b/res/layout-land/launcher.xml @@ -36,28 +36,13 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_gravity="center" - android:paddingStart="@dimen/workspace_left_padding" - android:paddingEnd="@dimen/workspace_right_padding" - android:paddingTop="@dimen/workspace_top_padding" - android:paddingBottom="@dimen/workspace_bottom_padding" launcher:defaultScreen="@integer/config_workspaceDefaultScreen" - launcher:cellCountX="@integer/cell_count_x" - launcher:cellCountY="@integer/cell_count_y" launcher:pageSpacing="@dimen/workspace_page_spacing" - launcher:scrollIndicatorPaddingLeft="@dimen/qsb_bar_height" - launcher:scrollIndicatorPaddingRight="@dimen/button_bar_height" /> - - <include - android:id="@+id/qsb_divider" - layout="@layout/workspace_divider" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_marginStart="@dimen/qsb_bar_height" - android:layout_gravity="start" /> + launcher:pageIndicator="@id/page_indicator" /> <include layout="@layout/hotseat" android:id="@+id/hotseat" - android:layout_width="@dimen/button_bar_height_plus_padding" + android:layout_width="match_parent" android:layout_height="match_parent" android:layout_gravity="end" /> @@ -84,16 +69,18 @@ android:layout_height="match_parent" android:visibility="gone" /> + <!-- TODO: Fix <com.android.launcher3.DrawableStateProxyView android:id="@+id/voice_button_proxy" - android:layout_width="@dimen/qsb_bar_height" - android:layout_height="@dimen/app_icon_size" + android:layout_width="0dp" + android:layout_height="0dp" android:layout_gravity="top|start" android:layout_marginTop="64dp" android:clickable="true" android:onClick="onClickVoiceButton" android:importantForAccessibility="no" launcher:sourceViewId="@+id/voice_button" /> + --> <include layout="@layout/apps_customize_pane" android:id="@+id/apps_customize_pane" diff --git a/res/layout-land/search_bar.xml b/res/layout-land/search_bar.xml index ab36361fe..d56e380d0 100644 --- a/res/layout-land/search_bar.xml +++ b/res/layout-land/search_bar.xml @@ -15,7 +15,7 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="@dimen/qsb_bar_height" + android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical"> <!-- Global search icon --> diff --git a/res/layout-port/hotseat.xml b/res/layout-port/hotseat.xml deleted file mode 100644 index cab20b2da..000000000 --- a/res/layout-port/hotseat.xml +++ /dev/null @@ -1,36 +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.Hotseat - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" - launcher:cellCountX="@integer/hotseat_cell_count" - launcher:cellCountY="1"> - <com.android.launcher3.CellLayout - android:id="@+id/layout" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_gravity="center" - android:paddingTop="@dimen/button_bar_height_top_padding" - android:paddingBottom="@dimen/button_bar_height_bottom_padding" - android:paddingStart="@dimen/button_bar_width_left_padding" - android:paddingEnd="@dimen/button_bar_width_right_padding" - - launcher:cellWidth="@dimen/hotseat_cell_width" - launcher:cellHeight="@dimen/hotseat_cell_height" - launcher:widthGap="@dimen/hotseat_width_gap" - launcher:heightGap="@dimen/hotseat_height_gap" - launcher:maxGap="@dimen/workspace_max_gap" /> -</com.android.launcher3.Hotseat> diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml index a2e829819..dd3ad47e4 100644 --- a/res/layout-port/launcher.xml +++ b/res/layout-port/launcher.xml @@ -35,25 +35,15 @@ android:id="@+id/workspace" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_gravity="center" - android:paddingStart="@dimen/workspace_left_padding" - android:paddingEnd="@dimen/workspace_right_padding" - android:paddingTop="@dimen/workspace_top_padding" - android:paddingBottom="@dimen/workspace_bottom_padding" launcher:defaultScreen="@integer/config_workspaceDefaultScreen" - launcher:cellCountX="@integer/cell_count_x" - launcher:cellCountY="@integer/cell_count_y" launcher:pageSpacing="@dimen/workspace_page_spacing" - launcher:pageIndicator="@id/page_indicator" - launcher:scrollIndicatorPaddingLeft="@dimen/workspace_divider_padding_left" - launcher:scrollIndicatorPaddingRight="@dimen/workspace_divider_padding_right"> + launcher:pageIndicator="@id/page_indicator"> </com.android.launcher3.Workspace> <include layout="@layout/hotseat" android:id="@+id/hotseat" android:layout_width="match_parent" - android:layout_height="@dimen/button_bar_height_plus_padding" - android:layout_gravity="bottom" /> + android:layout_height="match_parent" /> <include layout="@layout/overview_panel" android:id="@+id/overview_panel" @@ -66,8 +56,7 @@ layout="@layout/page_indicator" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="bottom|center_horizontal" - android:layout_marginBottom="@dimen/button_bar_height_plus_padding" /> + android:layout_gravity="center_horizontal" /> <include android:id="@+id/qsb_bar" @@ -90,8 +79,8 @@ <com.android.launcher3.DrawableStateProxyView android:id="@+id/voice_button_proxy" - android:layout_width="80dp" - android:layout_height="@dimen/qsb_bar_height" + android:layout_width="0dp" + android:layout_height="0dp" android:layout_gravity="top|end" android:clickable="true" android:onClick="onClickVoiceButton" diff --git a/res/layout-port/search_bar.xml b/res/layout-port/search_bar.xml index 1e12e9eb8..69dd61aa2 100644 --- a/res/layout-port/search_bar.xml +++ b/res/layout-port/search_bar.xml @@ -17,9 +17,6 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" style="@style/SearchDropTargetBar" - android:layout_width="match_parent" - android:layout_height="@dimen/search_bar_height" - android:layout_gravity="bottom|center_horizontal" android:background="@drawable/search_frame"> <!-- Global search icon --> <com.android.launcher3.HolographicLinearLayout @@ -29,8 +26,8 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_gravity="center_vertical" + android:layout_centerVertical="true" android:layout_alignParentStart="true" - android:layout_alignParentTop="true" android:layout_toStartOf="@+id/voice_button_container" android:paddingStart="8dp" android:onClick="onClickSearchButton" @@ -41,7 +38,8 @@ android:id="@+id/search_button" android:layout_width="wrap_content" android:layout_height="match_parent" - android:scaleType="fitStart" + android:layout_gravity="start" + android:scaleType="fitCenter" android:src="@drawable/ic_home_search_normal_holo" android:adjustViewBounds="true" /> </com.android.launcher3.HolographicLinearLayout> @@ -51,22 +49,22 @@ style="@style/SearchButton" launcher:sourceImageViewId="@+id/voice_button" android:id="@+id/voice_button_container" - android:layout_width="@dimen/search_bar_height" + android:layout_width="@dimen/app_icon_size" android:layout_height="match_parent" android:layout_gravity="center_vertical" + android:layout_centerVertical="true" android:layout_alignParentEnd="true" - android:layout_alignParentTop="true" android:paddingEnd="8dp" - android:gravity="end" android:onClick="onClickVoiceButton" android:focusable="true" android:clickable="true" android:contentDescription="@string/accessibility_voice_search_button"> <ImageView android:id="@+id/voice_button" - android:layout_width="wrap_content" + android:layout_width="match_parent" android:layout_height="match_parent" - android:scaleType="fitEnd" + android:layout_gravity="end" + android:scaleType="fitCenter" android:src="@drawable/ic_home_voice_search_holo" android:adjustViewBounds="true" /> </com.android.launcher3.HolographicLinearLayout> diff --git a/res/layout-sw600dp-land/launcher.xml b/res/layout-sw600dp-land/launcher.xml deleted file mode 100644 index 8e45028b8..000000000 --- a/res/layout-sw600dp-land/launcher.xml +++ /dev/null @@ -1,108 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2007 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. ---> - -<!-- Full screen view projects under the status bar and contains the background --> -<FrameLayout - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" - - android:id="@+id/launcher" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@drawable/workspace_bg"> - - <com.android.launcher3.DragLayer - android:id="@+id/drag_layer" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:fitsSystemWindows="true"> - - <include - android:id="@+id/page_indicator" - layout="@layout/page_indicator" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="bottom|center_horizontal" /> - - <!-- The workspace contains 5 screens of cells --> - <com.android.launcher3.Workspace - android:id="@+id/workspace" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_gravity="center" - android:paddingStart="@dimen/workspace_left_padding" - android:paddingEnd="@dimen/workspace_right_padding" - android:paddingTop="@dimen/workspace_top_padding" - android:paddingBottom="@dimen/workspace_bottom_padding" - launcher:defaultScreen="@integer/config_workspaceDefaultScreen" - launcher:cellCountX="@integer/cell_count_x" - launcher:cellCountY="@integer/cell_count_y" - launcher:pageSpacing="@dimen/workspace_page_spacing" - launcher:pageIndicator="@id/page_indicator" - launcher:scrollIndicatorPaddingLeft="@dimen/qsb_bar_height" - launcher:scrollIndicatorPaddingRight="@dimen/button_bar_height" /> - - <include - android:id="@+id/qsb_divider" - layout="@layout/workspace_divider" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_marginStart="@dimen/qsb_bar_height" - android:layout_gravity="start" /> - - <include layout="@layout/hotseat" - android:id="@+id/hotseat" - android:layout_width="@dimen/button_bar_height_plus_padding" - android:layout_height="match_parent" - android:layout_gravity="end" /> - - <include - android:id="@+id/qsb_bar" - layout="@layout/qsb_bar" /> - - <!-- The Workspace cling must appear under the AppsCustomizePagedView below to ensure - that it is still visible during the transition to AllApps and doesn't overlay on - top of that view. --> - <include layout="@layout/workspace_cling" - android:id="@+id/workspace_cling" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:visibility="gone" /> - - <include layout="@layout/folder_cling" - android:id="@+id/folder_cling" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:visibility="gone" /> - - <com.android.launcher3.DrawableStateProxyView - android:id="@+id/voice_button_proxy" - android:layout_width="@dimen/qsb_bar_height" - android:layout_height="@dimen/app_icon_size" - android:layout_gravity="top|start" - android:layout_marginTop="64dp" - android:clickable="true" - android:onClick="onClickVoiceButton" - android:importantForAccessibility="no" - launcher:sourceViewId="@+id/voice_button" /> - - <include layout="@layout/apps_customize_pane" - android:id="@+id/apps_customize_pane" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:visibility="invisible" /> - </com.android.launcher3.DragLayer> -</FrameLayout> diff --git a/res/layout-sw720dp/hotseat.xml b/res/layout-sw720dp/hotseat.xml deleted file mode 100644 index f69f68d95..000000000 --- a/res/layout-sw720dp/hotseat.xml +++ /dev/null @@ -1,36 +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.Hotseat - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" - launcher:cellCountX="@integer/hotseat_cell_count" - launcher:cellCountY="1"> - <com.android.launcher3.CellLayout - android:id="@+id/layout" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_gravity="center" - android:paddingTop="@dimen/button_bar_height_top_padding" - android:paddingBottom="@dimen/button_bar_height_bottom_padding" - android:paddingStart="@dimen/button_bar_width_left_padding" - android:paddingEnd="@dimen/button_bar_width_right_padding" - - launcher:cellWidth="@dimen/hotseat_cell_width" - launcher:cellHeight="@dimen/hotseat_cell_height" - launcher:widthGap="@dimen/hotseat_width_gap" - launcher:heightGap="@dimen/hotseat_height_gap" - launcher:maxGap="@dimen/hotseat_width_gap" /> -</com.android.launcher3.Hotseat> diff --git a/res/layout-sw720dp/launcher.xml b/res/layout-sw720dp/launcher.xml index 82f01788a..fee0198ed 100644 --- a/res/layout-sw720dp/launcher.xml +++ b/res/layout-sw720dp/launcher.xml @@ -35,25 +35,15 @@ android:id="@+id/workspace" android:layout_width="match_parent" android:layout_height="match_parent" - android:paddingStart="@dimen/workspace_left_padding" - android:paddingEnd="@dimen/workspace_right_padding" - android:paddingTop="@dimen/workspace_top_padding" - android:paddingBottom="@dimen/workspace_bottom_padding" - android:layout_gravity="center" launcher:defaultScreen="@integer/config_workspaceDefaultScreen" - launcher:cellCountX="@integer/cell_count_x" - launcher:cellCountY="@integer/cell_count_y" launcher:pageSpacing="@dimen/workspace_page_spacing" - launcher:pageIndicator="@id/page_indicator" - launcher:scrollIndicatorPaddingLeft="@dimen/workspace_divider_padding_left" - launcher:scrollIndicatorPaddingRight="@dimen/workspace_divider_padding_right"> + launcher:pageIndicator="@id/page_indicator"> </com.android.launcher3.Workspace> <include layout="@layout/hotseat" android:id="@+id/hotseat" android:layout_width="match_parent" - android:layout_height="@dimen/button_bar_height_plus_padding" - android:layout_gravity="bottom" /> + android:layout_height="match_parent" /> <include android:id="@+id/qsb_bar" @@ -70,8 +60,7 @@ layout="@layout/page_indicator" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="bottom|center_horizontal" - android:layout_marginBottom="@dimen/button_bar_height_plus_padding" /> + android:layout_gravity="center_horizontal" /> <!-- The Workspace cling must appear under the AppsCustomizePagedView below to ensure that it is still visible during the transition to AllApps and doesn't overlay on @@ -90,9 +79,8 @@ <com.android.launcher3.DrawableStateProxyView android:id="@+id/voice_button_proxy" - android:layout_width="80dp" - android:layout_height="@dimen/qsb_bar_height" - android:layout_marginEnd="@dimen/qsb_voice_proxy_padding_right" + android:layout_width="0dp" + android:layout_height="0dp" android:layout_gravity="top|end" android:clickable="true" android:onClick="onClickVoiceButton" diff --git a/res/layout-sw720dp/search_bar.xml b/res/layout-sw720dp/search_bar.xml index 44c969bef..69dd61aa2 100644 --- a/res/layout-sw720dp/search_bar.xml +++ b/res/layout-sw720dp/search_bar.xml @@ -17,9 +17,6 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" style="@style/SearchDropTargetBar" - android:layout_width="match_parent" - android:layout_height="@dimen/search_bar_height" - android:layout_gravity="bottom|center_horizontal" android:background="@drawable/search_frame"> <!-- Global search icon --> <com.android.launcher3.HolographicLinearLayout @@ -29,8 +26,8 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_gravity="center_vertical" + android:layout_centerVertical="true" android:layout_alignParentStart="true" - android:layout_alignParentTop="true" android:layout_toStartOf="@+id/voice_button_container" android:paddingStart="8dp" android:onClick="onClickSearchButton" @@ -41,6 +38,8 @@ android:id="@+id/search_button" android:layout_width="wrap_content" android:layout_height="match_parent" + android:layout_gravity="start" + android:scaleType="fitCenter" android:src="@drawable/ic_home_search_normal_holo" android:adjustViewBounds="true" /> </com.android.launcher3.HolographicLinearLayout> @@ -50,21 +49,22 @@ style="@style/SearchButton" launcher:sourceImageViewId="@+id/voice_button" android:id="@+id/voice_button_container" - android:layout_width="@dimen/search_bar_height" + android:layout_width="@dimen/app_icon_size" android:layout_height="match_parent" android:layout_gravity="center_vertical" + android:layout_centerVertical="true" android:layout_alignParentEnd="true" - android:layout_alignParentTop="true" android:paddingEnd="8dp" - android:gravity="end" android:onClick="onClickVoiceButton" android:focusable="true" android:clickable="true" android:contentDescription="@string/accessibility_voice_search_button"> <ImageView android:id="@+id/voice_button" - android:layout_width="wrap_content" + android:layout_width="match_parent" android:layout_height="match_parent" + android:layout_gravity="end" + android:scaleType="fitCenter" android:src="@drawable/ic_home_voice_search_holo" android:adjustViewBounds="true" /> </com.android.launcher3.HolographicLinearLayout> diff --git a/res/layout-sw720dp/workspace.xml b/res/layout-sw720dp/workspace.xml deleted file mode 100644 index 00ed529e0..000000000 --- a/res/layout-sw720dp/workspace.xml +++ /dev/null @@ -1,33 +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. ---> - -<!-- The workspace contains 5 screens of cells --> - -<com.android.launcher3.Workspace - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" - android:paddingStart="@dimen/workspace_left_padding" - android:paddingEnd="@dimen/workspace_right_padding" - android:paddingTop="@dimen/workspace_top_padding" - android:paddingBottom="@dimen/workspace_bottom_padding" - launcher:defaultScreen="2" - launcher:pageSpacing="@dimen/workspace_page_spacing"> - <include android:id="@+id/cell1" layout="@layout/workspace_screen" /> - <include android:id="@+id/cell2" layout="@layout/workspace_screen" /> - <include android:id="@+id/cell3" layout="@layout/workspace_screen" /> - <include android:id="@+id/cell4" layout="@layout/workspace_screen" /> - <include android:id="@+id/cell5" layout="@layout/workspace_screen" /> -</com.android.launcher3.Workspace> diff --git a/res/layout-port/application.xml b/res/layout/application.xml index 4dcc774d7..e4909ddad 100644 --- a/res/layout-port/application.xml +++ b/res/layout/application.xml @@ -15,6 +15,6 @@ --> <com.android.launcher3.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android" - style="@style/WorkspaceIcon.Portrait" + style="@style/WorkspaceIcon" android:focusable="true" android:background="@drawable/focusable_view_bg" /> diff --git a/res/layout/now_page_indicator_marker.xml b/res/layout/custom_content_page_indicator_marker.xml index 7d0562743..168599266 100644 --- a/res/layout/now_page_indicator_marker.xml +++ b/res/layout/custom_content_page_indicator_marker.xml @@ -17,18 +17,19 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" android:layout_width="wrap_content" - android:layout_height="wrap_content"> + android:layout_height="wrap_content" + android:layout_gravity="center_vertical"> <ImageView android:id="@+id/inactive" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/now_page" + android:src="@drawable/custom_content_page" /> <ImageView android:id="@+id/active" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/now_page" + android:src="@drawable/custom_content_page" android:alpha="0" /> </com.android.launcher3.PageIndicatorMarker> diff --git a/res/layout-port/folder_icon.xml b/res/layout/folder_icon.xml index 686fb170c..5a9a83415 100644 --- a/res/layout-port/folder_icon.xml +++ b/res/layout/folder_icon.xml @@ -24,10 +24,10 @@ <ImageView android:id="@+id/preview_background" android:layout_gravity="center_horizontal" - android:layout_width="@dimen/folder_preview_size" - android:layout_height="@dimen/folder_preview_size" + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:src="@drawable/portal_ring_inner_holo"/> <com.android.launcher3.BubbleTextView android:id="@+id/folder_icon_name" - style="@style/WorkspaceIcon.Portrait.Folder"/> + style="@style/WorkspaceIcon"/> </com.android.launcher3.FolderIcon> diff --git a/res/layout/workspace_divider.xml b/res/layout/hotseat.xml index 304e53297..dc9ed2a6f 100644 --- a/res/layout/workspace_divider.xml +++ b/res/layout/hotseat.xml @@ -13,11 +13,12 @@ See the License for the specific language governing permissions and limitations under the License. --> -<ImageView +<com.android.launcher3.Hotseat xmlns:android="http://schemas.android.com/apk/res/android" - android:paddingStart="@dimen/workspace_divider_padding_left" - android:paddingEnd="@dimen/workspace_divider_padding_right" - android:paddingTop="@dimen/workspace_divider_padding_top" - android:paddingBottom="@dimen/workspace_divider_padding_bottom" - android:scaleType="fitXY" - android:src="@drawable/hotseat_track_holo" /> + xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3"> + <com.android.launcher3.CellLayout + android:id="@+id/layout" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_gravity="center" /> +</com.android.launcher3.Hotseat> diff --git a/res/layout/page_indicator_marker.xml b/res/layout/page_indicator_marker.xml index 0260e7e4e..496f3bdc9 100644 --- a/res/layout/page_indicator_marker.xml +++ b/res/layout/page_indicator_marker.xml @@ -17,7 +17,8 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" android:layout_width="wrap_content" - android:layout_height="wrap_content"> + android:layout_height="wrap_content" + android:layout_gravity="center_vertical"> <ImageView android:id="@+id/inactive" android:layout_width="wrap_content" diff --git a/res/layout/qsb_bar.xml b/res/layout/qsb_bar.xml index 56e052346..f0e3bbfce 100644 --- a/res/layout/qsb_bar.xml +++ b/res/layout/qsb_bar.xml @@ -16,16 +16,24 @@ <com.android.launcher3.SearchDropTargetBar xmlns:android="http://schemas.android.com/apk/res/android" style="@style/QSBBar" - android:focusable="false"> + android:focusable="false" + android:layout_width="match_parent" + android:layout_height="match_parent"> <!-- Search buttons container --> <include android:id="@+id/qsb_search_bar" - layout="@layout/search_bar" /> + layout="@layout/search_bar" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_gravity="center" /> <!-- Drag specific targets container --> <LinearLayout style="@style/SearchDropTargetBar" - android:id="@+id/drag_target_bar"> + android:id="@+id/drag_target_bar" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_gravity="center"> <include layout="@layout/drop_target_bar" /> diff --git a/res/layout/user_folder.xml b/res/layout/user_folder.xml index 3eeec35a2..d790c5388 100644 --- a/res/layout/user_folder.xml +++ b/res/layout/user_folder.xml @@ -30,16 +30,8 @@ android:id="@+id/folder_content" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:paddingStart="@dimen/folder_padding" - android:paddingEnd="@dimen/folder_padding" - android:paddingTop="@dimen/folder_padding" - android:paddingBottom="@dimen/folder_padding" android:cacheColorHint="#ff333333" - android:hapticFeedbackEnabled="false" - launcher:widthGap="@dimen/folder_width_gap" - launcher:heightGap="@dimen/folder_height_gap" - launcher:cellWidth="@dimen/folder_cell_width" - launcher:cellHeight="@dimen/folder_cell_height" /> + android:hapticFeedbackEnabled="false" /> </ScrollView> <com.android.launcher3.FolderEditText diff --git a/res/layout/workspace_screen.xml b/res/layout/workspace_screen.xml index acc9f6651..855cf39f5 100644 --- a/res/layout/workspace_screen.xml +++ b/res/layout/workspace_screen.xml @@ -20,14 +20,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" - android:paddingStart="@dimen/cell_layout_left_padding" - android:paddingEnd="@dimen/cell_layout_right_padding" - android:paddingTop="@dimen/cell_layout_top_padding" - android:paddingBottom="@dimen/cell_layout_bottom_padding" android:hapticFeedbackEnabled="false" - launcher:cellWidth="@dimen/workspace_cell_width" - launcher:cellHeight="@dimen/workspace_cell_height" - launcher:widthGap="@dimen/workspace_width_gap" - launcher:heightGap="@dimen/workspace_height_gap" launcher:maxGap="@dimen/workspace_max_gap" /> diff --git a/res/values-land/config.xml b/res/values-land/config.xml index da9f9f982..121bb0c14 100644 --- a/res/values-land/config.xml +++ b/res/values-land/config.xml @@ -20,11 +20,4 @@ <bool name="config_useDropTargetDownTransition">false</bool> <!-- Whether or not to fade the side pages --> <bool name="config_workspaceFadeAdjacentScreens">false</bool> - - <!-- Folder max bounds and max number of items. Note: folder_max_count_x * folder_max_count_y - >= folder_max_num_items. If any values are set to 0, the values will be determined automatically. - A value of -1 indicates unbounded --> - <integer name="folder_max_count_x">6</integer> - <integer name="folder_max_count_y">-1</integer> - <integer name="folder_max_num_items">-1</integer> </resources> diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml index 5edd14364..4d94d7e62 100644 --- a/res/values-land/dimens.xml +++ b/res/values-land/dimens.xml @@ -20,39 +20,9 @@ <dimen name="toolbar_button_horizontal_padding">0dip</dimen> <!-- Workspace --> - <dimen name="hotseat_cell_width">64dp</dimen> - <dimen name="hotseat_cell_height">58dp</dimen> <!-- We really want the page spacing to be the max of either the button bar height or the qsb bar height --> <dimen name="workspace_page_spacing">-1dp</dimen> - <dimen name="workspace_divider_padding_left">0dp</dimen> - <dimen name="workspace_divider_padding_right">0dp</dimen> - <dimen name="workspace_divider_padding_top">12dp</dimen> - <dimen name="workspace_divider_padding_bottom">12dp</dimen> - - <!-- Block spacing on each side of the screen. And also padding - for the portals to look right. --> - <dimen name="cell_layout_left_padding">@dimen/cell_layout_left_padding_land</dimen> - <dimen name="cell_layout_right_padding">@dimen/cell_layout_right_padding_land</dimen> - <dimen name="cell_layout_top_padding">@dimen/cell_layout_top_padding_land</dimen> - <dimen name="cell_layout_bottom_padding">@dimen/cell_layout_bottom_padding_land</dimen> - <!-- Workspace padding --> - <dimen name="workspace_left_padding">@dimen/workspace_left_padding_land</dimen> - <dimen name="workspace_right_padding">@dimen/workspace_right_padding_land</dimen> - <dimen name="workspace_top_padding">@dimen/workspace_top_padding_land</dimen> - <dimen name="workspace_bottom_padding">@dimen/workspace_bottom_padding_land</dimen> - - <dimen name="app_icon_padding_top">6dp</dimen> - - <!-- height of the bottom row of controls --> - <dimen name="button_bar_height">68dip</dimen> - <!-- Because portal animations go beyond the bounds of an icon, we need - to make the dock layout slightly larger than the button_bar_height --> - <dimen name="button_bar_height_top_padding">8dp</dimen> - <dimen name="button_bar_height_bottom_padding">0dp</dimen> - <dimen name="button_bar_width_left_padding">0dp</dimen> - <dimen name="button_bar_width_right_padding">0dp</dimen> - <dimen name="button_bar_height_plus_padding">76dp</dimen> <!-- AppsCustomize --> <dimen name="apps_customize_cell_width">80dp</dimen> @@ -71,14 +41,4 @@ <integer name="apps_customize_widget_cell_count_y">2</integer> <integer name="apps_customize_cling_focused_x">2</integer> <integer name="apps_customize_cling_focused_y">1</integer> - -<!-- Folders --> - <!-- The size of the image which sits behind the preview of the folder contents --> - <dimen name="folder_preview_size">58dp</dimen> - -<!-- Workspace cell size --> - <dimen name="workspace_cell_width">@dimen/workspace_cell_width_land</dimen> - <dimen name="workspace_cell_height">@dimen/workspace_cell_height_land</dimen> - <dimen name="workspace_width_gap">@dimen/workspace_width_gap_land</dimen> - <dimen name="workspace_height_gap">@dimen/workspace_height_gap_land</dimen> </resources> diff --git a/res/values-land/styles.xml b/res/values-land/styles.xml index 6c9fd504e..ccb5fcb06 100644 --- a/res/values-land/styles.xml +++ b/res/values-land/styles.xml @@ -20,23 +20,10 @@ <resources> <!-- Search Bar --> <style name="QSBBar"> - <item name="android:orientation">vertical</item> - <item name="android:layout_width">@dimen/qsb_bar_height</item> - <item name="android:layout_height">match_parent</item> - <item name="android:layout_gravity">start</item> </style> <style name="SearchDropTargetBar"> - <item name="android:orientation">vertical</item> - <item name="android:layout_width">match_parent</item> - <item name="android:layout_height">wrap_content</item> - <item name="android:layout_gravity">center_horizontal</item> </style> <style name="SearchButton"> - <item name="android:layout_gravity">center_horizontal</item> - <item name="android:paddingTop">@dimen/toolbar_button_vertical_padding</item> - <item name="android:paddingBottom">@dimen/toolbar_button_vertical_padding</item> - <item name="android:paddingStart">@dimen/toolbar_button_horizontal_padding</item> - <item name="android:paddingEnd">@dimen/toolbar_button_horizontal_padding</item> </style> <style name="DropTargetButtonContainer"> <item name="android:layout_width">match_parent</item> diff --git a/res/values-port/dimens.xml b/res/values-port/dimens.xml index 969d3358a..bee2dd5d6 100644 --- a/res/values-port/dimens.xml +++ b/res/values-port/dimens.xml @@ -15,25 +15,7 @@ --> <resources> -<!-- QSB --> - <dimen name="qsb_bar_height_inset">37dp</dimen> - <dimen name="qsb_bar_height">43dp</dimen> - <dimen name="qsb_padding_left">3dp</dimen> - <dimen name="qsb_padding_right">3dp</dimen> - <!-- Workspace --> - <!-- Block spacing on each side of the screen. And also padding - for the portals to look right. --> - <dimen name="cell_layout_left_padding">@dimen/cell_layout_left_padding_port</dimen> - <dimen name="cell_layout_right_padding">@dimen/cell_layout_right_padding_port</dimen> - <dimen name="cell_layout_top_padding">@dimen/cell_layout_top_padding_port</dimen> - <dimen name="cell_layout_bottom_padding">@dimen/cell_layout_bottom_padding_port</dimen> - <!-- Workspace padding --> - <dimen name="workspace_left_padding">@dimen/workspace_left_padding_port</dimen> - <dimen name="workspace_right_padding">@dimen/workspace_right_padding_port</dimen> - <dimen name="workspace_top_padding">@dimen/workspace_top_padding_port</dimen> - <dimen name="workspace_bottom_padding">@dimen/workspace_bottom_padding_port</dimen> - <dimen name="workspace_page_spacing">-1dp</dimen> <!-- AppsCustomize --> @@ -50,10 +32,4 @@ <dimen name="apps_customize_widget_cell_height_gap">10dp</dimen> <integer name="apps_customize_widget_cell_count_x">2</integer> <integer name="apps_customize_widget_cell_count_y">3</integer> - -<!-- Workspace cell size --> - <dimen name="workspace_cell_width">@dimen/workspace_cell_width_port</dimen> - <dimen name="workspace_cell_height">@dimen/workspace_cell_height_port</dimen> - <dimen name="workspace_width_gap">@dimen/workspace_width_gap_port</dimen> - <dimen name="workspace_height_gap">@dimen/workspace_height_gap_port</dimen> </resources> diff --git a/res/values-sw340dp-land/dimens.xml b/res/values-sw340dp-land/dimens.xml index facbf5669..7901dc47d 100644 --- a/res/values-sw340dp-land/dimens.xml +++ b/res/values-sw340dp-land/dimens.xml @@ -17,10 +17,4 @@ <resources> <!-- Clings --> <dimen name="folderClingMarginTop">50dp</dimen> - -<!-- Workspace --> - <dimen name="workspace_divider_padding_top">6dp</dimen> - <dimen name="workspace_divider_padding_bottom">6dp</dimen> - - <dimen name="qsb_bar_height">48dp</dimen> </resources> diff --git a/res/values-sw340dp-land/styles.xml b/res/values-sw340dp-land/styles.xml deleted file mode 100644 index 203827df5..000000000 --- a/res/values-sw340dp-land/styles.xml +++ /dev/null @@ -1,28 +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> -<!-- Workspace --> - <style name="QSBBar"> - <item name="android:orientation">vertical</item> - <item name="android:layout_width">@dimen/qsb_bar_height</item> - <item name="android:layout_height">match_parent</item> - <item name="android:layout_gravity">start|center_vertical</item> - </style> -</resources> diff --git a/res/values-sw340dp-port/dimens.xml b/res/values-sw340dp-port/dimens.xml index 18f28318a..2dbcb4539 100644 --- a/res/values-sw340dp-port/dimens.xml +++ b/res/values-sw340dp-port/dimens.xml @@ -18,18 +18,6 @@ <!-- Clings --> <dimen name="folderClingMarginTop">70dp</dimen> -<!-- Workspace --> - <dimen name="workspace_divider_padding_left">6dp</dimen> - <dimen name="workspace_divider_padding_right">6dp</dimen> - - <!-- qsb_bar_height_inset represents qsb_bar_height minus the padding - that we put on each page for allowing folders to draw out of bounds --> - <dimen name="qsb_bar_height_inset">48dp</dimen> - <dimen name="qsb_bar_height">54dp</dimen> - <dimen name="qsb_padding_left">6dp</dimen> - <dimen name="qsb_padding_right">6dp</dimen> - <dimen name="search_bar_height">48dp</dimen> - <!-- AppsCustomize --> <dimen name="apps_customize_pageLayoutPaddingTop">16dp</dimen> <dimen name="apps_customize_pageLayoutPaddingBottom">20dp</dimen> diff --git a/res/values-sw340dp/dimens.xml b/res/values-sw340dp/dimens.xml index 93de009db..69d6e58a3 100644 --- a/res/values-sw340dp/dimens.xml +++ b/res/values-sw340dp/dimens.xml @@ -17,26 +17,4 @@ <resources> <!-- Drag padding to add to the bottom of drop targets --> <dimen name="drop_target_drag_padding">20dp</dimen> - -<!-- Hotseat --> - <dimen name="hotseat_width_gap">0dp</dimen> - <dimen name="hotseat_height_gap">0dp</dimen> - <!-- height of the bottom row of controls --> - <dimen name="button_bar_height">80dip</dimen> - <!-- Because portal animations go beyond the bounds of an icon, we need - to make the dock layout slightly larger than the button_bar_height --> - <dimen name="button_bar_height_bottom_padding">8dp</dimen> - <dimen name="button_bar_width_left_padding">8dp</dimen> - <dimen name="button_bar_width_right_padding">8dp</dimen> - <dimen name="button_bar_height_plus_padding">80dp</dimen> - -<!-- CellLayout padding land / port--> - <dimen name="cell_layout_left_padding_port">8dp</dimen> - <dimen name="cell_layout_left_padding_land">8dp</dimen> - <dimen name="cell_layout_right_padding_port">8dp</dimen> - <dimen name="cell_layout_right_padding_land">8dp</dimen> - <dimen name="cell_layout_top_padding_port">8dp</dimen> - <dimen name="cell_layout_top_padding_land">8dp</dimen> - <dimen name="cell_layout_bottom_padding_port">8dp</dimen> - <dimen name="cell_layout_bottom_padding_land">8dp</dimen> </resources> diff --git a/res/values-sw380dp-port/dimens.xml b/res/values-sw380dp-port/dimens.xml deleted file mode 100644 index eef6eb205..000000000 --- a/res/values-sw380dp-port/dimens.xml +++ /dev/null @@ -1,35 +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> -<!-- Workspace --> - <!-- qsb_bar_height_inset represents qsb_bar_height minus the padding - that we put on each page for allowing folders to draw out of bounds --> - <dimen name="qsb_bar_height_inset">48dp</dimen> - <dimen name="qsb_bar_height">56dp</dimen> - <dimen name="qsb_padding_left">8dp</dimen> - <dimen name="qsb_padding_right">8dp</dimen> - <dimen name="search_bar_height">48dp</dimen> - - <dimen name="workspace_divider_padding_left">8dp</dimen> - <dimen name="workspace_divider_padding_right">8dp</dimen> - <dimen name="workspace_width_gap_land">0dp</dimen> - <dimen name="workspace_width_gap_port">8dp</dimen> - <dimen name="workspace_height_gap_land">0dp</dimen> - <dimen name="workspace_height_gap_port">0dp</dimen> - - <dimen name="hotseat_width_gap">2dp</dimen> -</resources> diff --git a/res/values-sw600dp-land/config.xml b/res/values-sw600dp-land/config.xml deleted file mode 100644 index 3e8a92b55..000000000 --- a/res/values-sw600dp-land/config.xml +++ /dev/null @@ -1,8 +0,0 @@ -<resources> -<!-- Folder max bounds and max number of items. Note: folder_max_count_x * folder_max_count_y - >= folder_max_num_items. If any values are set to 0, the values will be determined automatically. - A value of -1 indicates unbounded --> - <integer name="folder_max_count_x">8</integer> - <integer name="folder_max_count_y">-1</integer> - <integer name="folder_max_num_items">-1</integer> -</resources> diff --git a/res/values-sw600dp-land/dimens.xml b/res/values-sw600dp-land/dimens.xml index 3d4ba1c80..7f5594de3 100644 --- a/res/values-sw600dp-land/dimens.xml +++ b/res/values-sw600dp-land/dimens.xml @@ -15,14 +15,6 @@ --> <resources> - <dimen name="app_icon_padding_top">0dp</dimen> - <dimen name="app_icon_drawable_padding_land">0dp</dimen> - <dimen name="workspace_icon_text_size">11sp</dimen> - -<!-- Hotseat --> - <dimen name="button_bar_width_left_padding">14dp</dimen> - <dimen name="button_bar_width_right_padding">14dp</dimen> - <!-- AppsCustomize --> <dimen name="apps_customize_pageLayoutWidthGap">36dp</dimen> <dimen name="apps_customize_pageLayoutHeightGap">8dp</dimen> @@ -30,13 +22,6 @@ <dimen name="apps_customize_pageLayoutPaddingBottom">14dp</dimen> <!-- QSB --> - <dimen name="qsb_bar_height">82dp</dimen> <dimen name="toolbar_button_vertical_padding">12dip</dimen> <dimen name="toolbar_button_horizontal_padding">20dip</dimen> - -<!-- Workspace --> - <dimen name="workspace_divider_padding_top">12dp</dimen> - <dimen name="workspace_divider_padding_bottom">12dp</dimen> - <dimen name="workspace_divider_padding_left">0dp</dimen> - <dimen name="workspace_divider_padding_right">0dp</dimen> </resources> diff --git a/res/values-sw600dp-port/dimens.xml b/res/values-sw600dp-port/dimens.xml index 8ad6d2e98..7cc3c79c9 100644 --- a/res/values-sw600dp-port/dimens.xml +++ b/res/values-sw600dp-port/dimens.xml @@ -22,7 +22,4 @@ <dimen name="apps_customize_pageLayoutHeightGap">24dp</dimen> <dimen name="apps_customize_pageLayoutPaddingTop">25dp</dimen> <dimen name="apps_customize_pageLayoutPaddingBottom">10dp</dimen> - -<!-- QSB --> - <dimen name="qsb_bar_height">54dp</dimen> </resources> diff --git a/res/values-sw600dp/config.xml b/res/values-sw600dp/config.xml index d657d4311..2ec2f146c 100644 --- a/res/values-sw600dp/config.xml +++ b/res/values-sw600dp/config.xml @@ -1,8 +1,5 @@ <resources> - <integer name="cell_count_x">6</integer> - <integer name="cell_count_y">6</integer> - <integer name="hotseat_cell_count">7</integer> - <integer name="hotseat_all_apps_index">3</integer> + <bool name="is_tablet">true</bool> <bool name="allow_rotation">true</bool> <!-- Whether or not to use custom clings if a custom workspace layout is passed in --> @@ -11,18 +8,7 @@ <!-- DragController --> <integer name="config_flingToDeleteMinVelocity">-1000</integer> -<!-- Folder max bounds and max number of items. Note: folder_max_count_x * folder_max_count_y - >= folder_max_num_items. If any values are set to 0, the values will be determined automatically. - A value of -1 indicates unbounded --> - <integer name="folder_max_count_x">6</integer> - <integer name="folder_max_count_y">-1</integer> - <integer name="folder_max_num_items">-1</integer> - <!-- Camera distance for the overscroll effect. We use a higher value here because the workspace screens run nearly flush to the edge of the screen--> <integer name="config_cameraDistance">14000</integer> - -<!-- Hotseat --> - <!-- must be between 0 and 100 --> - <integer name="hotseat_item_scale_percentage">80</integer> </resources> diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml index bf19e5c88..c261c00ef 100644 --- a/res/values-sw600dp/dimens.xml +++ b/res/values-sw600dp/dimens.xml @@ -16,44 +16,6 @@ <resources> <dimen name="app_icon_size">64dp</dimen> - <dimen name="reveal_radius">64dp</dimen> - <dimen name="app_icon_drawable_padding">3dp</dimen> - <dimen name="app_icon_padding_top">4dp</dimen> - -<!-- qsb_bar_height_inset represents qsb_bar_height minus the padding - that we put on each page for allowing folders to draw out of bounds --> - <dimen name="qsb_bar_height_inset">34dp</dimen> - <dimen name="qsb_bar_height">48dp</dimen> - <dimen name="qsb_padding_left">16dp</dimen> - <dimen name="qsb_padding_right">16dp</dimen> - - <dimen name="search_bar_height">48dp</dimen> - -<!-- Hotseat --> - <dimen name="hotseat_cell_width">70dp</dimen> - <dimen name="hotseat_cell_height">70dp</dimen> - <dimen name="hotseat_width_gap">-1dp</dimen> - <dimen name="hotseat_height_gap">-1dp</dimen> - <dimen name="button_bar_height">94dip</dimen> - <dimen name="button_bar_height_bottom_padding">14dp</dimen> - <dimen name="button_bar_height_top_padding">20dp</dimen> - <dimen name="button_bar_width_left_padding">25dp</dimen> - <dimen name="button_bar_width_right_padding">25dp</dimen> - <dimen name="button_bar_height_plus_padding">104dp</dimen> - -<!-- Folders --> - <!-- The size of the image which sits behind the preview of the folder contents --> - <dimen name="folder_preview_size">68dp</dimen> - <dimen name="folder_cell_width">86dp</dimen> - <dimen name="folder_cell_height">90dp</dimen> - <dimen name="folder_width_gap">3dp</dimen> - <dimen name="folder_height_gap">3dp</dimen> - <dimen name="folder_padding">6dp</dimen> - - <dimen name="cell_layout_left_padding_port">12dp</dimen> - <dimen name="cell_layout_right_padding_port">12dp</dimen> - <dimen name="workspace_divider_padding_left">19dp</dimen> - <dimen name="workspace_divider_padding_right">19dp</dimen> <!-- AppsCustomize --> <dimen name="apps_customize_cell_width">96dp</dimen> @@ -67,13 +29,4 @@ <dimen name="app_widget_preview_label_margin_top">8dp</dimen> <dimen name="app_widget_preview_label_margin_left">@dimen/app_widget_preview_padding_left</dimen> <dimen name="app_widget_preview_label_margin_right">@dimen/app_widget_preview_padding_right</dimen> -<!-- Workspace cell size --> - <dimen name="workspace_cell_width_land">88dp</dimen> - <dimen name="workspace_cell_width_port">96dp</dimen> - <dimen name="workspace_cell_height_land">88dp</dimen> - <dimen name="workspace_cell_height_port">96dp</dimen> - <dimen name="workspace_width_gap_land">32dp</dimen> - <dimen name="workspace_width_gap_port">0dp</dimen> - <dimen name="workspace_height_gap_land">0dp</dimen> - <dimen name="workspace_height_gap_port">24dp</dimen> </resources> diff --git a/res/values-sw720dp-port/dimens.xml b/res/values-sw720dp-port/dimens.xml index fbc0799d3..9cf37ffee 100644 --- a/res/values-sw720dp-port/dimens.xml +++ b/res/values-sw720dp-port/dimens.xml @@ -33,26 +33,9 @@ <dimen name="scroll_zone">40dp</dimen> <dimen name="workspace_page_spacing">24dp</dimen> - <dimen name="qsb_bar_height">102dp</dimen> - <dimen name="qsb_bar_height_inset">102dp</dimen> - <dimen name="qsb_padding_left">72dp</dimen> - <dimen name="qsb_padding_right">72dp</dimen> - <!-- We offset the proxy to overlap with the voice icon --> - <dimen name="qsb_voice_proxy_padding_right">100dp</dimen> - <integer name="apps_customize_cling_focused_x">2</integer> <integer name="apps_customize_cling_focused_y">2</integer> - <!-- Divider width set to match the qsb width --> - <dimen name="workspace_divider_padding_left">72dp</dimen> - <dimen name="workspace_divider_padding_right">72dp</dimen> - -<!-- Hotseat --> - <dimen name="hotseat_width_gap">14dp</dimen> - <dimen name="button_bar_height">126dp</dimen> - <dimen name="button_bar_height_plus_padding">126dp</dimen> - <dimen name="button_bar_height_bottom_padding">32dp</dimen> - <!-- Cling --> <!-- The offset for the text in the cling --> <dimen name="cling_text_block_offset_x">80dp</dimen> diff --git a/res/values-sw720dp/config.xml b/res/values-sw720dp/config.xml index 03e5f9ce3..4f537a9f4 100644 --- a/res/values-sw720dp/config.xml +++ b/res/values-sw720dp/config.xml @@ -1,25 +1,14 @@ <resources> - <integer name="cell_count_x">8</integer> - <integer name="cell_count_y">5</integer> - <integer name="hotseat_cell_count">9</integer> - <integer name="hotseat_all_apps_index">4</integer> <bool name="config_largeHeap">true</bool> - <bool name="is_large_screen">true</bool> + <bool name="is_large_tablet">true</bool> <!-- AllApps/Customize/AppsCustomize --> <!-- Out of 100, the percent to shrink the workspace during spring loaded mode. --> <integer name="config_workspaceSpringLoadShrinkPercentage">90</integer> -<!-- Folder max bounds and max number of items. Note: folder_max_count_x * folder_max_count_y - >= folder_max_num_items. If any values are set to 0, the values will be determined automatically. - A value of -1 indicates unbounded --> - <integer name="folder_max_count_x">0</integer> - <integer name="folder_max_count_y">-1</integer> - <integer name="folder_max_num_items">-1</integer> - <!-- Workspace --> <!-- Whether or not the drop targets drop down as opposed to fade in --> - <bool name="config_useDropTargetDownTransition">true</bool> + <bool name="config_useDropTargetDownTransition">false</bool> <!-- Whether or not to fade the side pages --> <bool name="config_workspaceFadeAdjacentScreens">true</bool> diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml index 439709afd..c9639dd9d 100644 --- a/res/values-sw720dp/dimens.xml +++ b/res/values-sw720dp/dimens.xml @@ -16,38 +16,16 @@ <resources> <dimen name="app_icon_size">72dp</dimen> - <dimen name="app_icon_padding_top">0dp</dimen> - <dimen name="reveal_radius">72dp</dimen> - -<!-- Hotseat --> - <dimen name="button_bar_height">82dp</dimen> - <dimen name="button_bar_height_top_padding">12dp</dimen> - <dimen name="button_bar_height_bottom_padding">12dp</dimen> - <dimen name="button_bar_width_left_padding">12dp</dimen> - <dimen name="button_bar_width_right_padding">12dp</dimen> - <dimen name="button_bar_height_plus_padding">82dp</dimen> - <dimen name="hotseat_width_gap">58dp</dimen> <!-- QSB --> <dimen name="toolbar_button_vertical_padding">8dip</dimen> <dimen name="toolbar_button_horizontal_padding">8dip</dimen> -<!-- Workspace --> - <dimen name="qsb_bar_height">60dp</dimen> - <dimen name="qsb_bar_height_inset">60dp</dimen> - <dimen name="qsb_padding_left">177dp</dimen> - <dimen name="qsb_padding_right">177dp</dimen> - <!-- We offset the proxy to overlap with the voice icon --> - <dimen name="qsb_voice_proxy_padding_right">230dp</dimen> - <!-- 44dp high for the optical bounds --> - <dimen name="search_bar_height">52dp</dimen> - <!-- AppsCustomize --> <dimen name="apps_customize_cell_width">96dp</dimen> <dimen name="apps_customize_cell_height">96dp</dimen> <integer name="apps_customize_maxCellCountX">-1</integer> <integer name="apps_customize_maxCellCountY">-1</integer> - <dimen name="all_apps_button_vertical_padding">4dip</dimen> <!-- dimensions for the wallpaper picker wallpaper thumbnail width --> <dimen name="wallpaper_chooser_grid_width">196dp</dimen> @@ -57,51 +35,4 @@ the drag view should be offset from the position of the original view. --> <dimen name="dragViewOffsetX">0dp</dimen> <dimen name="dragViewOffsetY">0dp</dimen> - -<!-- CellLayout padding land / port--> - <dimen name="cell_layout_left_padding_port">4dp</dimen> - <dimen name="cell_layout_left_padding_land">4dp</dimen> - <dimen name="cell_layout_right_padding_port">4dp</dimen> - <dimen name="cell_layout_right_padding_land">4dp</dimen> - <dimen name="cell_layout_top_padding_port">12dp</dimen> - <dimen name="cell_layout_top_padding_land">12dp</dimen> - <dimen name="cell_layout_bottom_padding_port">8dp</dimen> - <dimen name="cell_layout_bottom_padding_land">8dp</dimen> - -<!-- Folders --> - <!-- The size of the image which sits behind the preview of the folder contents --> - <dimen name="folder_cell_width">96dp</dimen> - <dimen name="folder_cell_height">96dp</dimen> - <dimen name="folder_preview_size">70dp</dimen> - <dimen name="folder_width_gap">2dp</dimen> - <dimen name="folder_height_gap">2dp</dimen> - <dimen name="folder_padding">4dp</dimen> - -<!-- Workspace padding --> - <dimen name="workspace_left_padding_port">0dp</dimen> - <dimen name="workspace_left_padding_land">0dp</dimen> - <dimen name="workspace_right_padding_port">0dp</dimen> - <dimen name="workspace_right_padding_land">0dp</dimen> - - <dimen name="workspace_top_padding_port">@dimen/qsb_bar_height_inset</dimen> - <dimen name="workspace_top_padding_land">@dimen/qsb_bar_height_inset</dimen> - <dimen name="workspace_bottom_padding_port">@dimen/button_bar_height_plus_padding</dimen> - <dimen name="workspace_bottom_padding_land">@dimen/button_bar_height_plus_padding</dimen> - - <!-- Divider width set to match the qsb width --> - <dimen name="workspace_divider_width">0dp</dimen> - <dimen name="workspace_divider_padding_left">177dp</dimen> - <dimen name="workspace_divider_padding_right">177dp</dimen> - <dimen name="workspace_divider_padding_top">0dp</dimen> - <dimen name="workspace_divider_padding_bottom">0dp</dimen> - -<!-- Workspace cell size --> - <dimen name="workspace_cell_width_land">96dp</dimen> - <dimen name="workspace_cell_width_port">96dp</dimen> - <dimen name="workspace_cell_height_land">96dp</dimen> - <dimen name="workspace_cell_height_port">96dp</dimen> - <dimen name="workspace_width_gap_land">50dp</dimen> - <dimen name="workspace_width_gap_port">0dp</dimen> - <dimen name="workspace_height_gap_land">16dp</dimen> - <dimen name="workspace_height_gap_port">70dp</dimen> </resources> diff --git a/res/values-sw720dp/styles.xml b/res/values-sw720dp/styles.xml index 5b24bdf46..77898d158 100644 --- a/res/values-sw720dp/styles.xml +++ b/res/values-sw720dp/styles.xml @@ -51,43 +51,6 @@ </style> <!-- Workspace --> - <style name="WorkspaceIcon.Portrait"> - <item name="android:drawablePadding">0dp</item> - <item name="android:paddingStart">4dp</item> - <item name="android:paddingEnd">4dp</item> - <item name="android:paddingTop">@dimen/app_icon_padding_top</item> - <item name="android:paddingBottom">4dp</item> - <item name="android:textSize">13sp</item> - </style> - <style name="WorkspaceIcon.Portrait.Folder"> - <item name="android:shadowRadius">0.0</item> <!-- Don't use text shadow --> - <item name="android:drawablePadding">0dp</item> - <item name="android:paddingStart">4dp</item> - <item name="android:paddingEnd">4dp</item> - <item name="android:paddingTop">0dp</item> - <item name="android:paddingBottom">0dp</item> - <item name="android:textSize">13sp</item> - <item name="android:layout_marginTop">-2dp</item> - </style> - <style name="WorkspaceIcon.Landscape"> - <item name="android:drawablePadding">0dp</item> - <item name="android:paddingStart">4dp</item> - <item name="android:paddingEnd">4dp</item> - <item name="android:paddingTop">@dimen/app_icon_padding_top</item> - <item name="android:paddingBottom">4dp</item> - <item name="android:textSize">13sp</item> - </style> - <style name="WorkspaceIcon.Landscape.Folder"> - <item name="android:shadowRadius">0.0</item> <!-- Don't use text shadow --> - <item name="android:drawablePadding">0dp</item> - <item name="android:paddingStart">4dp</item> - <item name="android:paddingEnd">4dp</item> - <item name="android:paddingTop">0dp</item> - <item name="android:paddingBottom">0dp</item> - <item name="android:textSize">13sp</item> - <item name="android:layout_marginTop">-2dp</item> - </style> - <style name="Theme" parent="android:Theme.Holo.Wallpaper.NoTitleBar"> <item name="android:windowActionModeOverlay">true</item> </style> @@ -123,23 +86,10 @@ <!-- QSB Search / Drop Target bar --> <style name="QSBBar"> - <item name="android:orientation">horizontal</item> - <item name="android:layout_width">match_parent</item> - <item name="android:layout_height">@dimen/qsb_bar_height</item> - <item name="android:layout_gravity">top|center_horizontal</item> - <item name="android:paddingStart">@dimen/qsb_padding_left</item> - <item name="android:paddingEnd">@dimen/qsb_padding_right</item> </style> <style name="SearchDropTargetBar"> - <item name="android:orientation">horizontal</item> - <item name="android:layout_width">match_parent</item> - <item name="android:layout_height">match_parent</item> - <item name="android:layout_gravity">bottom|center_horizontal</item> </style> <style name="SearchButton"> - <item name="android:layout_gravity">center_vertical</item> - <item name="android:paddingTop">@dimen/toolbar_button_vertical_padding</item> - <item name="android:paddingBottom">@dimen/toolbar_button_vertical_padding</item> </style> <style name="DropTargetButtonContainer"> <item name="android:layout_width">0dp</item> diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 09b880420..bf4748c55 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -106,9 +106,6 @@ <attr name="pageSpacing" format="dimension" /> <!-- The page indicator for this workspace --> <attr name="pageIndicator" format="reference" /> - <!-- The padding for the scroll indicator area --> - <attr name="scrollIndicatorPaddingLeft" format="dimension" /> - <attr name="scrollIndicatorPaddingRight" format="dimension" /> </declare-styleable> <!-- AppsCustomizePagedView specific attributes. These attributes are used to diff --git a/res/values/config.xml b/res/values/config.xml index 2fc3473a7..14e5a565b 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -1,6 +1,7 @@ <resources> <bool name="config_largeHeap">false</bool> - <bool name="is_large_screen">false</bool> + <bool name="is_tablet">false</bool> + <bool name="is_large_tablet">false</bool> <bool name="allow_rotation">false</bool> <!-- Max number of page indicators to show --> @@ -40,7 +41,7 @@ <!-- Workspace --> <!-- Whether or not the drop targets drop down as opposed to fade in --> - <bool name="config_useDropTargetDownTransition">true</bool> + <bool name="config_useDropTargetDownTransition">false</bool> <!-- Whether or not to fade the side pages --> <bool name="config_workspaceFadeAdjacentScreens">false</bool> @@ -72,25 +73,11 @@ <!-- Camera distance for the overscroll effect --> <integer name="config_cameraDistance">6500</integer> - <!-- Folder max bounds and max number of items. Note: folder_max_count_x * folder_max_count_y - >= folder_max_num_items. If any values are set to 0, the values will be determined automatically. - A value of -1 indicates unbounded --> - <integer name="folder_max_count_x">4</integer> - <integer name="folder_max_count_y">-1</integer> - <integer name="folder_max_num_items">-1</integer> - - <integer name="cell_count_x">4</integer> - <integer name="cell_count_y">4</integer> - <!-- Whether or not to use custom clings if a custom workspace layout is passed in --> <bool name="config_useCustomClings">false</bool> <!-- Hotseat --> <bool name="hotseat_transpose_layout_with_orientation">true</bool> - <integer name="hotseat_cell_count">5</integer> - <integer name="hotseat_all_apps_index">2</integer> - <!-- must be between 0 and 100 --> - <integer name="hotseat_item_scale_percentage">100</integer> <!-- Memory debugging, including a memory dump icon --> <bool name="debug_memory_enabled">true</bool> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 13a15e394..6e2448147 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -15,48 +15,30 @@ --> <resources> +<!-- 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">48dp</dimen> + <dimen name="dynamic_grid_page_indicator_height">24dp</dimen> + <!-- Cling --> <dimen name="clingPunchThroughGraphicCenterRadius">94dp</dimen> <dimen name="folderClingMarginTop">20dp</dimen> <!-- The offset for the text in the cling --> <dimen name="cling_text_block_offset_x">0dp</dimen> <dimen name="cling_text_block_offset_y">0dp</dimen> - <dimen name="reveal_radius">48dp</dimen> <!-- entries for custom clings, will be set in overlays --> <add-resource type="dimen" name="custom_cling_margin_top" /> <add-resource type="dimen" name="custom_cling_margin_right" /> <add-resource type="dimen" name="custom_cling_margin_left" /> <!-- Workspace --> - <!-- qsb_bar_height_inset represents qsb_bar_height minus the padding - that we put on each page for allowing folders to draw out of bounds --> - <dimen name="qsb_bar_height_inset">34dp</dimen> - <dimen name="qsb_bar_height">40dp</dimen> - <dimen name="qsb_padding_left">0dp</dimen> - <dimen name="qsb_padding_right">0dp</dimen> - <dimen name="search_bar_height">40dp</dimen> <dimen name="workspace_max_gap">16dp</dimen> - <dimen name="folder_cell_width">74dp</dimen> - <dimen name="folder_cell_height">82dp</dimen> - <dimen name="folder_icon_padding_top">2dp</dimen> - <dimen name="workspace_divider_padding_left">3dp</dimen> - <dimen name="workspace_divider_padding_right">3dp</dimen> - <dimen name="workspace_divider_padding_top">0dp</dimen> - <dimen name="workspace_divider_padding_bottom">0dp</dimen> - <dimen name="hotseat_cell_width">64dp</dimen> - <dimen name="hotseat_cell_height">64dp</dimen> - <dimen name="hotseat_width_gap">-1dp</dimen> - <dimen name="hotseat_height_gap">-1dp</dimen> <dimen name="workspace_overscroll_drawable_padding">0dp</dimen> - <dimen name="workspace_icon_text_size">12sp</dimen> <dimen name="workspace_spring_loaded_page_spacing">15dp</dimen> <dimen name="overview_panel_bottom_padding">50dp</dimen> <dimen name="overview_panel_buttonSpacing">40dp</dimen> - <dimen name="app_icon_drawable_padding">6dp</dimen> - <dimen name="app_icon_drawable_padding_land">2dp</dimen> - <dimen name="app_icon_padding_top">8dp</dimen> - <!-- QSB --> <dimen name="toolbar_button_vertical_padding">4dip</dimen> <dimen name="toolbar_button_horizontal_padding">12dip</dimen> @@ -83,16 +65,6 @@ <dimen name="apps_customize_page_indicator_height">12dp</dimen> <dimen name="apps_customize_page_indicator_margin">4dp</dimen> - <!-- height of the bottom row of controls --> - <dimen name="button_bar_height">62dip</dimen> - <!-- Because portal animations go beyond the bounds of an icon, we need - to make the dock layout slightly larger than the button_bar_height --> - <dimen name="button_bar_height_top_padding">8dp</dimen> - <dimen name="button_bar_height_bottom_padding">0dp</dimen> - <dimen name="button_bar_width_left_padding">0dp</dimen> - <dimen name="button_bar_width_right_padding">0dp</dimen> - <dimen name="button_bar_height_plus_padding">70dp</dimen> - <!-- Drag padding to add to the bottom of drop targets --> <dimen name="drop_target_drag_padding">14dp</dimen> @@ -123,42 +95,7 @@ <dimen name="shortcut_preview_padding_top">0dp</dimen> <!-- Folders --> - <!-- The size of the image which sits behind the preview of the folder contents --> - <dimen name="folder_preview_size">62dp</dimen> <!-- The amount that the preview contents are inset from the preview background --> <dimen name="folder_preview_padding">4dp</dimen> <dimen name="folder_name_padding">10dp</dimen> - <dimen name="folder_width_gap">0dp</dimen> - <dimen name="folder_height_gap">0dp</dimen> - <dimen name="folder_padding">0dp</dimen> - -<!-- CellLayout padding --> - <dimen name="cell_layout_left_padding_port">0dp</dimen> - <dimen name="cell_layout_left_padding_land">0dp</dimen> - <dimen name="cell_layout_right_padding_port">0dp</dimen> - <dimen name="cell_layout_right_padding_land">0dp</dimen> - <dimen name="cell_layout_top_padding_port">6dp</dimen> - <dimen name="cell_layout_top_padding_land">0dp</dimen> - <dimen name="cell_layout_bottom_padding_port">0dp</dimen> - <dimen name="cell_layout_bottom_padding_land">0dp</dimen> - -<!-- Workspace padding --> - <dimen name="workspace_left_padding_port">0dp</dimen> - <dimen name="workspace_left_padding_land">@dimen/qsb_bar_height</dimen> - <dimen name="workspace_right_padding_port">0dp</dimen> - <dimen name="workspace_right_padding_land">@dimen/button_bar_height</dimen> - <dimen name="workspace_top_padding_port">@dimen/qsb_bar_height_inset</dimen> - <dimen name="workspace_top_padding_land">0dp</dimen> - <dimen name="workspace_bottom_padding_port">@dimen/button_bar_height</dimen> - <dimen name="workspace_bottom_padding_land">0dp</dimen> - -<!-- Workspace cell size --> - <dimen name="workspace_cell_width_land">106dp</dimen> - <dimen name="workspace_cell_width_port">80dp</dimen> - <dimen name="workspace_cell_height_land">74dp</dimen> - <dimen name="workspace_cell_height_port">100dp</dimen> - <dimen name="workspace_width_gap_land">0dp</dimen> - <dimen name="workspace_width_gap_port">0dp</dimen> - <dimen name="workspace_height_gap_land">0dp</dimen> - <dimen name="workspace_height_gap_port">0dp</dimen> </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index 872244cca..9f5ade487 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -63,38 +63,14 @@ <item name="android:gravity">center_horizontal</item> <item name="android:singleLine">true</item> <item name="android:ellipsize">marquee</item> - <item name="android:textSize">@dimen/workspace_icon_text_size</item> <item name="android:textColor">@color/workspace_icon_text_color</item> <item name="android:shadowRadius">2.0</item> <item name="android:shadowColor">#B0000000</item> </style> <style name="WorkspaceIcon.Portrait"> - <item name="android:drawablePadding">@dimen/app_icon_drawable_padding</item> - <item name="android:paddingStart">4dp</item> - <item name="android:paddingEnd">4dp</item> - <item name="android:paddingTop">@dimen/app_icon_padding_top</item> - <item name="android:paddingBottom">4dp</item> </style> - <style name="WorkspaceIcon.Landscape"> - <item name="android:drawablePadding">@dimen/app_icon_drawable_padding_land</item> - <item name="android:paddingStart">4dp</item> - <item name="android:paddingEnd">4dp</item> - <item name="android:paddingTop">@dimen/app_icon_padding_top</item> - <item name="android:paddingBottom">4dp</item> - </style> - - <style name="WorkspaceIcon.Portrait.Folder"> - <item name="android:shadowRadius">0.0</item> <!-- Don't use text shadow --> - <item name="android:drawablePadding">0dp</item> - <item name="android:paddingTop">@dimen/folder_icon_padding_top</item> - </style> - <style name="WorkspaceIcon.Landscape.Folder"> - <item name="android:shadowRadius">0.0</item> <!-- Don't use text shadow --> - <item name="android:drawablePadding">0dp</item> - <item name="android:paddingTop">0dp</item> - <item name="android:layout_marginTop">-2dp</item> </style> <style name="WorkspaceIcon.Portrait.AppsCustomize"> @@ -118,22 +94,10 @@ <style name="QSBBar"> <item name="android:orientation">horizontal</item> - <item name="android:layout_width">match_parent</item> - <item name="android:layout_height">@dimen/qsb_bar_height</item> - <item name="android:layout_gravity">top|center_horizontal</item> - <item name="android:paddingStart">@dimen/qsb_padding_left</item> - <item name="android:paddingEnd">@dimen/qsb_padding_right</item> </style> <style name="SearchDropTargetBar"> - <item name="android:orientation">horizontal</item> - <item name="android:layout_width">match_parent</item> - <item name="android:layout_height">match_parent</item> - <item name="android:layout_gravity">bottom|center_horizontal</item> </style> <style name="SearchButton"> - <item name="android:layout_gravity">center_vertical</item> - <item name="android:paddingTop">@dimen/toolbar_button_vertical_padding</item> - <item name="android:paddingBottom">@dimen/toolbar_button_vertical_padding</item> </style> <style name="DropTargetButtonContainer"> <item name="android:layout_width">0dp</item> |