summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorVinod Krishnan <vinodkrishnan@google.com>2015-10-01 16:13:13 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-10-01 16:13:13 +0000
commit12c698b4d2d75895c72bc900ed363acd03c94bfe (patch)
tree41886245d88f1e66da8f8a04e619f9b869be8742 /res
parenta45767446b89a047b8fc19e63604552ba1e7dc83 (diff)
parenteb9a1b659375d01d4276db622358dafb68b9d4fc (diff)
downloadandroid_packages_apps_PackageInstaller-12c698b4d2d75895c72bc900ed363acd03c94bfe.tar.gz
android_packages_apps_PackageInstaller-12c698b4d2d75895c72bc900ed363acd03c94bfe.tar.bz2
android_packages_apps_PackageInstaller-12c698b4d2d75895c72bc900ed363acd03c94bfe.zip
Merge "Block Install Intent for Wear devices" into cw-e-dev
Diffstat (limited to 'res')
-rw-r--r--res/values-watch/styles.xml2
-rw-r--r--res/values/strings.xml5
2 files changed, 7 insertions, 0 deletions
diff --git a/res/values-watch/styles.xml b/res/values-watch/styles.xml
index dc2be042..01ab90eb 100644
--- a/res/values-watch/styles.xml
+++ b/res/values-watch/styles.xml
@@ -15,6 +15,8 @@
-->
<resources>
+ <style name="Theme.DialogWhenLarge" parent="@android:style/Theme.DeviceDefault.NoActionBar"/>
+
<!-- START: Ported values -->
<style name="TextAppearance.Wearable.Small" parent="android:TextAppearance.Medium">
<item name="android:textSize">16sp</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d79ba63d..0f1a73f2 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -274,4 +274,9 @@
before permissions can be changed. [CHAR LIMIT=NONE] -->
<string name="screen_overlay_button">Open settings</string>
+ <!-- Title of dialog telling users that Install/Uninstall action is not supported on Android Wear. -->
+ <string name="wear_not_allowed_dlg_title">Android Wear</string>
+ <!-- Title of dialog telling users that Install/Uninstall action is not supported on Android Wear. -->
+ <string name="wear_not_allowed_dlg_text">Instal/Uninstall actions not supported on Wear.</string>
+
</resources>