From 23f85ec14dab49b2c525dc266d2a1f74f7f9d07c Mon Sep 17 00:00:00 2001
From: Jason Monk <jmonk@google.com>
Date: Tue, 31 Jan 2017 14:29:32 -0500
Subject: [PATCH] Move Keyguard to SystemUI

Test: make
Change-Id: I3abb67e2b022737d2aa0226bb07f3966ad68fff7
---
 packages/Keyguard/Android.mk                  |  52 ---
 packages/Keyguard/test/Android.mk             |  31 --
 packages/Keyguard/test/AndroidManifest.xml    |  33 --
 .../Keyguard/test/SampleTrustAgent/Android.mk |  34 --
 .../test/SampleTrustAgent/AndroidManifest.xml |  48 ---
 .../sample_trust_agent_settings.xml           |  74 ----
 .../layout/sample_trust_agent_settings.xml    |  67 ----
 .../SampleTrustAgent/res/values/strings.xml   |  20 -
 .../res/xml-v26/sample_trust_agent.xml        |  19 -
 .../res/xml/sample_trust_agent.xml            |  18 -
 .../trustagent/test/SampleTrustAgent.java     | 268 -------------
 .../test/SampleTrustAgentSettings.java        | 111 ------
 .../test/res/drawable-hdpi/app_icon.png       | Bin 3020 -> 0 bytes
 .../test/res/drawable-mdpi/app_icon.png       | Bin 1883 -> 0 bytes
 .../test/res/drawable-xhdpi/app_icon.png      | Bin 4173 -> 0 bytes
 .../res/layout/keyguard_test_activity.xml     |  47 ---
 .../Keyguard/test/res/menu/optionmenu.xml     |  17 -
 packages/Keyguard/test/res/values/strings.xml |  34 --
 .../keyguard/test/KeyguardTestActivity.java   | 373 ------------------
 packages/SystemUI/Android.mk                  |  13 +-
 .../drawable-hdpi/ic_done_wht.png             | Bin
 .../drawable-hdpi/ic_lockscreen_sim.png       | Bin
 .../drawable-hdpi/kg_security_lock_normal.png | Bin
 .../drawable-mdpi/ic_done_wht.png             | Bin
 .../drawable-mdpi/ic_lockscreen_sim.png       | Bin
 .../drawable-mdpi/kg_security_lock_normal.png | Bin
 .../drawable-xhdpi/ic_done_wht.png            | Bin
 .../drawable-xhdpi/ic_lockscreen_sim.png      | Bin
 .../kg_security_lock_normal.png               | Bin
 .../drawable-xxhdpi/ic_done_wht.png           | Bin
 .../drawable-xxxhdpi/ic_done_wht.png          | Bin
 .../drawable/ic_access_alarms_big.xml         |   0
 .../drawable/ic_backspace_24dp.xml            |   0
 .../drawable/ic_lockscreen_ime.xml            |   0
 .../drawable/ripple_drawable.xml              |   0
 .../res-keyguard}/layout/keyguard_bouncer.xml |   0
 .../keyguard_emergency_carrier_area.xml       |   0
 .../layout/keyguard_host_view.xml             |   0
 .../layout/keyguard_message_area.xml          |   0
 .../layout/keyguard_message_area_large.xml    |   0
 .../layout/keyguard_num_pad_key.xml           |   0
 .../layout/keyguard_password_view.xml         |   0
 .../layout/keyguard_pattern_view.xml          |   0
 .../layout/keyguard_pin_view.xml              |   0
 .../layout/keyguard_presentation.xml          |   0
 .../layout/keyguard_sim_pin_view.xml          |   0
 .../layout/keyguard_sim_puk_view.xml          |   0
 .../layout/keyguard_status_area.xml           |   0
 .../layout/keyguard_status_view.xml           |   0
 .../res-keyguard}/values-af/strings.xml       |   0
 .../res-keyguard}/values-am/strings.xml       |   0
 .../res-keyguard}/values-ar/strings.xml       |   0
 .../res-keyguard}/values-az/strings.xml       |   0
 .../values-b+sr+Latn/strings.xml              |   0
 .../res-keyguard}/values-be/strings.xml       |   0
 .../res-keyguard}/values-bg/strings.xml       |   0
 .../res-keyguard}/values-bn/strings.xml       |   0
 .../res-keyguard}/values-bs/strings.xml       |   0
 .../res-keyguard}/values-ca/strings.xml       |   0
 .../res-keyguard}/values-cs/strings.xml       |   0
 .../res-keyguard}/values-da/strings.xml       |   0
 .../res-keyguard}/values-de/strings.xml       |   0
 .../res-keyguard}/values-el/strings.xml       |   0
 .../res-keyguard}/values-en-rAU/strings.xml   |   0
 .../res-keyguard}/values-en-rGB/strings.xml   |   0
 .../res-keyguard}/values-en-rIN/strings.xml   |   0
 .../res-keyguard}/values-es-rUS/strings.xml   |   0
 .../res-keyguard}/values-es/strings.xml       |   0
 .../res-keyguard}/values-et/strings.xml       |   0
 .../res-keyguard}/values-eu/strings.xml       |   0
 .../res-keyguard}/values-fa/strings.xml       |   0
 .../res-keyguard}/values-fi/strings.xml       |   0
 .../res-keyguard}/values-fr-rCA/strings.xml   |   0
 .../res-keyguard}/values-fr/strings.xml       |   0
 .../res-keyguard}/values-gl/strings.xml       |   0
 .../res-keyguard}/values-gu/strings.xml       |   0
 .../res-keyguard}/values-h560dp/dimens.xml    |   0
 .../res-keyguard}/values-h650dp/dimens.xml    |   0
 .../res-keyguard}/values-hi/strings.xml       |   0
 .../res-keyguard}/values-hr/strings.xml       |   0
 .../res-keyguard}/values-hu/strings.xml       |   0
 .../res-keyguard}/values-hy/strings.xml       |   0
 .../res-keyguard}/values-in/strings.xml       |   0
 .../res-keyguard}/values-is/strings.xml       |   0
 .../res-keyguard}/values-it/strings.xml       |   0
 .../res-keyguard}/values-iw/strings.xml       |   0
 .../res-keyguard}/values-ja/strings.xml       |   0
 .../res-keyguard}/values-ka/strings.xml       |   0
 .../res-keyguard}/values-kk/strings.xml       |   0
 .../res-keyguard}/values-km/strings.xml       |   0
 .../res-keyguard}/values-kn/strings.xml       |   0
 .../res-keyguard}/values-ko/strings.xml       |   0
 .../res-keyguard}/values-ky/strings.xml       |   0
 .../res-keyguard}/values-land/bools.xml       |   0
 .../res-keyguard}/values-land/integers.xml    |   0
 .../res-keyguard}/values-lo/strings.xml       |   0
 .../res-keyguard}/values-lt/strings.xml       |   0
 .../res-keyguard}/values-lv/strings.xml       |   0
 .../values-mcc262-mnc07/bools.xml             |   0
 .../values-mcc262-mnc08/bools.xml             |   0
 .../values-mcc262-mnc11/bools.xml             |   0
 .../res-keyguard}/values-mk/strings.xml       |   0
 .../res-keyguard}/values-ml/strings.xml       |   0
 .../res-keyguard}/values-mn/strings.xml       |   0
 .../res-keyguard}/values-mr/strings.xml       |   0
 .../res-keyguard}/values-ms/strings.xml       |   0
 .../res-keyguard}/values-my/dimens.xml        |   0
 .../res-keyguard}/values-my/strings.xml       |   0
 .../res-keyguard}/values-nb/strings.xml       |   0
 .../res-keyguard}/values-ne/strings.xml       |   0
 .../res-keyguard}/values-nl/strings.xml       |   0
 .../res-keyguard}/values-pa/strings.xml       |   0
 .../res-keyguard}/values-pl/strings.xml       |   0
 .../res-keyguard}/values-port/bools.xml       |   0
 .../res-keyguard}/values-port/integers.xml    |   0
 .../res-keyguard}/values-pt-rBR/strings.xml   |   0
 .../res-keyguard}/values-pt-rPT/strings.xml   |   0
 .../res-keyguard}/values-pt/strings.xml       |   0
 .../res-keyguard}/values-ro/strings.xml       |   0
 .../res-keyguard}/values-ru/strings.xml       |   0
 .../res-keyguard}/values-si/strings.xml       |   0
 .../res-keyguard}/values-sk/strings.xml       |   0
 .../res-keyguard}/values-sl/strings.xml       |   0
 .../res-keyguard}/values-sq/strings.xml       |   0
 .../res-keyguard}/values-sr/strings.xml       |   0
 .../res-keyguard}/values-sv/strings.xml       |   0
 .../res-keyguard}/values-sw/strings.xml       |   0
 .../res-keyguard}/values-sw320dp/dimens.xml   |   0
 .../res-keyguard}/values-sw360dp/dimens.xml   |   0
 .../res-keyguard}/values-sw380dp/dimens.xml   |   0
 .../values-sw540dp-port/dimens.xml            |   0
 .../values-sw600dp-land/dimens.xml            |   0
 .../res-keyguard}/values-sw600dp/alias.xml    |   0
 .../res-keyguard}/values-sw600dp/bools.xml    |   0
 .../res-keyguard}/values-sw600dp/dimens.xml   |   0
 .../res-keyguard}/values-sw600dp/styles.xml   |   0
 .../res-keyguard}/values-sw720dp/dimens.xml   |   0
 .../res-keyguard}/values-ta/strings.xml       |   0
 .../res-keyguard}/values-te/strings.xml       |   0
 .../res-keyguard}/values-th/strings.xml       |   0
 .../res-keyguard}/values-tl/strings.xml       |   0
 .../res-keyguard}/values-tr/strings.xml       |   0
 .../res-keyguard}/values-uk/strings.xml       |   0
 .../res-keyguard}/values-ur/strings.xml       |   0
 .../res-keyguard}/values-uz/strings.xml       |   0
 .../res-keyguard}/values-vi/strings.xml       |   0
 .../res-keyguard}/values-zh-rCN/strings.xml   |   0
 .../res-keyguard}/values-zh-rHK/strings.xml   |   0
 .../res-keyguard}/values-zh-rTW/strings.xml   |   0
 .../res-keyguard}/values-zu/strings.xml       |   0
 .../res-keyguard}/values/alias.xml            |   0
 .../res-keyguard}/values/arrays.xml           |   0
 .../res-keyguard}/values/attrs.xml            |   0
 .../res-keyguard}/values/bools.xml            |   0
 .../res-keyguard}/values/colors.xml           |   0
 .../res-keyguard}/values/config.xml           |   0
 .../res-keyguard}/values/dimens.xml           |   0
 .../res-keyguard}/values/donottranslate.xml   |   0
 .../res-keyguard}/values/strings.xml          |   0
 .../res-keyguard}/values/styles.xml           |   0
 .../scripts/copy_profile_icons.sh             |   0
 .../scripts/new_merge.py                      |   0
 .../keyguard/AlphaOptimizedImageButton.java   |   0
 .../keyguard/AlphaOptimizedLinearLayout.java  |   0
 .../AlphaOptimizedRelativeLayout.java         |   0
 .../src/com/android/keyguard/CarrierText.java |   0
 .../com/android/keyguard/EmergencyButton.java |   0
 .../keyguard/EmergencyCarrierArea.java        |   0
 .../keyguard/KeyguardAbsKeyInputView.java     |   0
 .../android/keyguard/KeyguardConstants.java   |   0
 .../keyguard/KeyguardDisplayManager.java      |   0
 .../android/keyguard/KeyguardHostView.java    |   0
 .../android/keyguard/KeyguardMessageArea.java |   0
 .../com/android/keyguard/KeyguardPINView.java |   0
 .../keyguard/KeyguardPasswordView.java        |   0
 .../android/keyguard/KeyguardPatternView.java |   0
 .../keyguard/KeyguardPinBasedInputView.java   |   0
 .../keyguard/KeyguardSecurityCallback.java    |   0
 .../keyguard/KeyguardSecurityContainer.java   |   0
 .../keyguard/KeyguardSecurityModel.java       |   0
 .../keyguard/KeyguardSecurityView.java        |   0
 .../keyguard/KeyguardSecurityViewFlipper.java |   0
 .../android/keyguard/KeyguardSimPinView.java  |   0
 .../android/keyguard/KeyguardSimPukView.java  |   0
 .../android/keyguard/KeyguardStatusView.java  |   0
 .../keyguard/KeyguardUpdateMonitor.java       |   0
 .../KeyguardUpdateMonitorCallback.java        |   0
 .../com/android/keyguard/LatencyTracker.java  |   0
 .../keyguard/LiftToActivateListener.java      |   0
 .../src/com/android/keyguard/NumPadKey.java   |   0
 .../keyguard/ObscureSpeechDelegate.java       |   0
 .../android/keyguard/PasswordTextView.java    |   0
 .../keyguard/SecurityMessageDisplay.java      |   0
 .../keyguard/ViewMediatorCallback.java        |   0
 .../com/android/systemui/EventLogTags.logtags |   0
 packages/SystemUI/tests/Android.mk            |   4 +-
 196 files changed, 14 insertions(+), 1249 deletions(-)
 delete mode 100644 packages/Keyguard/Android.mk
 delete mode 100644 packages/Keyguard/test/Android.mk
 delete mode 100644 packages/Keyguard/test/AndroidManifest.xml
 delete mode 100644 packages/Keyguard/test/SampleTrustAgent/Android.mk
 delete mode 100644 packages/Keyguard/test/SampleTrustAgent/AndroidManifest.xml
 delete mode 100644 packages/Keyguard/test/SampleTrustAgent/res/layout-v26/sample_trust_agent_settings.xml
 delete mode 100644 packages/Keyguard/test/SampleTrustAgent/res/layout/sample_trust_agent_settings.xml
 delete mode 100644 packages/Keyguard/test/SampleTrustAgent/res/values/strings.xml
 delete mode 100644 packages/Keyguard/test/SampleTrustAgent/res/xml-v26/sample_trust_agent.xml
 delete mode 100644 packages/Keyguard/test/SampleTrustAgent/res/xml/sample_trust_agent.xml
 delete mode 100644 packages/Keyguard/test/SampleTrustAgent/src/com/android/trustagent/test/SampleTrustAgent.java
 delete mode 100644 packages/Keyguard/test/SampleTrustAgent/src/com/android/trustagent/test/SampleTrustAgentSettings.java
 delete mode 100644 packages/Keyguard/test/res/drawable-hdpi/app_icon.png
 delete mode 100644 packages/Keyguard/test/res/drawable-mdpi/app_icon.png
 delete mode 100644 packages/Keyguard/test/res/drawable-xhdpi/app_icon.png
 delete mode 100644 packages/Keyguard/test/res/layout/keyguard_test_activity.xml
 delete mode 100644 packages/Keyguard/test/res/menu/optionmenu.xml
 delete mode 100644 packages/Keyguard/test/res/values/strings.xml
 delete mode 100644 packages/Keyguard/test/src/com/android/keyguard/test/KeyguardTestActivity.java
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/drawable-hdpi/ic_done_wht.png (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/drawable-hdpi/ic_lockscreen_sim.png (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/drawable-hdpi/kg_security_lock_normal.png (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/drawable-mdpi/ic_done_wht.png (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/drawable-mdpi/ic_lockscreen_sim.png (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/drawable-mdpi/kg_security_lock_normal.png (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/drawable-xhdpi/ic_done_wht.png (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/drawable-xhdpi/ic_lockscreen_sim.png (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/drawable-xhdpi/kg_security_lock_normal.png (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/drawable-xxhdpi/ic_done_wht.png (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/drawable-xxxhdpi/ic_done_wht.png (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/drawable/ic_access_alarms_big.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/drawable/ic_backspace_24dp.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/drawable/ic_lockscreen_ime.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/drawable/ripple_drawable.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/layout/keyguard_bouncer.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/layout/keyguard_emergency_carrier_area.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/layout/keyguard_host_view.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/layout/keyguard_message_area.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/layout/keyguard_message_area_large.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/layout/keyguard_num_pad_key.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/layout/keyguard_password_view.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/layout/keyguard_pattern_view.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/layout/keyguard_pin_view.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/layout/keyguard_presentation.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/layout/keyguard_sim_pin_view.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/layout/keyguard_sim_puk_view.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/layout/keyguard_status_area.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/layout/keyguard_status_view.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-af/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-am/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-ar/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-az/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-b+sr+Latn/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-be/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-bg/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-bn/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-bs/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-ca/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-cs/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-da/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-de/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-el/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-en-rAU/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-en-rGB/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-en-rIN/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-es-rUS/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-es/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-et/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-eu/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-fa/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-fi/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-fr-rCA/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-fr/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-gl/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-gu/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-h560dp/dimens.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-h650dp/dimens.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-hi/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-hr/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-hu/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-hy/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-in/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-is/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-it/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-iw/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-ja/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-ka/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-kk/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-km/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-kn/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-ko/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-ky/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-land/bools.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-land/integers.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-lo/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-lt/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-lv/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-mcc262-mnc07/bools.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-mcc262-mnc08/bools.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-mcc262-mnc11/bools.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-mk/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-ml/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-mn/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-mr/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-ms/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-my/dimens.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-my/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-nb/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-ne/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-nl/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-pa/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-pl/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-port/bools.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-port/integers.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-pt-rBR/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-pt-rPT/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-pt/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-ro/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-ru/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-si/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-sk/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-sl/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-sq/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-sr/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-sv/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-sw/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-sw320dp/dimens.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-sw360dp/dimens.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-sw380dp/dimens.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-sw540dp-port/dimens.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-sw600dp-land/dimens.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-sw600dp/alias.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-sw600dp/bools.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-sw600dp/dimens.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-sw600dp/styles.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-sw720dp/dimens.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-ta/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-te/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-th/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-tl/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-tr/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-uk/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-ur/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-uz/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-vi/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-zh-rCN/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-zh-rHK/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-zh-rTW/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values-zu/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values/alias.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values/arrays.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values/attrs.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values/bools.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values/colors.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values/config.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values/dimens.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values/donottranslate.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values/strings.xml (100%)
 rename packages/{Keyguard/res => SystemUI/res-keyguard}/values/styles.xml (100%)
 rename packages/{Keyguard => SystemUI}/scripts/copy_profile_icons.sh (100%)
 rename packages/{Keyguard => SystemUI}/scripts/new_merge.py (100%)
 rename packages/{Keyguard => SystemUI}/src/com/android/keyguard/AlphaOptimizedImageButton.java (100%)
 rename packages/{Keyguard => SystemUI}/src/com/android/keyguard/AlphaOptimizedLinearLayout.java (100%)
 rename packages/{Keyguard => SystemUI}/src/com/android/keyguard/AlphaOptimizedRelativeLayout.java (100%)
 rename packages/{Keyguard => SystemUI}/src/com/android/keyguard/CarrierText.java (100%)
 rename packages/{Keyguard => SystemUI}/src/com/android/keyguard/EmergencyButton.java (100%)
 rename packages/{Keyguard => SystemUI}/src/com/android/keyguard/EmergencyCarrierArea.java (100%)
 rename packages/{Keyguard => SystemUI}/src/com/android/keyguard/KeyguardAbsKeyInputView.java (100%)
 rename packages/{Keyguard => SystemUI}/src/com/android/keyguard/KeyguardConstants.java (100%)
 rename packages/{Keyguard => SystemUI}/src/com/android/keyguard/KeyguardDisplayManager.java (100%)
 rename packages/{Keyguard => SystemUI}/src/com/android/keyguard/KeyguardHostView.java (100%)
 rename packages/{Keyguard => SystemUI}/src/com/android/keyguard/KeyguardMessageArea.java (100%)
 rename packages/{Keyguard => SystemUI}/src/com/android/keyguard/KeyguardPINView.java (100%)
 rename packages/{Keyguard => SystemUI}/src/com/android/keyguard/KeyguardPasswordView.java (100%)
 rename packages/{Keyguard => SystemUI}/src/com/android/keyguard/KeyguardPatternView.java (100%)
 rename packages/{Keyguard => SystemUI}/src/com/android/keyguard/KeyguardPinBasedInputView.java (100%)
 rename packages/{Keyguard => SystemUI}/src/com/android/keyguard/KeyguardSecurityCallback.java (100%)
 rename packages/{Keyguard => SystemUI}/src/com/android/keyguard/KeyguardSecurityContainer.java (100%)
 rename packages/{Keyguard => SystemUI}/src/com/android/keyguard/KeyguardSecurityModel.java (100%)
 rename packages/{Keyguard => SystemUI}/src/com/android/keyguard/KeyguardSecurityView.java (100%)
 rename packages/{Keyguard => SystemUI}/src/com/android/keyguard/KeyguardSecurityViewFlipper.java (100%)
 rename packages/{Keyguard => SystemUI}/src/com/android/keyguard/KeyguardSimPinView.java (100%)
 rename packages/{Keyguard => SystemUI}/src/com/android/keyguard/KeyguardSimPukView.java (100%)
 rename packages/{Keyguard => SystemUI}/src/com/android/keyguard/KeyguardStatusView.java (100%)
 rename packages/{Keyguard => SystemUI}/src/com/android/keyguard/KeyguardUpdateMonitor.java (100%)
 rename packages/{Keyguard => SystemUI}/src/com/android/keyguard/KeyguardUpdateMonitorCallback.java (100%)
 rename packages/{Keyguard => SystemUI}/src/com/android/keyguard/LatencyTracker.java (100%)
 rename packages/{Keyguard => SystemUI}/src/com/android/keyguard/LiftToActivateListener.java (100%)
 rename packages/{Keyguard => SystemUI}/src/com/android/keyguard/NumPadKey.java (100%)
 rename packages/{Keyguard => SystemUI}/src/com/android/keyguard/ObscureSpeechDelegate.java (100%)
 rename packages/{Keyguard => SystemUI}/src/com/android/keyguard/PasswordTextView.java (100%)
 rename packages/{Keyguard => SystemUI}/src/com/android/keyguard/SecurityMessageDisplay.java (100%)
 rename packages/{Keyguard => SystemUI}/src/com/android/keyguard/ViewMediatorCallback.java (100%)
 rename packages/{Keyguard => SystemUI}/src/com/android/systemui/EventLogTags.logtags (100%)

diff --git a/packages/Keyguard/Android.mk b/packages/Keyguard/Android.mk
deleted file mode 100644
index 38cf55966c82d..0000000000000
--- a/packages/Keyguard/Android.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright (C) 2013 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.
-#
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := SystemUI-tags
-
-LOCAL_SRC_FILES := src/com/android/systemui/EventLogTags.logtags
-
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
-# ------------------
-
-include $(CLEAR_VARS)
-
-LOCAL_USE_AAPT2 := true
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-subdir-Iaidl-files)
-
-LOCAL_MODULE := Keyguard
-
-LOCAL_CERTIFICATE := platform
-
-LOCAL_JAVA_LIBRARIES := SettingsLib
-
-LOCAL_STATIC_JAVA_LIBRARIES = SystemUI-tags
-
-LOCAL_PRIVILEGED_MODULE := true
-
-LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-LOCAL_JAR_EXCLUDE_FILES := none
-
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
-#include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/packages/Keyguard/test/Android.mk b/packages/Keyguard/test/Android.mk
deleted file mode 100644
index 54224b7679575..0000000000000
--- a/packages/Keyguard/test/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright (C) 2013 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.
-#
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_USE_AAPT2 := true
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := KeyguardTest
-
-# Remove these to verify permission checks are working correctly
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := true
-
-# LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-
-include $(BUILD_PACKAGE)
diff --git a/packages/Keyguard/test/AndroidManifest.xml b/packages/Keyguard/test/AndroidManifest.xml
deleted file mode 100644
index 163812741a014..0000000000000
--- a/packages/Keyguard/test/AndroidManifest.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2013, 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.
-*/
--->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.keyguard.test">
-    <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="17"/>
-    <uses-permission android:name="android.permission.CONTROL_KEYGUARD" />
-    <application android:label="@string/app_name" android:icon="@drawable/app_icon">
-        <activity android:name=".KeyguardTestActivity"
-                android:label="@string/app_name"
-                android:theme="@android:style/Theme.DeviceDefault.Light">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-</manifest>
diff --git a/packages/Keyguard/test/SampleTrustAgent/Android.mk b/packages/Keyguard/test/SampleTrustAgent/Android.mk
deleted file mode 100644
index 6ffb01898dbaa..0000000000000
--- a/packages/Keyguard/test/SampleTrustAgent/Android.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright (C) 2014 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.
-#
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_USE_AAPT2 := true
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := SampleTrustAgent
-
-# Remove this to verify permission checks are working correctly
-LOCAL_CERTIFICATE := platform
-
-LOCAL_MODULE_TAGS := tests
-
-# LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-
-LOCAL_STATIC_ANDROID_LIBRARIES := android-support-v4
-
-include $(BUILD_PACKAGE)
diff --git a/packages/Keyguard/test/SampleTrustAgent/AndroidManifest.xml b/packages/Keyguard/test/SampleTrustAgent/AndroidManifest.xml
deleted file mode 100644
index edcea0e64ac78..0000000000000
--- a/packages/Keyguard/test/SampleTrustAgent/AndroidManifest.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2014 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
-  -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.trustagent.test">
-    <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="17"/>
-    <uses-permission android:name="android.permission.CONTROL_KEYGUARD" />
-    <uses-permission android:name="android.permission.PROVIDE_TRUST_AGENT" />
-    <application android:label="@string/app_name">
-      <service
-          android:name=".SampleTrustAgent"
-          android:label="@string/app_name"
-          android:permission="android.permission.BIND_TRUST_AGENT"
-          android:directBootAware="true"
-          android:exported="true">
-        <intent-filter>
-          <action android:name="android.service.trust.TrustAgentService" />
-          <category android:name="android.intent.category.DEFAULT" />
-        </intent-filter>
-        <meta-data android:name="android.service.trust.trustagent"
-                   android:resource="@xml/sample_trust_agent"/>
-      </service>
-
-      <activity
-          android:name=".SampleTrustAgentSettings"
-          android:label="@string/app_name"
-          android:exported="true"
-          android:launchMode="singleInstance" >
-          <intent-filter>
-              <action android:name="android.intent.action.MAIN" />
-              <category android:name="android.intent.category.LAUNCHER" />
-          </intent-filter>
-      </activity>
-    </application>
-</manifest>
diff --git a/packages/Keyguard/test/SampleTrustAgent/res/layout-v26/sample_trust_agent_settings.xml b/packages/Keyguard/test/SampleTrustAgent/res/layout-v26/sample_trust_agent_settings.xml
deleted file mode 100644
index 4669971e9be39..0000000000000
--- a/packages/Keyguard/test/SampleTrustAgent/res/layout-v26/sample_trust_agent_settings.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright (C) 2014 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
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-    <Button android:id="@+id/enable_trust"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="Grant trust for 30 seconds" />
-    <Button android:id="@+id/revoke_trust"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="Revoke trust" />
-    <Button android:id="@+id/crash"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="Crash" />
-    <CheckBox android:id="@+id/managing_trust"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingTop="8dp"
-            android:paddingBottom="8dp"
-            android:text="Managing trust" />
-    <CheckBox android:id="@+id/managing_trust_direct_boot"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingTop="8dp"
-            android:paddingBottom="8dp"
-            android:text="Managing trust direct boot"/>
-
-    <CheckBox android:id="@+id/report_unlock_attempts"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingTop="8dp"
-            android:paddingBottom="8dp"
-            android:text="Report unlock attempts" />
-    <CheckBox android:id="@+id/report_device_locked"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingTop="8dp"
-            android:paddingBottom="8dp"
-            android:text="Report device locked or unlocked" />
-
-    <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-        <Button android:id="@+id/check_device_locked"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Device locked?" />
-        <TextView android:id="@+id/check_device_locked_result"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1" />
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/packages/Keyguard/test/SampleTrustAgent/res/layout/sample_trust_agent_settings.xml b/packages/Keyguard/test/SampleTrustAgent/res/layout/sample_trust_agent_settings.xml
deleted file mode 100644
index 00193ed8455fb..0000000000000
--- a/packages/Keyguard/test/SampleTrustAgent/res/layout/sample_trust_agent_settings.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright (C) 2014 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
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-    <Button android:id="@+id/enable_trust"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="Grant trust for 30 seconds" />
-    <Button android:id="@+id/revoke_trust"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="Revoke trust" />
-    <Button android:id="@+id/crash"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="Crash" />
-    <CheckBox android:id="@+id/managing_trust"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingTop="8dp"
-            android:paddingBottom="8dp"
-            android:text="Managing trust" />
-    <CheckBox android:id="@+id/report_unlock_attempts"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingTop="8dp"
-            android:paddingBottom="8dp"
-            android:text="Report unlock attempts" />
-    <CheckBox android:id="@+id/report_device_locked"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingTop="8dp"
-            android:paddingBottom="8dp"
-            android:text="Report device locked or unlocked" />
-
-    <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-        <Button android:id="@+id/check_device_locked"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Device locked?" />
-        <TextView android:id="@+id/check_device_locked_result"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1" />
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/packages/Keyguard/test/SampleTrustAgent/res/values/strings.xml b/packages/Keyguard/test/SampleTrustAgent/res/values/strings.xml
deleted file mode 100644
index 0c6b502701ba7..0000000000000
--- a/packages/Keyguard/test/SampleTrustAgent/res/values/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2014 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>
-    <string name="app_name">Sample Trust Agent</string>
-</resources>
\ No newline at end of file
diff --git a/packages/Keyguard/test/SampleTrustAgent/res/xml-v26/sample_trust_agent.xml b/packages/Keyguard/test/SampleTrustAgent/res/xml-v26/sample_trust_agent.xml
deleted file mode 100644
index 26d5aa0c26f38..0000000000000
--- a/packages/Keyguard/test/SampleTrustAgent/res/xml-v26/sample_trust_agent.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2014 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
-  -->
-<trust-agent xmlns:android="http://schemas.android.com/apk/res/android"
-             android:settingsActivity=".SampleTrustAgentSettings"
-             android:unlockProfile="true" />
diff --git a/packages/Keyguard/test/SampleTrustAgent/res/xml/sample_trust_agent.xml b/packages/Keyguard/test/SampleTrustAgent/res/xml/sample_trust_agent.xml
deleted file mode 100644
index 6cd34bbab8e0e..0000000000000
--- a/packages/Keyguard/test/SampleTrustAgent/res/xml/sample_trust_agent.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2014 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
-  -->
-<trust-agent xmlns:android="http://schemas.android.com/apk/res/android"
-             android:settingsActivity=".SampleTrustAgentSettings" />
diff --git a/packages/Keyguard/test/SampleTrustAgent/src/com/android/trustagent/test/SampleTrustAgent.java b/packages/Keyguard/test/SampleTrustAgent/src/com/android/trustagent/test/SampleTrustAgent.java
deleted file mode 100644
index 4b50cf8c9fd56..0000000000000
--- a/packages/Keyguard/test/SampleTrustAgent/src/com/android/trustagent/test/SampleTrustAgent.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
- * Copyright (C) 2014 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.trustagent.test;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.SharedPreferences;
-import android.os.PersistableBundle;
-import android.os.UserManager;
-import android.preference.PreferenceManager;
-import android.service.trust.TrustAgentService;
-import android.support.v4.content.LocalBroadcastManager;
-import android.util.Log;
-import android.widget.Toast;
-
-import java.util.List;
-
-public class SampleTrustAgent extends TrustAgentService
-        implements SharedPreferences.OnSharedPreferenceChangeListener {
-
-    /**
-     * If true, allows anyone to control this trust agent, e.g. using adb:
-     * <pre>
-     * $ adb shell am broadcast -a action.sample_trust_agent.grant_trust\
-     *  -e extra.message SampleTrust\
-     *  --el extra.duration 1000 --ez extra.init_by_user false --ez extra.dismiss_keyguard false
-     * </pre>
-     */
-    private static final boolean ALLOW_EXTERNAL_BROADCASTS = false;
-
-    LocalBroadcastManager mLocalBroadcastManager;
-
-    private static final String ACTION_GRANT_TRUST = "action.sample_trust_agent.grant_trust";
-    private static final String ACTION_REVOKE_TRUST = "action.sample_trust_agent.revoke_trust";
-
-    private static final String EXTRA_MESSAGE = "extra.message";
-    private static final String EXTRA_DURATION = "extra.duration";
-    private static final String EXTRA_INITIATED_BY_USER = "extra.init_by_user";
-    private static final String EXTRA_DISMISS_KEYGUARD = "extra.dismiss_keyguard";
-
-    private static final String PREFERENCE_REPORT_UNLOCK_ATTEMPTS
-            = "preference.report_unlock_attempts";
-    private static final String PREFERENCE_MANAGING_TRUST
-            = "preference.managing_trust";
-    private static final String PREFERENCE_MANAGING_TRUST_DIRECT_BOOT
-            = "preference.managing_trust_direct_boot";
-    private static final String PREFERENCE_REPORT_DEVICE_LOCKED = "preference.report_device_locked";
-
-    private static final String TAG = "SampleTrustAgent";
-
-    private static final BroadcastReceiver mUnlockReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-
-        }
-    };
-
-    private boolean mIsUserUnlocked;
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        UserManager um = (UserManager) getSystemService(Context.USER_SERVICE);
-        mIsUserUnlocked = um.isUserUnlocked();
-        Log.i(TAG,, "onCreate, is user unlocked=" + mIsUserUnlocked);
-        mLocalBroadcastManager = LocalBroadcastManager.getInstance(this);
-
-        IntentFilter filter = new IntentFilter();
-        filter.addAction(ACTION_GRANT_TRUST);
-        filter.addAction(ACTION_REVOKE_TRUST);
-        if (!mIsUserUnlocked) {
-            filter.addAction(Intent.ACTION_BOOT_COMPLETED);
-        }
-        mLocalBroadcastManager.registerReceiver(mReceiver, filter);
-        if (ALLOW_EXTERNAL_BROADCASTS) {
-            registerReceiver(mReceiver, filter);
-        }
-
-        if (!mIsUserUnlocked) {
-            boolean trustManaged = getIsManagingTrustDirectBoot(this);
-            Log.i(TAG, "in Direct boot." + (trustManaged ? "manage" : "cannot manage") + "trust");
-            setManagingTrust(getIsManagingTrustDirectBoot(this));
-        } else {
-            onBootCompleted();
-        }
-    }
-
-    @Override
-    public void onTrustTimeout() {
-        super.onTrustTimeout();
-        logAndShowToast("onTrustTimeout(): timeout expired");
-    }
-
-    @Override
-    public void onDeviceLocked() {
-        super.onDeviceLocked();
-        if (getReportDeviceLocked(this)) {
-            logAndShowToast("onDeviceLocked(): device is now locked");
-        }
-    }
-
-    @Override
-    public void onDeviceUnlocked() {
-        super.onDeviceUnlocked();
-        if (getReportDeviceLocked(this)) {
-            logAndShowToast("onDeviceUnlocked(): device is now unlocked");
-        }
-    }
-
-    @Override
-    public void onUnlockAttempt(boolean successful) {
-        if (getReportUnlockAttempts(this)) {
-            logAndShowToast("onUnlockAttempt(successful=" + successful + ")");
-        }
-    }
-
-    private void logAndShowToast(String text) {
-        Log.i(TAG, text);
-        Toast.makeText(this, text, Toast.LENGTH_SHORT).show();
-    }
-
-    @Override
-    public boolean onConfigure(List<PersistableBundle> options) {
-        if (options != null) {
-           for (int i = 0; i < options.size(); i++) {
-               Log.v(TAG, "Policy options received: " + options.get(i));
-           }
-        } else {
-            Log.w(TAG, "onConfigure() called with no options");
-        }
-        // TODO: Handle options
-        return true; // inform DPM that we support it
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        mLocalBroadcastManager.unregisterReceiver(mReceiver);
-        if (ALLOW_EXTERNAL_BROADCASTS) {
-            unregisterReceiver(mReceiver);
-        }
-        PreferenceManager.getDefaultSharedPreferences(this)
-                .unregisterOnSharedPreferenceChangeListener(this);
-    }
-
-    private void onBootCompleted() {
-        PreferenceManager.getDefaultSharedPreferences(this)
-                .registerOnSharedPreferenceChangeListener(this);
-        setManagingTrust(getIsManagingTrust(this));
-    }
-
-    private BroadcastReceiver mReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            String action = intent.getAction();
-            if (ACTION_GRANT_TRUST.equals(action)) {
-                int flags = 0;
-                if (intent.getBooleanExtra(EXTRA_INITIATED_BY_USER, false)) {
-                    flags |= TrustAgentService.FLAG_GRANT_TRUST_INITIATED_BY_USER;
-                }
-                if (intent.getBooleanExtra(EXTRA_DISMISS_KEYGUARD, false)) {
-                    flags |= TrustAgentService.FLAG_GRANT_TRUST_DISMISS_KEYGUARD;
-                }
-
-                try {
-                    grantTrust(intent.getStringExtra(EXTRA_MESSAGE),
-                            intent.getLongExtra(EXTRA_DURATION, 0), flags);
-                } catch (IllegalStateException e) {
-                    logAndShowToast("IllegalStateException: " + e.getMessage());
-                }
-            } else if (ACTION_REVOKE_TRUST.equals(action)) {
-                revokeTrust();
-            } else if (intent.ACTION_BOOT_COMPLETED.equals(action)) {
-                Log.d(TAG, "User unlocked and boot completed.");
-                onBootCompleted();
-            }
-        }
-    };
-
-    public static void sendGrantTrust(Context context,
-            String message, long durationMs, boolean initiatedByUser) {
-        Intent intent = new Intent(ACTION_GRANT_TRUST);
-        intent.putExtra(EXTRA_MESSAGE, message);
-        intent.putExtra(EXTRA_DURATION, durationMs);
-        intent.putExtra(EXTRA_INITIATED_BY_USER, initiatedByUser);
-        LocalBroadcastManager.getInstance(context).sendBroadcast(intent);
-    }
-
-    public static void sendRevokeTrust(Context context) {
-        Intent intent = new Intent(ACTION_REVOKE_TRUST);
-        LocalBroadcastManager.getInstance(context).sendBroadcast(intent);
-    }
-
-    public static void setReportUnlockAttempts(Context context, boolean enabled) {
-        SharedPreferences sharedPreferences = PreferenceManager
-                .getDefaultSharedPreferences(context);
-        sharedPreferences.edit().putBoolean(PREFERENCE_REPORT_UNLOCK_ATTEMPTS, enabled).apply();
-    }
-
-    public static boolean getReportUnlockAttempts(Context context) {
-        SharedPreferences sharedPreferences = PreferenceManager
-                .getDefaultSharedPreferences(context);
-        return sharedPreferences.getBoolean(PREFERENCE_REPORT_UNLOCK_ATTEMPTS, false);
-    }
-
-    public static void setReportDeviceLocked(Context context, boolean enabled) {
-        SharedPreferences sharedPreferences = PreferenceManager
-                .getDefaultSharedPreferences(context);
-        sharedPreferences.edit().putBoolean(PREFERENCE_REPORT_DEVICE_LOCKED, enabled).apply();
-    }
-
-    public static boolean getReportDeviceLocked(Context context) {
-        SharedPreferences sharedPreferences = PreferenceManager
-                .getDefaultSharedPreferences(context);
-        return sharedPreferences.getBoolean(PREFERENCE_REPORT_DEVICE_LOCKED, false);
-    }
-
-    public static void setIsManagingTrust(Context context, boolean enabled) {
-        SharedPreferences sharedPreferences = PreferenceManager
-                .getDefaultSharedPreferences(context);
-        Log.d("AAAA", "save manage trust preference. Enabled=" + enabled);
-        sharedPreferences.edit().putBoolean(PREFERENCE_MANAGING_TRUST, enabled).apply();
-    }
-
-    public static boolean getIsManagingTrust(Context context) {
-        SharedPreferences sharedPreferences = PreferenceManager
-                .getDefaultSharedPreferences(context);
-        return sharedPreferences.getBoolean(PREFERENCE_MANAGING_TRUST, false);
-    }
-
-    public static void setIsManagingTrustDirectBoot(Context context, boolean enabled) {
-        Context directBootContext = context.createDeviceProtectedStorageContext();
-        SharedPreferences sharedPreferences = PreferenceManager
-                .getDefaultSharedPreferences(directBootContext);
-        Log.d("AAAA", "save to direct boot preference. Enabled=" + enabled);
-        sharedPreferences.edit().putBoolean(PREFERENCE_MANAGING_TRUST_DIRECT_BOOT, enabled).apply();
-    }
-
-    public static boolean getIsManagingTrustDirectBoot(Context context) {
-        Context directBootContext = context.createDeviceProtectedStorageContext();
-        SharedPreferences sharedPreferences = PreferenceManager
-                .getDefaultSharedPreferences(directBootContext);
-        return sharedPreferences.getBoolean(PREFERENCE_MANAGING_TRUST_DIRECT_BOOT, false);
-    }
-
-    @Override
-    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
-        if (PREFERENCE_MANAGING_TRUST.equals(key)) {
-            setManagingTrust(getIsManagingTrust(this));
-        }
-    }
-}
diff --git a/packages/Keyguard/test/SampleTrustAgent/src/com/android/trustagent/test/SampleTrustAgentSettings.java b/packages/Keyguard/test/SampleTrustAgent/src/com/android/trustagent/test/SampleTrustAgentSettings.java
deleted file mode 100644
index 1b171693a6c91..0000000000000
--- a/packages/Keyguard/test/SampleTrustAgent/src/com/android/trustagent/test/SampleTrustAgentSettings.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (C) 2014 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.trustagent.test;
-
-import android.annotation.Nullable;
-import android.app.Activity;
-import android.app.KeyguardManager;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.CheckBox;
-import android.widget.CompoundButton;
-import android.widget.TextView;
-
-public class SampleTrustAgentSettings extends Activity implements View.OnClickListener,
-        CompoundButton.OnCheckedChangeListener {
-
-    private static final int TRUST_DURATION_MS = 30 * 1000;
-
-    private CheckBox mReportUnlockAttempts;
-    private CheckBox mReportDeviceLocked;
-    private CheckBox mManagingTrust;
-    private CheckBox mManagingTrustDirectBoot;
-    private TextView mCheckDeviceLockedResult;
-
-    private KeyguardManager mKeyguardManager;
-
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        mKeyguardManager = (KeyguardManager) getSystemService(KEYGUARD_SERVICE);
-
-        setContentView(R.layout.sample_trust_agent_settings);
-
-        findViewById(R.id.enable_trust).setOnClickListener(this);
-        findViewById(R.id.revoke_trust).setOnClickListener(this);
-        findViewById(R.id.crash).setOnClickListener(this);
-        findViewById(R.id.check_device_locked).setOnClickListener(this);
-
-        mReportUnlockAttempts = (CheckBox) findViewById(R.id.report_unlock_attempts);
-        mReportUnlockAttempts.setOnCheckedChangeListener(this);
-
-        mReportDeviceLocked = (CheckBox) findViewById(R.id.report_device_locked);
-        mReportDeviceLocked.setOnCheckedChangeListener(this);
-
-        mManagingTrust = (CheckBox) findViewById(R.id.managing_trust);
-        mManagingTrust.setOnCheckedChangeListener(this);
-        mManagingTrustDirectBoot = (CheckBox) findViewById(R.id.managing_trust_direct_boot);
-        mManagingTrustDirectBoot.setOnCheckedChangeListener(this);
-
-        mCheckDeviceLockedResult = (TextView) findViewById(R.id.check_device_locked_result);
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        mReportUnlockAttempts.setChecked(SampleTrustAgent.getReportUnlockAttempts(this));
-        mManagingTrust.setChecked(SampleTrustAgent.getIsManagingTrust(this));
-        mManagingTrustDirectBoot.setChecked(
-            SampleTrustAgent.getIsManagingTrustDirectBoot(this));
-        updateTrustedState();
-    }
-
-    @Override
-    public void onClick(View v) {
-        int id = v.getId();
-        if (id == R.id.enable_trust) {
-            SampleTrustAgent.sendGrantTrust(this, "SampleTrustAgent", TRUST_DURATION_MS,
-                    false /* initiatedByUser */);
-        } else if (id == R.id.revoke_trust) {
-            SampleTrustAgent.sendRevokeTrust(this);
-        } else if (id == R.id.crash) {
-            throw new RuntimeException("crash");
-        } else if (id == R.id.check_device_locked) {
-            updateTrustedState();
-        }
-    }
-
-    @Override
-    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-        if (buttonView == mReportUnlockAttempts) {
-            SampleTrustAgent.setReportUnlockAttempts(this, isChecked);
-        } else if (buttonView == mManagingTrust) {
-            SampleTrustAgent.setIsManagingTrust(this, isChecked);
-        } else if (buttonView == mReportDeviceLocked) {
-            SampleTrustAgent.setReportDeviceLocked(this, isChecked);
-        } else if (buttonView == mManagingTrustDirectBoot) {
-            SampleTrustAgent.setIsManagingTrustDirectBoot(this, isChecked);
-        }
-    }
-
-    private void updateTrustedState() {
-        mCheckDeviceLockedResult.setText(Boolean.toString(
-                mKeyguardManager.isDeviceLocked()));
-    }
-}
diff --git a/packages/Keyguard/test/res/drawable-hdpi/app_icon.png b/packages/Keyguard/test/res/drawable-hdpi/app_icon.png
deleted file mode 100644
index 732133c13a24e885f9d6d91e60232123dd558728..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3020
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

diff --git a/packages/Keyguard/test/res/drawable-mdpi/app_icon.png b/packages/Keyguard/test/res/drawable-mdpi/app_icon.png
deleted file mode 100644
index 30eb97473dc194ebbf18fde7ca45eb03025440b5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1883
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
On*caNb4;~9Ip%LpPg9-%

diff --git a/packages/Keyguard/test/res/drawable-xhdpi/app_icon.png b/packages/Keyguard/test/res/drawable-xhdpi/app_icon.png
deleted file mode 100644
index c44a33012aa6e958a3dd9fd42b5818d32b889553..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4173
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

diff --git a/packages/Keyguard/test/res/layout/keyguard_test_activity.xml b/packages/Keyguard/test/res/layout/keyguard_test_activity.xml
deleted file mode 100644
index dab10881b6d9a..0000000000000
--- a/packages/Keyguard/test/res/layout/keyguard_test_activity.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2013, 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.
-*/
--->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:gravity="center">
-
-    <Button android:id="@+id/do_keyguard"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/do_keyguard" />
-
-    <Button android:id="@+id/on_screen_turned_off"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/on_screen_turned_off" />
-
-    <Button android:id="@+id/on_screen_turned_on"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/on_screen_turned_on" />
-
-    <Button android:id="@+id/verify_unlock"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/verify_unlock" />
-
-</LinearLayout>
diff --git a/packages/Keyguard/test/res/menu/optionmenu.xml b/packages/Keyguard/test/res/menu/optionmenu.xml
deleted file mode 100644
index 22f300d19ca67..0000000000000
--- a/packages/Keyguard/test/res/menu/optionmenu.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/none_menu_item"
-          android:title="@string/none_menu_item" />
-    <item android:id="@+id/pin_menu_item"
-          android:title="@string/pin_menu_item" />
-    <item android:id="@+id/password_menu_item"
-        android:title="@string/password_menu_item" />
-    <item android:id="@+id/pattern_menu_item"
-          android:title="@string/pattern_menu_item" />
-    <item android:id="@+id/sim_pin_menu_item"
-          android:title="@string/sim_pin_menu_item" />
-    <item android:id="@+id/sim_puk_menu_item"
-          android:title="@string/sim_puk_menu_item" />
-    <item android:id="@+id/add_widget_item"
-          android:title="@string/add_widget_item" />
-</menu>
diff --git a/packages/Keyguard/test/res/values/strings.xml b/packages/Keyguard/test/res/values/strings.xml
deleted file mode 100644
index 129204b097d02..0000000000000
--- a/packages/Keyguard/test/res/values/strings.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/strings.xml
-**
-** Copyright 2013, 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">
-    <string name="app_name">KeyguardTestActivity</string>
-    <string name="secure_app_name">UnifiedCamera</string>
-    <string name="none_menu_item">No security</string>
-    <string name="pin_menu_item">PIN</string>
-    <string name="password_menu_item">Password</string>
-    <string name="pattern_menu_item">Pattern</string>
-    <string name="sim_pin_menu_item">SIM PIN</string>
-    <string name="sim_puk_menu_item">SIM PUK</string>
-    <string name="add_widget_item">Choose widget...</string>
-    <string name="on_screen_turned_off">onScreenTurnedOff</string>
-    <string name="on_screen_turned_on">onScreenTurnedOn</string>
-    <string name="do_keyguard">doKeyguard</string>
-    <string name="verify_unlock">verifyUnlock</string>
-</resources>
diff --git a/packages/Keyguard/test/src/com/android/keyguard/test/KeyguardTestActivity.java b/packages/Keyguard/test/src/com/android/keyguard/test/KeyguardTestActivity.java
deleted file mode 100644
index e89c10eea19a9..0000000000000
--- a/packages/Keyguard/test/src/com/android/keyguard/test/KeyguardTestActivity.java
+++ /dev/null
@@ -1,373 +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.test;
-
-import com.android.internal.policy.IKeyguardShowCallback;
-import com.android.internal.policy.IKeyguardExitCallback;
-import com.android.internal.policy.IKeyguardService;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.admin.DevicePolicyManager;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.IBinder;
-import android.os.RemoteException;
-import android.os.SystemClock;
-import android.provider.Settings;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.WindowManagerPolicy;
-
-import com.android.internal.widget.LockPatternUtils;
-import com.android.internal.widget.LockPatternView.Cell;
-
-import java.util.List;
-
-public class KeyguardTestActivity extends Activity implements OnClickListener {
-    private static final String KEYGUARD_PACKAGE = "com.android.keyguard";
-    private static final String KEYGUARD_CLASS = "com.android.keyguard.KeyguardService";
-    private static final String TAG = "LockScreenTestActivity";
-    private static final int MODE_NONE = 0;
-    private static final int MODE_PIN = 1;
-    private static final int MODE_PASSWORD = 2;
-    private static final int MODE_PATTERN = 3;
-    private static final int MODE_SIM_PIN = 4;
-    private static final int MODE_SIM_PUK = 5;
-    private static final String SECURITY_MODE = "security_mode";
-    Handler mHandler = new Handler();
-
-    IKeyguardService mService = null;
-
-    KeyguardShowCallback mKeyguardShowCallback = new KeyguardShowCallback();
-    KeyguardExitCallback mKeyguardExitCallback = new KeyguardExitCallback();
-
-    RemoteServiceConnection mConnection;
-    private boolean mSentSystemReady;
-
-    class KeyguardShowCallback extends IKeyguardShowCallback.Stub {
-
-        @Override
-        public void onShown(IBinder windowToken) throws RemoteException {
-            Log.v(TAG, "Keyguard is shown, windowToken = " + windowToken);
-        }
-    }
-
-    class KeyguardExitCallback extends IKeyguardExitCallback.Stub {
-
-        @Override
-        public void onKeyguardExitResult(final boolean success) throws RemoteException {
-            mHandler.post(new Runnable() {
-                @Override
-                public void run() {
-                    new AlertDialog.Builder(KeyguardTestActivity.this)
-                    .setMessage("Result: " + success)
-                    .setPositiveButton("OK", null)
-                    .show();
-                }
-            });
-        }
-    };
-
-    private class RemoteServiceConnection implements ServiceConnection {
-        public void onServiceConnected(ComponentName className, IBinder service) {
-            Log.v(TAG, "onServiceConnected()");
-            mService = IKeyguardService.Stub.asInterface(service);
-            try {
-                mService.asBinder().linkToDeath(new IBinder.DeathRecipient() {
-                    @Override
-                    public void binderDied() {
-                        new AlertDialog.Builder(KeyguardTestActivity.this)
-                            .setMessage("Oops! Keygued died")
-                            .setPositiveButton("OK", null)
-                            .show();
-                    }
-                }, 0);
-            } catch (RemoteException e) {
-                Log.w(TAG, "Couldn't linkToDeath");
-                e.printStackTrace();
-            }
-//            try {
-//                mService.onSystemReady();
-//            } catch (RemoteException e) {
-//                Log.v(TAG, "Remote service died trying to call onSystemReady");
-//                e.printStackTrace();
-//            }
-        }
-
-        public void onServiceDisconnected(ComponentName className) {
-            Log.v(TAG, "onServiceDisconnected()");
-            mService = null;
-        }
-    };
-
-    private void bindService() {
-        if (mConnection == null) {
-            mConnection = new RemoteServiceConnection();
-            Intent intent = new Intent();
-            intent.setClassName(KEYGUARD_PACKAGE, KEYGUARD_CLASS);
-            Log.v(TAG, "BINDING SERVICE: " + KEYGUARD_CLASS);
-            if (!bindService(intent, mConnection, Context.BIND_AUTO_CREATE)) {
-                Log.v(TAG, "FAILED TO BIND TO KEYGUARD!");
-            }
-        } else {
-            Log.v(TAG, "Service already bound");
-        }
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.keyguard_test_activity);
-        final int[] buttons = {
-                R.id.on_screen_turned_off, R.id.on_screen_turned_on,
-                R.id.do_keyguard, R.id.verify_unlock
-        };
-        for (int i = 0; i < buttons.length; i++) {
-            findViewById(buttons[i]).setOnClickListener(this);
-        }
-        Log.v(TAG, "Binding service...");
-        bindService();
-    }
-
-    @Override
-    protected void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        outState.putInt(SECURITY_MODE, mSecurityMode);
-    }
-
-    @Override
-    protected void onRestoreInstanceState(Bundle savedInstanceState) {
-        super.onRestoreInstanceState(savedInstanceState);
-        setMode(savedInstanceState.getInt(SECURITY_MODE));
-    }
-
-// TODO: Find a secure way to inject mock into keyguard...
-//    @Override
-//    public boolean onCreateOptionsMenu(Menu menu) {
-//        MenuInflater inflater = getMenuInflater();
-//        inflater.inflate(R.menu.optionmenu, menu);
-//        return true;
-//    }
-
-    private void setMode(int mode) {
-        mTestSimPin = false;
-        mTestSimPuk = false;
-        mLockPasswordEnabled = false;
-        mLockPatternEnabled = false;
-        switch(mode) {
-            case MODE_NONE:
-                mSecurityModeMock = DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
-                break;
-            case MODE_PIN:
-                mSecurityModeMock = DevicePolicyManager.PASSWORD_QUALITY_NUMERIC;
-                mLockPasswordEnabled = true;
-                break;
-            case MODE_PASSWORD:
-                mSecurityModeMock = DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC;
-                mLockPasswordEnabled = true;
-                break;
-            case MODE_PATTERN:
-                mSecurityModeMock = DevicePolicyManager.PASSWORD_QUALITY_SOMETHING;
-                mLockPatternEnabled = true;
-                break;
-            case MODE_SIM_PIN:
-                mTestSimPin = true;
-                break;
-            case MODE_SIM_PUK:
-                mTestSimPuk = true;
-                break;
-        }
-        mSecurityMode = mode;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        // Handle item selection
-        switch (item.getItemId()) {
-            case R.id.none_menu_item:
-                setMode(MODE_NONE);
-                break;
-            case R.id.pin_menu_item:
-                setMode(MODE_PIN);
-                break;
-            case R.id.password_menu_item:
-                setMode(MODE_PASSWORD);
-                break;
-            case R.id.pattern_menu_item:
-                setMode(MODE_PATTERN);
-                break;
-            case R.id.sim_pin_menu_item:
-                setMode(MODE_SIM_PIN);
-                break;
-            case R.id.sim_puk_menu_item:
-                setMode(MODE_SIM_PUK);
-                break;
-            case R.id.add_widget_item:
-                startWidgetPicker();
-                break;
-            default:
-                return super.onOptionsItemSelected(item);
-        }
-        try {
-            mService.doKeyguardTimeout(null);
-        } catch (RemoteException e) {
-            Log.e(TAG, "Remote service died");
-            e.printStackTrace();
-        }
-        return true;
-    }
-
-    private void startWidgetPicker() {
-        startActivity(new Intent(Settings.ACTION_SECURITY_SETTINGS));
-    }
-
-    @Override
-    public void onClick(View v) {
-        try {
-            switch (v.getId()) {
-            case R.id.on_screen_turned_on:
-                mService.onScreenTurnedOn(mKeyguardShowCallback);
-                break;
-            case R.id.on_screen_turned_off:
-                mService.onScreenTurnedOff(WindowManagerPolicy.OFF_BECAUSE_OF_USER);
-                break;
-            case R.id.do_keyguard:
-                if (!mSentSystemReady) {
-                    mSentSystemReady = true;
-                    mService.onSystemReady();
-                }
-                mService.doKeyguardTimeout(null);
-                break;
-            case R.id.verify_unlock:
-                mService.doKeyguardTimeout(null);
-                // Wait for keyguard to lock and then try this...
-                mHandler.postDelayed(new Runnable() {
-                    @Override
-                    public void run() {
-                        try {
-                            mService.verifyUnlock(mKeyguardExitCallback);
-                        } catch (RemoteException e) {
-                            Log.e(TAG, "Failed verifyUnlock()", e);
-                        }
-                    }
-                }, 5000);
-                break;
-            }
-        } catch (RemoteException e) {
-            Log.e(TAG, "onClick(): Failed due to remote exeption", e);
-        }
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-        try {
-            if (mService != null) {
-                mService.setHidden(true);
-            }
-        } catch (RemoteException e) {
-            Log.e(TAG, "Remote service died");
-            e.printStackTrace();
-        }
-    }
-
-    protected void onResume() {
-        super.onResume();
-        try {
-            if (mService != null) {
-                mService.setHidden(false);
-            }
-        } catch (RemoteException e) {
-            Log.e(TAG, "Remote service died");
-            e.printStackTrace();
-        }
-    }
-
-    public int mSecurityModeMock;
-    private boolean mTestSimPin;
-    private boolean mTestSimPuk;
-    private boolean mLockPasswordEnabled;
-    public boolean mLockPatternEnabled;
-    private int mSecurityMode;
-
-    class LockPatternUtilsMock extends LockPatternUtils {
-        private long mDeadline;
-        public LockPatternUtilsMock(Context context) {
-            super(context);
-        }
-
-        @Override
-        public boolean checkPattern(List<Cell> pattern) {
-            return pattern.size() > 4;
-        }
-
-        @Override
-        public boolean checkPassword(String password) {
-            return password.length() > 4;
-        }
-        @Override
-        public long setLockoutAttemptDeadline() {
-            final long deadline = SystemClock.elapsedRealtime() + FAILED_ATTEMPT_TIMEOUT_MS;
-            mDeadline = deadline;
-            return deadline;
-        }
-        @Override
-        public boolean isLockScreenDisabled() {
-            return false;
-        }
-        @Override
-        public long getLockoutAttemptDeadline() {
-            return mDeadline;
-        }
-        @Override
-        public void reportFailedPasswordAttempt() {
-            // Ignored
-        }
-        @Override
-        public void reportSuccessfulPasswordAttempt() {
-            // Ignored
-        }
-        @Override
-        public boolean isLockPatternEnabled() {
-            return mLockPatternEnabled;
-        }
-
-        @Override
-        public boolean isLockPasswordEnabled() {
-            return mLockPasswordEnabled;
-        }
-
-        @Override
-        public int getKeyguardStoredPasswordQuality() {
-            return mSecurityModeMock;
-        }
-
-        public boolean isSecure() {
-            return mLockPatternEnabled || mLockPasswordEnabled || mTestSimPin || mTestSimPuk;
-        }
-
-    }
-}
diff --git a/packages/SystemUI/Android.mk b/packages/SystemUI/Android.mk
index d1e1060e18d43..1ebfbad6d206f 100644
--- a/packages/SystemUI/Android.mk
+++ b/packages/SystemUI/Android.mk
@@ -11,6 +11,14 @@ LOCAL_PROTO_JAVA_OUTPUT_PARAMS := optional_field_style=accessors
 
 include $(BUILD_STATIC_JAVA_LIBRARY)
 
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := SystemUI-tags
+
+LOCAL_SRC_FILES := src/com/android/systemui/EventLogTags.logtags
+
+include $(BUILD_STATIC_JAVA_LIBRARY)
+
 # ------------------
 
 include $(CLEAR_VARS)
