From 8633ea9b7ad23e24eeb59bb30ac91db459660dfa Mon Sep 17 00:00:00 2001 From: Daniel Sandler Date: Wed, 11 Nov 2009 22:23:36 -0800 Subject: [PATCH] Update LockScreen/UnlockScreen for new UX designs. This change depends upon relevant layout changes in frameworks/base/core/res/res. --- policy/com/android/internal/policy/impl/LockScreen.java | 2 -- policy/com/android/internal/policy/impl/UnlockScreen.java | 6 ------ 2 files changed, 8 deletions(-) diff --git a/policy/com/android/internal/policy/impl/LockScreen.java b/policy/com/android/internal/policy/impl/LockScreen.java index 1eb274796efc3..43e155778ba11 100644 --- a/policy/com/android/internal/policy/impl/LockScreen.java +++ b/policy/com/android/internal/policy/impl/LockScreen.java @@ -180,7 +180,6 @@ class LockScreen extends LinearLayout implements KeyguardScreen, KeyguardUpdateM } mCarrier = (TextView) findViewById(R.id.carrier); - mTime = (TextView) findViewById(R.id.time); mDate = (TextView) findViewById(R.id.date); mStatus1 = (TextView) findViewById(R.id.status1); mStatus2 = (TextView) findViewById(R.id.status2); @@ -371,7 +370,6 @@ class LockScreen extends LinearLayout implements KeyguardScreen, KeyguardUpdateM private void refreshTimeAndDateDisplay() { Date now = new Date(); - mTime.setText(mTimeFormat.format(now)); mDate.setText(mDateFormat.format(now)); } diff --git a/policy/com/android/internal/policy/impl/UnlockScreen.java b/policy/com/android/internal/policy/impl/UnlockScreen.java index a5032b3ae0c56..2843dd4ce4bb8 100644 --- a/policy/com/android/internal/policy/impl/UnlockScreen.java +++ b/policy/com/android/internal/policy/impl/UnlockScreen.java @@ -72,9 +72,7 @@ class UnlockScreen extends LinearLayoutWithDefaultTouchRecepient private boolean mCreatedInPortrait; private TextView mCarrier; - private TextView mCenterDot; private TextView mDate; - private TextView mTime; // are we showing battery information? private boolean mShowingBatteryInfo = false; @@ -169,11 +167,8 @@ class UnlockScreen extends LinearLayoutWithDefaultTouchRecepient } mCarrier = (TextView) findViewById(R.id.carrier); - mCenterDot = (TextView) findViewById(R.id.centerDot); mDate = (TextView) findViewById(R.id.date); - mTime = (TextView) findViewById(R.id.time); - mCenterDot.setText("|"); refreshTimeAndDateDisplay(); mStatus1 = (TextView) findViewById(R.id.status1); @@ -323,7 +318,6 @@ class UnlockScreen extends LinearLayoutWithDefaultTouchRecepient private void refreshTimeAndDateDisplay() { Date now = new Date(); - mTime.setText(DateFormat.getTimeFormat(getContext()).format(now)); mDate.setText(DateFormat.getMediumDateFormat(getContext()).format(now)); }