Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 6845 into donut

Browse Source 
* changes:
  Use MeasureSpec.getWidth instead of default display in lock pattern widget.
This commit is contained in:
Android (Google) Code Review
2009-07-10 16:28:03 -07:00
parent 2d7910555a 6a109b4874
commit 1c9fb40cb6
1 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/java/com/android/internal/widget/LockPatternView.java
View File

@@ -20,23 +20,22 @@ package com.android.internal.widget;
import com.android.internal.R; import com.android.internal.R;
import android.content.Context; import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Canvas; import android.graphics.Canvas;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.Matrix; import android.graphics.Matrix;
import android.graphics.Paint; import android.graphics.Paint;
import android.graphics.Path; import android.graphics.Path;
import android.graphics.Rect; import android.graphics.Rect;
import android.graphics.Bitmap; import android.os.Debug;
import android.graphics.BitmapFactory;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.os.SystemClock; import android.os.SystemClock;
import android.os.Debug;
import android.os.Vibrator; import android.os.Vibrator;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View; import android.view.View;
import android.view.WindowManager;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -393,17 +392,9 @@ public class LockPatternView extends View {
@Override @Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
final WindowManager wm = (WindowManager) getContext() final int width = MeasureSpec.getSize(widthMeasureSpec);
.getSystemService(Context.WINDOW_SERVICE); final int height = MeasureSpec.getSize(heightMeasureSpec);
final int width = wm.getDefaultDisplay().getWidth(); final int squareSide = Math.min(width, height);
final int height = wm.getDefaultDisplay().getHeight();
int squareSide = Math.min(width, height);
// if in landscape...
if (width > height) {
squareSide -= STATUS_BAR_HEIGHT;
}
setMeasuredDimension(squareSide, squareSide); setMeasuredDimension(squareSide, squareSide);
} }