diff options
Diffstat (limited to 'res')
-rw-r--r-- | res/layout-land/launcher.xml | 3 | ||||
-rw-r--r-- | res/layout-port/launcher.xml | 1 | ||||
-rw-r--r-- | res/layout-sw720dp/launcher.xml | 1 | ||||
-rw-r--r-- | res/layout/workspace_screen.xml | 5 | ||||
-rw-r--r-- | res/values-land/styles.xml | 3 | ||||
-rw-r--r-- | res/values-sw340dp-port/styles.xml | 27 | ||||
-rw-r--r-- | res/values-sw720dp-land/dimens.xml | 21 | ||||
-rw-r--r-- | res/values-sw720dp-port/dimens.xml | 22 | ||||
-rw-r--r-- | res/values-sw720dp/styles.xml | 2 | ||||
-rw-r--r-- | res/values/attrs.xml | 36 | ||||
-rw-r--r-- | res/values/config.xml | 2 | ||||
-rw-r--r-- | res/values/dimens.xml | 12 | ||||
-rw-r--r-- | res/values/styles.xml | 2 |
13 files changed, 2 insertions, 135 deletions
diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml index 951a30ec7..d166df7ac 100644 --- a/res/layout-land/launcher.xml +++ b/res/layout-land/launcher.xml @@ -39,8 +39,7 @@ android:id="@+id/workspace" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_gravity="center" - launcher:defaultScreen="@integer/config_workspaceDefaultScreen" /> + android:layout_gravity="center" /> <!-- DO NOT CHANGE THE ID --> <include layout="@layout/hotseat" diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml index 4cb34e92e..b618b534c 100644 --- a/res/layout-port/launcher.xml +++ b/res/layout-port/launcher.xml @@ -40,7 +40,6 @@ android:id="@+id/workspace" android:layout_width="match_parent" android:layout_height="match_parent" - launcher:defaultScreen="@integer/config_workspaceDefaultScreen" launcher:pageIndicator="@+id/page_indicator"> </com.android.launcher3.Workspace> diff --git a/res/layout-sw720dp/launcher.xml b/res/layout-sw720dp/launcher.xml index 3228999ce..f976e3042 100644 --- a/res/layout-sw720dp/launcher.xml +++ b/res/layout-sw720dp/launcher.xml @@ -39,7 +39,6 @@ android:id="@+id/workspace" android:layout_width="match_parent" android:layout_height="match_parent" - launcher:defaultScreen="@integer/config_workspaceDefaultScreen" launcher:pageIndicator="@id/page_indicator"> </com.android.launcher3.Workspace> diff --git a/res/layout/workspace_screen.xml b/res/layout/workspace_screen.xml index 83b319b72..faf688503 100644 --- a/res/layout/workspace_screen.xml +++ b/res/layout/workspace_screen.xml @@ -17,9 +17,6 @@ <com.android.launcher3.CellLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:launcher="http://schemas.android.com/apk/res-auto" - android:layout_width="wrap_content" android:layout_height="wrap_content" - android:hapticFeedbackEnabled="false" - - launcher:maxGap="@dimen/workspace_max_gap" /> + android:hapticFeedbackEnabled="false" /> diff --git a/res/values-land/styles.xml b/res/values-land/styles.xml index c5a76d595..40926799f 100644 --- a/res/values-land/styles.xml +++ b/res/values-land/styles.xml @@ -19,9 +19,6 @@ <resources> - <!-- Search Bar --> - <style name="SearchButton"></style> - <style name="DropTargetButtonContainer"> <item name="android:layout_width">match_parent</item> <item name="android:layout_height">wrap_content</item> diff --git a/res/values-sw340dp-port/styles.xml b/res/values-sw340dp-port/styles.xml deleted file mode 100644 index 8ac3b5ea1..000000000 --- a/res/values-sw340dp-port/styles.xml +++ /dev/null @@ -1,27 +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="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> -</resources> diff --git a/res/values-sw720dp-land/dimens.xml b/res/values-sw720dp-land/dimens.xml deleted file mode 100644 index 514980fe0..000000000 --- a/res/values-sw720dp-land/dimens.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<resources> - <!-- 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> -</resources> diff --git a/res/values-sw720dp-port/dimens.xml b/res/values-sw720dp-port/dimens.xml deleted file mode 100644 index 6f594d518..000000000 --- a/res/values-sw720dp-port/dimens.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 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 --> - <!-- the area at the edge of the screen that makes the workspace go left - or right while you're dragging. --> - <dimen name="scroll_zone">40dp</dimen> -</resources> diff --git a/res/values-sw720dp/styles.xml b/res/values-sw720dp/styles.xml index e8b706e23..b7a16f3a7 100644 --- a/res/values-sw720dp/styles.xml +++ b/res/values-sw720dp/styles.xml @@ -20,8 +20,6 @@ <resources> <!-- Workspace --> - <style name="SearchButton"></style> - <style name="DropTargetButtonContainer"> <item name="android:layout_width">0dp</item> <item name="android:layout_height">match_parent</item> diff --git a/res/values/attrs.xml b/res/values/attrs.xml index c2017e259..55166cf24 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -36,42 +36,6 @@ <attr name="windowSize" format="integer" /> </declare-styleable> - <!-- Workspace specific attributes. These attributes are used to customize - the workspace in XML files. --> - <declare-styleable name="Workspace"> - <!-- The first screen the workspace should display. --> - <attr name="defaultScreen" format="integer" /> - <!-- The number of horizontal cells in the CellLayout --> - <attr name="cellCountX" format="integer" /> - <!-- The number of vertical cells in the CellLayout --> - <attr name="cellCountY" format="integer" /> - </declare-styleable> - - <!-- Hotseat specific attributes. These attributes are used to customize - the hotseat in XML files. --> - <declare-styleable name="Hotseat"> - <!-- The number of horizontal cells in the CellLayout --> - <attr name="cellCountX" /> - <!-- The number of vertical cells in the CellLayout --> - <attr name="cellCountY" /> - </declare-styleable> - - <!-- CellLayout specific attributes. These attributes are used to customize - a CellLayout view in XML files. --> - <declare-styleable name="CellLayout"> - <!-- The width of a single cell --> - <attr name="cellWidth" format="dimension" /> - <!-- The height of a single cell --> - <attr name="cellHeight" format="dimension" /> - <!-- An override for the width and height gap to allow users to specify - a specific size for the page using spacing instead of resolving the - spacing from the width of the page --> - <attr name="widthGap" format="dimension" /> - <attr name="heightGap" format="dimension" /> - <!-- The max gap size for each dimension --> - <attr name="maxGap" format="dimension" /> - </declare-styleable> - <!-- PagedView specific attributes. These attributes are used to customize a PagedView view in XML files. --> <declare-styleable name="PagedView"> diff --git a/res/values/config.xml b/res/values/config.xml index af4c96d5a..4efffffe1 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -40,8 +40,6 @@ is used for internal (baked-in) padding --> <integer name="config_allAppsButtonPaddingPercent">17</integer> - <integer name="config_workspaceDefaultScreen">0</integer> - <!-- Workspace --> <!-- The duration (in ms) of the fade animation on the object outlines, used when we are dragging objects around on the home screen. --> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 4882df6e5..e0cbd907e 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -15,8 +15,6 @@ --> <resources> - <dimen name="app_icon_size">64dp</dimen> - <!-- Dynamic Grid --> <dimen name="dynamic_grid_edge_margin">6dp</dimen> <dimen name="dynamic_grid_search_bar_max_width">500dp</dimen> @@ -42,9 +40,6 @@ <dimen name="cling_migration_content_margin">16dp</dimen> <dimen name="cling_migration_content_width">280dp</dimen> -<!-- Workspace --> - <dimen name="workspace_max_gap">16dp</dimen> - <!-- QSB --> <dimen name="toolbar_button_vertical_padding">4dip</dimen> <dimen name="toolbar_button_horizontal_padding">12dip</dimen> @@ -67,7 +62,6 @@ <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">48dp</dimen> - <dimen name="all_apps_search_bar_prediction_bar_padding">8dp</dimen> <dimen name="all_apps_icon_top_bottom_padding">8dp</dimen> <dimen name="all_apps_icon_width_gap">24dp</dimen> <!-- The top padding should account for the existing all_apps_list_top_bottom_padding --> @@ -80,10 +74,8 @@ <dimen name="all_apps_background_canvas_height">475dp</dimen> <!-- Widget tray --> - <dimen name="widget_container_inset">8dp</dimen> <dimen name="widget_preview_label_vertical_padding">8dp</dimen> <dimen name="widget_preview_label_horizontal_padding">8dp</dimen> - <dimen name="widget_preview_horizontal_padding">8dp</dimen> <dimen name="widget_section_height">56dp</dimen> <dimen name="widget_section_icon_size">40dp</dimen> @@ -104,10 +96,6 @@ <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> diff --git a/res/values/styles.xml b/res/values/styles.xml index 4eee13099..c03f08d4e 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -56,8 +56,6 @@ <item name="customShadows">false</item> </style> - <style name="SearchButton"></style> - <style name="DropTargetButtonContainer"> <item name="android:layout_width">0dp</item> <item name="android:layout_height">match_parent</item> |