diff options
| author | John Spurlock <jspurlock@google.com> | 2013-05-31 10:31:04 -0400 |
|---|---|---|
| committer | John Spurlock <jspurlock@google.com> | 2013-06-07 11:02:53 -0400 |
| commit | 245fd017b3a3e3ce838b3a989840c92eee2d4499 (patch) | |
| tree | dd4b16e38e6b329808e3639c7981e2ded684cc8b /policy | |
| parent | 5133dcb83821ed1362efbc83b3c5131ea6374d3f (diff) | |
| download | frameworks_base-245fd017b3a3e3ce838b3a989840c92eee2d4499.zip frameworks_base-245fd017b3a3e3ce838b3a989840c92eee2d4499.tar.gz frameworks_base-245fd017b3a3e3ce838b3a989840c92eee2d4499.tar.bz2 | |
Put overlay system bar testing behind a setting.
And disable the system gesture by default. Also remove observer
for obsolete "fancy_rotation_anim" setting.
Change-Id: I08012c164e10bfa5f10a1df8a3db4a3f0203f236
Diffstat (limited to 'policy')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index 82db56d..0da3b56 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -538,7 +538,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { Settings.Secure.DEFAULT_INPUT_METHOD), false, this, UserHandle.USER_ALL); resolver.registerContentObserver(Settings.System.getUriFor( - "fancy_rotation_anim"), false, this, + OverlayTesting.ENABLED_SETTING), false, this, UserHandle.USER_ALL); updateSettings(); } @@ -949,7 +949,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { } @Override public void onDebug() { - if (OverlayTesting.ENABLED) { + if (OverlayTesting.enabled) { OverlayTesting.toggleForceOverlay(mFocusedWindow, mContext); } } @@ -1179,6 +1179,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { mHasSoftInput = hasSoftInput; updateRotation = true; } + OverlayTesting.enabled = Settings.System.getIntForUser(resolver, + OverlayTesting.ENABLED_SETTING, 0, UserHandle.USER_CURRENT) != 0; } if (updateRotation) { updateRotation(true); @@ -5088,7 +5090,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { } private int updateHideybarsLw(int tmpVisibility) { - if (OverlayTesting.ENABLED) { + if (OverlayTesting.enabled) { tmpVisibility = OverlayTesting.applyForced(mFocusedWindow, tmpVisibility); } boolean statusBarHasFocus = @@ -5155,7 +5157,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { // TODO temporary helper that allows testing overlay bars on existing apps private static final class OverlayTesting { - static final boolean ENABLED = true; + static String ENABLED_SETTING = "overlay_testing_enabled"; + static boolean enabled = false; private static final HashSet<String> sForced = new HashSet<String>(); private static String parseActivity(WindowState win) { |