diff options
| author | Owen Lin <owenlin@google.com> | 2012-05-17 12:44:51 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-17 12:44:51 -0700 |
| commit | 59d6f1b97c7159dd9faead8872f2d583dbb49ac8 (patch) | |
| tree | fc413ee43297253f214dfcc974605dda878455df | |
| parent | 9723770a40d230092204dd685f19ff4bce6dabd5 (diff) | |
| parent | 7896b2ce915cbd180682e94e2fe3d246ff760763 (diff) | |
| download | android_packages_apps_Gallery2-59d6f1b97c7159dd9faead8872f2d583dbb49ac8.tar.gz android_packages_apps_Gallery2-59d6f1b97c7159dd9faead8872f2d583dbb49ac8.tar.bz2 android_packages_apps_Gallery2-59d6f1b97c7159dd9faead8872f2d583dbb49ac8.zip | |
Merge "Set the window backgrond and remove it in onCreate()." into jb-dev
| -rw-r--r-- | res/values-xlarge/styles.xml | 2 | ||||
| -rw-r--r-- | res/values/styles.xml | 2 | ||||
| -rw-r--r-- | src/com/android/gallery3d/app/AbstractGalleryActivity.java | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/res/values-xlarge/styles.xml b/res/values-xlarge/styles.xml index b71e0394b..0bf4d568b 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/styles.xml b/res/values/styles.xml index d61993854..3c32cef6d 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> diff --git a/src/com/android/gallery3d/app/AbstractGalleryActivity.java b/src/com/android/gallery3d/app/AbstractGalleryActivity.java index 2c63e3409..4ee740360 100644 --- a/src/com/android/gallery3d/app/AbstractGalleryActivity.java +++ b/src/com/android/gallery3d/app/AbstractGalleryActivity.java @@ -61,6 +61,7 @@ public class AbstractGalleryActivity extends Activity implements GalleryActivity super.onCreate(savedInstanceState); mOrientationManager = new OrientationManager(this); toggleStatusBarByOrientation(); + getWindow().setBackgroundDrawable(null); } @Override |