diff options
| author | Dianne Hackborn <hackbod@google.com> | 2009-10-07 17:45:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-07 17:45:14 -0700 |
| commit | d78fbdddea1e0cbecfd0f209c09b6dd4ef56e7d4 (patch) | |
| tree | 2533588852c8e621e958ac8a50cffd6a8385cd88 /core | |
| parent | 18fc0120f59f179ab13adf9e122371f32f65a12c (diff) | |
| parent | 568cae571a3d74d1992176a21722e07b44e9a3c4 (diff) | |
| download | frameworks_base-d78fbdddea1e0cbecfd0f209c09b6dd4ef56e7d4.zip frameworks_base-d78fbdddea1e0cbecfd0f209c09b6dd4ef56e7d4.tar.gz frameworks_base-d78fbdddea1e0cbecfd0f209c09b6dd4ef56e7d4.tar.bz2 | |
am 568cae57: Fix issue #2171460: Turn off background blurring of power dialog
Merge commit '568cae571a3d74d1992176a21722e07b44e9a3c4' into eclair-mr2
* commit '568cae571a3d74d1992176a21722e07b44e9a3c4':
Fix issue #2171460: Turn off background blurring of power dialog
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/com/android/internal/app/ShutdownThread.java | 11 | ||||
| -rw-r--r-- | core/res/res/values/config.xml | 5 |
2 files changed, 14 insertions, 2 deletions
diff --git a/core/java/com/android/internal/app/ShutdownThread.java b/core/java/com/android/internal/app/ShutdownThread.java index 01f6dac..2060cf8 100644 --- a/core/java/com/android/internal/app/ShutdownThread.java +++ b/core/java/com/android/internal/app/ShutdownThread.java @@ -32,6 +32,7 @@ import android.os.RemoteException; import android.os.Power; import android.os.ServiceManager; import android.os.SystemClock; + import com.android.internal.telephony.ITelephony; import android.util.Log; import android.view.WindowManager; @@ -91,7 +92,10 @@ public final class ShutdownThread extends Thread { .setNegativeButton(com.android.internal.R.string.no, null) .create(); dialog.getWindow().setType(WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG); - dialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_BLUR_BEHIND); + if (!context.getResources().getBoolean( + com.android.internal.R.bool.config_sf_slowBlur)) { + dialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_BLUR_BEHIND); + } dialog.show(); } else { beginShutdownSequence(context); @@ -111,7 +115,10 @@ public final class ShutdownThread extends Thread { pd.setIndeterminate(true); pd.setCancelable(false); pd.getWindow().setType(WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG); - pd.getWindow().addFlags(WindowManager.LayoutParams.FLAG_BLUR_BEHIND); + if (!context.getResources().getBoolean( + com.android.internal.R.bool.config_sf_slowBlur)) { + pd.getWindow().addFlags(WindowManager.LayoutParams.FLAG_BLUR_BEHIND); + } pd.show(); diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 9f4af83..9040edb 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -26,6 +26,11 @@ strictly needed. --> <bool name="config_sf_limitedAlpha">false</bool> + <!-- Flag indicating whether the surface flinger is inefficient + at performing a blur. Used by parts of the UI to turn off + the blur effect where it isn't worth the performance hit. --> + <bool name="config_sf_slowBlur">false</bool> + <!-- The duration (in milliseconds) of a short animation. --> <integer name="config_shortAnimTime">150</integer> |