diff options
| author | Jeff Brown <jeffbrown@google.com> | 2014-04-11 01:21:14 -0700 |
|---|---|---|
| committer | Jeff Brown <jeffbrown@google.com> | 2014-04-11 01:33:20 -0700 |
| commit | 4e5c089ef3e62e7f658e71c0be262d09bd3e399b (patch) | |
| tree | 6482287ee4ff25d4f40d8e2fd162c85c2dbbc14e /tests | |
| parent | 90b39abaf95640021d15be70b5841abe8366b33e (diff) | |
| parent | 337e764debde56b1462fb5f2794b3e917d8a42e2 (diff) | |
| download | frameworks_base-4e5c089ef3e62e7f658e71c0be262d09bd3e399b.zip frameworks_base-4e5c089ef3e62e7f658e71c0be262d09bd3e399b.tar.gz frameworks_base-4e5c089ef3e62e7f658e71c0be262d09bd3e399b.tar.bz2 | |
resolved conflicts for merge of 337e764d to master
Change-Id: I8168dbf42b68c2f7b5ccb300e0080dddc627af26
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/DozeTest/src/com/android/dreams/dozetest/DozeTestDream.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/DozeTest/src/com/android/dreams/dozetest/DozeTestDream.java b/tests/DozeTest/src/com/android/dreams/dozetest/DozeTestDream.java index bf35db4..a0b2d1a 100644 --- a/tests/DozeTest/src/com/android/dreams/dozetest/DozeTestDream.java +++ b/tests/DozeTest/src/com/android/dreams/dozetest/DozeTestDream.java @@ -97,6 +97,7 @@ public class DozeTestDream extends DreamService { setLowProfile(true); setFullscreen(true); setContentView(R.layout.dream); + setScreenBright(false); mAlarmClock = (TextView)findViewById(R.id.alarm_clock); |