diff options
| author | Michael Wright <michaelwr@google.com> | 2014-08-28 00:00:54 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-28 00:00:56 +0000 |
| commit | b4558af745047631d27697460efd8fc6e7a7cf38 (patch) | |
| tree | f455b2b33ea0d9d5f23e23f0bb530571677d351a /tests | |
| parent | 89972815a2d17775538d66b9ba02747e016c81e2 (diff) | |
| parent | 219857b900e2a15464c6254d8d64b68db7d548c0 (diff) | |
| download | frameworks_base-b4558af745047631d27697460efd8fc6e7a7cf38.zip frameworks_base-b4558af745047631d27697460efd8fc6e7a7cf38.tar.gz frameworks_base-b4558af745047631d27697460efd8fc6e7a7cf38.tar.bz2 | |
Merge "Change constant to PowerManager#FLAG_WAIT_FOR_DISTANT_PROXIMITY" into lmp-dev
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/StatusBar/src/com/android/statusbartest/PowerTest.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/StatusBar/src/com/android/statusbartest/PowerTest.java b/tests/StatusBar/src/com/android/statusbartest/PowerTest.java index 0cab10d..2ec620b 100644 --- a/tests/StatusBar/src/com/android/statusbartest/PowerTest.java +++ b/tests/StatusBar/src/com/android/statusbartest/PowerTest.java @@ -77,9 +77,9 @@ public class PowerTest extends TestActivity mProx.release(); } }, - new Test("Disable proximity (WAIT_FOR_PROXIMITY_NEGATIVE)") { + new Test("Disable proximity (WAIT_FOR_DISTANT_PROXIMITY") { public void run() { - mProx.release(PowerManager.WAIT_FOR_PROXIMITY_NEGATIVE); + mProx.release(PowerManager.WAIT_FOR_DISTANT_PROXIMITY); } }, new Test("Enable proximity, wait 5 seconds then disable") { @@ -93,13 +93,13 @@ public class PowerTest extends TestActivity }, 5000); } }, - new Test("Enable proximity, wait 5 seconds then disable (WAIT_FOR_PROXIMITY_NEGATIVE)") { + new Test("Enable proximity, wait 5 seconds then disable (WAIT_FOR_DISTANT_PROXIMITY)") { public void run() { mProx.acquire(); mHandler.postDelayed(new Runnable() { @Override public void run() { - mProx.release(PowerManager.WAIT_FOR_PROXIMITY_NEGATIVE); + mProx.release(PowerManager.WAIT_FOR_DISTANT_PROXIMITY); } }, 5000); } |