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

Keyguard bug fixes

Browse Source 
Bug:7088530 Lockscreen falsely states "Wrong PIN"
Bug:7091531 Owner name no longer shown on slide to unlock screen, Nakasi
Bug:7091131 When entering a SIM PIN, focus is not put onto the pin entry box
Change-Id: I5c7e957083b25a3445804ea092d962163d187fa1
This commit is contained in:
Jim Miller
2012-08-31 17:42:42 -07:00
parent 58a2950b66
commit d36ebe03c9
9 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/res/res/layout-sw600dp/keyguard_screen_status_land.xml
View File

@@ -109,7 +109,7 @@
/>
<TextView
android:id="@+id/propertyOf"
android:id="@+id/owner_info"
android:lineSpacingExtra="8dip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

2
core/res/res/layout-sw600dp/keyguard_screen_status_port.xml
View File

@@ -109,7 +109,7 @@
/>
<TextView
android:id="@+id/propertyOf"
android:id="@+id/owner_info"
android:lineSpacingExtra="8dip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

11
core/res/res/layout/keyguard_navigation.xml
View File

@@ -31,11 +31,11 @@
android:padding="10dip"
android:clickable="true">
<TextView
android:layout_width="20dip"
android:layout_height="wrap_content"
android:textSize="28dp"
android:text="@string/kg_temp_back_string" />
<ImageView
android:src="?android:attr/homeAsUpIndicator"
android:layout_gravity="center_vertical|start"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<!-- message area for security screen -->
<TextView
@@ -43,6 +43,7 @@
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="end"
android:singleLine="true"
android:ellipsize="marquee"
android:layout_marginEnd="6dip"

15
core/res/res/layout/keyguard_status_view.xml
View File

@@ -94,7 +94,7 @@
</LinearLayout>
<TextView
android:id="@*android:id/status1"
android:id="@+id/status1"
android:layout_gravity="end"
android:layout_marginEnd="@*android:dimen/keyguard_lockscreen_status_line_font_right_margin"
android:singleLine="true"
@@ -105,7 +105,18 @@
/>
<TextView
android:id="@*android:id/carrier"
android:id="@+id/owner_info"
android:layout_gravity="end"
android:layout_marginEnd="@*android:dimen/keyguard_lockscreen_status_line_font_right_margin"
android:singleLine="true"
android:ellipsize="marquee"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="@*android:dimen/keyguard_lockscreen_status_line_font_size"
android:drawablePadding="4dip"
/>
<TextView
android:id="@+id/carrier"
android:layout_gravity="end"
android:layout_marginEnd="@*android:dimen/keyguard_lockscreen_status_line_font_right_margin"
android:singleLine="true"

2
core/res/res/values/public.xml
View File

@@ -1292,7 +1292,7 @@
<java-symbol type="id" name="passwordEntry" />
<java-symbol type="id" name="pinDel" />
<java-symbol type="id" name="pinDisplay" />
<java-symbol type="id" name="propertyOf" />
<java-symbol type="id" name="owner_info" />
<java-symbol type="id" name="pukDel" />
<java-symbol type="id" name="pukDisplay" />
<java-symbol type="id" name="right_icon" />

6
policy/src/com/android/internal/policy/impl/keyguard/KeyguardPasswordView.java
View File

@@ -256,12 +256,10 @@ public class KeyguardPasswordView extends LinearLayout
private void verifyPasswordAndUnlock() {
String entry = mPasswordEntry.getText().toString();
boolean wrongPassword = true;
if (mLockPatternUtils.checkPassword(entry)) {
mCallback.reportSuccessfulUnlockAttempt();
KeyStore.getInstance().password(entry);
mCallback.dismiss(true);
wrongPassword = false;
} else if (entry.length() > MINIMUM_PASSWORD_LENGTH_BEFORE_REPORT ) {
// to avoid accidental lockout, only count attempts that are long enough to be a
// real password. This may require some tweaking.
@@ -271,9 +269,9 @@ public class KeyguardPasswordView extends LinearLayout
long deadline = mLockPatternUtils.setLockoutAttemptDeadline();
handleAttemptLockout(deadline);
}
mNavigationManager.setMessage(
mIsAlpha ? R.string.kg_wrong_password : R.string.kg_wrong_pin);
}
mNavigationManager.setMessage(wrongPassword ?
(mIsAlpha ? R.string.kg_wrong_password : R.string.kg_wrong_pin) : 0);
mPasswordEntry.setText("");
}

2
policy/src/com/android/internal/policy/impl/keyguard/KeyguardSimPinView.java
View File

@@ -91,8 +91,6 @@ public class KeyguardSimPinView extends LinearLayout
}
});
}
setFocusableInTouchMode(true);
reset();
}

2
policy/src/com/android/internal/policy/impl/keyguard/KeyguardStatusViewManager.java
View File

@@ -119,7 +119,7 @@ class KeyguardStatusViewManager {
mDateView = (TextView) findViewById(R.id.date);
mStatus1View = (TextView) findViewById(R.id.status1);
mAlarmStatusView = (TextView) findViewById(R.id.alarm_status);
mOwnerInfoView = (TextView) findViewById(R.id.propertyOf);
mOwnerInfoView = (TextView) findViewById(R.id.owner_info);
mDigitalClock = (DigitalClock) findViewById(R.id.time);
// Registering this callback immediately updates the battery state, among other things.

2
policy/src/com/android/internal/policy/impl/keyguard_obsolete/KeyguardStatusViewManager.java
View File

@@ -179,7 +179,7 @@ class KeyguardStatusViewManager implements OnClickListener {
mDateView = (TextView) findViewById(R.id.date);
mStatus1View = (TextView) findViewById(R.id.status1);
mAlarmStatusView = (TextView) findViewById(R.id.alarm_status);
mOwnerInfoView = (TextView) findViewById(R.id.propertyOf);
mOwnerInfoView = (TextView) findViewById(R.id.owner_info);
mTransportView = (TransportControlView) findViewById(R.id.transport);
mEmergencyCallButton = (Button) findViewById(R.id.emergencyCallButton);
mEmergencyCallButtonEnabledInScreen = emergencyButtonEnabledInScreen;