View/List

build.gradle

@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-alpha9'
+        classpath 'com.android.tools.build:gradle:3.0.0-beta2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

mobile/build.gradle

@@ -4,11 +4,11 @@ apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion 26
-    buildToolsVersion "26.0.0"
+    buildToolsVersion '26.0.0'
 
     defaultConfig {
         applicationId "com.example.android.apis"
-        minSdkVersion 15
+        minSdkVersion 23
         targetSdkVersion 26
         versionCode 1
         versionName "1.0"

mobile/src/main/java/com/example/android/apis/view/Baseline1.java → mobile/src/main/java/com/example/android/apis/view/Baseline1.kt

@@ -14,22 +14,21 @@
  * limitations under the License.
  */
 
-package com.example.android.apis.view;
+package com.example.android.apis.view
 
-import com.example.android.apis.R;
+import com.example.android.apis.R
 
-import android.app.Activity;
-import android.os.Bundle;
+import android.app.Activity
+import android.os.Bundle
 
 
 /**
  * Baseline alignment in LinearLayout.
  */
-public class Baseline1 extends Activity {
+class Baseline1 : Activity() {
 
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.baseline_1);
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.baseline_1)
     }
 }

mobile/src/main/java/com/example/android/apis/view/Baseline2.java → mobile/src/main/java/com/example/android/apis/view/Baseline2.kt

@@ -14,22 +14,21 @@
  * limitations under the License.
  */
 
-package com.example.android.apis.view;
+package com.example.android.apis.view
 
-import com.example.android.apis.R;
+import com.example.android.apis.R
 
-import android.app.Activity;
-import android.os.Bundle;
+import android.app.Activity
+import android.os.Bundle
 
 
 /**
  * Baseline alignment in LinearLayout with a BOTTOM gravity.
  */
-public class Baseline2 extends Activity {
+class Baseline2 : Activity() {
 
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.baseline_2);
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.baseline_2)
     }
 }

mobile/src/main/java/com/example/android/apis/view/Baseline3.java → mobile/src/main/java/com/example/android/apis/view/Baseline3.kt

@@ -14,23 +14,22 @@
  * limitations under the License.
  */
 
-package com.example.android.apis.view;
+package com.example.android.apis.view
 
-import com.example.android.apis.R;
+import com.example.android.apis.R
 
-import android.app.Activity;
-import android.os.Bundle;
+import android.app.Activity
+import android.os.Bundle
 
 
 /**
  * Baseline alignement in LinearLayout with a center_vertical gravity. This sample shows that
  * using a center_vertical gravity disables baseline alignment.
  */
-public class Baseline3 extends Activity {
+class Baseline3 : Activity() {
 
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.baseline_3);
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.baseline_3)
     }
 }

mobile/src/main/java/com/example/android/apis/view/Baseline4.java → mobile/src/main/java/com/example/android/apis/view/Baseline4.kt

@@ -14,22 +14,21 @@
  * limitations under the License.
  */
 
-package com.example.android.apis.view;
+package com.example.android.apis.view
 
-import com.example.android.apis.R;
+import com.example.android.apis.R
 
-import android.app.Activity;
-import android.os.Bundle;
+import android.app.Activity
+import android.os.Bundle
 
 
 /**
  * Baseline alignment in LinearLayout with mixed gravities.
  */
-public class Baseline4 extends Activity {
+class Baseline4 : Activity() {
 
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.baseline_4);
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.baseline_4)
     }
 }

mobile/src/main/java/com/example/android/apis/view/Baseline6.java → mobile/src/main/java/com/example/android/apis/view/Baseline6.kt

@@ -14,22 +14,21 @@
  * limitations under the License.
  */
 
-package com.example.android.apis.view;
+package com.example.android.apis.view
 
-import com.example.android.apis.R;
+import com.example.android.apis.R
 
-import android.app.Activity;
-import android.os.Bundle;
+import android.app.Activity
+import android.os.Bundle
 
 
 /**
  * Baseline alignment in RelativeLayout.
  */
-public class Baseline6 extends Activity {
+class Baseline6 : Activity() {
 
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.baseline_6);
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.baseline_6)
     }
 }

mobile/src/main/java/com/example/android/apis/view/Baseline7.java → mobile/src/main/java/com/example/android/apis/view/Baseline7.kt

@@ -14,22 +14,21 @@
  * limitations under the License.
  */
 
-package com.example.android.apis.view;
+package com.example.android.apis.view
 
-import com.example.android.apis.R;
+import com.example.android.apis.R
 
-import android.app.Activity;
-import android.os.Bundle;
+import android.app.Activity
+import android.os.Bundle
 
 
 /**
  * Baseline alignment in RelativeLayout with various font weights.
  */
-public class Baseline7 extends Activity {
+class Baseline7 : Activity() {
 
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.baseline_7);
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.baseline_7)
     }
 }

mobile/src/main/java/com/example/android/apis/view/BaselineNested1.java → mobile/src/main/java/com/example/android/apis/view/BaselineNested1.kt

@@ -14,23 +14,22 @@
  * limitations under the License.
  */
 
-package com.example.android.apis.view;
+package com.example.android.apis.view
 
-import com.example.android.apis.R;
+import com.example.android.apis.R
 
-import android.app.Activity;
-import android.os.Bundle;
+import android.app.Activity
+import android.os.Bundle
 
 /**
  * Baseline alignment includes elements within nested vertical
- * {@link android.widget.LinearLayout}s.
+ * [android.widget.LinearLayout]s.
  */
-public class BaselineNested1 extends Activity {
+class BaselineNested1 : Activity() {
 
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
 
-        setContentView(R.layout.baseline_nested_1);
+        setContentView(R.layout.baseline_nested_1)
     }
 }

mobile/src/main/java/com/example/android/apis/view/BaselineNested2.java → mobile/src/main/java/com/example/android/apis/view/BaselineNested2.kt

@@ -14,23 +14,22 @@
  * limitations under the License.
  */
 
-package com.example.android.apis.view;
+package com.example.android.apis.view
 
-import com.example.android.apis.R;
+import com.example.android.apis.R
 
-import android.app.Activity;
-import android.os.Bundle;
+import android.app.Activity
+import android.os.Bundle
 
 /**
  * Baseline alignment includes an element within a nested horizontal
- * {@link android.widget.LinearLayout}.
+ * [android.widget.LinearLayout].
  */
-public class BaselineNested2 extends Activity {
+class BaselineNested2 : Activity() {
 
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
 
-        setContentView(R.layout.baseline_nested_2);
+        setContentView(R.layout.baseline_nested_2)
     }
 }

mobile/src/main/java/com/example/android/apis/view/BaselineNested3.kt

@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.example.android.apis.view
+
+import com.example.android.apis.R
+
+import android.app.Activity
+import android.os.Bundle
+
+/**
+ * Baseline alignment includes a [android.widget.LinearLayout]
+ * within another [android.widget.LinearLayout].
+ */
+class BaselineNested3 : Activity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        setContentView(R.layout.baseline_nested_3)
+    }
+}