PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixing broken testQsbTallHeight for some devices

Browse Source 
am: eb04507471

* commit 'eb04507471351cc3a2d86adcb4603f8565e75dd9':
  Fixing broken testQsbTallHeight for some devices
This commit is contained in:
Sunny Goyal
2016-02-25 22:57:30 +00:00
committed by android-build-merger
parent 69694a7f89 eb04507471
commit dde079bb7b
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle
+4 -4
View File
@@ -51,14 +51,14 @@ repositories {
}
dependencies {
compile 'com.android.support:support-v4:23.0.1'
compile 'com.android.support:recyclerview-v7:23.0.1'
compile 'com.android.support:support-v4:23.1.1'
compile 'com.android.support:recyclerview-v7:23.1.1'
compile 'com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-2'
compile project(":WallpaperPicker-Lib")
testCompile 'junit:junit:4.12'
androidTestCompile 'com.android.support.test:runner:+'
androidTestCompile 'com.android.support.test.uiautomator:uiautomator-v18:+'
androidTestCompile 'com.android.support.test:runner:0.5'
androidTestCompile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
}
protobuf {
tests/src/com/android/launcher3/InvariantDeviceProfileTest.java
+3 -1
View File
@@ -168,7 +168,9 @@ public class InvariantDeviceProfileTest extends AndroidTestCase {
resources.getDisplayMetrics());
if (portraitProfile.isPhone) {
// This fails on some devices due to http://b/26884580 (portraitHeight is 101, not 100).
assertEquals(4 + 94 + 2, portraitHeight);
// TODO: Remove the comparision against 101 once b/26884580 is fixed
// assertEquals(4 + 94 + 2, portraitHeight);
assertTrue(portraitHeight == (4 + 94 + 2) || portraitHeight == (4 + 95 + 2));
} else {
assertEquals(8 + 94 + 24, portraitHeight);
}