diff options
| author | Michael Jurka <mikejurka@google.com> | 2013-09-14 12:26:09 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-14 12:26:09 +0000 |
| commit | 78cf9299b9273053aebba0fdc465d91753aae83f (patch) | |
| tree | 31bf8197e3bc977f8166c11d9050874bc1d01739 /res | |
| parent | af110e8603b2f372286d9155cbe8955a6a329e2d (diff) | |
| parent | adc574ccb1986856b38198ad5a934b7543a1debb (diff) | |
| download | android_packages_apps_Trebuchet-78cf9299b9273053aebba0fdc465d91753aae83f.tar.gz android_packages_apps_Trebuchet-78cf9299b9273053aebba0fdc465d91753aae83f.tar.bz2 android_packages_apps_Trebuchet-78cf9299b9273053aebba0fdc465d91753aae83f.zip | |
Merge "Update to using new crop intent" into jb-ub-now-indigo-rose
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 2 | ||||
| -rw-r--r-- | res/values/styles.xml | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index bd803c64e..e04902a16 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -45,6 +45,8 @@ <string name="gallery">Gallery</string> <!-- Option in "Select wallpaper from" dialog box --> <string name="pick_wallpaper">Wallpapers</string> + <!-- Title of activity for cropping wallpapers --> + <string name="crop_wallpaper">Crop wallpaper</string> <!-- Displayed when user selects a shortcut for an app that was uninstalled [CHAR_LIMIT=none]--> <string name="activity_not_found">App isn\'t installed.</string> <!-- Labels for the tabs in the customize drawer --> diff --git a/res/values/styles.xml b/res/values/styles.xml index 6eb044cda..618bb4705 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -18,13 +18,13 @@ --> <resources> - <style name="Theme.WallpaperPicker" parent="@android:style/Theme.Holo"> - <item name="android:actionBarStyle">@style/WallpaperPickerActionBar</item> + <style name="Theme.WallpaperCropper" parent="@android:style/Theme.Holo"> + <item name="android:actionBarStyle">@style/WallpaperCropperActionBar</item> <item name="android:windowFullscreen">true</item> <item name="android:windowActionBarOverlay">true</item> </style> - <style name="WallpaperPickerActionBar" parent="android:style/Widget.Holo.ActionBar"> + <style name="WallpaperCropperActionBar" parent="android:style/Widget.Holo.ActionBar"> <item name="android:displayOptions">showCustom</item> <item name="android:background">#88000000</item> </style> |