-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_checked="true" android:drawable="@drawable/grid_pressed" />
- <item android:state_focused="true" android:drawable="@drawable/grid_focused" />
- <item android:state_pressed="true" android:drawable="@drawable/grid_pressed" />
- <item android:state_selected="true" android:drawable="@drawable/grid_selected" />
+ <item android:state_checked="true" android:drawable="@drawable/tile_picker_selected" />
+ <item android:state_focused="true" android:drawable="@drawable/tile_picker_focused" />
+ <item android:state_pressed="true" android:drawable="@drawable/tile_picker_pressed" />
+ <item android:state_selected="true" android:drawable="@drawable/tile_picker_selected" />
<item android:drawable="@android:color/transparent" />
</selector>
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/wallpaper_cropper"
+ android:id="@+id/wallpaper_root"
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.android.launcher3.CropView
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/wallpaper_picker"
+ android:id="@+id/wallpaper_root"
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.android.launcher3.CropView
android:indeterminate="true"
android:indeterminateOnly="true"
android:background="@android:color/transparent" />
- <HorizontalScrollView
+ <LinearLayout
android:id="@+id/wallpaper_strip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_alignParentBottom="true" >
- <LinearLayout android:id="@+id/wallpaper_list"
+ android:layout_alignParentBottom="true"
+ android:orientation="vertical"
+ android:fitsSystemWindows="true" >
+ <View
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal" />
- </HorizontalScrollView>
+ android:layout_height="2dp"
+ android:background="@drawable/tile_shadow_top" />
+ <HorizontalScrollView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" >
+ <LinearLayout android:id="@+id/wallpaper_list"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal" />
+ </HorizontalScrollView>
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="2dp"
+ android:background="@drawable/tile_shadow_bottom" />
+ </LinearLayout>
</RelativeLayout>
android:layout_height="@dimen/wallpaperThumbnailHeight"
android:focusable="true"
android:clickable="true"
- android:background="@drawable/wallpaper_gallery_item"
- android:foreground="@drawable/wallpaper_gallery_item">
+ android:background="@drawable/wallpaper_tile_fg"
+ android:foreground="@drawable/wallpaper_tile_fg">
<ImageView
android:id="@+id/wallpaper_image"
android:layout_width="match_parent"
android:layout_height="@dimen/wallpaperThumbnailHeight"
android:focusable="true"
android:clickable="true"
- android:background="@drawable/wallpaper_gallery_item"
- android:foreground="@drawable/wallpaper_gallery_item">
+ android:background="@drawable/wallpaper_tile_fg"
+ android:foreground="@drawable/wallpaper_tile_fg">
<ImageView
android:id="@+id/wallpaper_image"
android:layout_width="match_parent"
mIgnoreNextTap = true;
}
mAnim = new LauncherViewPropertyAnimator(wallpaperStrip);
- mAnim.translationY(wallpaperStrip.getHeight())
- .setInterpolator(new DecelerateInterpolator(0.75f));
+ mAnim.translationY(wallpaperStrip.getHeight()).alpha(0f)
+ .setInterpolator(new DecelerateInterpolator(0.75f));
mAnim.start();
}
public void onTap() {
mAnim.cancel();
}
mAnim = new LauncherViewPropertyAnimator(wallpaperStrip);
- mAnim.translationY(0).setInterpolator(new DecelerateInterpolator(0.75f));
+ mAnim.translationY(0).alpha(1f)
+ .setInterpolator(new DecelerateInterpolator(0.75f));
mAnim.start();
}
}
cursor.close();
return thumb;
}
-
+
+ protected void onStop() {
+ super.onStop();
+ final View wallpaperStrip = findViewById(R.id.wallpaper_strip);
+ if (wallpaperStrip.getTranslationY() > 0) {
+ wallpaperStrip.setTranslationY(0);
+ wallpaperStrip.setAlpha(1f);
+ }
+ }
+
protected void onSaveInstanceState(Bundle outState) {
outState.putParcelableArrayList(TEMP_WALLPAPER_TILES, mTempWallpaperTiles);
}