diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000000..9bea4330f055c --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ + +.DS_Store diff --git a/cmds/bootanimation/bootanimation_main.cpp b/cmds/bootanimation/bootanimation_main.cpp index 5f8b7441f4dc5..161ba445824d7 100644 --- a/cmds/bootanimation/bootanimation_main.cpp +++ b/cmds/bootanimation/bootanimation_main.cpp @@ -45,7 +45,7 @@ int main(int argc, char** argv) #endif char value[PROPERTY_VALUE_MAX]; - property_get("debug.sf.nobootanimation", value, "0"); + property_get("persist.sys.nobootanimation", value, "0"); int noBootAnimation = atoi(value); LOGI_IF(noBootAnimation, "boot animation disabled"); if (!noBootAnimation) { diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java index c41439da22e9e..6e9551c534bd7 100644 --- a/core/java/android/provider/ContactsContract.java +++ b/core/java/android/provider/ContactsContract.java @@ -750,7 +750,11 @@ protected interface BaseSyncColumns { public static final String SYNC3 = "sync3"; /** Generic column for use by sync adapters. */ public static final String SYNC4 = "sync4"; +<<<<<<< HEAD /** Facebook contacts */ +======= + /** Facebook sync */ +>>>>>>> a653394989b691362658984f62af44943a1eba05 public static final String IS_RESTRICTED = "is_restricted"; } diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index bf86a071aa298..84ed4a1dc6b7e 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -589,6 +589,22 @@ public final class Settings { @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) public static final String ACTION_NFCSHARING_SETTINGS = "android.settings.NFCSHARING_SETTINGS"; + + /** + * Activity Action: Show Anderson settings. + *

+ * In some cases, a matching Activity may not exist, so ensure you + * safeguard against this. + *

+ * Input: Nothing. + *

