diff options
| author | Vinod Krishnan <vinodkrishnan@google.com> | 2015-10-01 16:20:20 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-10-01 16:20:20 +0000 |
| commit | 50728943132334309e0784de72fa2eaebef40435 (patch) | |
| tree | af6a1c79099a8af9326ce105faffb7f3bd355408 /res | |
| parent | 37a5aeb54c53a26e887ae51e60dbe0813542105d (diff) | |
| parent | 12c698b4d2d75895c72bc900ed363acd03c94bfe (diff) | |
| download | android_packages_apps_PackageInstaller-50728943132334309e0784de72fa2eaebef40435.tar.gz android_packages_apps_PackageInstaller-50728943132334309e0784de72fa2eaebef40435.tar.bz2 android_packages_apps_PackageInstaller-50728943132334309e0784de72fa2eaebef40435.zip | |
am 12c698b4: Merge "Block Install Intent for Wear devices" into cw-e-dev
* commit '12c698b4d2d75895c72bc900ed363acd03c94bfe':
Block Install Intent for Wear devices
Diffstat (limited to 'res')
| -rw-r--r-- | res/values-watch/styles.xml | 2 | ||||
| -rw-r--r-- | res/values/strings.xml | 5 |
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> |