Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE
Change-Id: I3756ac113f430ea9c47af7dd0198722b25baf83c
diff --git a/Android.mk b/Android.mk
index 90c35ca..3d95493 100644
--- a/Android.mk
+++ b/Android.mk
@@ -21,6 +21,8 @@
LOCAL_STATIC_JAVA_LIBRARIES := android-common android-support-v13
+LOCAL_JAVA_LIBRARIES := telephony-common
+
LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src)
LOCAL_SDK_VERSION := current
diff --git a/src/com/android/launcher2/Hotseat.java b/src/com/android/launcher2/Hotseat.java
index c122695..97a7790 100644
--- a/src/com/android/launcher2/Hotseat.java
+++ b/src/com/android/launcher2/Hotseat.java
@@ -136,6 +136,8 @@
}
});
+ mContent.enableHardwareLayers();
+
// Note: We do this to ensure that the hotseat is always laid out in the orientation of
// the hotseat in order regardless of which orientation they were added
int x = getCellXFromOrder(mAllAppsButtonRank);
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index b222cdf..9a62973 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -1,6 +1,7 @@
/*
* Copyright (C) 2008 The Android Open Source Project
+ * Copyright (c) 2013, The Linux Foundation. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -96,6 +97,7 @@
import android.widget.Toast;
import com.android.common.Search;
+import com.android.internal.telephony.cat.AppInterface;
import com.android.launcher.R;
import com.android.launcher2.DropTarget.DragObject;
@@ -821,6 +823,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(AppInterface.CAT_IDLE_SCREEN_ACTION);
+ idleScreenIntent.putExtra("SCREEN_IDLE",true);
+ Log.d(TAG,"Broadcasting Home Idle Screen Intent ...");
+ sendBroadcast(idleScreenIntent);
}
@Override