diff options
9 files changed, 15 insertions, 16 deletions
diff --git a/ui/lists/CustomChoiceList/Application/src/main/res/layout/list_item.xml b/ui/lists/CustomChoiceList/Application/src/main/res/layout/list_item.xml index 09a17edf..81592a03 100644 --- a/ui/lists/CustomChoiceList/Application/src/main/res/layout/list_item.xml +++ b/ui/lists/CustomChoiceList/Application/src/main/res/layout/list_item.xml @@ -57,6 +57,7 @@ android:duplicateParentState="true" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="16dp" /> + android:layout_marginLeft="16dp" + android:layout_marginStart="16dp" /> </com.example.android.customchoicelist.CheckableLinearLayout> diff --git a/ui/lists/CustomChoiceList/Application/src/main/res/layout/sample_main.xml b/ui/lists/CustomChoiceList/Application/src/main/res/layout/sample_main.xml index 17a69e41..ec3592be 100755 --- a/ui/lists/CustomChoiceList/Application/src/main/res/layout/sample_main.xml +++ b/ui/lists/CustomChoiceList/Application/src/main/res/layout/sample_main.xml @@ -15,6 +15,8 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + tools:targetApi="HONEYCOMB" android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" diff --git a/ui/lists/CustomChoiceList/README.md b/ui/lists/CustomChoiceList/README.md index 09a9d3a4..086fe574 100644 --- a/ui/lists/CustomChoiceList/README.md +++ b/ui/lists/CustomChoiceList/README.md @@ -41,8 +41,8 @@ guidelines. When doing so, you should set the `android:scrollbarStyle` attribute Pre-requisites -------------- -- Android SDK v23 -- Android Build Tools v23.0.0 +- Android SDK 24 +- Android Build Tools v24.0.1 - Android Support Repository Screenshots @@ -71,7 +71,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de License ------- -Copyright 2014 The Android Open Source Project, Inc. +Copyright 2016 The Android Open Source Project, Inc. Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for diff --git a/ui/views/CardView/Application/src/main/AndroidManifest.xml b/ui/views/CardView/Application/src/main/AndroidManifest.xml index 6c4a9d98..b90c56bc 100644 --- a/ui/views/CardView/Application/src/main/AndroidManifest.xml +++ b/ui/views/CardView/Application/src/main/AndroidManifest.xml @@ -19,9 +19,6 @@ android:versionCode="1" android:versionName="1.0" > - <uses-sdk android:minSdkVersion="7" - android:targetSdkVersion="21" /> - <application android:allowBackup="true" android:icon="@drawable/ic_launcher" diff --git a/ui/views/CardView/Application/src/main/res/layout/fragment_card_view.xml b/ui/views/CardView/Application/src/main/res/layout/fragment_card_view.xml index 432c5243..02eb4597 100644 --- a/ui/views/CardView/Application/src/main/res/layout/fragment_card_view.xml +++ b/ui/views/CardView/Application/src/main/res/layout/fragment_card_view.xml @@ -22,7 +22,7 @@ > <LinearLayout android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_height="wrap_content" android:orientation="vertical" android:paddingBottom="@dimen/activity_vertical_margin" android:paddingTop="@dimen/activity_vertical_margin" diff --git a/ui/views/CardView/Application/src/main/res/values/strings.xml b/ui/views/CardView/Application/src/main/res/values/strings.xml index c9955950..be5d9b07 100644 --- a/ui/views/CardView/Application/src/main/res/values/strings.xml +++ b/ui/views/CardView/Application/src/main/res/values/strings.xml @@ -15,7 +15,6 @@ limitations under the License. --> <resources> - <string name="title_activity_card_view">CardViewActivity</string> <string name="cardview_contents">This is a CardView widget. CardView widgets can have shadows and rounded corners. \n\nTo create a card with a shadow, use the <font fgcolor="#FFFFFFFF">android:elevation</font> diff --git a/ui/views/CardView/README.md b/ui/views/CardView/README.md index d5fa23be..b8efe9e9 100644 --- a/ui/views/CardView/README.md +++ b/ui/views/CardView/README.md @@ -8,8 +8,8 @@ Android L preview. Pre-requisites -------------- -- Android SDK v21 -- Android Build Tools v23.0.0 +- Android SDK 24 +- Android Build Tools v24.0.1 - Android Support Repository Getting Started @@ -33,7 +33,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de License ------- -Copyright 2014 The Android Open Source Project, Inc. +Copyright 2016 The Android Open Source Project, Inc. Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for diff --git a/ui/views/CardView/template-params.xml b/ui/views/CardView/template-params.xml index 3ce856f3..a029eadb 100644 --- a/ui/views/CardView/template-params.xml +++ b/ui/views/CardView/template-params.xml @@ -25,7 +25,7 @@ <auto_add_support_lib>false</auto_add_support_lib> <!-- change minSdk if needed--> - <minSdk>21</minSdk> + <minSdk>7</minSdk> <dependency>com.android.support:cardview-v7:24.0.0</dependency> diff --git a/ui/views/Clipping/ClippingBasic/README.md b/ui/views/Clipping/ClippingBasic/README.md index 43736892..8b223db9 100644 --- a/ui/views/Clipping/ClippingBasic/README.md +++ b/ui/views/Clipping/ClippingBasic/README.md @@ -47,8 +47,8 @@ clippedView.setClipToOutline(true); // Setting false disable clipping Pre-requisites -------------- -- Android SDK v21 -- Android Build Tools v23.0.0 +- Android SDK 24 +- Android Build Tools v24.0.1 - Android Support Repository Screenshots @@ -77,7 +77,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de License ------- -Copyright 2014 The Android Open Source Project, Inc. +Copyright 2016 The Android Open Source Project, Inc. Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for |