diff options
| author | Martijn Coenen <maco@google.com> | 2012-10-16 16:02:05 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-16 16:02:05 -0700 |
| commit | dce0f825ae357c2c87b5b3ee4b9b52b832900b16 (patch) | |
| tree | 37774284754addac9037169af19fdb8ca72c4e38 | |
| parent | 47dbe9f2bcc03107adf2be32864d81e192451d71 (diff) | |
| parent | b034c8b4aea76979cf7bce841dbb627eec507d3d (diff) | |
| download | packages_apps_nfc-dce0f825ae357c2c87b5b3ee4b9b52b832900b16.zip packages_apps_nfc-dce0f825ae357c2c87b5b3ee4b9b52b832900b16.tar.gz packages_apps_nfc-dce0f825ae357c2c87b5b3ee4b9b52b832900b16.tar.bz2 | |
Merge "Fix Beam animation for non-owner user." into jb-mr1-dev
| -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(); |