diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2018-12-05 09:10:17 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-12-05 09:10:17 +0000 |
commit | c6726f5c36e1d9b590b2c45f99407926fec83563 (patch) | |
tree | 55ea8066153e59a4366e7e471e74c1a91d7e37b9 /res | |
parent | de78d7ca78b457c057f91ba838ea5c7c0f14c2dd (diff) | |
parent | ef92b8277896890c61cab7e945144c5689ce9151 (diff) | |
download | android_packages_apps_Trebuchet-c6726f5c36e1d9b590b2c45f99407926fec83563.tar.gz android_packages_apps_Trebuchet-c6726f5c36e1d9b590b2c45f99407926fec83563.tar.bz2 android_packages_apps_Trebuchet-c6726f5c36e1d9b590b2c45f99407926fec83563.zip |
Merge "Adding support for launcher preview generation" into ub-launcher3-master
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/launcher_preview_layout.xml | 50 | ||||
-rw-r--r-- | res/values/attrs.xml | 5 | ||||
-rw-r--r-- | res/values/strings.xml | 2 |
3 files changed, 57 insertions, 0 deletions
diff --git a/res/layout/launcher_preview_layout.xml b/res/layout/launcher_preview_layout.xml new file mode 100644 index 000000000..3fd02e3fd --- /dev/null +++ b/res/layout/launcher_preview_layout.xml @@ -0,0 +1,50 @@ +<?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.InsettableFrameLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:launcher="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <com.android.launcher3.CellLayout + android:id="@+id/workspace" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_gravity="top|left" + android:theme="@style/HomeScreenElementTheme" + launcher:containerType="workspace" + launcher:pageIndicator="@+id/page_indicator"/> + + <com.android.launcher3.Hotseat + android:id="@+id/hotseat" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:importantForAccessibility="no" + android:theme="@style/HomeScreenElementTheme" + launcher:containerType="hotseat" /> + + <com.android.launcher3.InsettableFrameLayout + android:id="@+id/apps_view" + android:layout_width="match_parent" + android:layout_height="match_parent" > + + <include + android:id="@id/search_container_all_apps" + layout="@layout/search_container_all_apps"/> + + </com.android.launcher3.InsettableFrameLayout> + +</com.android.launcher3.InsettableFrameLayout>
\ No newline at end of file diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 956270cba..b4b69782c 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -148,4 +148,9 @@ <attr name="numMinRows" format="integer" /> <attr name="numMinColumns" format="integer" /> </declare-styleable> + + <declare-styleable name="PreviewFragment"> + <attr name="android:name" /> + <attr name="android:id" /> + </declare-styleable> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index fb6eb4326..ceada18e3 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -66,6 +66,8 @@ <string name="all_apps_no_search_results">No apps found matching \"<xliff:g id="query" example="Android">%1$s</xliff:g>\"</string> <!-- Label for the button which allows the user to get app search results. [CHAR_LIMIT=50] --> <string name="all_apps_search_market_message">Search for more apps</string> + <!-- Label for an icon representing any generic app. [CHAR_LIMIT=50] --> + <string name="label_application">App</string> <!-- Popup items --> <!-- Text to display as the header above notifications. [CHAR_LIMIT=30] --> |