diff options
author | Xin Li <delphij@google.com> | 2022-12-09 21:51:11 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-12-09 21:51:11 +0000 |
commit | d6fc8e820931dee657c644cae972dbb57e1f9a55 (patch) | |
tree | f0308152cf66632eee0ad208d726cbc8b27ae87d | |
parent | cc1964ec371659e803762b825bb19e2fd188ed90 (diff) | |
parent | 5c9e30ae440c3e2471d02cfaa58e02b294e558df (diff) | |
download | Stk-d6fc8e820931dee657c644cae972dbb57e1f9a55.tar.gz |
Merge "Merge Android 13 QPR1"
-rw-r--r-- | AndroidManifest.xml | 1 | ||||
-rw-r--r-- | src/com/android/stk/StkInputActivity.java | 5 | ||||
-rw-r--r-- | src/com/android/stk/StkLauncherActivity.java | 4 | ||||
-rw-r--r-- | src/com/android/stk/StkMain.java | 5 | ||||
-rw-r--r-- | src/com/android/stk/StkMenuActivity.java | 4 |
5 files changed, 12 insertions, 7 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 6b841ce..348e798 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -32,6 +32,7 @@ <uses-permission android:name="android.permission.VIBRATE" /> <uses-permission android:name="android.permission.WAKE_LOCK" /> <uses-permission android:name="android.permission.POST_NOTIFICATIONS" /> + <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 57e515a..c84b7f2 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 @@ public class StkInputActivity extends AppCompatActivity implements View.OnClickL @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 97b642c..907c6ee 100644 --- a/src/com/android/stk/StkLauncherActivity.java +++ b/src/com/android/stk/StkLauncherActivity.java @@ -23,6 +23,7 @@ import android.content.Intent; 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 android.graphics.BitmapFactory; 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; @@ -57,6 +57,8 @@ public class StkLauncherActivity extends ListActivity { @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 c9ff44a..2d3e467 100644 --- a/src/com/android/stk/StkMain.java +++ b/src/com/android/stk/StkMain.java @@ -20,14 +20,13 @@ import android.app.Activity; 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; /** @@ -46,6 +45,8 @@ import android.widget.Toast; @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 f32c1bd..2033900 100644 --- a/src/com/android/stk/StkMenuActivity.java +++ b/src/com/android/stk/StkMenuActivity.java @@ -31,6 +31,7 @@ import android.view.ContextMenu.ContextMenuInfo; 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; @@ -84,7 +85,8 @@ public class StkMenuActivity extends ListActivity implements View.OnCreateContex @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(); |