Skip to content
This repository was archived by the owner on Nov 21, 2019. It is now read-only.

Commit 1c642c5

Browse files
committed
Import examples for MotionLayout.
Also rename the module existing samples for CosntraintLayout from "app" to "constraintlayout" to be consistent with the samples for MotionLayout. Change-Id: I953df4803e376ce0461a9acb1731d1ec87b17fce
1 parent 454ed2b commit 1c642c5

File tree

170 files changed

+4581
-8
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

170 files changed

+4581
-8
lines changed

build.gradle

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2017 The Android Open Source Project
2+
* Copyright (C) 2018 The Android Open Source Project
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -17,11 +17,14 @@
1717
// Top-level build file where you can add configuration options common to all sub-projects/modules.
1818

1919
buildscript {
20+
ext.kotlin_version = '1.2.41'
2021
repositories {
22+
google()
2123
jcenter()
2224
}
2325
dependencies {
24-
classpath 'com.android.tools.build:gradle:2.3.0'
26+
classpath 'com.android.tools.build:gradle:3.2.0-alpha17'
27+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
2528

2629
// NOTE: Do not place your application dependencies here; they belong
2730
// in the individual module build.gradle files
@@ -30,6 +33,7 @@ buildscript {
3033

3134
allprojects {
3235
repositories {
36+
google()
3337
jcenter()
3438
}
3539
}
Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,11 @@
1717
apply plugin: 'com.android.application'
1818

1919
android {
20-
compileSdkVersion 25
21-
buildToolsVersion "25.0.2"
20+
compileSdkVersion 27
2221
defaultConfig {
2322
applicationId "com.example.android.constraintlayoutexamples"
2423
minSdkVersion 19
25-
targetSdkVersion 25
24+
targetSdkVersion 27
2625
versionCode 1
2726
versionName "1.0"
2827
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -37,5 +36,5 @@ dependencies {
3736
})
3837
compile 'com.android.support:appcompat-v7:25.1.1'
3938
testCompile 'junit:junit:4.12'
40-
compile 'com.android.support.constraint:constraint-layout:1.0.1'
39+
compile 'com.android.support.constraint:constraint-layout:1.1.2'
4140
}

app/src/androidTest/java/com/example/android/constraintlayoutexamples/ExampleInstrumentedTest.java renamed to constraintlayout/src/androidTest/java/com/example/android/constraintlayoutexamples/ExampleInstrumentedTest.java

File renamed without changes.
File renamed without changes.

app/src/main/java/com/example/android/constraintlayoutexamples/ConstraintSetExampleActivity.java renamed to constraintlayout/src/main/java/com/example/android/constraintlayoutexamples/ConstraintSetExampleActivity.java

File renamed without changes.

app/src/main/java/com/example/android/constraintlayoutexamples/MainActivity.java renamed to constraintlayout/src/main/java/com/example/android/constraintlayoutexamples/MainActivity.java

File renamed without changes.

app/src/main/res/drawable/ic_android_black_24dp.xml renamed to constraintlayout/src/main/res/drawable/ic_android_black_24dp.xml

File renamed without changes.
File renamed without changes.

app/src/main/res/layout-land/constraintset_example_big.xml renamed to constraintlayout/src/main/res/layout-land/constraintset_example_big.xml

File renamed without changes.

0 commit comments

Comments
 (0)