Merge "Add carrier text on lockscreen in top left corner." (b0396038) · Commits · e / os / android_frameworks_base

packages/Keyguard/res/layout/keyguard_emergency_carrier_area.xml

+3 −1

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@
		<!-- This contains emergency call button and carrier as shared by pin/pattern/password screens -->
		<com.android.keyguard.EmergencyCarrierArea
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:androidprv="http://schemas.android.com/apk/res-auto"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical"
		@@ -35,7 +36,8 @@
		android:ellipsize="marquee"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:textSize="@dimen/kg_status_line_font_size"
		android:textColor="?android:attr/textColorSecondary" />
		android:textColor="?android:attr/textColorSecondary"
		androidprv:allCaps="@bool/kg_use_all_caps" />

		<LinearLayout
		android:layout_width="match_parent"

packages/Keyguard/res/values/attrs.xml

+4 −0

Original line number	Diff line number	Diff line
		@@ -133,4 +133,8 @@
		<attr name="digit" format="integer" />
		<attr name="textView" format="reference" />
		</declare-styleable>

		<declare-styleable name="CarrierText">
		<attr name="allCaps" format="boolean" />
		</declare-styleable>
		</resources>

packages/Keyguard/src/com/android/keyguard/CarrierText.java

+9 −1

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package com.android.keyguard;

		import android.content.Context;
		import android.content.res.TypedArray;
		import android.text.method.SingleLineTransformationMethod;
		import android.text.TextUtils;
		import android.util.AttributeSet;
		@@ -81,7 +82,14 @@ public class CarrierText extends TextView {
		public CarrierText(Context context, AttributeSet attrs) {
		super(context, attrs);
		mLockPatternUtils = new LockPatternUtils(mContext);
		boolean useAllCaps = mContext.getResources().getBoolean(R.bool.kg_use_all_caps);
		boolean useAllCaps;
		TypedArray a = context.getTheme().obtainStyledAttributes(
		attrs, R.styleable.CarrierText, 0, 0);
		try {
		useAllCaps = a.getBoolean(R.styleable.CarrierText_allCaps, false);
		} finally {
		a.recycle();
		}
		setTransformationMethod(new CarrierTextTransformationMethod(mContext, useAllCaps));
		}

packages/SystemUI/res/layout/status_bar_expanded.xml

+9 −0

Original line number	Diff line number	Diff line
		@@ -45,6 +45,15 @@
		android:layout_marginTop="@dimen/status_bar_height"
		android:visibility="gone" />

		<com.android.keyguard.CarrierText
		android:id="@+id/keyguard_carrier_text"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginTop="2dp"
		android:layout_marginLeft="8dp"
		android:ellipsize="marquee"
		android:textAppearance="?android:attr/textAppearanceMedium" />

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -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() {