From 8ca2fc10ceac645a04c8223947df03f359441115 Mon Sep 17 00:00:00 2001 From: Jim Miller Date: Tue, 11 Dec 2012 17:37:53 -0800 Subject: [PATCH] Remove unused keyguard code This change removes the old keyguard code because it's obsolete and doesn't run anymore. Change-Id: I8ed93f507378a17cf834d2ee9284c098eb8efffe --- .../android/internal/widget/DigitalClock.java | 245 ---- .../keyguard_screen_glogin_unlock.xml | 136 -- .../layout-sw600dp/keyguard_screen_lock.xml | 218 --- .../keyguard_screen_password_landscape.xml | 184 --- .../keyguard_screen_password_portrait.xml | 187 --- .../keyguard_screen_sim_pin_landscape.xml | 122 -- .../keyguard_screen_sim_pin_portrait.xml | 120 -- .../keyguard_screen_status_land.xml | 123 -- .../keyguard_screen_status_port.xml | 123 -- .../keyguard_screen_tab_unlock.xml | 124 -- .../keyguard_screen_tab_unlock_land.xml | 124 -- .../keyguard_screen_unlock_landscape.xml | 157 -- .../keyguard_screen_unlock_portrait.xml | 150 -- .../layout/keyguard_screen_glogin_unlock.xml | 126 -- core/res/res/layout/keyguard_screen_lock.xml | 219 --- .../keyguard_screen_password_landscape.xml | 241 --- .../keyguard_screen_password_portrait.xml | 231 --- .../keyguard_screen_sim_pin_landscape.xml | 120 -- .../keyguard_screen_sim_pin_portrait.xml | 120 -- .../keyguard_screen_sim_puk_landscape.xml | 184 --- .../keyguard_screen_sim_puk_portrait.xml | 170 --- .../res/layout/keyguard_screen_tab_unlock.xml | 200 --- .../keyguard_screen_tab_unlock_land.xml | 166 --- .../keyguard_screen_unlock_landscape.xml | 196 --- .../keyguard_screen_unlock_portrait.xml | 205 --- core/res/res/values/symbols.xml | 30 - .../impl/keyguard/KeyguardStatusView.java | 3 +- .../AccountUnlockScreen.java | 317 ---- .../BiometricSensorUnlock.java | 80 - .../impl/keyguard_obsolete/FaceUnlock.java | 554 ------- .../keyguard_obsolete/KeyguardScreen.java | 45 - .../KeyguardScreenCallback.java | 82 -- .../KeyguardStatusViewManager.java | 682 --------- .../KeyguardUpdateMonitor.java | 642 -------- .../KeyguardUpdateMonitorCallback.java | 96 -- .../keyguard_obsolete/KeyguardViewBase.java | 270 ---- .../KeyguardViewCallback.java | 49 - .../KeyguardViewManager.java | 309 ---- .../KeyguardViewMediator.java | 1302 ----------------- .../KeyguardViewProperties.java | 47 - .../KeyguardWindowController.java | 29 - .../LockPatternKeyguardView.java | 1220 --------------- .../LockPatternKeyguardViewProperties.java | 64 - .../impl/keyguard_obsolete/LockScreen.java | 619 -------- .../PasswordUnlockScreen.java | 383 ----- .../PatternUnlockScreen.java | 416 ------ .../keyguard_obsolete/SimPukUnlockScreen.java | 422 ------ .../keyguard_obsolete/SimUnlockScreen.java | 396 ----- policy/tests/Android.mk | 29 - policy/tests/AndroidManifest.xml | 31 - .../LockPatternKeyguardViewTest.java | 356 ----- 51 files changed, 1 insertion(+), 12663 deletions(-) delete mode 100644 core/java/com/android/internal/widget/DigitalClock.java delete mode 100644 core/res/res/layout-sw600dp/keyguard_screen_glogin_unlock.xml delete mode 100644 core/res/res/layout-sw600dp/keyguard_screen_lock.xml delete mode 100644 core/res/res/layout-sw600dp/keyguard_screen_password_landscape.xml delete mode 100644 core/res/res/layout-sw600dp/keyguard_screen_password_portrait.xml delete mode 100644 core/res/res/layout-sw600dp/keyguard_screen_sim_pin_landscape.xml delete mode 100644 core/res/res/layout-sw600dp/keyguard_screen_sim_pin_portrait.xml delete mode 100644 core/res/res/layout-sw600dp/keyguard_screen_status_land.xml delete mode 100644 core/res/res/layout-sw600dp/keyguard_screen_status_port.xml delete mode 100644 core/res/res/layout-sw600dp/keyguard_screen_tab_unlock.xml delete mode 100644 core/res/res/layout-sw600dp/keyguard_screen_tab_unlock_land.xml delete mode 100644 core/res/res/layout-sw600dp/keyguard_screen_unlock_landscape.xml delete mode 100644 core/res/res/layout-sw600dp/keyguard_screen_unlock_portrait.xml delete mode 100644 core/res/res/layout/keyguard_screen_glogin_unlock.xml delete mode 100644 core/res/res/layout/keyguard_screen_lock.xml delete mode 100644 core/res/res/layout/keyguard_screen_password_landscape.xml delete mode 100644 core/res/res/layout/keyguard_screen_password_portrait.xml delete mode 100644 core/res/res/layout/keyguard_screen_sim_pin_landscape.xml delete mode 100644 core/res/res/layout/keyguard_screen_sim_pin_portrait.xml delete mode 100644 core/res/res/layout/keyguard_screen_sim_puk_landscape.xml delete mode 100644 core/res/res/layout/keyguard_screen_sim_puk_portrait.xml delete mode 100644 core/res/res/layout/keyguard_screen_tab_unlock.xml delete mode 100644 core/res/res/layout/keyguard_screen_tab_unlock_land.xml delete mode 100644 core/res/res/layout/keyguard_screen_unlock_landscape.xml delete mode 100644 core/res/res/layout/keyguard_screen_unlock_portrait.xml delete mode 100644 policy/src/com/android/internal/policy/impl/keyguard_obsolete/AccountUnlockScreen.java delete mode 100644 policy/src/com/android/internal/policy/impl/keyguard_obsolete/BiometricSensorUnlock.java delete mode 100644 policy/src/com/android/internal/policy/impl/keyguard_obsolete/FaceUnlock.java delete mode 100644 policy/src/com/android/internal/policy/impl/keyguard_obsolete/KeyguardScreen.java delete mode 100644 policy/src/com/android/internal/policy/impl/keyguard_obsolete/KeyguardScreenCallback.java delete mode 100644 policy/src/com/android/internal/policy/impl/keyguard_obsolete/KeyguardStatusViewManager.java delete mode 100644 policy/src/com/android/internal/policy/impl/keyguard_obsolete/KeyguardUpdateMonitor.java delete mode 100644 policy/src/com/android/internal/policy/impl/keyguard_obsolete/KeyguardUpdateMonitorCallback.java delete mode 100644 policy/src/com/android/internal/policy/impl/keyguard_obsolete/KeyguardViewBase.java delete mode 100644 policy/src/com/android/internal/policy/impl/keyguard_obsolete/KeyguardViewCallback.java delete mode 100644 policy/src/com/android/internal/policy/impl/keyguard_obsolete/KeyguardViewManager.java delete mode 100644 policy/src/com/android/internal/policy/impl/keyguard_obsolete/KeyguardViewMediator.java delete mode 100644 policy/src/com/android/internal/policy/impl/keyguard_obsolete/KeyguardViewProperties.java delete mode 100644 policy/src/com/android/internal/policy/impl/keyguard_obsolete/KeyguardWindowController.java delete mode 100644 policy/src/com/android/internal/policy/impl/keyguard_obsolete/LockPatternKeyguardView.java delete mode 100644 policy/src/com/android/internal/policy/impl/keyguard_obsolete/LockPatternKeyguardViewProperties.java delete mode 100644 policy/src/com/android/internal/policy/impl/keyguard_obsolete/LockScreen.java delete mode 100644 policy/src/com/android/internal/policy/impl/keyguard_obsolete/PasswordUnlockScreen.java delete mode 100644 policy/src/com/android/internal/policy/impl/keyguard_obsolete/PatternUnlockScreen.java delete mode 100644 policy/src/com/android/internal/policy/impl/keyguard_obsolete/SimPukUnlockScreen.java delete mode 100644 policy/src/com/android/internal/policy/impl/keyguard_obsolete/SimUnlockScreen.java delete mode 100644 policy/tests/Android.mk delete mode 100644 policy/tests/AndroidManifest.xml delete mode 100644 policy/tests/src/com/android/internal/policy/impl/keyguard_obsolete/LockPatternKeyguardViewTest.java diff --git a/core/java/com/android/internal/widget/DigitalClock.java b/core/java/com/android/internal/widget/DigitalClock.java deleted file mode 100644 index af3fd425d4fde..0000000000000 --- a/core/java/com/android/internal/widget/DigitalClock.java +++ /dev/null @@ -1,245 +0,0 @@ -/* - * Copyright (C) 2008 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.internal.widget; - -import com.android.internal.R; - -import android.content.BroadcastReceiver; -import android.content.Context; -import android.content.Intent; -import android.content.IntentFilter; -import android.database.ContentObserver; -import android.graphics.Typeface; -import android.os.Handler; -import android.provider.Settings; -import android.text.format.DateFormat; -import android.util.AttributeSet; -import android.view.View; -import android.widget.RelativeLayout; -import android.widget.TextView; - -import java.lang.ref.WeakReference; -import java.text.DateFormatSymbols; -import java.util.Calendar; - -/** - * Displays the time - */ -public class DigitalClock extends RelativeLayout { - - private static final String SYSTEM = "/system/fonts/"; - private static final String SYSTEM_FONT_TIME_BACKGROUND = SYSTEM + "AndroidClock.ttf"; - private static final String SYSTEM_FONT_TIME_FOREGROUND = SYSTEM + "AndroidClock_Highlight.ttf"; - private final static String M12 = "h:mm"; - private final static String M24 = "kk:mm"; - - private Calendar mCalendar; - private String mFormat; - private TextView mTimeDisplayBackground; - private TextView mTimeDisplayForeground; - private AmPm mAmPm; - private ContentObserver mFormatChangeObserver; - private int mAttached = 0; // for debugging - tells us whether attach/detach is unbalanced - - /* called by system on minute ticks */ - private final Handler mHandler = new Handler(); - private BroadcastReceiver mIntentReceiver; - - private static final Typeface sBackgroundFont; - private static final Typeface sForegroundFont; - - static { - sBackgroundFont = Typeface.createFromFile(SYSTEM_FONT_TIME_BACKGROUND); - sForegroundFont = Typeface.createFromFile(SYSTEM_FONT_TIME_FOREGROUND); - } - - private static class TimeChangedReceiver extends BroadcastReceiver { - private WeakReference mClock; - private Context mContext; - - public TimeChangedReceiver(DigitalClock clock) { - mClock = new WeakReference(clock); - mContext = clock.getContext(); - } - - @Override - public void onReceive(Context context, Intent intent) { - // Post a runnable to avoid blocking the broadcast. - final boolean timezoneChanged = - intent.getAction().equals(Intent.ACTION_TIMEZONE_CHANGED); - final DigitalClock clock = mClock.get(); - if (clock != null) { - clock.mHandler.post(new Runnable() { - public void run() { - if (timezoneChanged) { - clock.mCalendar = Calendar.getInstance(); - } - clock.updateTime(); - } - }); - } else { - try { - mContext.unregisterReceiver(this); - } catch (RuntimeException e) { - // Shouldn't happen - } - } - } - }; - - static class AmPm { - private TextView mAmPmTextView; - private String mAmString, mPmString; - - AmPm(View parent, Typeface tf) { - // No longer used, uncomment if we decide to use AM/PM indicator again - // mAmPmTextView = (TextView) parent.findViewById(R.id.am_pm); - if (mAmPmTextView != null && tf != null) { - mAmPmTextView.setTypeface(tf); - } - - String[] ampm = new DateFormatSymbols().getAmPmStrings(); - mAmString = ampm[0]; - mPmString = ampm[1]; - } - - void setShowAmPm(boolean show) { - if (mAmPmTextView != null) { - mAmPmTextView.setVisibility(show ? View.VISIBLE : View.GONE); - } - } - - void setIsMorning(boolean isMorning) { - if (mAmPmTextView != null) { - mAmPmTextView.setText(isMorning ? mAmString : mPmString); - } - } - } - - private static class FormatChangeObserver extends ContentObserver { - private WeakReference mClock; - private Context mContext; - public FormatChangeObserver(DigitalClock clock) { - super(new Handler()); - mClock = new WeakReference(clock); - mContext = clock.getContext(); - } - @Override - public void onChange(boolean selfChange) { - DigitalClock digitalClock = mClock.get(); - if (digitalClock != null) { - digitalClock.setDateFormat(); - digitalClock.updateTime(); - } else { - try { - mContext.getContentResolver().unregisterContentObserver(this); - } catch (RuntimeException e) { - // Shouldn't happen - } - } - } - } - - public DigitalClock(Context context) { - this(context, null); - } - - public DigitalClock(Context context, AttributeSet attrs) { - super(context, attrs); - } - - @Override - protected void onFinishInflate() { - super.onFinishInflate(); - - /* The time display consists of two tones. That's why we have two overlapping text views. */ - mTimeDisplayBackground = (TextView) findViewById(R.id.timeDisplayBackground); - mTimeDisplayBackground.setTypeface(sBackgroundFont); - mTimeDisplayBackground.setVisibility(View.INVISIBLE); - - mTimeDisplayForeground = (TextView) findViewById(R.id.timeDisplayForeground); - mTimeDisplayForeground.setTypeface(sForegroundFont); - mAmPm = new AmPm(this, null); - mCalendar = Calendar.getInstance(); - - setDateFormat(); - } - - @Override - protected void onAttachedToWindow() { - super.onAttachedToWindow(); - - mAttached++; - - /* monitor time ticks, time changed, timezone */ - if (mIntentReceiver == null) { - mIntentReceiver = new TimeChangedReceiver(this); - IntentFilter filter = new IntentFilter(); - filter.addAction(Intent.ACTION_TIME_TICK); - filter.addAction(Intent.ACTION_TIME_CHANGED); - filter.addAction(Intent.ACTION_TIMEZONE_CHANGED); - mContext.registerReceiver(mIntentReceiver, filter); - } - - /* monitor 12/24-hour display preference */ - if (mFormatChangeObserver == null) { - mFormatChangeObserver = new FormatChangeObserver(this); - mContext.getContentResolver().registerContentObserver( - Settings.System.CONTENT_URI, true, mFormatChangeObserver); - } - - updateTime(); - } - - @Override - protected void onDetachedFromWindow() { - super.onDetachedFromWindow(); - - mAttached--; - - if (mIntentReceiver != null) { - mContext.unregisterReceiver(mIntentReceiver); - } - if (mFormatChangeObserver != null) { - mContext.getContentResolver().unregisterContentObserver( - mFormatChangeObserver); - } - - mFormatChangeObserver = null; - mIntentReceiver = null; - } - - void updateTime(Calendar c) { - mCalendar = c; - updateTime(); - } - - public void updateTime() { - mCalendar.setTimeInMillis(System.currentTimeMillis()); - - CharSequence newTime = DateFormat.format(mFormat, mCalendar); - mTimeDisplayBackground.setText(newTime); - mTimeDisplayForeground.setText(newTime); - mAmPm.setIsMorning(mCalendar.get(Calendar.AM_PM) == 0); - } - - private void setDateFormat() { - mFormat = android.text.format.DateFormat.is24HourFormat(getContext()) - ? M24 : M12; - mAmPm.setShowAmPm(mFormat.equals(M12)); - } -} diff --git a/core/res/res/layout-sw600dp/keyguard_screen_glogin_unlock.xml b/core/res/res/layout-sw600dp/keyguard_screen_glogin_unlock.xml deleted file mode 100644 index a0b1aaa21fed4..0000000000000 --- a/core/res/res/layout-sw600dp/keyguard_screen_glogin_unlock.xml +++ /dev/null @@ -1,136 +0,0 @@ - - - - - - - - - - - - - - - - - - -