Merge remote-tracking branch 'origin/Bitra.LA.3.2.1' into fp4t-qssi-0413
Change-Id: Ia41f05725c1abd1f337f0e57e01e32d1f2d68fbf
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b7f380c..b01a928 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -33,6 +33,7 @@
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
<uses-permission android:name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME" />
+ <uses-permission android:name="android.permission.HIDE_NON_SYSTEM_OVERLAY_WINDOWS"/>
<application android:icon="@drawable/ic_launcher_sim_toolkit"
android:label="@string/app_name"
diff --git a/src/com/android/stk/StkInputActivity.java b/src/com/android/stk/StkInputActivity.java
index 9d4b177..6cd8637 100644
--- a/src/com/android/stk/StkInputActivity.java
+++ b/src/com/android/stk/StkInputActivity.java
@@ -16,8 +16,6 @@
package com.android.stk;
-import android.app.ActionBar;
-import android.app.Activity;
import android.app.AlarmManager;
import android.content.Context;
import android.content.Intent;
@@ -151,7 +149,8 @@
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
-
+ getWindow().addSystemFlags(
+ WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
CatLog.d(LOG_TAG, "onCreate - mIsResponseSent[" + mIsResponseSent + "]");
// appService can be null if this activity is automatically recreated by the system
diff --git a/src/com/android/stk/StkLauncherActivity.java b/src/com/android/stk/StkLauncherActivity.java
index f1100b2..79233cb 100644
--- a/src/com/android/stk/StkLauncherActivity.java
+++ b/src/com/android/stk/StkLauncherActivity.java
@@ -23,6 +23,7 @@
import android.os.Bundle;
import android.view.View;
import android.view.KeyEvent;
+import android.view.WindowManager;
import android.widget.ImageView;
import android.widget.ListView;
import android.widget.TextView;
@@ -32,7 +33,6 @@
import com.android.internal.telephony.cat.Item;
import com.android.internal.telephony.cat.Menu;
import com.android.internal.telephony.cat.CatLog;
-import com.android.internal.telephony.PhoneConstants;
import android.telephony.TelephonyManager;
@@ -58,6 +58,8 @@
@Override
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
+ getWindow().addSystemFlags(
+ WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
CatLog.d(LOG_TAG, "onCreate+");
mContext = getBaseContext();
mTm = (TelephonyManager) mContext.getSystemService(
diff --git a/src/com/android/stk/StkMain.java b/src/com/android/stk/StkMain.java
index 0899d2b..e732152 100644
--- a/src/com/android/stk/StkMain.java
+++ b/src/com/android/stk/StkMain.java
@@ -20,14 +20,13 @@
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
-import android.view.View;
import com.android.internal.telephony.cat.CatLog;
-import com.android.internal.telephony.PhoneConstants;
import android.telephony.TelephonyManager;
import android.view.Gravity;
+import android.view.WindowManager;
import android.widget.Toast;
/**
@@ -47,6 +46,8 @@
@Override
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
+ getWindow().addSystemFlags(
+ WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
CatLog.d(LOG_TAG, "onCreate+");
mContext = getBaseContext();
mTm = (TelephonyManager) mContext.getSystemService(
diff --git a/src/com/android/stk/StkMenuActivity.java b/src/com/android/stk/StkMenuActivity.java
index b35877f..f7c2e30 100644
--- a/src/com/android/stk/StkMenuActivity.java
+++ b/src/com/android/stk/StkMenuActivity.java
@@ -31,6 +31,7 @@
import android.view.KeyEvent;
import android.view.MenuItem;
import android.view.View;
+import android.view.WindowManager;
import android.widget.AdapterView;
import android.widget.ImageView;
import android.widget.ListView;
@@ -85,7 +86,8 @@
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
-
+ getWindow().addSystemFlags(
+ WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
CatLog.d(LOG_TAG, "onCreate");
ActionBar actionBar = getActionBar();