diff options
Diffstat (limited to 'packages/Keyguard')
13 files changed, 15 insertions, 508 deletions
diff --git a/packages/Keyguard/res/drawable-hdpi/ic_action_assist_generic_activated.png b/packages/Keyguard/res/drawable-hdpi/ic_action_assist_generic_activated.png Binary files differdeleted file mode 100644 index c0e2098..0000000 --- a/packages/Keyguard/res/drawable-hdpi/ic_action_assist_generic_activated.png +++ /dev/null diff --git a/packages/Keyguard/res/drawable-hdpi/ic_action_assist_generic_normal.png b/packages/Keyguard/res/drawable-hdpi/ic_action_assist_generic_normal.png Binary files differdeleted file mode 100644 index a852e2c..0000000 --- a/packages/Keyguard/res/drawable-hdpi/ic_action_assist_generic_normal.png +++ /dev/null diff --git a/packages/Keyguard/res/drawable-mdpi/ic_action_assist_generic_activated.png b/packages/Keyguard/res/drawable-mdpi/ic_action_assist_generic_activated.png Binary files differdeleted file mode 100644 index f88f7e1..0000000 --- a/packages/Keyguard/res/drawable-mdpi/ic_action_assist_generic_activated.png +++ /dev/null diff --git a/packages/Keyguard/res/drawable-mdpi/ic_action_assist_generic_normal.png b/packages/Keyguard/res/drawable-mdpi/ic_action_assist_generic_normal.png Binary files differdeleted file mode 100644 index 7426994..0000000 --- a/packages/Keyguard/res/drawable-mdpi/ic_action_assist_generic_normal.png +++ /dev/null diff --git a/packages/Keyguard/res/drawable-xhdpi/ic_action_assist_generic_activated.png b/packages/Keyguard/res/drawable-xhdpi/ic_action_assist_generic_activated.png Binary files differdeleted file mode 100644 index 500b157..0000000 --- a/packages/Keyguard/res/drawable-xhdpi/ic_action_assist_generic_activated.png +++ /dev/null diff --git a/packages/Keyguard/res/drawable-xhdpi/ic_action_assist_generic_normal.png b/packages/Keyguard/res/drawable-xhdpi/ic_action_assist_generic_normal.png Binary files differdeleted file mode 100644 index d0e4cf3..0000000 --- a/packages/Keyguard/res/drawable-xhdpi/ic_action_assist_generic_normal.png +++ /dev/null diff --git a/packages/Keyguard/res/drawable/ic_action_assist_generic.xml b/packages/Keyguard/res/drawable/ic_action_assist_generic.xml deleted file mode 100644 index 60f5d5d..0000000 --- a/packages/Keyguard/res/drawable/ic_action_assist_generic.xml +++ /dev/null @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2012 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - - <item - android:state_enabled="true" - android:state_active="false" - android:state_focused="false" - android:drawable="@drawable/ic_action_assist_generic_normal" /> - - <item - android:state_enabled="true" - android:state_active="true" - android:state_focused="false" - android:drawable="@drawable/ic_action_assist_generic_activated" /> - - <item - android:state_enabled="true" - android:state_active="false" - android:state_focused="true" - android:drawable="@drawable/ic_action_assist_generic_activated" /> - -</selector> diff --git a/packages/Keyguard/res/layout/keyguard_glow_pad_view.xml b/packages/Keyguard/res/layout/keyguard_glow_pad_view.xml index 3a466dd..2432336 100644 --- a/packages/Keyguard/res/layout/keyguard_glow_pad_view.xml +++ b/packages/Keyguard/res/layout/keyguard_glow_pad_view.xml @@ -28,10 +28,6 @@ android:orientation="horizontal" android:gravity="@integer/kg_selector_gravity" android:contentDescription="@string/keyguard_accessibility_slide_area" - - prvandroid:targetDrawables="@array/lockscreen_targets_unlock_only" - prvandroid:targetDescriptions="@array/lockscreen_target_descriptions_unlock_only" - prvandroid:directionDescriptions="@array/lockscreen_direction_descriptions" prvandroid:handleDrawable="@drawable/ic_lockscreen_handle" prvandroid:outerRingDrawable="@drawable/ic_lockscreen_outerring" prvandroid:outerRadius="@dimen/glowpadview_target_placement_radius" diff --git a/packages/Keyguard/res/values-land/arrays.xml b/packages/Keyguard/res/values-land/arrays.xml deleted file mode 100644 index 240b9e4..0000000 --- a/packages/Keyguard/res/values-land/arrays.xml +++ /dev/null @@ -1,72 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* //device/apps/common/assets/res/any/colors.xml -** -** Copyright 2006, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ ---> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - - <!-- Resources for GlowPadView in LockScreen --> - <array name="lockscreen_targets_when_silent"> - <item>@null</item>" - <item>@drawable/ic_action_assist_generic</item> - <item>@drawable/ic_lockscreen_soundon</item> - <item>@drawable/ic_lockscreen_unlock</item> - </array> - - <array name="lockscreen_target_descriptions_when_silent"> - <item>@null</item> - <item>@string/description_target_search</item> - <item>@string/description_target_soundon</item> - <item>@string/description_target_unlock</item> - </array> - - <array name="lockscreen_direction_descriptions"> - <item>@null</item> - <item>@string/description_direction_up</item> - <item>@string/description_direction_left</item> - <item>@string/description_direction_down</item> - </array> - - <array name="lockscreen_targets_when_soundon"> - <item>@null</item> - <item>@drawable/ic_action_assist_generic</item> - <item>@drawable/ic_lockscreen_silent</item> - <item>@drawable/ic_lockscreen_unlock</item> - </array> - - <array name="lockscreen_target_descriptions_when_soundon"> - <item>@null</item> - <item>@string/description_target_search</item> - <item>@string/description_target_silent</item> - <item>@string/description_target_unlock</item> - </array> - - <array name="lockscreen_targets_with_camera"> - <item>@null</item> - <item>@drawable/ic_action_assist_generic</item> - <item>@drawable/ic_lockscreen_camera</item> - <item>@drawable/ic_lockscreen_unlock</item> - </array> - - <array name="lockscreen_target_descriptions_with_camera"> - <item>@null</item> - <item>@string/description_target_search</item> - <item>@string/description_target_camera</item> - <item>@string/description_target_unlock</item> - </array> - -</resources> diff --git a/packages/Keyguard/res/values-sw600dp-land/arrays.xml b/packages/Keyguard/res/values-sw600dp-land/arrays.xml deleted file mode 100644 index 5550216..0000000 --- a/packages/Keyguard/res/values-sw600dp-land/arrays.xml +++ /dev/null @@ -1,72 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* //device/apps/common/assets/res/any/colors.xml -** -** Copyright 2006, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ ---> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - - <!-- Resources for GlowPadView in LockScreen --> - <array name="lockscreen_targets_when_silent"> - <item>@drawable/ic_lockscreen_unlock</item> - <item>@null</item> - <item>@drawable/ic_lockscreen_soundon</item> - <item>@null</item> - </array> - - <array name="lockscreen_target_descriptions_when_silent"> - <item>@string/description_target_unlock</item> - <item>@null</item> - <item>@string/description_target_soundon</item> - <item>@null</item> - </array> - - <array name="lockscreen_direction_descriptions"> - <item>@string/description_direction_right</item> - <item>@null</item> - <item>@string/description_direction_left</item> - <item>@null</item> - </array> - - <array name="lockscreen_targets_when_soundon"> - <item>@drawable/ic_lockscreen_unlock</item> - <item>@null</item> - <item>@drawable/ic_lockscreen_silent</item> - <item>@null</item> - </array> - - <array name="lockscreen_target_descriptions_when_soundon"> - <item>@string/description_target_unlock</item> - <item>@null</item> - <item>@string/description_target_silent</item> - <item>@null</item> - </array> - - <array name="lockscreen_targets_with_camera"> - <item>@drawable/ic_lockscreen_unlock</item> - <item>@drawable/ic_action_assist_generic</item> - <item>@drawable/ic_lockscreen_camera</item> - <item>@null</item> - </array> - - <array name="lockscreen_target_descriptions_with_camera"> - <item>@string/description_target_unlock</item> - <item>@string/description_target_search</item> - <item>@string/description_target_camera</item> - <item>@null</item> - </array> - -</resources> diff --git a/packages/Keyguard/res/values/arrays.xml b/packages/Keyguard/res/values/arrays.xml index 291f776..a8b3c1b 100644 --- a/packages/Keyguard/res/values/arrays.xml +++ b/packages/Keyguard/res/values/arrays.xml @@ -19,64 +19,6 @@ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <!-- Resources for GlowPadView in LockScreen --> - <array name="lockscreen_targets_when_silent"> - <item>@drawable/ic_lockscreen_unlock</item> - <item>@drawable/ic_action_assist_generic</item> - <item>@drawable/ic_lockscreen_soundon</item> - <item>@null</item> - </array> - - <array name="lockscreen_target_descriptions_when_silent"> - <item>@string/description_target_unlock</item> - <item>@string/description_target_search</item> - <item>@string/description_target_soundon</item> - <item>@null</item> - </array> - - <array name="lockscreen_direction_descriptions"> - <item>@string/description_direction_right</item> - <item>@string/description_direction_up</item> - <item>@string/description_direction_left</item> - <item>@null</item> - </array> - - <array name="lockscreen_targets_when_soundon"> - <item>@drawable/ic_lockscreen_unlock</item> - <item>@drawable/ic_action_assist_generic</item> - <item>@drawable/ic_lockscreen_silent</item> - <item>@null</item> - </array> - - <array name="lockscreen_target_descriptions_when_soundon"> - <item>@string/description_target_unlock</item> - <item>@string/description_target_search</item> - <item>@string/description_target_silent</item> - <item>@null</item> - </array> - - <array name="lockscreen_targets_with_camera"> - <item>@drawable/ic_lockscreen_unlock</item> - <item>@drawable/ic_action_assist_generic</item> - <item>@drawable/ic_lockscreen_camera</item> - <item>@null</item> - </array> - - <array name="lockscreen_target_descriptions_with_camera"> - <item>@string/description_target_unlock</item> - <item>@string/description_target_search</item> - <item>@string/description_target_camera</item> - <item>@null</item> - </array> - - <array name="lockscreen_targets_unlock_only"> - <item>@drawable/ic_lockscreen_unlock</item> - </array> - - <array name="lockscreen_target_descriptions_unlock_only"> - <item>@string/description_target_unlock</item> - </array> - <!-- list of 3- or 4-letter mnemonics for a 10-key numeric keypad --> <string-array translatable="false" name="lockscreen_num_pad_klondike"> <item>+</item><!-- 0 --> diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java b/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java index 7727e4a..9dd6bc2 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java @@ -73,16 +73,22 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe @Override public void onResume(int reason) { - getSecurityView(mCurrentSecuritySelection).onResume(reason); + if (mCurrentSecuritySelection != SecurityMode.None) { + getSecurityView(mCurrentSecuritySelection).onResume(reason); + } } @Override public void onPause() { - getSecurityView(mCurrentSecuritySelection).onPause(); + if (mCurrentSecuritySelection != SecurityMode.None) { + getSecurityView(mCurrentSecuritySelection).onPause(); + } } public void startAppearAnimation() { - getSecurityView(mCurrentSecuritySelection).startAppearAnimation(); + if (mCurrentSecuritySelection != SecurityMode.None) { + getSecurityView(mCurrentSecuritySelection).startAppearAnimation(); + } } void updateSecurityViews(boolean isBouncing) { @@ -119,12 +125,6 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe view = (KeyguardSecurityView)v; } - if (view instanceof KeyguardSelectorView) { - KeyguardSelectorView selectorView = (KeyguardSelectorView) view; - View carrierText = selectorView.findViewById(R.id.keyguard_selector_fade_container); - selectorView.setCarrierArea(carrierText); - } - return view; } @@ -375,8 +375,10 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe oldView.onPause(); oldView.setKeyguardCallback(mNullCallback); // ignore requests from old view } - newView.onResume(KeyguardSecurityView.VIEW_REVEALED); - newView.setKeyguardCallback(mCallback); + if (securityMode != SecurityMode.None) { + newView.onResume(KeyguardSecurityView.VIEW_REVEALED); + newView.setKeyguardCallback(mCallback); + } // Find and show this child. final int childCount = mSecurityViewFlipper.getChildCount(); @@ -390,7 +392,8 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe } mCurrentSecuritySelection = securityMode; - mSecurityCallback.onSecurityModeChanged(securityMode, newView.needsInput()); + mSecurityCallback.onSecurityModeChanged(securityMode, + securityMode != SecurityMode.None && newView.needsInput()); } private KeyguardSecurityViewFlipper getFlipper() { @@ -472,7 +475,6 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe private int getSecurityViewIdForMode(SecurityMode securityMode) { switch (securityMode) { - case None: return R.id.keyguard_selector_view; case Pattern: return R.id.keyguard_pattern_view; case PIN: return R.id.keyguard_pin_view; case Password: return R.id.keyguard_password_view; @@ -486,7 +488,6 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe private int getLayoutIdFor(SecurityMode securityMode) { switch (securityMode) { - case None: return R.layout.keyguard_selector_view; case Pattern: return R.layout.keyguard_pattern_view; case PIN: return R.layout.keyguard_pin_view; case Password: return R.layout.keyguard_password_view; diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardSelectorView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardSelectorView.java deleted file mode 100644 index 85bd87d..0000000 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardSelectorView.java +++ /dev/null @@ -1,252 +0,0 @@ -/* - * Copyright (C) 2012 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.android.keyguard; - -import android.animation.ObjectAnimator; -import android.app.SearchManager; -import android.app.admin.DevicePolicyManager; -import android.content.ComponentName; -import android.content.Context; -import android.content.Intent; -import android.graphics.drawable.Drawable; -import android.os.UserHandle; -import android.provider.Settings; -import android.util.AttributeSet; -import android.util.Log; -import android.util.Slog; -import android.view.View; -import android.widget.LinearLayout; - -import com.android.internal.telephony.IccCardConstants.State; -import com.android.internal.widget.LockPatternUtils; -import com.android.internal.widget.multiwaveview.GlowPadView; -import com.android.internal.widget.multiwaveview.GlowPadView.OnTriggerListener; - -public class KeyguardSelectorView extends LinearLayout implements KeyguardSecurityView { - private static final String TAG = "SecuritySelectorView"; - private static final String ASSIST_ICON_METADATA_NAME = - "com.android.systemui.action_assist_icon"; - - private KeyguardSecurityCallback mCallback; - private GlowPadView mGlowPadView; - private ObjectAnimator mAnim; - private View mFadeView; - private boolean mIsBouncing; - private boolean mCameraDisabled; - private boolean mSearchDisabled; - private LockPatternUtils mLockPatternUtils; - private SecurityMessageDisplay mSecurityMessageDisplay; - private Drawable mBouncerFrame; - - OnTriggerListener mOnTriggerListener = new OnTriggerListener() { - - public void onTrigger(View v, int target) { - final int resId = mGlowPadView.getResourceIdForTarget(target); - - if (resId == R.drawable.ic_lockscreen_unlock_phantom - || resId == R.drawable.ic_lockscreen_unlock) { - mCallback.userActivity(); - mCallback.dismiss(false); - } - } - - public void onReleased(View v, int handle) { - if (!mIsBouncing) { - doTransition(mFadeView, 1.0f); - } - } - - public void onGrabbed(View v, int handle) { - mCallback.userActivity(); - doTransition(mFadeView, 0.0f); - } - - public void onGrabbedStateChange(View v, int handle) { - - } - - public void onFinishFinalAnimation() { - - } - - }; - - KeyguardUpdateMonitorCallback mUpdateCallback = new KeyguardUpdateMonitorCallback() { - - @Override - public void onDevicePolicyManagerStateChanged() { - updateTargets(); - } - - @Override - public void onSimStateChanged(State simState) { - updateTargets(); - } - }; - - public KeyguardSelectorView(Context context) { - this(context, null); - } - - public KeyguardSelectorView(Context context, AttributeSet attrs) { - super(context, attrs); - mLockPatternUtils = new LockPatternUtils(getContext()); - } - - @Override - protected void onFinishInflate() { - super.onFinishInflate(); - mGlowPadView = (GlowPadView) findViewById(R.id.glow_pad_view); - mGlowPadView.setOnTriggerListener(mOnTriggerListener); - updateTargets(); - - mSecurityMessageDisplay = new KeyguardMessageArea.Helper(this); - View bouncerFrameView = findViewById(R.id.keyguard_selector_view_frame); - mBouncerFrame = bouncerFrameView.getBackground(); - } - - public void setCarrierArea(View carrierArea) { - mFadeView = carrierArea; - } - - public boolean isTargetPresent(int resId) { - return mGlowPadView.getTargetPosition(resId) != -1; - } - - @Override - public void showUsabilityHint() { - mGlowPadView.ping(); - } - - private void updateTargets() { - int currentUserHandle = mLockPatternUtils.getCurrentUser(); - DevicePolicyManager dpm = mLockPatternUtils.getDevicePolicyManager(); - int disabledFeatures = dpm.getKeyguardDisabledFeatures(null, currentUserHandle); - boolean secureCameraDisabled = mLockPatternUtils.isSecure() - && (disabledFeatures & DevicePolicyManager.KEYGUARD_DISABLE_SECURE_CAMERA) != 0; - boolean cameraDisabledByAdmin = dpm.getCameraDisabled(null, currentUserHandle) - || secureCameraDisabled; - final KeyguardUpdateMonitor monitor = KeyguardUpdateMonitor.getInstance(getContext()); - boolean disabledBySimState = monitor.isSimLocked(); - boolean cameraTargetPresent = - isTargetPresent(R.drawable.ic_lockscreen_camera); - boolean searchTargetPresent = - isTargetPresent(R.drawable.ic_action_assist_generic); - - if (cameraDisabledByAdmin) { - Log.v(TAG, "Camera disabled by Device Policy"); - } else if (disabledBySimState) { - Log.v(TAG, "Camera disabled by Sim State"); - } - boolean currentUserSetup = 0 != Settings.Secure.getIntForUser( - mContext.getContentResolver(), - Settings.Secure.USER_SETUP_COMPLETE, - 0 /*default */, - currentUserHandle); - boolean searchActionAvailable = - ((SearchManager) mContext.getSystemService(Context.SEARCH_SERVICE)) - .getAssistIntent(mContext, false, UserHandle.USER_CURRENT) != null; - mCameraDisabled = cameraDisabledByAdmin || disabledBySimState || !cameraTargetPresent - || !currentUserSetup; - mSearchDisabled = disabledBySimState || !searchActionAvailable || !searchTargetPresent - || !currentUserSetup; - updateResources(); - } - - public void updateResources() { - // Update the search icon with drawable from the search .apk - if (!mSearchDisabled) { - Intent intent = ((SearchManager) mContext.getSystemService(Context.SEARCH_SERVICE)) - .getAssistIntent(mContext, false, UserHandle.USER_CURRENT); - if (intent != null) { - // XXX Hack. We need to substitute the icon here but haven't formalized - // the public API. The "_google" metadata will be going away, so - // DON'T USE IT! - ComponentName component = intent.getComponent(); - boolean replaced = mGlowPadView.replaceTargetDrawablesIfPresent(component, - ASSIST_ICON_METADATA_NAME + "_google", R.drawable.ic_action_assist_generic); - - if (!replaced && !mGlowPadView.replaceTargetDrawablesIfPresent(component, - ASSIST_ICON_METADATA_NAME, R.drawable.ic_action_assist_generic)) { - Slog.w(TAG, "Couldn't grab icon from package " + component); - } - } - } - - mGlowPadView.setEnableTarget(R.drawable.ic_lockscreen_camera, !mCameraDisabled); - mGlowPadView.setEnableTarget(R.drawable.ic_action_assist_generic, !mSearchDisabled); - } - - void doTransition(View view, float to) { - if (mAnim != null) { - mAnim.cancel(); - } - mAnim = ObjectAnimator.ofFloat(view, "alpha", to); - mAnim.start(); - } - - public void setKeyguardCallback(KeyguardSecurityCallback callback) { - mCallback = callback; - } - - public void setLockPatternUtils(LockPatternUtils utils) { - mLockPatternUtils = utils; - } - - @Override - public void reset() { - mGlowPadView.reset(false); - } - - @Override - public boolean needsInput() { - return false; - } - - @Override - public void onPause() { - KeyguardUpdateMonitor.getInstance(getContext()).removeCallback(mUpdateCallback); - } - - @Override - public void onResume(int reason) { - KeyguardUpdateMonitor.getInstance(getContext()).registerCallback(mUpdateCallback); - } - - @Override - public KeyguardSecurityCallback getCallback() { - return mCallback; - } - - @Override - public void showBouncer(int duration) { - mIsBouncing = true; - KeyguardSecurityViewHelper. - showBouncer(mSecurityMessageDisplay, mFadeView, mBouncerFrame, duration); - } - - @Override - public void hideBouncer(int duration) { - mIsBouncing = false; - KeyguardSecurityViewHelper. - hideBouncer(mSecurityMessageDisplay, mFadeView, mBouncerFrame, duration); - } - - @Override - public void startAppearAnimation() { - // noop. - } -} |
