merge in nakasi-factoryrom-release history after reset to jb-dev
diff --git a/res/menu/albumset.xml b/res/menu/albumset.xml
index 749b7f9..8ac8cbb 100644
--- a/res/menu/albumset.xml
+++ b/res/menu/albumset.xml
@@ -32,5 +32,6 @@
android:showAsAction="never" />
<item android:id="@+id/action_general_help"
android:title="@string/help"
+ android:visible="false"
android:showAsAction="never" />
</menu>
diff --git a/res/values-xlarge/styles.xml b/res/values-xlarge/styles.xml
index b71e039..0bf4d56 100644
--- a/res/values-xlarge/styles.xml
+++ b/res/values-xlarge/styles.xml
@@ -17,7 +17,7 @@
<style name="Theme.Gallery" parent="android:Theme.Holo">
<item name="android:displayOptions"></item>
<item name="android:actionBarStyle">@style/Holo.ActionBar</item>
- <item name="android:windowBackground">@null</item>
+ <item name="android:windowBackground">@android:color/black</item>
<item name="android:colorBackground">@null</item>
<item name="android:colorBackgroundCacheHint">@null</item>
</style>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4d23b0f..f369df9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -91,6 +91,8 @@
<!-- Displayed in the title of the dialog for things to do with a picture
that is to be "set as" (e.g. set as contact photo or set as wallpaper) -->
<string name="set_image">Set picture as</string>
+ <!-- Activity title for cropping picture and setting it as wallpaper [CHAR LIMIT=20] -->
+ <string name="set_wallpaper">Set wallpaper</string>
<!-- Toast/alert after saving wallpaper -->
<string name="wallpaper">Setting wallpaper\u2026</string>
<string name="camera_setas_wallpaper">Wallpaper</string>
@@ -438,5 +440,5 @@
<string name="help">Help</string>
<!-- Web address for gallery help. DO NOT TRANSLATE -->
- <string name="general_help_link" translatable="false">http://support.google.com/mobile/?p=gallery_top</string>
+ <string name="help_url_gallery_main" translatable="false"></string>
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index d619938..3c32cef 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -19,7 +19,7 @@
<item name="android:displayOptions"></item>
<item name="android:windowContentOverlay">@null</item>
<item name="android:actionBarStyle">@style/Holo.ActionBar</item>
- <item name="android:windowBackground">@null</item>
+ <item name="android:windowBackground">@android:color/black</item>
<item name="android:colorBackground">@null</item>
<item name="android:colorBackgroundCacheHint">@null</item>
</style>