diff options
| author |  Stephan Altmueller <stephana@google.com> | 2018-02-06 11:26:40 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-02-06 18:59:55 +0000 |
| commit | f2579ca3f2e94dfdda8eb19864f4e5487357b456 (patch) | |
| tree | b1d04a58117f17a3962cc79ecc2eb9291abb91af /platform_tools | |
| parent | 63cc29304a65039feaf27842d587ed16de010b0d (diff) | |
Remove ConstraintLayout from skqp app
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>
Diffstat (limited to 'platform_tools')
3 files changed, 5 insertions, 11 deletions
diff --git a/platform_tools/android/apps/skqp/build.gradle b/platform_tools/android/apps/skqp/build.gradle index 67a89e52af..3ebfb76bf0 100644 --- a/platform_tools/android/apps/skqp/build.gradle +++ b/platform_tools/android/apps/skqp/build.gradle @@ -7,7 +7,6 @@ apply plugin: 'com.android.application' dependencies { - compile 'com.android.support.constraint:constraint-layout:1.0.2' compile 'com.android.support:design:26.+' compile 'com.android.support.test:runner:0.5' } diff --git a/platform_tools/android/apps/skqp/src/main/res/layout/activity_main.xml b/platform_tools/android/apps/skqp/src/main/res/layout/activity_main.xml index 45b9c77f05..2625606114 100644 --- a/platform_tools/android/apps/skqp/src/main/res/layout/activity_main.xml +++ b/platform_tools/android/apps/skqp/src/main/res/layout/activity_main.xml @@ -1,5 +1,5 @@ <?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:tools="http://schemas.android.com/tools" android:layout_width="match_parent" @@ -18,11 +18,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" - 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" /> + android:text="Nothing to see here !"/> <Button android:id="@+id/button_start" @@ -33,5 +29,4 @@ android:onClick="startTests" android:text="Start Tests !" /> </LinearLayout> - -</android.support.constraint.ConstraintLayout> +</RelativeLayout> diff --git a/platform_tools/android/apps/skqp/src/main/res/layout/content_skqp.xml b/platform_tools/android/apps/skqp/src/main/res/layout/content_skqp.xml index 352937adf7..379bf11048 100644 --- a/platform_tools/android/apps/skqp/src/main/res/layout/content_skqp.xml +++ b/platform_tools/android/apps/skqp/src/main/res/layout/content_skqp.xml @@ -1,5 +1,5 @@ <?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:tools="http://schemas.android.com/tools" android:layout_width="match_parent" @@ -16,4 +16,4 @@ android:textSize="18sp" android:textStyle="bold" android:visibility="visible" /> -</android.support.constraint.ConstraintLayout> +</RelativeLayout> |