diff options
Diffstat (limited to 'res/layout')
-rw-r--r-- | res/layout/dvr_main.xml (renamed from res/layout/setup_item_divider.xml) | 14 | ||||
-rw-r--r-- | res/layout/dvr_play.xml | 28 | ||||
-rw-r--r-- | res/layout/fragment_new_sources.xml | 83 | ||||
-rw-r--r-- | res/layout/fragment_welcome.xml | 114 | ||||
-rw-r--r-- | res/layout/fragment_welcome_page.xml | 48 | ||||
-rw-r--r-- | res/layout/menu_card_dvr.xml | 52 | ||||
-rw-r--r-- | res/layout/menu_card_guide.xml | 4 | ||||
-rw-r--r-- | res/layout/onboarding_welcome_background.xml | 39 | ||||
-rw-r--r-- | res/layout/onboarding_welcome_content.xml | 54 | ||||
-rw-r--r-- | res/layout/onboarding_welcome_foreground.xml (renamed from res/layout/option_item_simple.xml) | 23 | ||||
-rw-r--r-- | res/layout/overlay_root_view.xml | 4 | ||||
-rw-r--r-- | res/layout/setup_dialog.xml | 71 | ||||
-rw-r--r-- | res/layout/setup_item_action.xml | 42 | ||||
-rw-r--r-- | res/layout/setup_item_input.xml | 51 |
14 files changed, 272 insertions, 355 deletions
diff --git a/res/layout/setup_item_divider.xml b/res/layout/dvr_main.xml index 65430f49..bac1cc91 100644 --- a/res/layout/setup_item_divider.xml +++ b/res/layout/dvr_main.xml @@ -14,14 +14,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" +<fragment xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/dvr_frame" + android:name="com.android.tv.dvr.ui.DvrBrowseFragment" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingTop="4dp" - android:paddingBottom="4dp"> - <View - android:layout_width="match_parent" - android:layout_height="0.5dp" - android:background="@color/setup_divider" /> -</FrameLayout> + android:layout_height="match_parent" />
\ No newline at end of file diff --git a/res/layout/dvr_play.xml b/res/layout/dvr_play.xml new file mode 100644 index 00000000..4df13686 --- /dev/null +++ b/res/layout/dvr_play.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2015 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 + --> + +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent"> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="@string/no_program_information" + android:id="@+id/placeHolderText" android:layout_gravity="center"/> +</FrameLayout>
\ No newline at end of file diff --git a/res/layout/fragment_new_sources.xml b/res/layout/fragment_new_sources.xml new file mode 100644 index 00000000..7a46dcdf --- /dev/null +++ b/res/layout/fragment_new_sources.xml @@ -0,0 +1,83 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2015 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. + --> + +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="bottom" + android:background="@color/common_tv_background" + android:paddingStart="40dp" + android:paddingEnd="56dp" + android:paddingTop="44dp" + android:paddingBottom="27dp"> + <ImageView + android:id="@+id/icon" + android:layout_width="64dp" + android:layout_height="64dp" + android:layout_marginTop="8dp" + android:layout_alignParentTop="true" + android:layout_alignParentStart="true" + android:scaleType="centerInside" + android:src="@drawable/ic_tvoption_channel_sources" /> + <Button + android:id="@+id/setup" + style="@style/Widget.Setup.GuidedActionItemContainerStyle" + android:layout_width="306dp" + android:layout_height="45dp" + android:layout_marginTop="7dp" + android:layout_alignParentEnd="true" + android:layout_marginStart="56dp" + android:background="@null" + android:foreground="@drawable/setup_selector_background" + android:gravity="start" + android:text="@string/new_sources_action_setup"/> + <Button + android:id="@+id/skip" + style="@style/Widget.Setup.GuidedActionItemContainerStyle" + android:layout_width="306dp" + android:layout_height="45dp" + android:layout_alignParentEnd="true" + android:layout_below="@id/setup" + android:background="@null" + android:foreground="@drawable/setup_selector_background" + android:gravity="start" + android:text="@string/new_sources_action_skip"/> + <TextView + android:id="@+id/title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentTop="true" + android:layout_marginTop="11dp" + android:layout_marginBottom="18dp" + android:layout_toEndOf="@id/icon" + android:layout_toStartOf="@+id/setup" + android:fontFamily="@string/light_font" + android:textColor="#EEEEEE" + android:text="@string/new_sources_title" + android:textSize="34sp"/> + <TextView + android:id="@+id/description" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@id/title" + android:layout_marginBottom="8dp" + android:layout_toEndOf="@id/icon" + android:layout_toStartOf="@id/setup" + android:fontFamily="@string/light_font" + android:text="@string/new_sources_description" + android:textColor="#ADEEEEEE"/> +</RelativeLayout> diff --git a/res/layout/fragment_welcome.xml b/res/layout/fragment_welcome.xml deleted file mode 100644 index bf336665..00000000 --- a/res/layout/fragment_welcome.xml +++ /dev/null @@ -1,114 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - ~ Copyright (C) 2015 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. - --> - -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/welcome_fragment_root" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:clipChildren="false" - android:clipToPadding="false"> - - <FrameLayout - android:id="@+id/page_container" - android:layout_width="@dimen/onboarding_welcome_content_width" - android:layout_height="100dp" - android:layout_alignParentTop="true" - android:layout_centerHorizontal="true" - android:layout_marginTop="64dp" - android:clipChildren="false" - android:clipToPadding="false" /> - - <FrameLayout - android:id="@+id/tv_container" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_below="@id/page_container" - android:layout_marginTop="67dp" - android:layout_centerHorizontal="true" - android:transitionGroup="true"> - <ImageView - android:layout_width="215dp" - android:layout_height="128dp" - android:layout_gravity="center" - android:contentDescription="@null" - android:src="@drawable/tv_bg" /> - <ImageView - android:id="@+id/tv_content" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:contentDescription="@null" - android:src="@drawable/tv_1a_01" /> - </FrameLayout> - - <ImageView - android:id="@+id/shadow" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_below="@id/tv_container" - android:layout_centerHorizontal="true" - android:layout_marginTop="16dp" - android:src="@drawable/tv_shadow" - android:contentDescription="@null" /> - - <com.android.tv.onboarding.PagingIndicator - android:id="@+id/page_indicator" - android:layout_width="@dimen/onboarding_welcome_content_width" - android:layout_height="36dp" - android:layout_below="@id/shadow" - android:layout_centerHorizontal="true" - android:layout_marginTop="50dp" - android:focusable="true" /> - - <ImageView - android:id="@+id/cloud1" - android:layout_width="182dp" - android:layout_height="114dp" - android:layout_marginTop="140dp" - android:layout_marginStart="-47dp" - android:layout_alignParentStart="true" - android:src="@drawable/cloud01" - android:contentDescription="@null" /> - - <ImageView - android:id="@+id/cloud2" - android:layout_width="120dp" - android:layout_height="74dp" - android:layout_marginTop="100dp" - android:layout_marginEnd="-40dp" - android:layout_alignParentEnd="true" - android:src="@drawable/cloud02" - android:contentDescription="@null" /> - - <ImageView - android:id="@+id/arrow" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginBottom="70dp" - android:layout_alignBottom="@id/tv_container" - android:layout_centerHorizontal="true" - android:contentDescription="@null" - android:visibility="gone" /> - - <ImageView - android:id="@+id/logo" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerInParent="true" - android:src="@drawable/splash_logo" - android:contentDescription="@null" /> -</RelativeLayout> diff --git a/res/layout/fragment_welcome_page.xml b/res/layout/fragment_welcome_page.xml deleted file mode 100644 index c60877ec..00000000 --- a/res/layout/fragment_welcome_page.xml +++ /dev/null @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - ~ Copyright (C) 2015 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. - --> - -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/welcome_page_fragment_root" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> - - <TextView - android:id="@+id/title" - android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="0.5" - android:layout_marginBottom="3dp" - android:fontFamily="@string/light_font" - android:gravity="center" - android:textColor="#EEEEEE" - android:textSize="34sp" - android:lineSpacingExtra="14sp"/> - - <TextView - android:id="@+id/description" - android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="0.5" - android:layout_marginTop="3dp" - android:fontFamily="@string/light_font" - android:gravity="center" - android:textColor="#B3EEEEEE" - android:textSize="14sp" - android:lineSpacingExtra="10sp" /> - -</LinearLayout> diff --git a/res/layout/menu_card_dvr.xml b/res/layout/menu_card_dvr.xml new file mode 100644 index 00000000..4cc178f3 --- /dev/null +++ b/res/layout/menu_card_dvr.xml @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2015 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. + --> + +<com.android.tv.menu.SimpleCardView xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="@dimen/card_layout_width" + android:layout_height="wrap_content" + android:orientation="vertical" + android:elevation="@dimen/card_elevation_normal" + android:focusable="true" + android:clickable="true"> + + <FrameLayout + android:layout_width="@dimen/card_image_layout_width" + android:layout_height="@dimen/card_image_layout_height" + android:background="@color/channel_card_guide"> + <ImageView + android:layout_width="82dp" + android:layout_height="48dp" + android:layout_marginTop="16dp" + android:src="@drawable/ic_channel_guide" + android:layout_gravity="center_horizontal" /> + </FrameLayout> + + <TextView + android:layout_width="match_parent" + android:layout_height="@dimen/card_meta_layout_height" + android:paddingStart="@dimen/card_meta_padding_start" + android:paddingEnd="@dimen/card_meta_padding_end" + android:paddingTop="@dimen/card_meta_padding_top" + android:singleLine="true" + android:ellipsize="end" + android:fontFamily="@string/condensed_font" + android:textColor="@color/card_meta_text_color" + android:background="@color/guide_card_meta_background" + android:text="@string/channels_item_dvr" + android:textSize="12sp" /> + +</com.android.tv.menu.SimpleCardView> diff --git a/res/layout/menu_card_guide.xml b/res/layout/menu_card_guide.xml index dcc80931..6b724b12 100644 --- a/res/layout/menu_card_guide.xml +++ b/res/layout/menu_card_guide.xml @@ -15,7 +15,7 @@ ~ limitations under the License. --> -<com.android.tv.menu.GuideCardView xmlns:android="http://schemas.android.com/apk/res/android" +<com.android.tv.menu.SimpleCardView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="@dimen/card_layout_width" android:layout_height="wrap_content" android:orientation="vertical" @@ -49,4 +49,4 @@ android:text="@string/channels_item_program_guide" android:textSize="12sp" /> -</com.android.tv.menu.GuideCardView> +</com.android.tv.menu.SimpleCardView> diff --git a/res/layout/onboarding_welcome_background.xml b/res/layout/onboarding_welcome_background.xml new file mode 100644 index 00000000..784127b4 --- /dev/null +++ b/res/layout/onboarding_welcome_background.xml @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2015 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. + --> + +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent"> + <ImageView + android:id="@+id/cloud1" + android:layout_width="182dp" + android:layout_height="114dp" + android:layout_marginTop="140dp" + android:layout_marginStart="-47dp" + android:layout_gravity="start" + android:src="@drawable/cloud01" + android:contentDescription="@null" /> + <ImageView + android:id="@+id/cloud2" + android:layout_width="120dp" + android:layout_height="74dp" + android:layout_marginTop="100dp" + android:layout_marginEnd="-40dp" + android:layout_gravity="end" + android:src="@drawable/cloud02" + android:contentDescription="@null" /> +</FrameLayout> diff --git a/res/layout/onboarding_welcome_content.xml b/res/layout/onboarding_welcome_content.xml new file mode 100644 index 00000000..57954df3 --- /dev/null +++ b/res/layout/onboarding_welcome_content.xml @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2015 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. + --> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/onboarding_welcome_content_margin_top" + android:layout_marginBottom="@dimen/onboarding_welcome_content_margin_bottom" + android:orientation="vertical"> + + <FrameLayout + android:id="@+id/tv_container" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:transitionGroup="true"> + <ImageView + android:layout_width="215dp" + android:layout_height="128dp" + android:layout_gravity="center" + android:contentDescription="@null" + android:src="@drawable/tv_bg" /> + <ImageView + android:id="@+id/tv_content" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:contentDescription="@null" + android:src="@drawable/tv_1a_01" /> + </FrameLayout> + + <ImageView + android:id="@+id/shadow" + android:layout_width="wrap_content" + android:layout_height="@dimen/onboarding_welcome_shadow_height" + android:layout_gravity="center_horizontal" + android:layout_marginTop="@dimen/onboarding_welcome_shadow_margin_top" + android:src="@drawable/tv_shadow" + android:contentDescription="@null" /> +</LinearLayout> diff --git a/res/layout/option_item_simple.xml b/res/layout/onboarding_welcome_foreground.xml index 5dc6b8cf..ab742c7d 100644 --- a/res/layout/option_item_simple.xml +++ b/res/layout/onboarding_welcome_foreground.xml @@ -15,19 +15,12 @@ ~ limitations under the License. --> -<!-- Non focusable item --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="horizontal" - android:layout_width="match_parent" +<!-- The bottom should be aligned to that of tv_container --> +<ImageView xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/arrow" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:paddingStart="@dimen/side_panel_padding_start" - android:paddingEnd="@dimen/side_panel_padding_end" - android:focusable="false" - android:background="?android:attr/selectableItemBackground" > - - <include layout="@layout/option_item_common" - android:layout_width="0dp" - android:layout_height="match_parent" - android:layout_weight="1" /> - -</LinearLayout> + android:layout_gravity="center_horizontal|bottom" + android:layout_marginBottom="@dimen/onboarding_welcome_arrow_margin_bottom" + android:contentDescription="@null" + android:visibility="gone" /> diff --git a/res/layout/overlay_root_view.xml b/res/layout/overlay_root_view.xml index 1048e267..1fc8647f 100644 --- a/res/layout/overlay_root_view.xml +++ b/res/layout/overlay_root_view.xml @@ -16,6 +16,7 @@ --> <com.android.tv.ui.OverlayRootView xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/overlay_root_view" android:layout_width="match_parent" android:layout_height="match_parent" > @@ -36,8 +37,7 @@ <include layout="@layout/menu" /> <include layout="@layout/option_container" /> <include layout="@layout/program_guide" /> - <FrameLayout android:id="@+id/search" + <FrameLayout android:id="@+id/fragment_container" android:layout_height="match_parent" android:layout_width="match_parent"/> - </com.android.tv.ui.OverlayRootView> diff --git a/res/layout/setup_dialog.xml b/res/layout/setup_dialog.xml deleted file mode 100644 index ce3dc22f..00000000 --- a/res/layout/setup_dialog.xml +++ /dev/null @@ -1,71 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - ~ Copyright (C) 2015 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. - --> - -<com.android.tv.ui.SetupView - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent"> - <View - android:id="@+id/background" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@color/setup_background" /> - <!-- clipChildren:false is given for item animations in input_list view. --> - <LinearLayout - android:id="@+id/container" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:clipChildren="false" - android:orientation="horizontal" > - <LinearLayout - android:id="@+id/setup_left" - android:layout_width="592dp" - android:layout_height="match_parent" - android:paddingStart="56dp" - android:paddingEnd="32dp" - android:paddingTop="183dp" - android:orientation="vertical"> - <TextView - android:id="@+id/setup_title" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:fontFamily="@string/light_font" - android:textColor="@color/setup_title" - android:textSize="34sp" /> - <TextView - android:id="@+id/setup_description" - android:layout_marginTop="8dp" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:fontFamily="@string/font" - android:textColor="@color/setup_description" - android:textSize="14sp" /> - </LinearLayout> - <android.support.v17.leanback.widget.VerticalGridView - android:id="@+id/input_list" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:paddingStart="24dp" - android:paddingEnd="40dp" - android:paddingTop="183dp" - android:paddingBottom="48dp" - android:clipToPadding="false" - android:focusable="true" - android:focusableInTouchMode="true" /> - </LinearLayout> -</com.android.tv.ui.SetupView> - diff --git a/res/layout/setup_item_action.xml b/res/layout/setup_item_action.xml deleted file mode 100644 index c39e4960..00000000 --- a/res/layout/setup_item_action.xml +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - ~ Copyright (C) 2015 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. - --> - -<!-- TODO: define its own resources instead of using option_item_xxx, once UI spec is defined. --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:minHeight="@dimen/option_item_height" - android:paddingStart="16dp" - android:paddingEnd="16dp" - android:paddingTop="@dimen/option_item_common_padding_top" - android:paddingBottom="@dimen/option_item_common_padding_bottom" - android:gravity="center_vertical" - android:background="@drawable/setup_item_background" - android:focusable="true" > - - <TextView - android:id="@+id/title" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:fontFamily="@string/option_item_text_font" - android:textSize="@dimen/option_item_text_size" - android:textColor="@color/option_item_text_color" - android:singleLine="true" - android:focusable="false" /> - -</LinearLayout> diff --git a/res/layout/setup_item_input.xml b/res/layout/setup_item_input.xml deleted file mode 100644 index 1bc7ccd4..00000000 --- a/res/layout/setup_item_input.xml +++ /dev/null @@ -1,51 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - ~ Copyright (C) 2015 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. - --> - -<!-- TODO: define its own resources instead of using option_item_xxx, once UI spec is defined. --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:minHeight="@dimen/option_item_height" - android:paddingStart="16dp" - android:paddingEnd="16dp" - android:paddingTop="@dimen/option_item_common_padding_top" - android:paddingBottom="@dimen/option_item_common_padding_bottom" - android:gravity="center_vertical" - android:background="@drawable/setup_item_background" - android:focusable="true" > - - <TextView - android:id="@+id/title" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:fontFamily="@string/option_item_text_font" - android:textSize="@dimen/option_item_text_size" - android:textColor="@color/option_item_text_color" - android:singleLine="true" - android:focusable="false" /> - <TextView - android:id="@+id/description" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="@dimen/option_item_text_margin_top" - android:fontFamily="@string/option_item_secondary_text_font" - android:textSize="@dimen/option_item_secondary_text_size" - android:textColor="@color/option_item_secondary_text_color" - android:focusable="false" /> - -</LinearLayout> |