summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authornicolasroard <nicolasroard@google.com>2013-09-18 16:54:05 -0700
committernicolasroard <nicolasroard@google.com>2013-09-19 12:17:23 -0700
commit19ab725a5e640a1a20b1a6def083e37d1d1c1e20 (patch)
treebde8672301573cd987f4e383029e55e7c70692fe /res/values
parent064d6000933354f7bf344a41e0caa7052401c903 (diff)
downloadandroid_packages_apps_Snap-19ab725a5e640a1a20b1a6def083e37d1d1c1e20.tar.gz
android_packages_apps_Snap-19ab725a5e640a1a20b1a6def083e37d1d1c1e20.tar.bz2
android_packages_apps_Snap-19ab725a5e640a1a20b1a6def083e37d1d1c1e20.zip
Add crop activity
bug:10367125 Change-Id: I8dce6d799e7469ff048d419598d87b0c04bef2a0
Diffstat (limited to 'res/values')
-rw-r--r--res/values/strings.xml5
-rw-r--r--res/values/styles.xml8
2 files changed, 13 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 021fc4ee5..eee320339 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -647,4 +647,9 @@ CHAR LIMIT = NONE] -->
<string name="tiny_planet_zoom">Zoom</string>
<!-- Label above a slider that let's the user set the rotation of a tiny planet image. [CHAR LIMIT = 15] -->
<string name="tiny_planet_rotate">Rotate</string>
+
+ <!-- Crop -->
+ <!-- Label for the save button in the crop activity action bar [CHAR LIMIT=20] -->
+ <string name="crop_save">Save</string>
+
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 23a5f5c79..a09bce73f 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -30,6 +30,14 @@
<item name="android:actionBarStyle">@style/Holo.ActionBar</item>
</style>
<style name="Theme.CameraBase" parent="android:Theme.Holo"/>
+ <style name="Theme.Crop" parent="Theme.GalleryBase">
+ <item name="android:displayOptions"></item>
+ <item name="android:windowContentOverlay">@null</item>
+ <item name="android:actionBarStyle">@style/Holo.ActionBar</item>
+ <item name="android:colorBackground">@null</item>
+ <item name="android:colorBackgroundCacheHint">@null</item>
+ <item name="android:windowBackground">@drawable/crop_tiled_background</item>
+ </style>
<style name="Holo.ActionBar" parent="android:Widget.Holo.ActionBar">
<item name="android:displayOptions">useLogo|showHome|homeAsUp</item>
<item name="android:background">@drawable/actionbar_translucent</item>