AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove ConstraintLayout from skqp app

Browse Source 
Bug: skia:
Change-Id: I25ca750c3baa8176b01d3b642a7cdbe67686dd77
Reviewed-on: https://skia-review.googlesource.com/103440
Reviewed-by: Hal Canary <halcanary@google.com>
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Commit-Queue: Stephan Altmueller <stephana@google.com>
This commit is contained in:
Stephan Altmueller 2018-02-06 11:26:40 -05:00 committed by Skia Commit-Bot
parent 63cc29304a
commit f2579ca3f2
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
platform_tools/android/apps/skqp/build.gradle
View File

@ -7,7 +7,6 @@
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
dependencies { dependencies {
compile 'com.android.support.constraint:constraint-layout:1.0.2'
compile 'com.android.support:design:26.+' compile 'com.android.support:design:26.+'
compile 'com.android.support.test:runner:0.5' compile 'com.android.support.test:runner:0.5'
} }

11
platform_tools/android/apps/skqp/src/main/res/layout/activity_main.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -18,11 +18,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:text="Nothing to see here !" android:text="Nothing to see here !"/>
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<Button <Button
android:id="@+id/button_start" android:id="@+id/button_start"
@ -33,5 +29,4 @@
android:onClick="startTests" android:onClick="startTests"
android:text="Start Tests !" /> android:text="Start Tests !" />
</LinearLayout> </LinearLayout>
</RelativeLayout>
</android.support.constraint.ConstraintLayout>

4
platform_tools/android/apps/skqp/src/main/res/layout/content_skqp.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -16,4 +16,4 @@
android:textSize="18sp" android:textSize="18sp"
android:textStyle="bold" android:textStyle="bold"
android:visibility="visible" /> android:visibility="visible" />
</android.support.constraint.ConstraintLayout> </RelativeLayout>