diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout-port/launcher.xml | 6 | ||||
| -rw-r--r-- | res/layout-sw720dp/launcher.xml | 6 | ||||
| -rw-r--r-- | res/layout/page_indicator.xml | 27 | ||||
| -rw-r--r-- | res/values/dimens.xml | 5 |
4 files changed, 33 insertions, 11 deletions
diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml index 49bac3bcc..a2e2f9bba 100644 --- a/res/layout-port/launcher.xml +++ b/res/layout-port/launcher.xml @@ -56,10 +56,8 @@ <!-- Keep these behind the workspace so that they are not visible when we go into AllApps --> - <com.android.launcher3.pageindicators.PageIndicatorLineCaret - android:id="@+id/page_indicator" - android:layout_width="match_parent" - android:layout_height="@dimen/dynamic_grid_page_indicator_height" /> + <include layout="@layout/page_indicator" + android:id="@+id/page_indicator" /> <include android:id="@+id/drop_target_bar" diff --git a/res/layout-sw720dp/launcher.xml b/res/layout-sw720dp/launcher.xml index 81d2e1b8f..12c01b77d 100644 --- a/res/layout-sw720dp/launcher.xml +++ b/res/layout-sw720dp/launcher.xml @@ -59,10 +59,8 @@ <!-- Keep these behind the workspace so that they are not visible when we go into AllApps --> - <com.android.launcher3.pageindicators.PageIndicatorLineCaret - android:id="@+id/page_indicator" - android:layout_width="match_parent" - android:layout_height="@dimen/dynamic_grid_page_indicator_height" /> + <include layout="@layout/page_indicator" + android:id="@+id/page_indicator" /> <include layout="@layout/qsb_container" diff --git a/res/layout/page_indicator.xml b/res/layout/page_indicator.xml new file mode 100644 index 000000000..2e1b57f56 --- /dev/null +++ b/res/layout/page_indicator.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2016 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.pageindicators.PageIndicatorLineCaret + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="@dimen/dynamic_grid_page_indicator_height"> + <ImageView + android:id="@+id/all_apps_handle" + android:layout_width="48dp" + android:layout_height="match_parent" + android:layout_gravity="center" + android:scaleType="centerInside"/> +</com.android.launcher3.pageindicators.PageIndicatorLineCaret> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 87ef78b2e..1ae468557 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -4,9 +4,9 @@ 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. @@ -19,7 +19,6 @@ <dimen name="dynamic_grid_edge_margin">8dp</dimen> <dimen name="dynamic_grid_page_indicator_height">28dp</dimen> <dimen name="dynamic_grid_page_indicator_line_height">1dp</dimen> - <dimen name="dynamic_grid_page_indicator_extra_touch_height">12dp</dimen> <dimen name="dynamic_grid_page_indicator_gutter_width_left_nav_bar">38dp</dimen> <dimen name="dynamic_grid_page_indicator_gutter_width_right_nav_bar">48dp</dimen> <dimen name="dynamic_grid_icon_drawable_padding">8dp</dimen> |