- Make the lock screen photo be a standard portrait size photo
- In the filmstrip, have the first tap on the lock screen photo
take the user directly to the unlock screen.
- Switch the asset to be a "locked" lock rather than an
"unlocked" lock.
bug:
7192331
Change-Id: If7541cd67cdfb711f8dd721796db3343ae91343a
public Bitmap run(JobContext jc) {
int targetSize = MediaItem.getTargetSize(mType);
Bitmap bitmap = BitmapFactory.decodeResource(mApplication.getResources(),
- R.drawable.ic_lockscreen_unlock_normal);
+ R.drawable.ic_lockscreen_handle_normal);
if (mType == MediaItem.TYPE_MICROTHUMBNAIL) {
bitmap = BitmapUtils.resizeAndCropCenter(bitmap, targetSize, true);
if (mFilmMode && !mDownInScrolling) {
switchToHitPicture((int) (x + 0.5f), (int) (y + 0.5f));
- setFilmMode(false);
- mIgnoreUpEvent = true;
- return true;
+
+ // If this is a lock screen photo, let the listener handle the
+ // event. Tapping on lock screen photo should take the user
+ // directly to the lock screen.
+ MediaItem item = mModel.getMediaItem(0);
+ int supported = 0;
+ if (item != null) supported = item.getSupportedOperations();
+ if ((supported & MediaItem.SUPPORT_UNLOCK) == 0) {
+ setFilmMode(false);
+ mIgnoreUpEvent = true;
+ return true;
+ }
}
if (mListener != null) {