+ * Output: Nothing + * + * @hide + */ + @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) + public static final String ACTION_ANDERSON_SETTINGS = + "android.settings.ANDERSON_SETTINGS"; // End of Intent actions for Settings @@ -1804,6 +1820,19 @@ public static void setShowGTalkServiceStatus(ContentResolver cr, boolean flag) { */ public static final String ACCELEROMETER_ROTATION = "accelerometer_rotation"; + /** + * Control the type of rotation which can be performed using the accelerometer + * if ACCELEROMETER_ROTATION is enabled. + * Value is a bitwise combination of + * 1 = 0 degrees (portrait) + * 2 = 90 degrees (left) + * 4 = 180 degrees (inverted portrait) + * 8 = 270 degrees (right) + * Setting to 0 is effectively orientation lock + * @hide + */ + public static final String ACCELEROMETER_ROTATION_ANGLES = "accelerometer_rotation_angles"; + /** * Default screen rotation when no other policy applies. * When {@link #ACCELEROMETER_ROTATION} is zero and no on-screen Activity expresses a @@ -2025,6 +2054,294 @@ public static void setShowGTalkServiceStatus(ContentResolver cr, boolean flag) { * @hide */ public static final String POINTER_SPEED = "pointer_speed"; + + /** + * Pulse light color setting. + * This is an int value which represents the color of the pulse light + * + * @hide + */ + public static final String NOTIFICATION_PULSE_COLOR = "notification_pulse_color"; + + /** + * Pulse light color fallback setting. + * This is an int value which represents the color of the pulse light if no setting is found + * + * @hide + */ + public static final int NOTIFICATION_PULSE_COLOR_FALLBACK = -1; // fallback to white if no other color set + + /** + * Use the Notification Power Widget? (Who wouldn't!) + * + * @hide + */ + public static final String EXPANDED_VIEW_WIDGET = "expanded_view_widget"; + + /** + * Whether to hide the notification screen after clicking on a widget + * button + * + * @hide + */ + public static final String EXPANDED_HIDE_ONCHANGE = "expanded_hide_onchange"; + + /** + * Hide scroll bar in power widget + * + * @hide + */ + public static final String EXPANDED_HIDE_SCROLLBAR = "expanded_hide_scrollbar"; + + /** + * Hide indicator in status bar widget + * + * @hide + */ + public static final String EXPANDED_HIDE_INDICATOR = "expanded_hide_indicator"; + + /** + * Haptic feedback in power widget + * + * @hide + */ + public static final String EXPANDED_HAPTIC_FEEDBACK = "expanded_haptic_feedback"; + + /** + * Notification Indicator Color + * + * @hide + */ + public static final String EXPANDED_VIEW_WIDGET_COLOR = "expanded_widget_color"; + + /** + * Widget Buttons to Use + * + * @hide + */ + public static final String WIDGET_BUTTONS = "expanded_widget_buttons"; + + /** + * Navigation controls to Use + * + * @hide + */ + public static final String NAV_BUTTONS = "nav_buttons"; + + /** + * Notification Power Widget - Custom Brightness Mode + * @hide + */ + public static final String EXPANDED_BRIGHTNESS_MODE = "expanded_brightness_mode"; + + /** + * Notification Power Widget - Custom Network Mode + * @hide + */ + public static final String EXPANDED_NETWORK_MODE = "expanded_network_mode"; + + /** + * Notification Power Widget - Custom LTE Toggle + * 1 - lte on, 0 - lte off + * @hide + */ + public static final String LTE_MODE = "lte_mode"; + + /** + * Notification Power Widget - Custom Screen Timeout + * @hide + */ + public static final String EXPANDED_SCREENTIMEOUT_MODE = "expanded_screentimeout_mode"; + + /** + * Notification Power Widget - Custom Ring Mode + * @hide + */ + public static final String EXPANDED_RING_MODE = "expanded_ring_mode"; + + /** + * Notification Power Widget - Custom Torch Mode + * @hide + */ + public static final String EXPANDED_FLASH_MODE = "expanded_flash_mode"; + + /** + * Setting to hide the statusbar alarm clock notification + * @hide + */ + public static final String STATUSBAR_SHOW_ALARM = "statusbar_show_alarm"; + + /** + * Status bar battery percentage text. + * @hide + */ + public static final String STATUSBAR_BATTERY_TEXT = "statusbar_battery_text"; + + /** + * Status bar battery percentage text style. + * @hide + */ + public static final String STATUSBAR_BATTERY_TEXT_STYLE = "statusbar_battery_text_style"; + + /** + * Pulse light duration setting. + * This is an int value which represents the milliseconds the pulse should flash + * + * @hide + */ + public static final String NOTIFICATION_PULSE_DURATION = "notification_pulse_duration"; + + /** + * Pulse light duration fallback setting. + * This is an int value which represents the milliseconds the pulse should flash + * + * @hide + */ + public static final int NOTIFICATION_PULSE_DURATION_FALLBACK = 500; // fallback to 500ms + + /** + * Pulse light frequency setting. + * This is an int value which represents the milliseconds between pulses + * + * @hide + */ + public static final String NOTIFICATION_PULSE_FREQUENCY = "notification_pulse_frequency"; + + /** + * Pulse light duration fallback setting. + * This is an int value which represents the milliseconds between pulses + * + * @hide + */ + public static final int NOTIFICATION_PULSE_FREQUENCY_FALLBACK = 7000; // fallback to 7000ms + + /** + * Setting for using battery percentage drawables + * @hide + */ + public static final String BATTERY_PERCENTAGES = "battery_percentages"; + + /** + * Setting to always show the menu button in navigation bar + * @hide + */ + public static final String PERSIST_MENU = "persist_menu"; + + /** + * Setting for AM/PM statusbar clock style + * + * @hide + */ + public static final String STATUSBAR_CLOCK_AM_PM_STYLE = "statusbar_clock_am_pm_style"; + + /** + * Setting for statusbar clock layout (right and center) + * + * @hide + */ + public static final String STATUSBAR_CLOCK_STYLE = "statusbar_clock_enabled"; + + /** + * Setting for custom statusbar clock colors + * + * @hide + */ + public static final String STATUSBAR_CLOCK_COLOR = "statusbar_clock_color"; + + /** + * Setting for statusbar clock layout (hide) + * + * @hide + */ + public static final String STATUSBAR_CLOCK_LOCKSCREEN_HIDE = "statusbar_clock_lockscreen_hide"; + + /** + * Setting to enable/disable menu unlock on the lockscreen + * + * @hide + */ + public static final String LOCKSCREEN_ENABLE_MENU_KEY = "lockscreen_enable_menu_key"; + + /** + * + * 0 = stock 1 = six 2 = eight 3 = eight unhidden + * @hide + */ + public static final String LOCKSCREEN_LAYOUT = "lockscreen_layout"; + + /** + * Setting for custom nav bar tint + * + * @hide + */ + public static final String NAVIGATION_BAR_TINT = "navigation_bar_tint"; + + /** + * Setting to switch the camera on the lockscreen out for the sound toggle + * + * @hide + */ + public static final String LOCKSCREEN_DISABLE_CAMERA = "lockscreen_disable_camera"; + + /** + * whether volume keys wake the screen. boolean value + * + * @hide + */ + public static final String VOLUME_WAKE_SCREEN = "volume_wake_screen"; + + /** + * launch a custom app for sms + * + * @hide + */ + public static final String LOCKSCREEN_CUSTOM_SMS_INTENT = "lockscreen_custom_sms_intent"; + + /** + * launch a custom app for upper right target + * + * @hide + */ + public static final String LOCKSCREEN_CUSTOM_UPPER_RIGHT_INTENT = "lockscreen_custom_upper_right_intent"; + + /** + * launch a custom app for upper left target + * + * @hide + */ + public static final String LOCKSCREEN_CUSTOM_UPPER_LEFT_INTENT = "lockscreen_custom_upper_left_intent"; + + /** + * launch a custom app for lower right target + * + * @hide + */ + public static final String LOCKSCREEN_CUSTOM_LOWER_RIGHT_INTENT = "lockscreen_custom_lower_right_intent"; + + /** + * launch a custom app for lower left target + * + * @hide + */ + public static final String LOCKSCREEN_CUSTOM_LOWER_LEFT_INTENT = "lockscreen_custom_lower_left_intent"; + + /** + * Whether volume up/down can be long pressed to skip tracks + * @hide + */ + public static final String VOLUME_MUSIC_CONTROLS = "volume_music_controls"; + + /** + * Whether to show the battery bar + * + * @hide + */ + public static final String STATUSBAR_BATTERY_BAR = "statusbar_battery_bar"; + + /** + * @hide + */ + public static final String STATUSBAR_BATTERY_BAR_COLOR = "statusbar_battery_bar_color"; /** * GLOBAL_PHONE_SIM_ABSENT_TAG setting @@ -2184,6 +2501,7 @@ public static void setShowGTalkServiceStatus(ContentResolver cr, boolean flag) { SIP_CALL_OPTIONS, SIP_RECEIVE_CALLS, POINTER_SPEED, + NOTIFICATION_PULSE_COLOR, }; // Settings moved to Settings.Secure @@ -2415,6 +2733,12 @@ public static void setShowGTalkServiceStatus(ContentResolver cr, boolean flag) { @Deprecated public static final String WIFI_WATCHDOG_PING_TIMEOUT_MS = Secure.WIFI_WATCHDOG_PING_TIMEOUT_MS; + + public static final String CRT_OFF_ANIMATION = "crt_off_animation"; + + public static final String CRT_ON_ANIMATION = "crt_on_animation"; + + public static final String CUSTOM_CARRIER_LABEL = "custom_carrier_label"; } /** @@ -2685,10 +3009,16 @@ public static boolean putFloat(ContentResolver cr, String name, float value) { public static final String ADB_ENABLED = "adb_enabled"; /** +<<<<<<< HEAD * The TCP/IP port to run ADB on, or -1 for USB * @hide */ public static final String ADB_PORT = "adb_port"; +======= + * Whether to display the ADB notification. + */ + public static final String ADB_NOTIFY = "adb_notify"; +>>>>>>> a653394989b691362658984f62af44943a1eba05 /** * Setting to allow mock locations and location provider status to be injected into the @@ -4276,6 +4606,28 @@ public static final String getBluetoothInputDevicePriorityKey(String address) { public static final String SETUP_PREPAID_DETECTION_REDIR_HOST = "setup_prepaid_detection_redir_host"; + /** + * Whether the screensaver is enabled. + * @hide + */ + public static final String SCREENSAVER_ENABLED = "screensaver_enabled"; + + /** + * The user's chosen screensaver component. + * + * This component will be launched by the PhoneWindowManager after a timeout when not on + * battery, or upon dock insertion (if SCREENSAVER_ACTIVATE_ON_DOCK is set to 1). + * @hide + */ + public static final String SCREENSAVER_COMPONENT = "screensaver_component"; + + /** + * Whether the screensaver should be automatically launched when the device is inserted + * into a (desk) dock. + * @hide + */ + public static final String SCREENSAVER_ACTIVATE_ON_DOCK = "screensaver_activate_on_dock"; + /** {@hide} */ public static final String NETSTATS_ENABLED = "netstats_enabled"; /** {@hide} */ diff --git a/core/java/android/view/WindowOrientationListener.java b/core/java/android/view/WindowOrientationListener.java index c3c74a7c59c54..2b7c5aae1b40c 100755 --- a/core/java/android/view/WindowOrientationListener.java +++ b/core/java/android/view/WindowOrientationListener.java @@ -322,7 +322,7 @@ static final class SensorEventListenerImpl implements SensorEventListener { // The number of milliseconds for which the device posture must be stable // before we perform an orientation change. If the device appears to be rotating // (being picked up, put down) then we keep waiting until it settles. - private static final int SETTLE_TIME_MS = 200; + private static final int SETTLE_TIME_MS = 50; // The maximum change in magnitude that can occur during the settle time. // Tuning this constant particularly helps to filter out situations where the diff --git a/core/java/com/android/internal/app/ShutdownThread.java b/core/java/com/android/internal/app/ShutdownThread.java index d445ab4f9b109..a9ae727e8824e 100644 --- a/core/java/com/android/internal/app/ShutdownThread.java +++ b/core/java/com/android/internal/app/ShutdownThread.java @@ -30,6 +30,8 @@ import android.content.Intent; import android.content.IntentFilter; import android.os.Handler; +import android.os.IBinder; +import android.os.IPowerManager; import android.os.Power; import android.os.PowerManager; import android.os.RemoteException; @@ -62,6 +64,7 @@ public final class ShutdownThread extends Thread { private static boolean sIsStarted = false; private static boolean mReboot; + private static boolean mRestart; private static String mRebootReason; // Provides shutdown assurance in case the system_server is killed @@ -105,14 +108,16 @@ public static void shutdown(final Context context, boolean confirm) { ? com.android.internal.R.string.shutdown_confirm_question : com.android.internal.R.string.shutdown_confirm; - Log.d(TAG, "Notifying thread to start shutdown longPressBehavior=" + longPressBehavior); if (confirm) { final AlertDialog dialog; // Set different dialog message based on whether or not we're rebooting if (mReboot) { dialog = new AlertDialog.Builder(context) +<<<<<<< HEAD .setIcon(android.R.drawable.ic_dialog_alert) +======= +>>>>>>> a653394989b691362658984f62af44943a1eba05 .setTitle(com.android.internal.R.string.reboot_system) .setSingleChoiceItems(com.android.internal.R.array.shutdown_reboot_options, 0, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { @@ -128,6 +133,12 @@ public void onClick(DialogInterface dialog, int which) { .setPositiveButton(com.android.internal.R.string.yes, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { mReboot = true; +<<<<<<< HEAD +======= + if (mRebootReason != null && mRebootReason.equals("restart")) { + mRestart = true; + } +>>>>>>> a653394989b691362658984f62af44943a1eba05 beginShutdownSequence(context); } }) @@ -147,12 +158,17 @@ public boolean onKey (DialogInterface dialog, int keyCode, KeyEvent event) { return true; } }); +<<<<<<< HEAD // Initialize to the first reason String actions[] = context.getResources().getStringArray(com.android.internal.R.array.shutdown_reboot_actions); mRebootReason = actions[0]; } else { dialog = new AlertDialog.Builder(context) .setIcon(android.R.drawable.ic_dialog_alert) +======= + } else { + dialog = new AlertDialog.Builder(context) +>>>>>>> a653394989b691362658984f62af44943a1eba05 .setTitle(com.android.internal.R.string.power_off) .setMessage(com.android.internal.R.string.shutdown_confirm) .setPositiveButton(com.android.internal.R.string.yes, new DialogInterface.OnClickListener() { @@ -215,12 +231,21 @@ private static void beginShutdownSequence(Context context) { sIsStarted = true; } - // throw up an indeterminate system dialog to indicate radio is - // shutting down. + // throw up an indeterminate system dialog while services shut down ProgressDialog pd = new ProgressDialog(context); if (mReboot) { +<<<<<<< HEAD pd.setTitle(context.getText(com.android.internal.R.string.reboot_system)); pd.setMessage(context.getText(com.android.internal.R.string.reboot_progress)); +======= + if (mRestart) { + pd.setTitle(context.getText(com.android.internal.R.string.restart_title)); + pd.setMessage(context.getText(com.android.internal.R.string.restart_progress)); + } else { + pd.setTitle(context.getText(com.android.internal.R.string.reboot_system)); + pd.setMessage(context.getText(com.android.internal.R.string.reboot_progress)); + } +>>>>>>> a653394989b691362658984f62af44943a1eba05 } else { pd.setTitle(context.getText(com.android.internal.R.string.power_off)); pd.setMessage(context.getText(com.android.internal.R.string.shutdown_progress)); @@ -288,35 +313,36 @@ public void run() { } }; - /* - * Write a system property in case the system_server reboots before we - * get to the actual hardware restart. If that happens, we'll retry at - * the beginning of the SystemServer startup. - */ - { - String reason = (mReboot ? "1" : "0") + (mRebootReason != null ? mRebootReason : ""); - SystemProperties.set(SHUTDOWN_ACTION_PROPERTY, reason); - } + if (!mRestart) { + /* + * Write a system property in case the system_server reboots before we + * get to the actual hardware restart. If that happens, we'll retry at + * the beginning of the SystemServer startup. + */ + { + String reason = (mReboot ? "1" : "0") + (mRebootReason != null ? mRebootReason : ""); + SystemProperties.set(SHUTDOWN_ACTION_PROPERTY, reason); + } - Log.i(TAG, "Sending shutdown broadcast..."); - - // First send the high-level shut down broadcast. - mActionDone = false; - mContext.sendOrderedBroadcast(new Intent(Intent.ACTION_SHUTDOWN), null, - br, mHandler, 0, null, null); - - final long endTime = SystemClock.elapsedRealtime() + MAX_BROADCAST_TIME; - synchronized (mActionDoneSync) { - while (!mActionDone) { - long delay = endTime - SystemClock.elapsedRealtime(); - if (delay <= 0) { - Log.w(TAG, "Shutdown broadcast timed out"); - break; - } - try { - mActionDoneSync.wait(delay); - } catch (InterruptedException e) { - } + Log.i(TAG, "Sending shutdown broadcast..."); + + // First send the high-level shut down broadcast. + mActionDone = false; + mContext.sendOrderedBroadcast(new Intent(Intent.ACTION_SHUTDOWN), null, + br, mHandler, 0, null, null); + + final long endTime = SystemClock.elapsedRealtime() + MAX_BROADCAST_TIME; + synchronized (mActionDoneSync) { + while (!mActionDone) { + long delay = endTime - SystemClock.elapsedRealtime(); + if (delay <= 0) { + Log.w(TAG, "Shutdown broadcast timed out"); + break; + } + try { + mActionDoneSync.wait(delay); + } catch (InterruptedException e) { + } } } } @@ -440,6 +466,20 @@ public void onShutDownComplete(int statusCode) throws RemoteException { public static void rebootOrShutdown(boolean reboot, String reason) { if (reboot) { Log.i(TAG, "Rebooting, reason: " + reason); + + // check if restart was requested + if (mRestart) { + // crash system server to restart framework + try { + IBinder b = ServiceManager.getService(Context.POWER_SERVICE); + IPowerManager pm = IPowerManager.Stub.asInterface(b); + pm.crash("Crashed framework, now restarting"); + } catch (RemoteException e) { + Log.e(TAG, "Restart failed, will attempt reboot instead", e); + reason = null; + } + } + // normal reboot try { Power.reboot(reason); } catch (Exception e) { @@ -452,7 +492,7 @@ public static void rebootOrShutdown(boolean reboot, String reason) { vibrator.vibrate(SHUTDOWN_VIBRATE_MS); } catch (Exception e) { // Failure to vibrate shouldn't interrupt shutdown. Just log it. - Log.w(TAG, "Failed to vibrate during shutdown.", e); + Log.w(TAG, "Failed to vibrate during shutdown", e); } // vibrator is asynchronous so we need to wait to avoid shutting down too soon. diff --git a/core/java/com/android/internal/widget/multiwaveview/MultiWaveView.java b/core/java/com/android/internal/widget/multiwaveview/MultiWaveView.java index ebd355aa272c6..f372f7ba40612 100644 --- a/core/java/com/android/internal/widget/multiwaveview/MultiWaveView.java +++ b/core/java/com/android/internal/widget/multiwaveview/MultiWaveView.java @@ -947,7 +947,13 @@ private String getDirectionDescription(int index) { return null; } } - return mDirectionDescriptions.get(index); + + try { + String desc = mDirectionDescriptions.get(index); + return desc; + } catch (Exception e) { + return ""; + } } private ArrayList loadDescriptions(int resourceId) { diff --git a/core/res/res/drawable-hdpi/ic_lockscreen_custom_activated.png b/core/res/res/drawable-hdpi/ic_lockscreen_custom_activated.png new file mode 100644 index 0000000000000..f8bb6449fbaaa Binary files /dev/null and b/core/res/res/drawable-hdpi/ic_lockscreen_custom_activated.png differ diff --git a/core/res/res/drawable-hdpi/ic_lockscreen_custom_normal.png b/core/res/res/drawable-hdpi/ic_lockscreen_custom_normal.png new file mode 100644 index 0000000000000..1ca90a1f18e13 Binary files /dev/null and b/core/res/res/drawable-hdpi/ic_lockscreen_custom_normal.png differ diff --git a/core/res/res/drawable-hdpi/ic_lockscreen_phone_activated.png b/core/res/res/drawable-hdpi/ic_lockscreen_phone_activated.png new file mode 100644 index 0000000000000..c0bb01c1fae1e Binary files /dev/null and b/core/res/res/drawable-hdpi/ic_lockscreen_phone_activated.png differ diff --git a/core/res/res/drawable-hdpi/ic_lockscreen_phone_normal.png b/core/res/res/drawable-hdpi/ic_lockscreen_phone_normal.png new file mode 100644 index 0000000000000..cc43e4c7807fe Binary files /dev/null and b/core/res/res/drawable-hdpi/ic_lockscreen_phone_normal.png differ diff --git a/core/res/res/drawable-hdpi/ic_lockscreen_sms_activated.png b/core/res/res/drawable-hdpi/ic_lockscreen_sms_activated.png new file mode 100644 index 0000000000000..9c1e73326f23c Binary files /dev/null and b/core/res/res/drawable-hdpi/ic_lockscreen_sms_activated.png differ diff --git a/core/res/res/drawable-hdpi/ic_lockscreen_sms_normal.png b/core/res/res/drawable-hdpi/ic_lockscreen_sms_normal.png new file mode 100644 index 0000000000000..9a598f45dc3ca Binary files /dev/null and b/core/res/res/drawable-hdpi/ic_lockscreen_sms_normal.png differ diff --git a/core/res/res/drawable-mdpi/ic_lockscreen_custom_activated.png b/core/res/res/drawable-mdpi/ic_lockscreen_custom_activated.png new file mode 100644 index 0000000000000..0ef72b0f7f427 Binary files /dev/null and b/core/res/res/drawable-mdpi/ic_lockscreen_custom_activated.png differ diff --git a/core/res/res/drawable-mdpi/ic_lockscreen_custom_normal.png b/core/res/res/drawable-mdpi/ic_lockscreen_custom_normal.png new file mode 100644 index 0000000000000..51a4440f13c5d Binary files /dev/null and b/core/res/res/drawable-mdpi/ic_lockscreen_custom_normal.png differ diff --git a/core/res/res/drawable-mdpi/ic_lockscreen_phone_activated.png b/core/res/res/drawable-mdpi/ic_lockscreen_phone_activated.png new file mode 100644 index 0000000000000..5aaa48266a0fc Binary files /dev/null and b/core/res/res/drawable-mdpi/ic_lockscreen_phone_activated.png differ diff --git a/core/res/res/drawable-mdpi/ic_lockscreen_phone_normal.png b/core/res/res/drawable-mdpi/ic_lockscreen_phone_normal.png new file mode 100644 index 0000000000000..6717045391862 Binary files /dev/null and b/core/res/res/drawable-mdpi/ic_lockscreen_phone_normal.png differ diff --git a/core/res/res/drawable-mdpi/ic_lockscreen_sms_activated.png b/core/res/res/drawable-mdpi/ic_lockscreen_sms_activated.png new file mode 100644 index 0000000000000..8240d9030d55a Binary files /dev/null and b/core/res/res/drawable-mdpi/ic_lockscreen_sms_activated.png differ diff --git a/core/res/res/drawable-mdpi/ic_lockscreen_sms_normal.png b/core/res/res/drawable-mdpi/ic_lockscreen_sms_normal.png new file mode 100644 index 0000000000000..75c25a3579edf Binary files /dev/null and b/core/res/res/drawable-mdpi/ic_lockscreen_sms_normal.png differ diff --git a/core/res/res/drawable-xhdpi/ic_lockscreen_custom_activated.png b/core/res/res/drawable-xhdpi/ic_lockscreen_custom_activated.png new file mode 100644 index 0000000000000..bbded3efc3189 Binary files /dev/null and b/core/res/res/drawable-xhdpi/ic_lockscreen_custom_activated.png differ diff --git a/core/res/res/drawable-xhdpi/ic_lockscreen_custom_normal.png b/core/res/res/drawable-xhdpi/ic_lockscreen_custom_normal.png new file mode 100644 index 0000000000000..eecfea8ead63a Binary files /dev/null and b/core/res/res/drawable-xhdpi/ic_lockscreen_custom_normal.png differ diff --git a/core/res/res/drawable-xhdpi/ic_lockscreen_phone_activated.png b/core/res/res/drawable-xhdpi/ic_lockscreen_phone_activated.png new file mode 100644 index 0000000000000..fa3331c53f27e Binary files /dev/null and b/core/res/res/drawable-xhdpi/ic_lockscreen_phone_activated.png differ diff --git a/core/res/res/drawable-xhdpi/ic_lockscreen_phone_normal.png b/core/res/res/drawable-xhdpi/ic_lockscreen_phone_normal.png new file mode 100644 index 0000000000000..2a1e48f2ef531 Binary files /dev/null and b/core/res/res/drawable-xhdpi/ic_lockscreen_phone_normal.png differ diff --git a/core/res/res/drawable-xhdpi/ic_lockscreen_sms_activated.png b/core/res/res/drawable-xhdpi/ic_lockscreen_sms_activated.png new file mode 100644 index 0000000000000..d7a19d1d7f7ec Binary files /dev/null and b/core/res/res/drawable-xhdpi/ic_lockscreen_sms_activated.png differ diff --git a/core/res/res/drawable-xhdpi/ic_lockscreen_sms_normal.png b/core/res/res/drawable-xhdpi/ic_lockscreen_sms_normal.png new file mode 100644 index 0000000000000..556277dc4e34c Binary files /dev/null and b/core/res/res/drawable-xhdpi/ic_lockscreen_sms_normal.png differ diff --git a/core/res/res/drawable/ic_lockscreen_custom.xml b/core/res/res/drawable/ic_lockscreen_custom.xml new file mode 100755 index 0000000000000..e23beec3843aa --- /dev/null +++ b/core/res/res/drawable/ic_lockscreen_custom.xml @@ -0,0 +1,30 @@ + + + + + + + + + diff --git a/core/res/res/drawable/ic_lockscreen_phone.xml b/core/res/res/drawable/ic_lockscreen_phone.xml new file mode 100755 index 0000000000000..d2516598f748d --- /dev/null +++ b/core/res/res/drawable/ic_lockscreen_phone.xml @@ -0,0 +1,30 @@ + + + + + + + + + diff --git a/core/res/res/drawable/ic_lockscreen_sms.xml b/core/res/res/drawable/ic_lockscreen_sms.xml new file mode 100755 index 0000000000000..43fd8d61d4beb --- /dev/null +++ b/core/res/res/drawable/ic_lockscreen_sms.xml @@ -0,0 +1,30 @@ + + + + + + + + + diff --git a/core/res/res/layout/keyguard_screen_eight_targets_unhidden.xml b/core/res/res/layout/keyguard_screen_eight_targets_unhidden.xml new file mode 100644 index 0000000000000..6df6fb3ca87e0 --- /dev/null +++ b/core/res/res/layout/keyguard_screen_eight_targets_unhidden.xml @@ -0,0 +1,195 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +