Add invisible lockscreen and custom message. (ccf92291) · Commits · e / os / android_frameworks_base

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

+11 −0

Original line number	Diff line number	Diff line
		@@ -69,6 +69,8 @@ class LockScreen extends LinearLayout implements KeyguardScreen, KeyguardUpdateM
		private TextView mEmergencyCallText;
		private Button mEmergencyCallButton;

		private TextView mCustomMsg;

		// current configuration state of keyboard and display
		private int mKeyboardHidden;
		private int mCreationOrientation;
		@@ -204,6 +206,15 @@ class LockScreen extends LinearLayout implements KeyguardScreen, KeyguardUpdateM
		mStatus1 = (TextView) findViewById(R.id.status1);
		mStatus2 = (TextView) findViewById(R.id.status2);

		mCustomMsg = (TextView) findViewById(R.id.customMsg);

		if (mLockPatternUtils.isShowCustomMsg()) {
		mCustomMsg.setVisibility(View.VISIBLE);
		mCustomMsg.setText(mLockPatternUtils.getCustomMsg());
		} else {
		mCustomMsg.setVisibility(View.GONE);
		}

		mScreenLocked = (TextView) findViewById(R.id.screenLocked);
		mSelector = (SlidingTab) findViewById(R.id.tab_selector);
		mSelector.setHoldAfterTrigger(true, false);

policy/src/com/android/internal/policy/impl/PatternUnlockScreen.java

+19 −4

Original line number	Diff line number	Diff line
		@@ -95,7 +95,7 @@ class PatternUnlockScreen extends LinearLayoutWithDefaultTouchRecepient
		private TextView mStatus1;
		private TextView mStatusSep;
		private TextView mStatus2;

		private TextView mCustomMsg;

		private LockPatternView mLockPatternView;

		@@ -236,6 +236,10 @@ class PatternUnlockScreen extends LinearLayoutWithDefaultTouchRecepient
		mLockPatternView.setFocusable(false);
		mLockPatternView.setOnPatternListener(new UnlockPatternListener());

		mLockPatternView.setVisibleDots(mLockPatternUtils.isVisibleDotsEnabled());
		mLockPatternView.setShowErrorPath(mLockPatternUtils.isShowErrorPath());
		mLockPatternView.setIncorrectDelay(mLockPatternUtils.getIncorrectDelay());

		// stealth mode will be the same for the life of this screen
		mLockPatternView.setInStealthMode(!mLockPatternUtils.isVisiblePatternEnabled());

		@@ -290,7 +294,13 @@ class PatternUnlockScreen extends LinearLayoutWithDefaultTouchRecepient
		R.drawable.ic_lock_idle_lock, 0, 0, 0);
		}

		if (mInstructions.equals(getContext().getString(R.string.lockscreen_pattern_wrong))
		&& !mLockPatternUtils.isShowUnlockErrMsg()) {
		mStatus1.setVisibility(View.GONE);
		} else {
		mStatus1.setVisibility(View.VISIBLE);
		}

		mStatusSep.setVisibility(View.GONE);
		mStatus2.setVisibility(View.GONE);
		} else if (mShowingBatteryInfo && mNextAlarm == null) {
		@@ -332,7 +342,12 @@ class PatternUnlockScreen extends LinearLayoutWithDefaultTouchRecepient
		mStatus2.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
		}

		if (mLockPatternUtils.isShowUnlockMsg()) {
		mStatus1.setVisibility(View.VISIBLE);
		} else {
		mStatus1.setVisibility(View.GONE);
		}

		mStatusSep.setVisibility(View.VISIBLE);
		mStatus2.setVisibility(View.VISIBLE);
		} else {
		@@ -537,7 +552,7 @@ class PatternUnlockScreen extends LinearLayoutWithDefaultTouchRecepient
		updateStatusLines();
		mLockPatternView.postDelayed(
		mCancelPatternRunnable,
		PATTERN_CLEAR_TIMEOUT_MS);
		mLockPatternView.getIncorrectDelay());
		}
		}
		}