diff options
| author | Jim Miller <jaggies@google.com> | 2011-06-22 14:07:44 -0700 |
|---|---|---|
| committer | Jim Miller <jaggies@google.com> | 2011-06-22 16:08:09 -0700 |
| commit | 08a975ef86200a73db51bfbcca6bea8ad2a63cbd (patch) | |
| tree | 2cf299cf40bd95f00b31cf0584c93ef2c0ddeadb /policy | |
| parent | 019caf42c0df10c0ed0a0242ea7a39321a36f483 (diff) | |
| download | frameworks_base-08a975ef86200a73db51bfbcca6bea8ad2a63cbd.zip frameworks_base-08a975ef86200a73db51bfbcca6bea8ad2a63cbd.tar.gz frameworks_base-08a975ef86200a73db51bfbcca6bea8ad2a63cbd.tar.bz2 | |
Update LockScreen layouts to latest UX spec.
- better placement and consistent handling of emergency button.
- use new GridLayout for landscape modes.
- add dimensionable parameters for time and status line fonts.
- fix assets and emergencyCallButton resource references when building for tablets.
Change-Id: I5f4c9cfb6a88ce3ccd8ab4fdafede8e6e59f9407
Diffstat (limited to 'policy')
4 files changed, 4 insertions, 4 deletions
diff --git a/policy/src/com/android/internal/policy/impl/AccountUnlockScreen.java b/policy/src/com/android/internal/policy/impl/AccountUnlockScreen.java index c4feefd..de4ea75 100644 --- a/policy/src/com/android/internal/policy/impl/AccountUnlockScreen.java +++ b/policy/src/com/android/internal/policy/impl/AccountUnlockScreen.java @@ -110,7 +110,7 @@ public class AccountUnlockScreen extends RelativeLayout implements KeyguardScree mOk = (Button) findViewById(R.id.ok); mOk.setOnClickListener(this); - mEmergencyCall = (Button) findViewById(R.id.emergencyCall); + mEmergencyCall = (Button) findViewById(R.id.emergencyCallButton); mEmergencyCall.setOnClickListener(this); mLockPatternUtils.updateEmergencyCallButtonState(mEmergencyCall); diff --git a/policy/src/com/android/internal/policy/impl/PasswordUnlockScreen.java b/policy/src/com/android/internal/policy/impl/PasswordUnlockScreen.java index 6734005..f862d01 100644 --- a/policy/src/com/android/internal/policy/impl/PasswordUnlockScreen.java +++ b/policy/src/com/android/internal/policy/impl/PasswordUnlockScreen.java @@ -129,7 +129,7 @@ public class PasswordUnlockScreen extends LinearLayout implements KeyguardScreen | InputType.TYPE_TEXT_VARIATION_PASSWORD); } - mEmergencyCallButton = (Button) findViewById(R.id.emergencyCall); + mEmergencyCallButton = (Button) findViewById(R.id.emergencyCallButton); mEmergencyCallButton.setOnClickListener(this); mLockPatternUtils.updateEmergencyCallButtonState(mEmergencyCallButton); diff --git a/policy/src/com/android/internal/policy/impl/SimPukUnlockScreen.java b/policy/src/com/android/internal/policy/impl/SimPukUnlockScreen.java index 544bb3d..7e8d547 100644 --- a/policy/src/com/android/internal/policy/impl/SimPukUnlockScreen.java +++ b/policy/src/com/android/internal/policy/impl/SimPukUnlockScreen.java @@ -109,7 +109,7 @@ public class SimPukUnlockScreen extends LinearLayout implements KeyguardScreen, mDelPinButton.setOnClickListener(this); - mEmergencyCallButton = (Button) findViewById(R.id.emergencyCall); + mEmergencyCallButton = (Button) findViewById(R.id.emergencyCallButton); mOkButton = (TextView) findViewById(R.id.ok); mHeaderText.setText(R.string.keyguard_password_enter_puk_code); diff --git a/policy/src/com/android/internal/policy/impl/SimUnlockScreen.java b/policy/src/com/android/internal/policy/impl/SimUnlockScreen.java index 7255c27..ec917f0 100644 --- a/policy/src/com/android/internal/policy/impl/SimUnlockScreen.java +++ b/policy/src/com/android/internal/policy/impl/SimUnlockScreen.java @@ -99,7 +99,7 @@ public class SimUnlockScreen extends LinearLayout implements KeyguardScreen, Vie mOkButton.setOnClickListener(this); - mEmergencyCallButton = (Button) findViewById(R.id.emergencyCall); + mEmergencyCallButton = (Button) findViewById(R.id.emergencyCallButton); mEmergencyCallButton.setOnClickListener(this); mLockPatternUtils.updateEmergencyCallButtonState(mEmergencyCallButton); |