diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2014-04-28 12:18:43 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-04-28 12:18:44 +0000 |
| commit | b039603867176c01c84ec1cbae681cb9868a4525 (patch) | |
| tree | 7d43343896eacf635448684ea4e2769b773e30b5 /packages/SystemUI/src/com | |
| parent | df2258be5bd9df4f9a31c4389e8b07b996d26f0b (diff) | |
| parent | 25807936e8e4ca2c811bb4121725e1dd87e18efd (diff) | |
| download | frameworks_base-b039603867176c01c84ec1cbae681cb9868a4525.zip frameworks_base-b039603867176c01c84ec1cbae681cb9868a4525.tar.gz frameworks_base-b039603867176c01c84ec1cbae681cb9868a4525.tar.bz2 | |
Merge "Add carrier text on lockscreen in top left corner."
Diffstat (limited to 'packages/SystemUI/src/com')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java index a274de6d..0e5e2f4 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -247,6 +247,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode { private int mCarrierLabelHeight; private TextView mEmergencyCallLabel; private int mNotificationHeaderHeight; + private View mKeyguardCarrierLabel; private boolean mShowCarrierInPanel = false; @@ -616,6 +617,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode { (NotificationOverflowContainer) LayoutInflater.from(mContext).inflate( R.layout.status_bar_notification_keyguard_overflow, mStackScroller, false); mKeyguardIconOverflowContainer.setOnActivatedListener(this); + mKeyguardCarrierLabel = mStatusBarWindow.findViewById(R.id.keyguard_carrier_text); mStackScroller.addView(mKeyguardIconOverflowContainer); mExpandedContents = mStackScroller; @@ -1344,7 +1346,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode { !(emergencyCallsShownElsewhere && mNetworkController.isEmergencyOnly()) && mStackScroller.getHeight() < (mNotificationPanel.getHeight() - mCarrierLabelHeight - mNotificationHeaderHeight) - && mStackScroller.getVisibility() == View.VISIBLE; + && mStackScroller.getVisibility() == View.VISIBLE + && !mOnKeyguard; if (force || mCarrierLabelVisible != makeVisible) { mCarrierLabelVisible = makeVisible; @@ -2956,6 +2959,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode { mKeyguardBottomArea.setVisibility(View.VISIBLE); mKeyguardIndicationTextView.setVisibility(View.VISIBLE); mKeyguardIndicationTextView.switchIndication(mKeyguardHotwordPhrase); + mKeyguardCarrierLabel.setVisibility(View.VISIBLE); mNotificationPanelHeader.setVisibility(View.GONE); mKeyguardFlipper.setVisibility(View.VISIBLE); @@ -2964,6 +2968,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode { mKeyguardStatusView.setVisibility(View.GONE); mKeyguardBottomArea.setVisibility(View.GONE); mKeyguardIndicationTextView.setVisibility(View.GONE); + mKeyguardCarrierLabel.setVisibility(View.GONE); mNotificationPanelHeader.setVisibility(View.VISIBLE); mKeyguardFlipper.setVisibility(View.GONE); @@ -2974,6 +2979,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode { updateRowStates(); checkBarModes(); updateNotificationIcons(); + updateCarrierLabelVisibility(false); } public void userActivity() { |