commit 96757ff1498345bef8735791da1ca147b2247f13
author Daniel Sandler <dsandler@google.com> Wed Nov 11 22:23:36 2009 -0800
committer Daniel Sandler <dsandler@google.com> Thu Nov 12 02:05:38 2009 -0800
tree 36bc93ec0f4682e5414fbfe68360ce06f5fcbccb
parent 07fba524a1dfa1a53b417a3e59c1a4797c49a9eb

Update LockScreen/UnlockScreen for new UX designs.

This change depends upon relevant layout changes in
frameworks/base/core/res/res.

phone/com/android/internal/policy/impl/LockScreen.java

diff --git a/phone/com/android/internal/policy/impl/LockScreen.java b/phone/com/android/internal/policy/impl/LockScreen.java
index 1eb2747..43e1557 100644
--- a/phone/com/android/internal/policy/impl/LockScreen.java
+++ b/phone/com/android/internal/policy/impl/LockScreen.java
@@ -180,7 +180,6 @@
         }
 
         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 @@
 
     private void refreshTimeAndDateDisplay() {
         Date now = new Date();
-        mTime.setText(mTimeFormat.format(now));
         mDate.setText(mDateFormat.format(now));
     }
 

phone/com/android/internal/policy/impl/UnlockScreen.java

diff --git a/phone/com/android/internal/policy/impl/UnlockScreen.java b/phone/com/android/internal/policy/impl/UnlockScreen.java
index a5032b3..2843dd4 100644
--- a/phone/com/android/internal/policy/impl/UnlockScreen.java
+++ b/phone/com/android/internal/policy/impl/UnlockScreen.java
@@ -72,9 +72,7 @@
     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 @@
         }
 
         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 @@
 
     private void refreshTimeAndDateDisplay() {
         Date now = new Date();
-        mTime.setText(DateFormat.getTimeFormat(getContext()).format(now));
         mDate.setText(DateFormat.getMediumDateFormat(getContext()).format(now));
     }