summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorMiranda Kephart <mkephart@google.com>2019-02-11 13:07:04 -0500
committerMiranda Kephart <mkephart@google.com>2019-02-20 15:17:03 -0500
commit1a359a261d031630747417239eca658c243b4996 (patch)
treebea099478782e20d7c4d05c9b93412f4b3b4d610 /res
parent7b4215d633f12794cebf1cfc9a390e0c7f520fd7 (diff)
downloadandroid_packages_apps_Trebuchet-1a359a261d031630747417239eca658c243b4996.tar.gz
android_packages_apps_Trebuchet-1a359a261d031630747417239eca658c243b4996.tar.bz2
android_packages_apps_Trebuchet-1a359a261d031630747417239eca658c243b4996.zip
Add hints in Overview
If the ENABLE_HINTS_IN_OVERVIEW flag is enabled, pulls chip hint data (currently from the NavBarHint plugin; eventually from AiAi) and shows the chips between the task view screenshot and the QSB. Screenshot: https://screenshot.googleplex.com/Ww05W13XjBv BUG:124390101 Change-Id: I7686673b705257eca31f2fa40e2744e197153c7c
Diffstat (limited to 'res')
-rw-r--r--res/layout/hint_container.xml17
-rw-r--r--res/layout/launcher.xml5
-rw-r--r--res/values/dimens.xml4
3 files changed, 26 insertions, 0 deletions
diff --git a/res/layout/hint_container.xml b/res/layout/hint_container.xml
new file mode 100644
index 000000000..75aa91341
--- /dev/null
+++ b/res/layout/hint_container.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2019 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.
+-->
+<merge/> \ No newline at end of file
diff --git a/res/layout/launcher.xml b/res/layout/launcher.xml
index 87078b93e..91c37054b 100644
--- a/res/layout/launcher.xml
+++ b/res/layout/launcher.xml
@@ -43,6 +43,11 @@
layout="@layout/overview_panel"
android:visibility="gone" />
+ <include
+ android:id="@+id/hints"
+ layout="@layout/hint_container"
+ android:visibility="gone"/>
+
<!-- Keep these behind the workspace so that they are not visible when
we go into AllApps -->
<com.android.launcher3.pageindicators.WorkspacePageIndicator
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 078ce60a6..04e4591be 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -236,4 +236,8 @@
<dimen name="snackbar_elevation">3dp</dimen>
<dimen name="snackbar_min_text_size">12sp</dimen>
<dimen name="snackbar_max_text_size">14sp</dimen>
+
+<!-- Hints -->
+ <dimen name="chip_hint_height">26dp</dimen>
+ <dimen name="chip_hint_bottom_margin">194dp</dimen>
</resources>