diff options
| author | Jim Miller <jaggies@google.com> | 2013-06-28 16:55:56 -0700 |
|---|---|---|
| committer | Jim Miller <jaggies@google.com> | 2013-06-28 16:55:56 -0700 |
| commit | cf182aac94e181c211b677402517af845a0241bb (patch) | |
| tree | d1fccbd51bbb5dc9c94c94fb07727e2ca7d72668 /packages/Keyguard | |
| parent | afb292a23cd56e6f328164ede81522afe7ef1f89 (diff) | |
| download | frameworks_base-cf182aac94e181c211b677402517af845a0241bb.zip frameworks_base-cf182aac94e181c211b677402517af845a0241bb.tar.gz frameworks_base-cf182aac94e181c211b677402517af845a0241bb.tar.bz2 | |
Minor cleanup of KeyguardViewManager
Removed unused code and redundant check for high-end graphics.
Change-Id: I750d3918e5448760e622a4b3d1781b375bdc66db
Diffstat (limited to 'packages/Keyguard')
| -rw-r--r-- | packages/Keyguard/src/com/android/keyguard/KeyguardViewManager.java | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardViewManager.java b/packages/Keyguard/src/com/android/keyguard/KeyguardViewManager.java index a1d11cd..35bea26 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardViewManager.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardViewManager.java @@ -171,8 +171,6 @@ public class KeyguardViewManager { private void maybeCreateKeyguardLocked(boolean enableScreenRotation, boolean force, Bundle options) { - final boolean isActivity = (mContext instanceof Activity); // for test activity - if (mKeyguardHost != null) { mKeyguardHost.saveHierarchyState(mStateContainer); } @@ -190,9 +188,6 @@ public class KeyguardViewManager { if (!mNeedsInput) { flags |= WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM; } - if (ActivityManager.isHighEndGfx()) { - flags |= WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED; - } final int stretch = ViewGroup.LayoutParams.MATCH_PARENT; final int type = WindowManager.LayoutParams.TYPE_KEYGUARD; @@ -209,11 +204,8 @@ public class KeyguardViewManager { WindowManager.LayoutParams.PRIVATE_FLAG_FORCE_HARDWARE_ACCELERATED; } lp.privateFlags |= WindowManager.LayoutParams.PRIVATE_FLAG_SET_NEEDS_MENU_KEY; - if (isActivity) { - lp.privateFlags |= WindowManager.LayoutParams.PRIVATE_FLAG_SHOW_FOR_ALL_USERS; - } lp.inputFeatures |= WindowManager.LayoutParams.INPUT_FEATURE_DISABLE_USER_ACTIVITY; - lp.setTitle(isActivity ? "KeyguardMock" : "Keyguard"); + lp.setTitle("Keyguard"); mWindowLayoutParams = lp; mViewManager.addView(mKeyguardHost, lp); } @@ -233,9 +225,6 @@ public class KeyguardViewManager { if (v != null) { mKeyguardHost.removeView(v); } - // TODO: Remove once b/7094175 is fixed - if (false) Slog.d(TAG, "inflateKeyguardView: b/7094175 mContext.config=" - + mContext.getResources().getConfiguration()); final LayoutInflater inflater = LayoutInflater.from(mContext); View view = inflater.inflate(R.layout.keyguard_host_view, mKeyguardHost, true); mKeyguardView = (KeyguardHostView) view.findViewById(R.id.keyguard_host_view); |