Merge tag 'android-6.0.0_r26' into HEAD
Android 6.0.0 release 26
* tag 'android-6.0.0_r26':
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Change-Id: I4ec0935f7158d30f7b97ba48cecb5b4637615d99
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 12d57ac..45cf372 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -1,7 +1,9 @@
/*
- * Copyright (C) 2008 The Android Open Source Project
+ * Copyright (c) 2015, The Linux Foundation. All rights reserved.
+ * Not a Contribution
*
+ * Copyright (C) 2008 The Android Open Source Project
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -160,6 +162,9 @@
static final String INTENT_EXTRA_IGNORE_LAUNCH_ANIMATION =
"com.android.launcher.intent.extra.shortcut.INGORE_LAUNCH_ANIMATION";
+ //Intent broadcasted when the device screen swithces to idle(home screen)
+ public static final String CAT_IDLE_SCREEN_ACTION =
+ "org.codeaurora.action.stk.idle_screen";
// Type: int
private static final String RUNTIME_STATE_CURRENT_SCREEN = "launcher.current_screen";
// Type: int
@@ -847,6 +852,12 @@
if (DEBUG_RESUME_TIME) {
Log.d(TAG, "Time spent in onResume: " + (System.currentTimeMillis() - startTime));
}
+
+ // Notify that Home or Idle Screen is being started or resumed
+ Intent idleScreenIntent = new Intent(CAT_IDLE_SCREEN_ACTION);
+ idleScreenIntent.putExtra("SCREEN_IDLE",true);
+ Log.d(TAG,"Broadcasting Home Idle Screen Intent ...");
+ sendBroadcast(idleScreenIntent);
}
@Override