summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorTony Mak <tonymak@google.com>2017-11-29 18:39:49 +0000
committerSunny Goyal <sunnygoyal@google.com>2017-12-04 17:36:33 -0800
commit191b688cc82a7997cd0c166c251aa2da3eec975f (patch)
tree66456b7a0332993998e20c632ac3b9995e7648f9 /res
parent4018f3df14237adb30c423fee361318cc32673de (diff)
downloadandroid_packages_apps_Trebuchet-191b688cc82a7997cd0c166c251aa2da3eec975f.tar.gz
android_packages_apps_Trebuchet-191b688cc82a7997cd0c166c251aa2da3eec975f.tar.bz2
android_packages_apps_Trebuchet-191b688cc82a7997cd0c166c251aa2da3eec975f.zip
Bottom user education view shown in work tab
Introduced a BottomUserEducationView for similar use case. Screenshot: https://hsv.googleplex.com/4856820942241792 BUG=69963630 Change-Id: Ia818ee44fa5ce97ad1778f33e6a9a3a36cea5017
Diffstat (limited to 'res')
-rw-r--r--res/drawable-hdpi/work_tab_user_education.pngbin0 -> 12986 bytes
-rw-r--r--res/drawable-mdpi/work_tab_user_education.pngbin0 -> 7088 bytes
-rw-r--r--res/drawable-xhdpi/work_tab_user_education.pngbin0 -> 20719 bytes
-rw-r--r--res/drawable-xxhdpi/work_tab_user_education.pngbin0 -> 41891 bytes
-rw-r--r--res/layout/work_tab_bottom_user_education_view.xml57
-rw-r--r--res/values/strings.xml4
6 files changed, 61 insertions, 0 deletions
diff --git a/res/drawable-hdpi/work_tab_user_education.png b/res/drawable-hdpi/work_tab_user_education.png
new file mode 100644
index 000000000..1879dfb2b
--- /dev/null
+++ b/res/drawable-hdpi/work_tab_user_education.png
Binary files differ
diff --git a/res/drawable-mdpi/work_tab_user_education.png b/res/drawable-mdpi/work_tab_user_education.png
new file mode 100644
index 000000000..65c7e638d
--- /dev/null
+++ b/res/drawable-mdpi/work_tab_user_education.png
Binary files differ
diff --git a/res/drawable-xhdpi/work_tab_user_education.png b/res/drawable-xhdpi/work_tab_user_education.png
new file mode 100644
index 000000000..59df7a864
--- /dev/null
+++ b/res/drawable-xhdpi/work_tab_user_education.png
Binary files differ
diff --git a/res/drawable-xxhdpi/work_tab_user_education.png b/res/drawable-xxhdpi/work_tab_user_education.png
new file mode 100644
index 000000000..3c6aa208e
--- /dev/null
+++ b/res/drawable-xxhdpi/work_tab_user_education.png
Binary files differ
diff --git a/res/layout/work_tab_bottom_user_education_view.xml b/res/layout/work_tab_bottom_user_education_view.xml
new file mode 100644
index 000000000..2a4ba5d06
--- /dev/null
+++ b/res/layout/work_tab_bottom_user_education_view.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 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.BottomUserEducationView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="bottom"
+ android:background="?android:attr/colorAccent"
+ android:elevation="2dp"
+ android:orientation="horizontal"
+ android:paddingLeft="20dp"
+ android:paddingRight="20dp">
+
+ <ImageView
+ android:layout_width="134dp"
+ android:layout_height="134dp"
+ android:layout_gravity="center_vertical"
+ android:src="@drawable/work_tab_user_education"/>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:paddingBottom="12dp"
+ android:paddingStart="24dp"
+ android:paddingTop="12dp">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:fontFamily="roboto-medium"
+ android:text="@string/bottom_work_tab_user_education_title"
+ android:textColor="@android:color/white"
+ android:textSize="20sp"/>
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/bottom_work_tab_user_education_body"
+ android:textColor="@android:color/white"
+ android:textSize="14sp"/>
+ </LinearLayout>
+
+</com.android.launcher3.views.BottomUserEducationView> \ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index cbba9a227..eca64c852 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -326,5 +326,9 @@
<!-- Label of the work mode toggle -->
<string name="work_profile_toggle_label">Work profile</string>
+ <!-- Title in bottom user education view in work tab -->
+ <string name="bottom_work_tab_user_education_title">Find work apps here</string>
+ <!-- Body text in bottom user education view in work tab -->
+ <string name="bottom_work_tab_user_education_body">Each work app has an orange badge, which means it\'s kept secure by your organization. Work apps can be moved to your Home Screen for easier access.</string>
</resources>