diff options
| author | Bobby Georgescu <georgescu@google.com> | 2012-10-16 21:41:47 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-16 21:41:47 -0700 |
| commit | 5b083ee2cd16740f16ef0345d30aa1b697801c58 (patch) | |
| tree | 885e69eff307cbf9322783624b494dd571d22d77 | |
| parent | 6587971c34fc4aa552c854673a51354d16d4d746 (diff) | |
| parent | a05bf4719abc1b16c997b2012b14fc3d4d4d0c20 (diff) | |
| download | android_packages_apps_Gallery2-5b083ee2cd16740f16ef0345d30aa1b697801c58.tar.gz android_packages_apps_Gallery2-5b083ee2cd16740f16ef0345d30aa1b697801c58.tar.bz2 android_packages_apps_Gallery2-5b083ee2cd16740f16ef0345d30aa1b697801c58.zip | |
am a05bf471: Merge "Update Camera album overlay icon asset" into gb-ub-photos-arches
* commit 'a05bf4719abc1b16c997b2012b14fc3d4d4d0c20':
Update Camera album overlay icon asset
| -rw-r--r-- | res/drawable-hdpi/ic_cameraalbum_overlay.png | bin | 0 -> 5618 bytes | |||
| -rw-r--r-- | res/drawable-mdpi/ic_cameraalbum_overlay.png | bin | 0 -> 3506 bytes | |||
| -rw-r--r-- | res/drawable-xhdpi/ic_cameraalbum_overlay.png | bin | 0 -> 7705 bytes | |||
| -rw-r--r-- | src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java | 2 |
4 files changed, 1 insertions, 1 deletions
diff --git a/res/drawable-hdpi/ic_cameraalbum_overlay.png b/res/drawable-hdpi/ic_cameraalbum_overlay.png Binary files differnew file mode 100644 index 000000000..e58777f11 --- /dev/null +++ b/res/drawable-hdpi/ic_cameraalbum_overlay.png diff --git a/res/drawable-mdpi/ic_cameraalbum_overlay.png b/res/drawable-mdpi/ic_cameraalbum_overlay.png Binary files differnew file mode 100644 index 000000000..5d14c32e9 --- /dev/null +++ b/res/drawable-mdpi/ic_cameraalbum_overlay.png diff --git a/res/drawable-xhdpi/ic_cameraalbum_overlay.png b/res/drawable-xhdpi/ic_cameraalbum_overlay.png Binary files differnew file mode 100644 index 000000000..bf71eaacf --- /dev/null +++ b/res/drawable-xhdpi/ic_cameraalbum_overlay.png diff --git a/src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java b/src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java index d5337f00d..9b3f29f2b 100644 --- a/src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java +++ b/src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java @@ -71,7 +71,7 @@ public class AlbumSetSlotRenderer extends AbstractSlotRenderer { mWaitLoadingTexture = new ColorTexture(mPlaceholderColor); mWaitLoadingTexture.setSize(1, 1); mCameraOverlay = new ResourceTexture(activity, - R.drawable.frame_overlay_gallery_camera); + R.drawable.ic_cameraalbum_overlay); } public void setPressedIndex(int index) { |
