diff options
| author | Jason Monk <jmonk@google.com> | 2014-12-02 16:43:17 -0500 |
|---|---|---|
| committer | Jason Monk <jmonk@google.com> | 2014-12-04 17:29:12 -0500 |
| commit | 9ff69bd8f115e70a16c72c798449908536a173ea (patch) | |
| tree | 9a9c6fa10e4c9ac142c9409a9c1268460947144c /packages/Keyguard/src/com/android/keyguard/KeyguardMessageArea.java | |
| parent | 1fb699360d1b193c5144c7dcf209d8dc8dfbb8b8 (diff) | |
| download | frameworks_base-9ff69bd8f115e70a16c72c798449908536a173ea.zip frameworks_base-9ff69bd8f115e70a16c72c798449908536a173ea.tar.gz frameworks_base-9ff69bd8f115e70a16c72c798449908536a173ea.tar.bz2 | |
Make CarrierText handle multi-sim
To do this need to handle the subscription id that comes with all
spn broadcasts and concatenate properly as needed.
Bug: 18223317
Change-Id: I2a1cde0a4bf2f50082288cc5cdeb968fa9aa7dd0
Diffstat (limited to 'packages/Keyguard/src/com/android/keyguard/KeyguardMessageArea.java')
| -rw-r--r-- | packages/Keyguard/src/com/android/keyguard/KeyguardMessageArea.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardMessageArea.java b/packages/Keyguard/src/com/android/keyguard/KeyguardMessageArea.java index 9bc2a4d..236cbf6 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardMessageArea.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardMessageArea.java @@ -153,7 +153,8 @@ class KeyguardMessageArea extends TextView { mUpdateMonitor.registerCallback(mInfoCallback); mHandler = new Handler(Looper.myLooper()); - mSeparator = getResources().getString(R.string.kg_text_message_separator); + mSeparator = getResources().getString( + com.android.internal.R.string.kg_text_message_separator); update(); } |