@@ -23,7 +31,6 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-Iaidl-files-unde
 
 LOCAL_STATIC_ANDROID_LIBRARIES := \
     SystemUIPluginLib \
-    Keyguard \
     android-support-v7-recyclerview \
     android-support-v7-preference \
     android-support-v7-appcompat \
@@ -32,6 +39,7 @@ LOCAL_STATIC_ANDROID_LIBRARIES := \
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
     framework-protos \
+    SystemUI-tags \
     SystemUI-proto
 
 LOCAL_JAVA_LIBRARIES := telephony-common
@@ -42,6 +50,7 @@ LOCAL_CERTIFICATE := platform
 LOCAL_PRIVILEGED_MODULE := true
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res-keyguard $(LOCAL_PATH)/res
 
 ifneq ($(INCREMENTAL_BUILDS),)
     LOCAL_PROGUARD_ENABLED := disabled
@@ -52,6 +61,8 @@ endif
 
 include frameworks/base/packages/SettingsLib/common.mk
 
+LOCAL_AAPT_FLAGS := --extra-packages com.android.keyguard
+
 include $(BUILD_PACKAGE)
 
 include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/packages/Keyguard/res/drawable-hdpi/ic_done_wht.png b/packages/SystemUI/res-keyguard/drawable-hdpi/ic_done_wht.png
