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

am c0657fb3: Integrate changes from lockscreen proto app

Browse Source 
* commit 'c0657fb36ce5ede652e8af084e484d07abfb449d':
  Integrate changes from lockscreen proto app
This commit is contained in:
Adam Powell
2012-10-29 13:29:43 -07:00
committed by Android Git Automerger
parent b18e19f5a0 c0657fb36c
commit 82da5b173c
4 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/res/res/layout-sw600dp-port/keyguard_host_view.xml
View File

@@ -47,7 +47,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
androidprv:layout_childType="challenge"
androidprv:layout_centerWithinArea="0.55">
android:layout_gravity="center_horizontal|bottom">
<com.android.internal.policy.impl.keyguard.KeyguardSecurityViewFlipper
android:id="@+id/view_flipper"
android:layout_width="wrap_content"

6
core/res/res/layout-sw600dp/keyguard_glow_pad_container.xml
View File

@@ -18,7 +18,7 @@
-->
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<include layout="@layout/keyguard_glow_pad_view"
android:layout_width="@dimen/kg_glow_pad_size"
android:layout_height="@dimen/kg_glow_pad_size"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center" />
</merge>
</merge>

3
core/res/res/values-sw720dp/dimens.xml
View File

@@ -100,9 +100,6 @@
devices to account for the widget pager padding -->
<dimen name="kg_runway_lights_top_margin">-30dp</dimen>
<!-- Margin around the various security views -->
<dimen name="keyguard_security_view_margin">100dp</dimen>
<!-- Margin around the various security views -->
<dimen name="keyguard_muliuser_selector_margin">24dp</dimen>

37
policy/src/com/android/internal/policy/impl/keyguard/MultiPaneChallengeLayout.java
View File

@@ -133,10 +133,11 @@ public class MultiPaneChallengeLayout extends ViewGroup implements ChallengeLayo
measureChildWithMargins(child, adjustedWidthSpec, 0, adjustedHeightSpec, 0);
// Only subtract out space from one dimension. Favor vertical.
// Offset by 1.5x to add some balance along the other edge.
if (Gravity.isVertical(lp.gravity)) {
heightUsed = child.getMeasuredHeight();
heightUsed += child.getMeasuredHeight() * 1.5f;
} else if (Gravity.isHorizontal(lp.gravity)) {
widthUsed = child.getMeasuredWidth();
widthUsed += child.getMeasuredWidth() * 1.5f;
}
}
}
@@ -224,11 +225,13 @@ public class MultiPaneChallengeLayout extends ViewGroup implements ChallengeLayo
final int adjustedWidth;
final int adjustedHeight;
if (fixedLayoutHorizontal) {
adjustedWidth = (int) (width * lp.centerWithinArea + 0.5f);
final int paddedWidth = width - padding.left - padding.right;
adjustedWidth = (int) (paddedWidth * lp.centerWithinArea + 0.5f);
adjustedHeight = height;
} else if (fixedLayoutVertical) {
final int paddedHeight = height - padding.top - padding.bottom;
adjustedWidth = width;
adjustedHeight = (int) (height * lp.centerWithinArea + 0.5f);
adjustedHeight = (int) (paddedHeight * lp.centerWithinArea + 0.5f);
} else {
adjustedWidth = width;
adjustedHeight = height;
@@ -248,17 +251,24 @@ public class MultiPaneChallengeLayout extends ViewGroup implements ChallengeLayo
top = fixedLayoutVertical ?
padding.top + (adjustedHeight - childHeight) / 2 : padding.top;
bottom = top + childHeight;
if (adjustPadding && isVertical) padding.top = bottom;
if (adjustPadding && isVertical) {
padding.top = bottom;
padding.bottom += childHeight / 2;
}
break;
case Gravity.BOTTOM:
bottom = fixedLayoutVertical
? height - padding.bottom - (adjustedHeight - childHeight) / 2
: height - padding.bottom;
top = bottom - childHeight;
if (adjustPadding && isVertical) padding.bottom = top;
if (adjustPadding && isVertical) {
padding.bottom = height - top;
padding.top += childHeight / 2;
}
break;
case Gravity.CENTER_VERTICAL:
top = (height - childHeight) / 2;
final int paddedHeight = height - padding.top - padding.bottom;
top = padding.top + (paddedHeight - childHeight) / 2;
bottom = top + childHeight;
break;
}
@@ -267,17 +277,24 @@ public class MultiPaneChallengeLayout extends ViewGroup implements ChallengeLayo
left = fixedLayoutHorizontal ?
padding.left + (adjustedWidth - childWidth) / 2 : padding.left;
right = left + childWidth;
if (adjustPadding && isHorizontal && !isVertical) padding.left = right;
if (adjustPadding && isHorizontal && !isVertical) {
padding.left = right;
padding.right += childWidth / 2;
}
break;
case Gravity.RIGHT:
right = fixedLayoutHorizontal
? width - padding.right - (adjustedWidth - childWidth) / 2
: width - padding.right;
left = right - childWidth;
if (adjustPadding && isHorizontal && !isVertical) padding.right = left;
if (adjustPadding && isHorizontal && !isVertical) {
padding.right = width - left;
padding.left += childWidth / 2;
}
break;
case Gravity.CENTER_HORIZONTAL:
left = (width - childWidth) / 2;
final int paddedWidth = width - padding.left - padding.right;
left = (paddedWidth - childWidth) / 2;
right = left + childWidth;
break;
}