diff options
author | John Spurlock <jspurlock@google.com> | 2014-07-13 11:59:50 -0400 |
---|---|---|
committer | John Spurlock <jspurlock@google.com> | 2014-07-13 12:06:21 -0400 |
commit | 1e6eb17a22056529601c8e413c2da0541d59d93b (patch) | |
tree | 0687b474f9c61b21ac7e09fac0a1b8b54bc764e4 /packages/Keyguard | |
parent | f6e2fcc2eaf5e650237d3c6d79a2de49d2d4111e (diff) | |
download | frameworks_base-1e6eb17a22056529601c8e413c2da0541d59d93b.zip frameworks_base-1e6eb17a22056529601c8e413c2da0541d59d93b.tar.gz frameworks_base-1e6eb17a22056529601c8e413c2da0541d59d93b.tar.bz2 |
QS: Introduce cast control panel.
Make cast controller more granular, at the route level, and
bind a common detail item panel to the available routes.
Fix tile icon, add connecting label.
Remove dialog presentation, no longer needed.
Add the new empty state, and add controller state to dump.
Found a bug in keyguard when in presentation mode, added
a workaround - don't crash when no owner info in keyguard
status view.
Bug:15833210
Change-Id: I19afec390eac2260bccf4a7064065b666b7bceca
Diffstat (limited to 'packages/Keyguard')
-rw-r--r-- | packages/Keyguard/src/com/android/keyguard/KeyguardStatusView.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardStatusView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardStatusView.java index 38316ff..150ab74 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardStatusView.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardStatusView.java @@ -86,7 +86,7 @@ public class KeyguardStatusView extends GridLayout { private void setEnableMarquee(boolean enabled) { if (DEBUG) Log.v(TAG, (enabled ? "Enable" : "Disable") + " transport text marquee"); if (mAlarmStatusView != null) mAlarmStatusView.setSelected(enabled); - mOwnerInfo.setSelected(enabled); + if (mOwnerInfo != null) mOwnerInfo.setSelected(enabled); } @Override @@ -131,6 +131,7 @@ public class KeyguardStatusView extends GridLayout { } private void updateOwnerInfo() { + if (mOwnerInfo == null) return; String ownerInfo = getOwnerInfo(); if (!TextUtils.isEmpty(ownerInfo)) { mOwnerInfo.setVisibility(View.VISIBLE); |