From ffed65886ecd83f52dc1c052897511c95a5f371a Mon Sep 17 00:00:00 2001 From: Selim Cinek Date: Fri, 28 Feb 2014 17:18:59 +0100 Subject: Changed behaviour of the wallpaper picker. When opening the picker, the currently chosen wallpaper is shown in the background. In this change also the nullpointer was fixed when deleting the currently selected wallpaper and setting it, because we revert to the old wallpaper in that case. When going into the same live wallpaper than the currently selected we are going back to home if the user sets it or goes back now, in order for the user not to loose state. The real fix for this will be done later when the following bug will be fixed: b/13241760 Bug: 12063773 Bug: 13219612 Change-Id: I7c6abb25755eca99c3255278e0884d1ff4749b55 --- .../src/com/android/photos/views/TiledImageView.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'WallpaperPicker/src/com/android/photos') diff --git a/WallpaperPicker/src/com/android/photos/views/TiledImageView.java b/WallpaperPicker/src/com/android/photos/views/TiledImageView.java index af4199c91..94063b027 100644 --- a/WallpaperPicker/src/com/android/photos/views/TiledImageView.java +++ b/WallpaperPicker/src/com/android/photos/views/TiledImageView.java @@ -112,6 +112,18 @@ public class TiledImageView extends FrameLayout { //setTileSource(new ColoredTiles()); } + @Override + public void setVisibility(int visibility) { + super.setVisibility(visibility); + // need to update inner view's visibility because it seems like we're causing it to draw + // from {@link #dispatchDraw} or {@link #invalidate} even if we are invisible. + if (USE_TEXTURE_VIEW) { + mTextureView.setVisibility(visibility); + } else { + mGLSurfaceView.setVisibility(visibility); + } + } + public void destroy() { if (!IS_SUPPORTED) { return; -- cgit v1.2.3