commit 3af5ee44a42f64b8db012ccacc565e0a6debd0c5
author Karl Rosaen <krosaen@google.com> Tue Jun 23 17:54:58 2009 -0700
committer Karl Rosaen <krosaen@google.com> Tue Jun 23 18:21:46 2009 -0700
tree 60961eb069425b1566d18969303970c1cfa4ba7a
parent ec5879f66489c9cc6ab12d4495af5a1801bba41c

Fix case where the lock screen information won't fit on screen.

The case is in landscape, 'next alarm' showing, and the plmn is showing.
In this case, don't show the next alarm.

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

diff --git a/policy/com/android/internal/policy/impl/LockScreen.java b/policy/com/android/internal/policy/impl/LockScreen.java
index 2ec6426..f221688 100644
--- a/policy/com/android/internal/policy/impl/LockScreen.java
+++ b/policy/com/android/internal/policy/impl/LockScreen.java
@@ -21,6 +21,7 @@
 
 import android.content.Context;
 import android.text.format.DateFormat;
+import android.text.TextUtils;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -236,8 +237,14 @@
     }
 
     private void refreshAlarmDisplay() {
-        String nextAlarmText = mLockPatternUtils.getNextAlarm();
-        if (nextAlarmText != null && mSimOk) {
+        final String nextAlarmText = mLockPatternUtils.getNextAlarm();
+
+        // bug 1685880: if we are in landscape and showing plmn, the information can end up not
+        // fitting on screen.  in this case, the alarm will get cut.
+        final CharSequence plmn = mUpdateMonitor.getTelephonyPlmn();
+        final boolean showingPlmn = plmn != null && !TextUtils.isEmpty(plmn);
+        final boolean wontFit = !mUpdateMonitor.isInPortrait() && showingPlmn;
+        if (nextAlarmText != null && mSimOk && !wontFit) {
             setAlarmInfoVisible(true);
             mAlarmText.setText(nextAlarmText);
         } else {
@@ -292,19 +299,20 @@
 
     public void onRefreshCarrierInfo(CharSequence plmn, CharSequence spn) {
         refreshSimOkHeaders(plmn, spn);
+        refreshAlarmDisplay();  // in case alarm won't fit anymore
     }
 
     private void refreshSimOkHeaders(CharSequence plmn, CharSequence spn) {
         final IccCard.State simState = mUpdateMonitor.getSimState();
         if (simState == IccCard.State.READY) {
-            if (plmn != null) {
+            if (plmn != null && !TextUtils.isEmpty(plmn)) {
                 mHeaderSimOk1.setVisibility(View.VISIBLE);
                 mHeaderSimOk1.setText(plmn);
             } else {
                 mHeaderSimOk1.setVisibility(View.GONE);
             }
 
-            if (spn != null) {
+            if (spn != null && !TextUtils.isEmpty(spn)) {
                 mHeaderSimOk2.setVisibility(View.VISIBLE);
                 mHeaderSimOk2.setText(spn);
             } else {