diff options
| author | Martijn Coenen <maco@google.com> | 2012-10-15 21:07:19 -0700 |
|---|---|---|
| committer | Martijn Coenen <maco@google.com> | 2012-10-15 21:07:19 -0700 |
| commit | b034c8b4aea76979cf7bce841dbb627eec507d3d (patch) | |
| tree | 1700f242c9b819f39836285c8bbdcc6506a81b18 | |
| parent | 81aa9898af2f99506cb025e9d8e37252d80c42fa (diff) | |
| download | packages_apps_nfc-b034c8b4aea76979cf7bce841dbb627eec507d3d.zip packages_apps_nfc-b034c8b4aea76979cf7bce841dbb627eec507d3d.tar.gz packages_apps_nfc-b034c8b4aea76979cf7bce841dbb627eec507d3d.tar.bz2 | |
Fix Beam animation for non-owner user.
The Beam animation adds a system window on top
of the current window stack, and does this
from a process run as the owner user.
Added required permission that allows showing the
window for all users.
Also added a glClear() to fix a rendering
glitch on Manta.
Bug: 7351616
Bug: 7310663
Change-Id: I06960ee9d843c2413fcfd36a81bc7161fed5ef98
| -rwxr-xr-x | AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | src/com/android/nfc/FireflyRenderer.java | 1 | ||||
| -rw-r--r-- | src/com/android/nfc/SendUi.java | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 3157598..710e2ee 100755 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -22,6 +22,7 @@ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" /> <uses-permission android:name="android.permission.MANAGE_USERS" /> + <uses-permission android:name="android.permission.INTERNAL_SYSTEM_WINDOW" /> <uses-permission android:name="com.android.permission.WHITELIST_BLUETOOTH_DEVICE" /> <uses-permission android:name="com.android.permission.HANDOVER_STATUS" /> <application android:name=".NfcApplication" diff --git a/src/com/android/nfc/FireflyRenderer.java b/src/com/android/nfc/FireflyRenderer.java index 4ce58b4..40c931d 100644 --- a/src/com/android/nfc/FireflyRenderer.java +++ b/src/com/android/nfc/FireflyRenderer.java @@ -200,6 +200,7 @@ public class FireflyRenderer { for (int i = 0; i < 3; i++) { // Call eglSwapBuffers 3 times - this will allocate the necessary // buffers, and make sure the animation looks smooth from the start. + mGL.glClear(GL10.GL_COLOR_BUFFER_BIT); if (!mEgl.eglSwapBuffers(mEglDisplay, mEglSurface)) { Log.e(LOG_TAG, "Could not swap buffers"); mFinished = true; diff --git a/src/com/android/nfc/SendUi.java b/src/com/android/nfc/SendUi.java index c54f54e..a12aabb 100644 --- a/src/com/android/nfc/SendUi.java +++ b/src/com/android/nfc/SendUi.java @@ -194,6 +194,8 @@ public class SendUi implements Animator.AnimatorListener, View.OnTouchListener, | hwAccelerationFlags | WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN, PixelFormat.OPAQUE); + mWindowLayoutParams.privateFlags |= + WindowManager.LayoutParams.PRIVATE_FLAG_SHOW_FOR_ALL_USERS; mWindowLayoutParams.token = new Binder(); mFrameCounterAnimator = new TimeAnimator(); |