Fix issues in CardView sample from bug bash
- Wraps the content with ScrollView so that it works in landscape on phones
- Fix the launcher app name's capitilization
Change-Id: I06db7b869c0a87a1dd3acf4144362c88dd1442e5
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 19c8b1d..432c524 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
@@ -14,70 +14,78 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:card_view="http://schemas.android.com/apk/res-auto"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical"
- android:paddingBottom="@dimen/activity_vertical_margin"
- android:paddingLeft="@dimen/activity_horizontal_margin"
- android:paddingRight="@dimen/activity_horizontal_margin"
- android:paddingTop="@dimen/activity_vertical_margin"
+<ScrollView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:card_view="http://schemas.android.com/apk/res-auto"
+ android:layout_height="match_parent"
+ android:layout_width="match_parent"
>
- <android.support.v7.widget.CardView
- android:id="@+id/cardview"
- android:layout_width="fill_parent"
- android:layout_height="250dp"
- android:elevation="100dp"
- card_view:cardBackgroundColor="@color/cardview_initial_background"
- card_view:cardCornerRadius="8dp"
+ <LinearLayout android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:paddingBottom="@dimen/activity_vertical_margin"
+ android:paddingTop="@dimen/activity_vertical_margin"
+ android:paddingLeft="@dimen/activity_horizontal_margin"
+ android:paddingRight="@dimen/activity_horizontal_margin"
>
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_margin="15dp"
- android:text="@string/cardview_contents"
- />
- </android.support.v7.widget.CardView>
-
- <LinearLayout
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="30dp"
- android:orientation="horizontal"
- >
- <TextView
- android:layout_width="70dp"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:text="@string/cardview_radius_seekbar_text"
- />
- <SeekBar
- android:id="@+id/cardview_radius_seekbar"
+ <android.support.v7.widget.CardView
+ android:id="@+id/cardview"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:layout_margin="10dp"
- />
- </LinearLayout>
+ android:elevation="100dp"
+ card_view:cardBackgroundColor="@color/cardview_initial_background"
+ card_view:cardCornerRadius="8dp"
+ android:layout_marginLeft="@dimen/margin_large"
+ android:layout_marginRight="@dimen/margin_large"
+ >
- <LinearLayout
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- >
- <TextView
- android:layout_width="70dp"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:text="@string/cardview_elevation_seekbar_text"
- />
- <SeekBar
- android:id="@+id/cardview_elevation_seekbar"
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_margin="@dimen/margin_medium"
+ android:text="@string/cardview_contents"
+ />
+ </android.support.v7.widget.CardView>
+
+ <LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:layout_margin="10dp"
- />
+ android:layout_marginTop="@dimen/margin_large"
+ android:orientation="horizontal"
+ >
+ <TextView
+ android:layout_width="@dimen/seekbar_label_length"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:text="@string/cardview_radius_seekbar_text"
+ />
+ <SeekBar
+ android:id="@+id/cardview_radius_seekbar"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_margin="@dimen/margin_medium"
+ />
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ >
+ <TextView
+ android:layout_width="@dimen/seekbar_label_length"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:text="@string/cardview_elevation_seekbar_text"
+ />
+ <SeekBar
+ android:id="@+id/cardview_elevation_seekbar"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_margin="@dimen/margin_medium"
+ />
+ </LinearLayout>
</LinearLayout>
-</LinearLayout>
+</ScrollView>
+
diff --git a/ui/views/CardView/Application/src/main/res/values/dimens.xml b/ui/views/CardView/Application/src/main/res/values/dimens.xml
index 71c0df5..9133662 100644
--- a/ui/views/CardView/Application/src/main/res/values/dimens.xml
+++ b/ui/views/CardView/Application/src/main/res/values/dimens.xml
@@ -18,4 +18,5 @@
<!-- Default screen margins, per the Android Design guidelines. -->
<dimen name="activity_horizontal_margin">16dp</dimen>
<dimen name="activity_vertical_margin">16dp</dimen>
+ <dimen name="seekbar_label_length">70dp</dimen>
</resources>
diff --git a/ui/views/CardView/template-params.xml b/ui/views/CardView/template-params.xml
index 93de62b..7dc7719 100644
--- a/ui/views/CardView/template-params.xml
+++ b/ui/views/CardView/template-params.xml
@@ -18,7 +18,7 @@
<sample>
- <name>CardView sample</name>
+ <name>CardView Sample</name>
<group>UI</group>
<package>com.example.android.cardview</package>