similarity index 100%
rename from packages/Keyguard/res/drawable-hdpi/ic_done_wht.png
rename to packages/SystemUI/res-keyguard/drawable-hdpi/ic_done_wht.png
diff --git a/packages/Keyguard/res/drawable-hdpi/ic_lockscreen_sim.png b/packages/SystemUI/res-keyguard/drawable-hdpi/ic_lockscreen_sim.png
similarity index 100%
rename from packages/Keyguard/res/drawable-hdpi/ic_lockscreen_sim.png
rename to packages/SystemUI/res-keyguard/drawable-hdpi/ic_lockscreen_sim.png
diff --git a/packages/Keyguard/res/drawable-hdpi/kg_security_lock_normal.png b/packages/SystemUI/res-keyguard/drawable-hdpi/kg_security_lock_normal.png
similarity index 100%
rename from packages/Keyguard/res/drawable-hdpi/kg_security_lock_normal.png
rename to packages/SystemUI/res-keyguard/drawable-hdpi/kg_security_lock_normal.png
diff --git a/packages/Keyguard/res/drawable-mdpi/ic_done_wht.png b/packages/SystemUI/res-keyguard/drawable-mdpi/ic_done_wht.png
similarity index 100%
rename from packages/Keyguard/res/drawable-mdpi/ic_done_wht.png
rename to packages/SystemUI/res-keyguard/drawable-mdpi/ic_done_wht.png
diff --git a/packages/Keyguard/res/drawable-mdpi/ic_lockscreen_sim.png b/packages/SystemUI/res-keyguard/drawable-mdpi/ic_lockscreen_sim.png
similarity index 100%
rename from packages/Keyguard/res/drawable-mdpi/ic_lockscreen_sim.png
rename to packages/SystemUI/res-keyguard/drawable-mdpi/ic_lockscreen_sim.png
diff --git a/packages/Keyguard/res/drawable-mdpi/kg_security_lock_normal.png b/packages/SystemUI/res-keyguard/drawable-mdpi/kg_security_lock_normal.png
similarity index 100%
rename from packages/Keyguard/res/drawable-mdpi/kg_security_lock_normal.png
rename to packages/SystemUI/res-keyguard/drawable-mdpi/kg_security_lock_normal.png
diff --git a/packages/Keyguard/res/drawable-xhdpi/ic_done_wht.png b/packages/SystemUI/res-keyguard/drawable-xhdpi/ic_done_wht.png
similarity index 100%
rename from packages/Keyguard/res/drawable-xhdpi/ic_done_wht.png
rename to packages/SystemUI/res-keyguard/drawable-xhdpi/ic_done_wht.png
diff --git a/packages/Keyguard/res/drawable-xhdpi/ic_lockscreen_sim.png b/packages/SystemUI/res-keyguard/drawable-xhdpi/ic_lockscreen_sim.png
similarity index 100%
rename from packages/Keyguard/res/drawable-xhdpi/ic_lockscreen_sim.png
rename to packages/SystemUI/res-keyguard/drawable-xhdpi/ic_lockscreen_sim.png
diff --git a/packages/Keyguard/res/drawable-xhdpi/kg_security_lock_normal.png b/packages/SystemUI/res-keyguard/drawable-xhdpi/kg_security_lock_normal.png
similarity index 100%
rename from packages/Keyguard/res/drawable-xhdpi/kg_security_lock_normal.png
rename to packages/SystemUI/res-keyguard/drawable-xhdpi/kg_security_lock_normal.png
diff --git a/packages/Keyguard/res/drawable-xxhdpi/ic_done_wht.png b/packages/SystemUI/res-keyguard/drawable-xxhdpi/ic_done_wht.png
similarity index 100%
rename from packages/Keyguard/res/drawable-xxhdpi/ic_done_wht.png
rename to packages/SystemUI/res-keyguard/drawable-xxhdpi/ic_done_wht.png
diff --git a/packages/Keyguard/res/drawable-xxxhdpi/ic_done_wht.png b/packages/SystemUI/res-keyguard/drawable-xxxhdpi/ic_done_wht.png
similarity index 100%
rename from packages/Keyguard/res/drawable-xxxhdpi/ic_done_wht.png
rename to packages/SystemUI/res-keyguard/drawable-xxxhdpi/ic_done_wht.png
diff --git a/packages/Keyguard/res/drawable/ic_access_alarms_big.xml b/packages/SystemUI/res-keyguard/drawable/ic_access_alarms_big.xml
similarity index 100%
rename from packages/Keyguard/res/drawable/ic_access_alarms_big.xml
rename to packages/SystemUI/res-keyguard/drawable/ic_access_alarms_big.xml
diff --git a/packages/Keyguard/res/drawable/ic_backspace_24dp.xml b/packages/SystemUI/res-keyguard/drawable/ic_backspace_24dp.xml
similarity index 100%
rename from packages/Keyguard/res/drawable/ic_backspace_24dp.xml
rename to packages/SystemUI/res-keyguard/drawable/ic_backspace_24dp.xml
diff --git a/packages/Keyguard/res/drawable/ic_lockscreen_ime.xml b/packages/SystemUI/res-keyguard/drawable/ic_lockscreen_ime.xml
similarity index 100%
rename from packages/Keyguard/res/drawable/ic_lockscreen_ime.xml
rename to packages/SystemUI/res-keyguard/drawable/ic_lockscreen_ime.xml
diff --git a/packages/Keyguard/res/drawable/ripple_drawable.xml b/packages/SystemUI/res-keyguard/drawable/ripple_drawable.xml
similarity index 100%
rename from packages/Keyguard/res/drawable/ripple_drawable.xml
rename to packages/SystemUI/res-keyguard/drawable/ripple_drawable.xml
diff --git a/packages/Keyguard/res/layout/keyguard_bouncer.xml b/packages/SystemUI/res-keyguard/layout/keyguard_bouncer.xml
similarity index 100%
rename from packages/Keyguard/res/layout/keyguard_bouncer.xml
rename to packages/SystemUI/res-keyguard/layout/keyguard_bouncer.xml
diff --git a/packages/Keyguard/res/layout/keyguard_emergency_carrier_area.xml b/packages/SystemUI/res-keyguard/layout/keyguard_emergency_carrier_area.xml
similarity index 100%
rename from packages/Keyguard/res/layout/keyguard_emergency_carrier_area.xml
rename to packages/SystemUI/res-keyguard/layout/keyguard_emergency_carrier_area.xml
diff --git a/packages/Keyguard/res/layout/keyguard_host_view.xml b/packages/SystemUI/res-keyguard/layout/keyguard_host_view.xml
similarity index 100%
rename from packages/Keyguard/res/layout/keyguard_host_view.xml
rename to packages/SystemUI/res-keyguard/layout/keyguard_host_view.xml
diff --git a/packages/Keyguard/res/layout/keyguard_message_area.xml b/packages/SystemUI/res-keyguard/layout/keyguard_message_area.xml
similarity index 100%
rename from packages/Keyguard/res/layout/keyguard_message_area.xml
rename to packages/SystemUI/res-keyguard/layout/keyguard_message_area.xml
diff --git a/packages/Keyguard/res/layout/keyguard_message_area_large.xml b/packages/SystemUI/res-keyguard/layout/keyguard_message_area_large.xml
similarity index 100%
rename from packages/Keyguard/res/layout/keyguard_message_area_large.xml
rename to packages/SystemUI/res-keyguard/layout/keyguard_message_area_large.xml
diff --git a/packages/Keyguard/res/layout/keyguard_num_pad_key.xml b/packages/SystemUI/res-keyguard/layout/keyguard_num_pad_key.xml
similarity index 100%
rename from packages/Keyguard/res/layout/keyguard_num_pad_key.xml
rename to packages/SystemUI/res-keyguard/layout/keyguard_num_pad_key.xml
diff --git a/packages/Keyguard/res/layout/keyguard_password_view.xml b/packages/SystemUI/res-keyguard/layout/keyguard_password_view.xml
similarity index 100%
rename from packages/Keyguard/res/layout/keyguard_password_view.xml
rename to packages/SystemUI/res-keyguard/layout/keyguard_password_view.xml
diff --git a/packages/Keyguard/res/layout/keyguard_pattern_view.xml b/packages/SystemUI/res-keyguard/layout/keyguard_pattern_view.xml
similarity index 100%
rename from packages/Keyguard/res/layout/keyguard_pattern_view.xml
rename to packages/SystemUI/res-keyguard/layout/keyguard_pattern_view.xml
diff --git a/packages/Keyguard/res/layout/keyguard_pin_view.xml b/packages/SystemUI/res-keyguard/layout/keyguard_pin_view.xml
similarity index 100%
rename from packages/Keyguard/res/layout/keyguard_pin_view.xml
rename to packages/SystemUI/res-keyguard/layout/keyguard_pin_view.xml
diff --git a/packages/Keyguard/res/layout/keyguard_presentation.xml b/packages/SystemUI/res-keyguard/layout/keyguard_presentation.xml
similarity index 100%
rename from packages/Keyguard/res/layout/keyguard_presentation.xml
rename to packages/SystemUI/res-keyguard/layout/keyguard_presentation.xml
diff --git a/packages/Keyguard/res/layout/keyguard_sim_pin_view.xml b/packages/SystemUI/res-keyguard/layout/keyguard_sim_pin_view.xml
similarity index 100%
rename from packages/Keyguard/res/layout/keyguard_sim_pin_view.xml
rename to packages/SystemUI/res-keyguard/layout/keyguard_sim_pin_view.xml
diff --git a/packages/Keyguard/res/layout/keyguard_sim_puk_view.xml b/packages/SystemUI/res-keyguard/layout/keyguard_sim_puk_view.xml
similarity index 100%
rename from packages/Keyguard/res/layout/keyguard_sim_puk_view.xml
rename to packages/SystemUI/res-keyguard/layout/keyguard_sim_puk_view.xml
diff --git a/packages/Keyguard/res/layout/keyguard_status_area.xml b/packages/SystemUI/res-keyguard/layout/keyguard_status_area.xml
similarity index 100%
rename from packages/Keyguard/res/layout/keyguard_status_area.xml
rename to packages/SystemUI/res-keyguard/layout/keyguard_status_area.xml
diff --git a/packages/Keyguard/res/layout/keyguard_status_view.xml b/packages/SystemUI/res-keyguard/layout/keyguard_status_view.xml
similarity index 100%
rename from packages/Keyguard/res/layout/keyguard_status_view.xml
rename to packages/SystemUI/res-keyguard/layout/keyguard_status_view.xml
diff --git a/packages/Keyguard/res/values-af/strings.xml b/packages/SystemUI/res-keyguard/values-af/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-af/strings.xml
rename to packages/SystemUI/res-keyguard/values-af/strings.xml
diff --git a/packages/Keyguard/res/values-am/strings.xml b/packages/SystemUI/res-keyguard/values-am/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-am/strings.xml
rename to packages/SystemUI/res-keyguard/values-am/strings.xml
diff --git a/packages/Keyguard/res/values-ar/strings.xml b/packages/SystemUI/res-keyguard/values-ar/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-ar/strings.xml
rename to packages/SystemUI/res-keyguard/values-ar/strings.xml
diff --git a/packages/Keyguard/res/values-az/strings.xml b/packages/SystemUI/res-keyguard/values-az/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-az/strings.xml
rename to packages/SystemUI/res-keyguard/values-az/strings.xml
diff --git a/packages/Keyguard/res/values-b+sr+Latn/strings.xml b/packages/SystemUI/res-keyguard/values-b+sr+Latn/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-b+sr+Latn/strings.xml
rename to packages/SystemUI/res-keyguard/values-b+sr+Latn/strings.xml
diff --git a/packages/Keyguard/res/values-be/strings.xml b/packages/SystemUI/res-keyguard/values-be/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-be/strings.xml
rename to packages/SystemUI/res-keyguard/values-be/strings.xml
diff --git a/packages/Keyguard/res/values-bg/strings.xml b/packages/SystemUI/res-keyguard/values-bg/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-bg/strings.xml
rename to packages/SystemUI/res-keyguard/values-bg/strings.xml
diff --git a/packages/Keyguard/res/values-bn/strings.xml b/packages/SystemUI/res-keyguard/values-bn/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-bn/strings.xml
rename to packages/SystemUI/res-keyguard/values-bn/strings.xml
diff --git a/packages/Keyguard/res/values-bs/strings.xml b/packages/SystemUI/res-keyguard/values-bs/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-bs/strings.xml
rename to packages/SystemUI/res-keyguard/values-bs/strings.xml
diff --git a/packages/Keyguard/res/values-ca/strings.xml b/packages/SystemUI/res-keyguard/values-ca/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-ca/strings.xml
rename to packages/SystemUI/res-keyguard/values-ca/strings.xml
diff --git a/packages/Keyguard/res/values-cs/strings.xml b/packages/SystemUI/res-keyguard/values-cs/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-cs/strings.xml
rename to packages/SystemUI/res-keyguard/values-cs/strings.xml
diff --git a/packages/Keyguard/res/values-da/strings.xml b/packages/SystemUI/res-keyguard/values-da/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-da/strings.xml
rename to packages/SystemUI/res-keyguard/values-da/strings.xml
diff --git a/packages/Keyguard/res/values-de/strings.xml b/packages/SystemUI/res-keyguard/values-de/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-de/strings.xml
rename to packages/SystemUI/res-keyguard/values-de/strings.xml
diff --git a/packages/Keyguard/res/values-el/strings.xml b/packages/SystemUI/res-keyguard/values-el/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-el/strings.xml
rename to packages/SystemUI/res-keyguard/values-el/strings.xml
diff --git a/packages/Keyguard/res/values-en-rAU/strings.xml b/packages/SystemUI/res-keyguard/values-en-rAU/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-en-rAU/strings.xml
rename to packages/SystemUI/res-keyguard/values-en-rAU/strings.xml
diff --git a/packages/Keyguard/res/values-en-rGB/strings.xml b/packages/SystemUI/res-keyguard/values-en-rGB/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-en-rGB/strings.xml
rename to packages/SystemUI/res-keyguard/values-en-rGB/strings.xml
diff --git a/packages/Keyguard/res/values-en-rIN/strings.xml b/packages/SystemUI/res-keyguard/values-en-rIN/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-en-rIN/strings.xml
rename to packages/SystemUI/res-keyguard/values-en-rIN/strings.xml
diff --git a/packages/Keyguard/res/values-es-rUS/strings.xml b/packages/SystemUI/res-keyguard/values-es-rUS/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-es-rUS/strings.xml
rename to packages/SystemUI/res-keyguard/values-es-rUS/strings.xml
diff --git a/packages/Keyguard/res/values-es/strings.xml b/packages/SystemUI/res-keyguard/values-es/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-es/strings.xml
rename to packages/SystemUI/res-keyguard/values-es/strings.xml
diff --git a/packages/Keyguard/res/values-et/strings.xml b/packages/SystemUI/res-keyguard/values-et/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-et/strings.xml
rename to packages/SystemUI/res-keyguard/values-et/strings.xml
diff --git a/packages/Keyguard/res/values-eu/strings.xml b/packages/SystemUI/res-keyguard/values-eu/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-eu/strings.xml
rename to packages/SystemUI/res-keyguard/values-eu/strings.xml
diff --git a/packages/Keyguard/res/values-fa/strings.xml b/packages/SystemUI/res-keyguard/values-fa/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-fa/strings.xml
rename to packages/SystemUI/res-keyguard/values-fa/strings.xml
diff --git a/packages/Keyguard/res/values-fi/strings.xml b/packages/SystemUI/res-keyguard/values-fi/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-fi/strings.xml
rename to packages/SystemUI/res-keyguard/values-fi/strings.xml
diff --git a/packages/Keyguard/res/values-fr-rCA/strings.xml b/packages/SystemUI/res-keyguard/values-fr-rCA/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-fr-rCA/strings.xml
rename to packages/SystemUI/res-keyguard/values-fr-rCA/strings.xml
diff --git a/packages/Keyguard/res/values-fr/strings.xml b/packages/SystemUI/res-keyguard/values-fr/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-fr/strings.xml
rename to packages/SystemUI/res-keyguard/values-fr/strings.xml
diff --git a/packages/Keyguard/res/values-gl/strings.xml b/packages/SystemUI/res-keyguard/values-gl/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-gl/strings.xml
rename to packages/SystemUI/res-keyguard/values-gl/strings.xml
diff --git a/packages/Keyguard/res/values-gu/strings.xml b/packages/SystemUI/res-keyguard/values-gu/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-gu/strings.xml
rename to packages/SystemUI/res-keyguard/values-gu/strings.xml
diff --git a/packages/Keyguard/res/values-h560dp/dimens.xml b/packages/SystemUI/res-keyguard/values-h560dp/dimens.xml
similarity index 100%
rename from packages/Keyguard/res/values-h560dp/dimens.xml
rename to packages/SystemUI/res-keyguard/values-h560dp/dimens.xml
diff --git a/packages/Keyguard/res/values-h650dp/dimens.xml b/packages/SystemUI/res-keyguard/values-h650dp/dimens.xml
similarity index 100%
rename from packages/Keyguard/res/values-h650dp/dimens.xml
rename to packages/SystemUI/res-keyguard/values-h650dp/dimens.xml
diff --git a/packages/Keyguard/res/values-hi/strings.xml b/packages/SystemUI/res-keyguard/values-hi/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-hi/strings.xml
rename to packages/SystemUI/res-keyguard/values-hi/strings.xml
diff --git a/packages/Keyguard/res/values-hr/strings.xml b/packages/SystemUI/res-keyguard/values-hr/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-hr/strings.xml
rename to packages/SystemUI/res-keyguard/values-hr/strings.xml
diff --git a/packages/Keyguard/res/values-hu/strings.xml b/packages/SystemUI/res-keyguard/values-hu/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-hu/strings.xml
rename to packages/SystemUI/res-keyguard/values-hu/strings.xml
diff --git a/packages/Keyguard/res/values-hy/strings.xml b/packages/SystemUI/res-keyguard/values-hy/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-hy/strings.xml
rename to packages/SystemUI/res-keyguard/values-hy/strings.xml
diff --git a/packages/Keyguard/res/values-in/strings.xml b/packages/SystemUI/res-keyguard/values-in/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-in/strings.xml
rename to packages/SystemUI/res-keyguard/values-in/strings.xml
diff --git a/packages/Keyguard/res/values-is/strings.xml b/packages/SystemUI/res-keyguard/values-is/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-is/strings.xml
rename to packages/SystemUI/res-keyguard/values-is/strings.xml
diff --git a/packages/Keyguard/res/values-it/strings.xml b/packages/SystemUI/res-keyguard/values-it/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-it/strings.xml
rename to packages/SystemUI/res-keyguard/values-it/strings.xml
diff --git a/packages/Keyguard/res/values-iw/strings.xml b/packages/SystemUI/res-keyguard/values-iw/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-iw/strings.xml
rename to packages/SystemUI/res-keyguard/values-iw/strings.xml
diff --git a/packages/Keyguard/res/values-ja/strings.xml b/packages/SystemUI/res-keyguard/values-ja/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-ja/strings.xml
rename to packages/SystemUI/res-keyguard/values-ja/strings.xml
diff --git a/packages/Keyguard/res/values-ka/strings.xml b/packages/SystemUI/res-keyguard/values-ka/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-ka/strings.xml
rename to packages/SystemUI/res-keyguard/values-ka/strings.xml
diff --git a/packages/Keyguard/res/values-kk/strings.xml b/packages/SystemUI/res-keyguard/values-kk/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-kk/strings.xml
rename to packages/SystemUI/res-keyguard/values-kk/strings.xml
diff --git a/packages/Keyguard/res/values-km/strings.xml b/packages/SystemUI/res-keyguard/values-km/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-km/strings.xml
rename to packages/SystemUI/res-keyguard/values-km/strings.xml
diff --git a/packages/Keyguard/res/values-kn/strings.xml b/packages/SystemUI/res-keyguard/values-kn/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-kn/strings.xml
rename to packages/SystemUI/res-keyguard/values-kn/strings.xml
diff --git a/packages/Keyguard/res/values-ko/strings.xml b/packages/SystemUI/res-keyguard/values-ko/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-ko/strings.xml
rename to packages/SystemUI/res-keyguard/values-ko/strings.xml
diff --git a/packages/Keyguard/res/values-ky/strings.xml b/packages/SystemUI/res-keyguard/values-ky/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-ky/strings.xml
rename to packages/SystemUI/res-keyguard/values-ky/strings.xml
diff --git a/packages/Keyguard/res/values-land/bools.xml b/packages/SystemUI/res-keyguard/values-land/bools.xml
similarity index 100%
rename from packages/Keyguard/res/values-land/bools.xml
rename to packages/SystemUI/res-keyguard/values-land/bools.xml
diff --git a/packages/Keyguard/res/values-land/integers.xml b/packages/SystemUI/res-keyguard/values-land/integers.xml
similarity index 100%
rename from packages/Keyguard/res/values-land/integers.xml
rename to packages/SystemUI/res-keyguard/values-land/integers.xml
diff --git a/packages/Keyguard/res/values-lo/strings.xml b/packages/SystemUI/res-keyguard/values-lo/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-lo/strings.xml
rename to packages/SystemUI/res-keyguard/values-lo/strings.xml
diff --git a/packages/Keyguard/res/values-lt/strings.xml b/packages/SystemUI/res-keyguard/values-lt/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-lt/strings.xml
rename to packages/SystemUI/res-keyguard/values-lt/strings.xml
diff --git a/packages/Keyguard/res/values-lv/strings.xml b/packages/SystemUI/res-keyguard/values-lv/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-lv/strings.xml
rename to packages/SystemUI/res-keyguard/values-lv/strings.xml
diff --git a/packages/Keyguard/res/values-mcc262-mnc07/bools.xml b/packages/SystemUI/res-keyguard/values-mcc262-mnc07/bools.xml
similarity index 100%
rename from packages/Keyguard/res/values-mcc262-mnc07/bools.xml
rename to packages/SystemUI/res-keyguard/values-mcc262-mnc07/bools.xml
diff --git a/packages/Keyguard/res/values-mcc262-mnc08/bools.xml b/packages/SystemUI/res-keyguard/values-mcc262-mnc08/bools.xml
similarity index 100%
rename from packages/Keyguard/res/values-mcc262-mnc08/bools.xml
rename to packages/SystemUI/res-keyguard/values-mcc262-mnc08/bools.xml
diff --git a/packages/Keyguard/res/values-mcc262-mnc11/bools.xml b/packages/SystemUI/res-keyguard/values-mcc262-mnc11/bools.xml
similarity index 100%
rename from packages/Keyguard/res/values-mcc262-mnc11/bools.xml
rename to packages/SystemUI/res-keyguard/values-mcc262-mnc11/bools.xml
diff --git a/packages/Keyguard/res/values-mk/strings.xml b/packages/SystemUI/res-keyguard/values-mk/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-mk/strings.xml
rename to packages/SystemUI/res-keyguard/values-mk/strings.xml
diff --git a/packages/Keyguard/res/values-ml/strings.xml b/packages/SystemUI/res-keyguard/values-ml/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-ml/strings.xml
rename to packages/SystemUI/res-keyguard/values-ml/strings.xml
diff --git a/packages/Keyguard/res/values-mn/strings.xml b/packages/SystemUI/res-keyguard/values-mn/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-mn/strings.xml
rename to packages/SystemUI/res-keyguard/values-mn/strings.xml
diff --git a/packages/Keyguard/res/values-mr/strings.xml b/packages/SystemUI/res-keyguard/values-mr/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-mr/strings.xml
rename to packages/SystemUI/res-keyguard/values-mr/strings.xml
diff --git a/packages/Keyguard/res/values-ms/strings.xml b/packages/SystemUI/res-keyguard/values-ms/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-ms/strings.xml
rename to packages/SystemUI/res-keyguard/values-ms/strings.xml
diff --git a/packages/Keyguard/res/values-my/dimens.xml b/packages/SystemUI/res-keyguard/values-my/dimens.xml
similarity index 100%
rename from packages/Keyguard/res/values-my/dimens.xml
rename to packages/SystemUI/res-keyguard/values-my/dimens.xml
diff --git a/packages/Keyguard/res/values-my/strings.xml b/packages/SystemUI/res-keyguard/values-my/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-my/strings.xml
rename to packages/SystemUI/res-keyguard/values-my/strings.xml
diff --git a/packages/Keyguard/res/values-nb/strings.xml b/packages/SystemUI/res-keyguard/values-nb/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-nb/strings.xml
rename to packages/SystemUI/res-keyguard/values-nb/strings.xml
diff --git a/packages/Keyguard/res/values-ne/strings.xml b/packages/SystemUI/res-keyguard/values-ne/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-ne/strings.xml
rename to packages/SystemUI/res-keyguard/values-ne/strings.xml
diff --git a/packages/Keyguard/res/values-nl/strings.xml b/packages/SystemUI/res-keyguard/values-nl/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-nl/strings.xml
rename to packages/SystemUI/res-keyguard/values-nl/strings.xml
diff --git a/packages/Keyguard/res/values-pa/strings.xml b/packages/SystemUI/res-keyguard/values-pa/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-pa/strings.xml
rename to packages/SystemUI/res-keyguard/values-pa/strings.xml
diff --git a/packages/Keyguard/res/values-pl/strings.xml b/packages/SystemUI/res-keyguard/values-pl/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-pl/strings.xml
rename to packages/SystemUI/res-keyguard/values-pl/strings.xml
diff --git a/packages/Keyguard/res/values-port/bools.xml b/packages/SystemUI/res-keyguard/values-port/bools.xml
similarity index 100%
rename from packages/Keyguard/res/values-port/bools.xml
rename to packages/SystemUI/res-keyguard/values-port/bools.xml
diff --git a/packages/Keyguard/res/values-port/integers.xml b/packages/SystemUI/res-keyguard/values-port/integers.xml
similarity index 100%
rename from packages/Keyguard/res/values-port/integers.xml
rename to packages/SystemUI/res-keyguard/values-port/integers.xml
diff --git a/packages/Keyguard/res/values-pt-rBR/strings.xml b/packages/SystemUI/res-keyguard/values-pt-rBR/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-pt-rBR/strings.xml
rename to packages/SystemUI/res-keyguard/values-pt-rBR/strings.xml
diff --git a/packages/Keyguard/res/values-pt-rPT/strings.xml b/packages/SystemUI/res-keyguard/values-pt-rPT/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-pt-rPT/strings.xml
rename to packages/SystemUI/res-keyguard/values-pt-rPT/strings.xml
diff --git a/packages/Keyguard/res/values-pt/strings.xml b/packages/SystemUI/res-keyguard/values-pt/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-pt/strings.xml
rename to packages/SystemUI/res-keyguard/values-pt/strings.xml
diff --git a/packages/Keyguard/res/values-ro/strings.xml b/packages/SystemUI/res-keyguard/values-ro/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-ro/strings.xml
rename to packages/SystemUI/res-keyguard/values-ro/strings.xml
diff --git a/packages/Keyguard/res/values-ru/strings.xml b/packages/SystemUI/res-keyguard/values-ru/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-ru/strings.xml
rename to packages/SystemUI/res-keyguard/values-ru/strings.xml
diff --git a/packages/Keyguard/res/values-si/strings.xml b/packages/SystemUI/res-keyguard/values-si/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-si/strings.xml
rename to packages/SystemUI/res-keyguard/values-si/strings.xml
diff --git a/packages/Keyguard/res/values-sk/strings.xml b/packages/SystemUI/res-keyguard/values-sk/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-sk/strings.xml
rename to packages/SystemUI/res-keyguard/values-sk/strings.xml
diff --git a/packages/Keyguard/res/values-sl/strings.xml b/packages/SystemUI/res-keyguard/values-sl/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-sl/strings.xml
rename to packages/SystemUI/res-keyguard/values-sl/strings.xml
diff --git a/packages/Keyguard/res/values-sq/strings.xml b/packages/SystemUI/res-keyguard/values-sq/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-sq/strings.xml
rename to packages/SystemUI/res-keyguard/values-sq/strings.xml
diff --git a/packages/Keyguard/res/values-sr/strings.xml b/packages/SystemUI/res-keyguard/values-sr/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-sr/strings.xml
rename to packages/SystemUI/res-keyguard/values-sr/strings.xml
diff --git a/packages/Keyguard/res/values-sv/strings.xml b/packages/SystemUI/res-keyguard/values-sv/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-sv/strings.xml
rename to packages/SystemUI/res-keyguard/values-sv/strings.xml
diff --git a/packages/Keyguard/res/values-sw/strings.xml b/packages/SystemUI/res-keyguard/values-sw/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-sw/strings.xml
rename to packages/SystemUI/res-keyguard/values-sw/strings.xml
diff --git a/packages/Keyguard/res/values-sw320dp/dimens.xml b/packages/SystemUI/res-keyguard/values-sw320dp/dimens.xml
similarity index 100%
rename from packages/Keyguard/res/values-sw320dp/dimens.xml
rename to packages/SystemUI/res-keyguard/values-sw320dp/dimens.xml
diff --git a/packages/Keyguard/res/values-sw360dp/dimens.xml b/packages/SystemUI/res-keyguard/values-sw360dp/dimens.xml
similarity index 100%
rename from packages/Keyguard/res/values-sw360dp/dimens.xml
rename to packages/SystemUI/res-keyguard/values-sw360dp/dimens.xml
diff --git a/packages/Keyguard/res/values-sw380dp/dimens.xml b/packages/SystemUI/res-keyguard/values-sw380dp/dimens.xml
similarity index 100%
rename from packages/Keyguard/res/values-sw380dp/dimens.xml
rename to packages/SystemUI/res-keyguard/values-sw380dp/dimens.xml
diff --git a/packages/Keyguard/res/values-sw540dp-port/dimens.xml b/packages/SystemUI/res-keyguard/values-sw540dp-port/dimens.xml
similarity index 100%
rename from packages/Keyguard/res/values-sw540dp-port/dimens.xml
rename to packages/SystemUI/res-keyguard/values-sw540dp-port/dimens.xml
diff --git a/packages/Keyguard/res/values-sw600dp-land/dimens.xml b/packages/SystemUI/res-keyguard/values-sw600dp-land/dimens.xml
similarity index 100%
rename from packages/Keyguard/res/values-sw600dp-land/dimens.xml
rename to packages/SystemUI/res-keyguard/values-sw600dp-land/dimens.xml
diff --git a/packages/Keyguard/res/values-sw600dp/alias.xml b/packages/SystemUI/res-keyguard/values-sw600dp/alias.xml
similarity index 100%
rename from packages/Keyguard/res/values-sw600dp/alias.xml
rename to packages/SystemUI/res-keyguard/values-sw600dp/alias.xml
diff --git a/packages/Keyguard/res/values-sw600dp/bools.xml b/packages/SystemUI/res-keyguard/values-sw600dp/bools.xml
similarity index 100%
rename from packages/Keyguard/res/values-sw600dp/bools.xml
rename to packages/SystemUI/res-keyguard/values-sw600dp/bools.xml
diff --git a/packages/Keyguard/res/values-sw600dp/dimens.xml b/packages/SystemUI/res-keyguard/values-sw600dp/dimens.xml
similarity index 100%
rename from packages/Keyguard/res/values-sw600dp/dimens.xml
rename to packages/SystemUI/res-keyguard/values-sw600dp/dimens.xml
diff --git a/packages/Keyguard/res/values-sw600dp/styles.xml b/packages/SystemUI/res-keyguard/values-sw600dp/styles.xml
similarity index 100%
rename from packages/Keyguard/res/values-sw600dp/styles.xml
rename to packages/SystemUI/res-keyguard/values-sw600dp/styles.xml
diff --git a/packages/Keyguard/res/values-sw720dp/dimens.xml b/packages/SystemUI/res-keyguard/values-sw720dp/dimens.xml
similarity index 100%
rename from packages/Keyguard/res/values-sw720dp/dimens.xml
rename to packages/SystemUI/res-keyguard/values-sw720dp/dimens.xml
diff --git a/packages/Keyguard/res/values-ta/strings.xml b/packages/SystemUI/res-keyguard/values-ta/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-ta/strings.xml
rename to packages/SystemUI/res-keyguard/values-ta/strings.xml
diff --git a/packages/Keyguard/res/values-te/strings.xml b/packages/SystemUI/res-keyguard/values-te/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-te/strings.xml
rename to packages/SystemUI/res-keyguard/values-te/strings.xml
diff --git a/packages/Keyguard/res/values-th/strings.xml b/packages/SystemUI/res-keyguard/values-th/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-th/strings.xml
rename to packages/SystemUI/res-keyguard/values-th/strings.xml
diff --git a/packages/Keyguard/res/values-tl/strings.xml b/packages/SystemUI/res-keyguard/values-tl/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-tl/strings.xml
rename to packages/SystemUI/res-keyguard/values-tl/strings.xml
diff --git a/packages/Keyguard/res/values-tr/strings.xml b/packages/SystemUI/res-keyguard/values-tr/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-tr/strings.xml
rename to packages/SystemUI/res-keyguard/values-tr/strings.xml
diff --git a/packages/Keyguard/res/values-uk/strings.xml b/packages/SystemUI/res-keyguard/values-uk/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-uk/strings.xml
rename to packages/SystemUI/res-keyguard/values-uk/strings.xml
diff --git a/packages/Keyguard/res/values-ur/strings.xml b/packages/SystemUI/res-keyguard/values-ur/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-ur/strings.xml
rename to packages/SystemUI/res-keyguard/values-ur/strings.xml
diff --git a/packages/Keyguard/res/values-uz/strings.xml b/packages/SystemUI/res-keyguard/values-uz/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-uz/strings.xml
rename to packages/SystemUI/res-keyguard/values-uz/strings.xml
diff --git a/packages/Keyguard/res/values-vi/strings.xml b/packages/SystemUI/res-keyguard/values-vi/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-vi/strings.xml
rename to packages/SystemUI/res-keyguard/values-vi/strings.xml
diff --git a/packages/Keyguard/res/values-zh-rCN/strings.xml b/packages/SystemUI/res-keyguard/values-zh-rCN/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-zh-rCN/strings.xml
rename to packages/SystemUI/res-keyguard/values-zh-rCN/strings.xml
diff --git a/packages/Keyguard/res/values-zh-rHK/strings.xml b/packages/SystemUI/res-keyguard/values-zh-rHK/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-zh-rHK/strings.xml
rename to packages/SystemUI/res-keyguard/values-zh-rHK/strings.xml
diff --git a/packages/Keyguard/res/values-zh-rTW/strings.xml b/packages/SystemUI/res-keyguard/values-zh-rTW/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-zh-rTW/strings.xml
rename to packages/SystemUI/res-keyguard/values-zh-rTW/strings.xml
diff --git a/packages/Keyguard/res/values-zu/strings.xml b/packages/SystemUI/res-keyguard/values-zu/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-zu/strings.xml
rename to packages/SystemUI/res-keyguard/values-zu/strings.xml
diff --git a/packages/Keyguard/res/values/alias.xml b/packages/SystemUI/res-keyguard/values/alias.xml
similarity index 100%
rename from packages/Keyguard/res/values/alias.xml
rename to packages/SystemUI/res-keyguard/values/alias.xml
diff --git a/packages/Keyguard/res/values/arrays.xml b/packages/SystemUI/res-keyguard/values/arrays.xml
similarity index 100%
rename from packages/Keyguard/res/values/arrays.xml
rename to packages/SystemUI/res-keyguard/values/arrays.xml
diff --git a/packages/Keyguard/res/values/attrs.xml b/packages/SystemUI/res-keyguard/values/attrs.xml
similarity index 100%
rename from packages/Keyguard/res/values/attrs.xml
rename to packages/SystemUI/res-keyguard/values/attrs.xml
diff --git a/packages/Keyguard/res/values/bools.xml b/packages/SystemUI/res-keyguard/values/bools.xml
similarity index 100%
rename from packages/Keyguard/res/values/bools.xml
rename to packages/SystemUI/res-keyguard/values/bools.xml
diff --git a/packages/Keyguard/res/values/colors.xml b/packages/SystemUI/res-keyguard/values/colors.xml
similarity index 100%
rename from packages/Keyguard/res/values/colors.xml
rename to packages/SystemUI/res-keyguard/values/colors.xml
diff --git a/packages/Keyguard/res/values/config.xml b/packages/SystemUI/res-keyguard/values/config.xml
similarity index 100%
rename from packages/Keyguard/res/values/config.xml
rename to packages/SystemUI/res-keyguard/values/config.xml
diff --git a/packages/Keyguard/res/values/dimens.xml b/packages/SystemUI/res-keyguard/values/dimens.xml
similarity index 100%
rename from packages/Keyguard/res/values/dimens.xml
rename to packages/SystemUI/res-keyguard/values/dimens.xml
diff --git a/packages/Keyguard/res/values/donottranslate.xml b/packages/SystemUI/res-keyguard/values/donottranslate.xml
similarity index 100%
rename from packages/Keyguard/res/values/donottranslate.xml
rename to packages/SystemUI/res-keyguard/values/donottranslate.xml
diff --git a/packages/Keyguard/res/values/strings.xml b/packages/SystemUI/res-keyguard/values/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values/strings.xml
rename to packages/SystemUI/res-keyguard/values/strings.xml
diff --git a/packages/Keyguard/res/values/styles.xml b/packages/SystemUI/res-keyguard/values/styles.xml
similarity index 100%
rename from packages/Keyguard/res/values/styles.xml
rename to packages/SystemUI/res-keyguard/values/styles.xml
diff --git a/packages/Keyguard/scripts/copy_profile_icons.sh b/packages/SystemUI/scripts/copy_profile_icons.sh
similarity index 100%
rename from packages/Keyguard/scripts/copy_profile_icons.sh
rename to packages/SystemUI/scripts/copy_profile_icons.sh
diff --git a/packages/Keyguard/scripts/new_merge.py b/packages/SystemUI/scripts/new_merge.py
similarity index 100%
rename from packages/Keyguard/scripts/new_merge.py
rename to packages/SystemUI/scripts/new_merge.py
diff --git a/packages/Keyguard/src/com/android/keyguard/AlphaOptimizedImageButton.java b/packages/SystemUI/src/com/android/keyguard/AlphaOptimizedImageButton.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/AlphaOptimizedImageButton.java
rename to packages/SystemUI/src/com/android/keyguard/AlphaOptimizedImageButton.java
diff --git a/packages/Keyguard/src/com/android/keyguard/AlphaOptimizedLinearLayout.java b/packages/SystemUI/src/com/android/keyguard/AlphaOptimizedLinearLayout.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/AlphaOptimizedLinearLayout.java
rename to packages/SystemUI/src/com/android/keyguard/AlphaOptimizedLinearLayout.java
diff --git a/packages/Keyguard/src/com/android/keyguard/AlphaOptimizedRelativeLayout.java b/packages/SystemUI/src/com/android/keyguard/AlphaOptimizedRelativeLayout.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/AlphaOptimizedRelativeLayout.java
rename to packages/SystemUI/src/com/android/keyguard/AlphaOptimizedRelativeLayout.java
diff --git a/packages/Keyguard/src/com/android/keyguard/CarrierText.java b/packages/SystemUI/src/com/android/keyguard/CarrierText.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/CarrierText.java
rename to packages/SystemUI/src/com/android/keyguard/CarrierText.java
diff --git a/packages/Keyguard/src/com/android/keyguard/EmergencyButton.java b/packages/SystemUI/src/com/android/keyguard/EmergencyButton.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/EmergencyButton.java
rename to packages/SystemUI/src/com/android/keyguard/EmergencyButton.java
diff --git a/packages/Keyguard/src/com/android/keyguard/EmergencyCarrierArea.java b/packages/SystemUI/src/com/android/keyguard/EmergencyCarrierArea.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/EmergencyCarrierArea.java
rename to packages/SystemUI/src/com/android/keyguard/EmergencyCarrierArea.java
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardAbsKeyInputView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardAbsKeyInputView.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/KeyguardAbsKeyInputView.java
rename to packages/SystemUI/src/com/android/keyguard/KeyguardAbsKeyInputView.java
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardConstants.java b/packages/SystemUI/src/com/android/keyguard/KeyguardConstants.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/KeyguardConstants.java
rename to packages/SystemUI/src/com/android/keyguard/KeyguardConstants.java
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardDisplayManager.java b/packages/SystemUI/src/com/android/keyguard/KeyguardDisplayManager.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/KeyguardDisplayManager.java
rename to packages/SystemUI/src/com/android/keyguard/KeyguardDisplayManager.java
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardHostView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardHostView.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/KeyguardHostView.java
rename to packages/SystemUI/src/com/android/keyguard/KeyguardHostView.java
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardMessageArea.java b/packages/SystemUI/src/com/android/keyguard/KeyguardMessageArea.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/KeyguardMessageArea.java
rename to packages/SystemUI/src/com/android/keyguard/KeyguardMessageArea.java
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardPINView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardPINView.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/KeyguardPINView.java
rename to packages/SystemUI/src/com/android/keyguard/KeyguardPINView.java
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardPasswordView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardPasswordView.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/KeyguardPasswordView.java
rename to packages/SystemUI/src/com/android/keyguard/KeyguardPasswordView.java
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardPatternView.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java
rename to packages/SystemUI/src/com/android/keyguard/KeyguardPatternView.java
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardPinBasedInputView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputView.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/KeyguardPinBasedInputView.java
rename to packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputView.java
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityCallback.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityCallback.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/KeyguardSecurityCallback.java
rename to packages/SystemUI/src/com/android/keyguard/KeyguardSecurityCallback.java
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java
rename to packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityModel.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityModel.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/KeyguardSecurityModel.java
rename to packages/SystemUI/src/com/android/keyguard/KeyguardSecurityModel.java
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityView.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/KeyguardSecurityView.java
rename to packages/SystemUI/src/com/android/keyguard/KeyguardSecurityView.java
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityViewFlipper.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityViewFlipper.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/KeyguardSecurityViewFlipper.java
rename to packages/SystemUI/src/com/android/keyguard/KeyguardSecurityViewFlipper.java
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardSimPinView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSimPinView.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/KeyguardSimPinView.java
rename to packages/SystemUI/src/com/android/keyguard/KeyguardSimPinView.java
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardSimPukView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSimPukView.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/KeyguardSimPukView.java
rename to packages/SystemUI/src/com/android/keyguard/KeyguardSimPukView.java
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardStatusView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/KeyguardStatusView.java
rename to packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
rename to packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitorCallback.java b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitorCallback.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitorCallback.java
rename to packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitorCallback.java
diff --git a/packages/Keyguard/src/com/android/keyguard/LatencyTracker.java b/packages/SystemUI/src/com/android/keyguard/LatencyTracker.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/LatencyTracker.java
rename to packages/SystemUI/src/com/android/keyguard/LatencyTracker.java
diff --git a/packages/Keyguard/src/com/android/keyguard/LiftToActivateListener.java b/packages/SystemUI/src/com/android/keyguard/LiftToActivateListener.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/LiftToActivateListener.java
rename to packages/SystemUI/src/com/android/keyguard/LiftToActivateListener.java
diff --git a/packages/Keyguard/src/com/android/keyguard/NumPadKey.java b/packages/SystemUI/src/com/android/keyguard/NumPadKey.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/NumPadKey.java
rename to packages/SystemUI/src/com/android/keyguard/NumPadKey.java
diff --git a/packages/Keyguard/src/com/android/keyguard/ObscureSpeechDelegate.java b/packages/SystemUI/src/com/android/keyguard/ObscureSpeechDelegate.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/ObscureSpeechDelegate.java
rename to packages/SystemUI/src/com/android/keyguard/ObscureSpeechDelegate.java
diff --git a/packages/Keyguard/src/com/android/keyguard/PasswordTextView.java b/packages/SystemUI/src/com/android/keyguard/PasswordTextView.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/PasswordTextView.java
rename to packages/SystemUI/src/com/android/keyguard/PasswordTextView.java
diff --git a/packages/Keyguard/src/com/android/keyguard/SecurityMessageDisplay.java b/packages/SystemUI/src/com/android/keyguard/SecurityMessageDisplay.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/SecurityMessageDisplay.java
rename to packages/SystemUI/src/com/android/keyguard/SecurityMessageDisplay.java
diff --git a/packages/Keyguard/src/com/android/keyguard/ViewMediatorCallback.java b/packages/SystemUI/src/com/android/keyguard/ViewMediatorCallback.java
similarity index 100%
rename from packages/Keyguard/src/com/android/keyguard/ViewMediatorCallback.java
rename to packages/SystemUI/src/com/android/keyguard/ViewMediatorCallback.java
diff --git a/packages/Keyguard/src/com/android/systemui/EventLogTags.logtags b/packages/SystemUI/src/com/android/systemui/EventLogTags.logtags
similarity index 100%
rename from packages/Keyguard/src/com/android/systemui/EventLogTags.logtags
rename to packages/SystemUI/src/com/android/systemui/EventLogTags.logtags
diff --git a/packages/SystemUI/tests/Android.mk b/packages/SystemUI/tests/Android.mk
index cefade086795a..8f5df7b54bec1 100644
--- a/packages/SystemUI/tests/Android.mk
+++ b/packages/SystemUI/tests/Android.mk
@@ -32,10 +32,10 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) \
 
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res \
     frameworks/base/packages/SystemUI/res \
+    frameworks/base/packages/SystemUI/res-keyguard \
 
 LOCAL_STATIC_ANDROID_LIBRARIES := \
     SystemUIPluginLib \
-    Keyguard \
     android-support-v7-recyclerview \
     android-support-v7-preference \
     android-support-v7-appcompat \
@@ -52,7 +52,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
 
 LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common android.car
 
-LOCAL_AAPT_FLAGS := --extra-packages com.android.systemui
+LOCAL_AAPT_FLAGS := --extra-packages com.android.systemui:com.android.keyguard
 
 # sign this with platform cert, so this test is allowed to inject key events into
 # UI it doesn't own. This is necessary to allow screenshots to be taken