summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWu-cheng Li <wuchengli@google.com>2012-10-01 23:32:00 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-01 23:32:00 -0700
commite9053c6d2e8be5f2257068d17d07d0cec3126845 (patch)
tree14705455e70b696960dedbbc6c2927ceed2c8730
parenta6f77a2e3edca93f32f6f6da06ef9345de13489f (diff)
parent935b9cfe991c3afe119720c487dc24cc02c55584 (diff)
downloadandroid_packages_apps_Gallery2-e9053c6d2e8be5f2257068d17d07d0cec3126845.tar.gz
android_packages_apps_Gallery2-e9053c6d2e8be5f2257068d17d07d0cec3126845.tar.bz2
android_packages_apps_Gallery2-e9053c6d2e8be5f2257068d17d07d0cec3126845.zip
am 935b9cfe: Merge "Update assets of the lock screen image in the secure album." into gb-ub-photos-arches
* commit '935b9cfe991c3afe119720c487dc24cc02c55584': Update assets of the lock screen image in the secure album.
-rw-r--r--res/drawable-hdpi/ic_lockscreen_handle_normal.pngbin6843 -> 0 bytes
-rw-r--r--res/drawable-hdpi/placeholder_locked.9.pngbin1130 -> 707 bytes
-rw-r--r--res/drawable-mdpi/ic_lockscreen_handle_normal.pngbin3855 -> 0 bytes
-rw-r--r--res/drawable-mdpi/placeholder_locked.9.pngbin836 -> 498 bytes
-rw-r--r--res/drawable-xhdpi/ic_lockscreen_handle_normal.pngbin10200 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/placeholder_locked.9.pngbin1448 -> 900 bytes
-rw-r--r--src/com/android/gallery3d/data/UnlockImage.java2
7 files changed, 1 insertions, 1 deletions
diff --git a/res/drawable-hdpi/ic_lockscreen_handle_normal.png b/res/drawable-hdpi/ic_lockscreen_handle_normal.png
deleted file mode 100644
index 940405e3d..000000000
--- a/res/drawable-hdpi/ic_lockscreen_handle_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/placeholder_locked.9.png b/res/drawable-hdpi/placeholder_locked.9.png
index 794b5e9a1..81a8a7469 100644
--- a/res/drawable-hdpi/placeholder_locked.9.png
+++ b/res/drawable-hdpi/placeholder_locked.9.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_lockscreen_handle_normal.png b/res/drawable-mdpi/ic_lockscreen_handle_normal.png
deleted file mode 100644
index e7c64eb7c..000000000
--- a/res/drawable-mdpi/ic_lockscreen_handle_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/placeholder_locked.9.png b/res/drawable-mdpi/placeholder_locked.9.png
index bb312eb78..e0ecefc85 100644
--- a/res/drawable-mdpi/placeholder_locked.9.png
+++ b/res/drawable-mdpi/placeholder_locked.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_lockscreen_handle_normal.png b/res/drawable-xhdpi/ic_lockscreen_handle_normal.png
deleted file mode 100644
index f902646ce..000000000
--- a/res/drawable-xhdpi/ic_lockscreen_handle_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/placeholder_locked.9.png b/res/drawable-xhdpi/placeholder_locked.9.png
index 578050f6b..70097ff43 100644
--- a/res/drawable-xhdpi/placeholder_locked.9.png
+++ b/res/drawable-xhdpi/placeholder_locked.9.png
Binary files differ
diff --git a/src/com/android/gallery3d/data/UnlockImage.java b/src/com/android/gallery3d/data/UnlockImage.java
index 19189e42d..ed3b485c4 100644
--- a/src/com/android/gallery3d/data/UnlockImage.java
+++ b/src/com/android/gallery3d/data/UnlockImage.java
@@ -24,7 +24,7 @@ public class UnlockImage extends ActionImage {
private static final String TAG = "UnlockImage";
public UnlockImage(Path path, GalleryApp application) {
- super(path, application, R.drawable.ic_lockscreen_handle_normal);
+ super(path, application, R.drawable.placeholder_locked);
}
@Override