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/values | |
| 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/values')
| -rw-r--r-- | res/values/attrs.xml | 5 | ||||
| -rw-r--r-- | res/values/strings.xml | 2 |
2 files changed, 7 insertions, 0 deletions
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] --> |