diff options
author | Joe Onorato <joeo@android.com> | 2010-05-02 16:28:15 -0700 |
---|---|---|
committer | Joe Onorato <joeo@android.com> | 2010-06-02 14:48:41 -0700 |
commit | 0cbda99f8721ad9b03ada04d2637fb75a2a0feca (patch) | |
tree | 99b716653b139e560223dfc764bfc9a746df7bb5 /policy | |
parent | 503007dd023668b1e45de948d3673e594d7f5a82 (diff) | |
download | frameworks_base-0cbda99f8721ad9b03ada04d2637fb75a2a0feca.zip frameworks_base-0cbda99f8721ad9b03ada04d2637fb75a2a0feca.tar.gz frameworks_base-0cbda99f8721ad9b03ada04d2637fb75a2a0feca.tar.bz2 |
The status bar draws its icons now.
Diffstat (limited to 'policy')
-rw-r--r-- | policy/com/android/internal/policy/impl/KeyguardViewMediator.java | 17 | ||||
-rwxr-xr-x | policy/com/android/internal/policy/impl/PhoneWindowManager.java | 2 |
2 files changed, 10 insertions, 9 deletions
diff --git a/policy/com/android/internal/policy/impl/KeyguardViewMediator.java b/policy/com/android/internal/policy/impl/KeyguardViewMediator.java index c255041..eb61f5e 100644 --- a/policy/com/android/internal/policy/impl/KeyguardViewMediator.java +++ b/policy/com/android/internal/policy/impl/KeyguardViewMediator.java @@ -145,8 +145,8 @@ public class KeyguardViewMediator implements KeyguardViewCallback, private Context mContext; private AlarmManager mAlarmManager; private StatusBarManager mStatusBarManager; - private boolean mShowLockIcon = false; - private IBinder mSecureLockIcon = null; + private boolean mShowLockIcon; + private boolean mShowingLockIcon; private boolean mSystemReady; @@ -1036,14 +1036,15 @@ public class KeyguardViewMediator implements KeyguardViewCallback, if (mShowLockIcon) { // Give feedback to user when secure keyguard is active and engaged if (mShowing && isSecure()) { - if (mSecureLockIcon == null) { - mSecureLockIcon = mStatusBarManager.addIcon("secure", - com.android.internal.R.drawable.stat_sys_secure, 0); + if (!mShowingLockIcon) { + mStatusBarManager.setIcon("secure", + com.android.internal.R.drawable.stat_sys_secure, 0); + mShowingLockIcon = true; } } else { - if (mSecureLockIcon != null) { - mStatusBarManager.removeIcon(mSecureLockIcon); - mSecureLockIcon = null; + if (mShowingLockIcon) { + mStatusBarManager.removeIcon("secure"); + mShowingLockIcon = false; } } } diff --git a/policy/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/com/android/internal/policy/impl/PhoneWindowManager.java index 20c5edd..11ebd0f 100755 --- a/policy/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/com/android/internal/policy/impl/PhoneWindowManager.java @@ -19,7 +19,6 @@ package com.android.internal.policy.impl; import android.app.Activity; import android.app.ActivityManagerNative; import android.app.IActivityManager; -import android.app.IStatusBarService; import android.app.IUiModeManager; import android.app.UiModeManager; import android.content.ActivityNotFoundException; @@ -47,6 +46,7 @@ import android.os.Vibrator; import android.provider.Settings; import com.android.internal.policy.PolicyManager; +import com.android.internal.statusbar.IStatusBarService; import com.android.internal.telephony.ITelephony; import com.android.internal.widget.PointerLocationView; |