diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2018-05-09 08:42:24 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2018-05-09 12:39:30 -0700 |
commit | ef39540dde69f9acf718966efa7bf3475798223e (patch) | |
tree | ca78ee2c3dd8428735a8d88eb2652d8e5e337c6f /res | |
parent | 578890ad93b566e9ba6380fe1349b0dad7d93427 (diff) | |
download | android_packages_apps_Trebuchet-ef39540dde69f9acf718966efa7bf3475798223e.tar.gz android_packages_apps_Trebuchet-ef39540dde69f9acf718966efa7bf3475798223e.tar.bz2 android_packages_apps_Trebuchet-ef39540dde69f9acf718966efa7bf3475798223e.zip |
Adding a carent in the scrim
> Caret is only visible when the accessibility is enabled
> It is visible in NOTMAL and OVERVIEW state and moves out of the
scrim along with the scrim.
> Acts as an accessible target for various options
Bug: 78172350
Bug: 79215734
Change-Id: I8a968b67e36901859649546295f6491d49cc9ce9
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable/drag_handle_indicator.xml (renamed from res/drawable/all_apps_handle_landscape.xml) | 16 | ||||
-rw-r--r-- | res/drawable/ic_drag_indicator.xml | 25 | ||||
-rw-r--r-- | res/layout/drag_handle_indicator.xml | 23 | ||||
-rw-r--r-- | res/layout/launcher.xml | 3 | ||||
-rw-r--r-- | res/values/dimens.xml | 1 |
5 files changed, 9 insertions, 59 deletions
diff --git a/res/drawable/all_apps_handle_landscape.xml b/res/drawable/drag_handle_indicator.xml index 15518ffaa..b01b84ab8 100644 --- a/res/drawable/all_apps_handle_landscape.xml +++ b/res/drawable/drag_handle_indicator.xml @@ -15,25 +15,25 @@ --> <vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="@dimen/dynamic_grid_min_page_indicator_size" - android:height="@dimen/dynamic_grid_min_page_indicator_size" - android:viewportWidth="48.0" - android:viewportHeight="48.0" > + android:width="@dimen/vertical_drag_handle_size" + android:height="@dimen/vertical_drag_handle_size" + android:viewportWidth="36.0" + android:viewportHeight="36.0" > <group - android:translateX="17.5" - android:translateY="17.5"> + android:translateX="11.5" + android:translateY="11.5"> <path android:pathData="M2 8.5L6.5 4L11 8.5" android:strokeColor="?attr/workspaceAmbientShadowColor" - android:strokeWidth="4" + android:strokeWidth="3.6" android:strokeLineCap="round" android:strokeLineJoin="round" /> <path android:pathData="M2 8.5L6.5 4L11 8.5" android:strokeColor="?attr/workspaceTextColor" - android:strokeWidth="2" + android:strokeWidth="1.8" android:strokeLineCap="round" android:strokeLineJoin="round" /> </group> diff --git a/res/drawable/ic_drag_indicator.xml b/res/drawable/ic_drag_indicator.xml deleted file mode 100644 index d50bdd3fd..000000000 --- a/res/drawable/ic_drag_indicator.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2018 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. ---> - -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:height="2dp" - android:width="16dp" - android:viewportHeight="2.0" - android:viewportWidth="16.0"> - <path - android:fillColor="@android:color/white" - android:pathData="M1,0h14c0.55,0,1,0.45,1,1s-0.45,1-1,1H1C0.45,2,0,1.55,0,1S0.45,0,1,0z"/> -</vector>
\ No newline at end of file diff --git a/res/layout/drag_handle_indicator.xml b/res/layout/drag_handle_indicator.xml deleted file mode 100644 index d5a7b8a03..000000000 --- a/res/layout/drag_handle_indicator.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2018 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.views.LauncherDragIndicator - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/drag_indicator" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:contentDescription="@string/all_apps_button_label" - android:scaleType="centerInside" - android:tint="?attr/workspaceTextColor" /> diff --git a/res/layout/launcher.xml b/res/layout/launcher.xml index cd8a4253b..ec8bd5c6f 100644 --- a/res/layout/launcher.xml +++ b/res/layout/launcher.xml @@ -67,9 +67,6 @@ android:layout_height="match_parent" android:visibility="invisible" /> - <include android:id="@+id/drag_indicator" - layout="@layout/drag_handle_indicator" /> - <!-- DO NOT CHANGE THE ID --> <include android:id="@+id/hotseat" diff --git a/res/values/dimens.xml b/res/values/dimens.xml index b1ad11ef0..cd050e88a 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -42,6 +42,7 @@ <dimen name="all_apps_scrim_radius">8dp</dimen> <dimen name="all_apps_scrim_margin">8dp</dimen> <dimen name="all_apps_scrim_blur">4dp</dimen> + <dimen name="vertical_drag_handle_size">24dp</dimen> <!-- Drop target bar --> <dimen name="dynamic_grid_drop_target_size">48dp</dimen> |