Merge "Revert "Use SetupWizardPreferenceLayout"" into nyc-dev (6b00d3fe) · Commits · e / os / android_packages_apps_Settings

Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -39,7 +39,7 @@ ifneq ($(INCREMENTAL_BUILDS),)
		LOCAL_JACK_FLAGS := --multi-dex native
		endif

		include frameworks/opt/setupwizard/library/common-full-support.mk
		include frameworks/opt/setupwizard/library/common.mk
		include frameworks/base/packages/SettingsLib/common.mk

		include $(BUILD_PACKAGE)

res/layout/setup_preference.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -15,11 +15,11 @@
		limitations under the License.
		-->

		<com.android.setupwizardlib.SetupWizardPreferenceLayout
		<com.android.setupwizardlib.SetupWizardLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:settings="http://schemas.android.com/apk/res-auto"
		android:id="@android:id/list_container"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout="@layout/suw_no_scroll_template"
		settings:suwBackgroundTile="@drawable/setup_illustration_tile"
		settings:suwIllustrationHorizontalTile="@drawable/setup_illustration_horizontal_tile" />

res/layout/suw_no_scroll_template_card.xml

0 → 100644

+81 −0

Original line number	Diff line number	Diff line
		<?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.
		-->

		<!-- This layout file is intended for use with views that handle its own scrolling, like WebView or
		RecyclerView. For other layouts that should be put inside a ScrollView, consider using
		suw_template instead. -->
		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:tools="http://schemas.android.com/tools"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="vertical">

		<com.android.setupwizardlib.view.Illustration
		android:id="@+id/suw_layout_decor"
		android:layout_width="match_parent"
		android:layout_height="0dp"
		android:layout_weight="1"
		android:background="@drawable/suw_layout_background">

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="vertical"
		android:paddingLeft="@dimen/suw_card_port_margin_sides"
		android:paddingRight="@dimen/suw_card_port_margin_sides">

		<TextView
		android:id="@+id/suw_layout_title"
		style="@style/SuwCardTitle"
		android:layout_width="match_parent"
		android:layout_height="wrap_content" />

		<FrameLayout
		android:layout_width="match_parent"
		android:layout_height="0dp"
		android:layout_weight="1"
		android:background="?attr/suwCardBackground"
		android:elevation="@dimen/suw_card_elevation"
		tools:ignore="UnusedAttribute">

		<FrameLayout
		android:id="@+id/suw_layout_content"
		android:layout_width="match_parent"
		android:layout_height="match_parent">

		<!-- Temporary solution to work with PreferenceFragment v14 -->
		<FrameLayout android:id="@android:id/list_container"
		android:layout_width="match_parent"
		android:layout_height="match_parent" />

		</FrameLayout>

		<include layout="@layout/suw_progress_bar_stub" />

		</FrameLayout>

		</LinearLayout>

		</com.android.setupwizardlib.view.Illustration>

		<com.android.setupwizardlib.view.NavigationBar
		android:id="@+id/suw_layout_navigation_bar"
		style="@style/SuwNavBarTheme"
		android:layout_width="match_parent"
		android:layout_height="@dimen/suw_navbar_height" />

		</LinearLayout>

res/layout/suw_no_scroll_template_card_wide.xml

0 → 100644

+82 −0

Original line number	Diff line number	Diff line
		<?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.
		-->

		<!-- This layout file is intended for use with views that handle its own scrolling, like WebView or
		RecyclerView. For other layouts that should be put inside a ScrollView, consider using
		suw_template instead. -->
		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:tools="http://schemas.android.com/tools"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="vertical">

		<com.android.setupwizardlib.view.Illustration
		android:id="@+id/suw_layout_decor"
		android:layout_width="match_parent"
		android:layout_height="0dp"
		android:layout_weight="1"
		android:background="@drawable/suw_layout_background">

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:gravity="start\|top"
		android:weightSum="16">

		<TextView
		android:id="@+id/suw_layout_title"
		style="@style/SuwCardTitle"
		android:layout_width="0dp"
		android:layout_height="wrap_content"
		android:layout_marginTop="@dimen/suw_card_land_header_text_margin_top"
		android:layout_weight="6" />

		<FrameLayout
		android:layout_width="0dp"
		android:layout_height="match_parent"
		android:layout_weight="8"
		android:background="?attr/suwCardBackground"
		android:elevation="@dimen/suw_card_elevation"
		tools:ignore="UnusedAttribute">

		<FrameLayout
		android:id="@+id/suw_layout_content"
		android:layout_width="match_parent"
		android:layout_height="match_parent">

		<!-- Temporary solution to work with PreferenceFragment v14 -->
		<FrameLayout android:id="@android:id/list_container"
		android:layout_width="match_parent"
		android:layout_height="match_parent" />

		</FrameLayout>

		<include layout="@layout/suw_progress_bar_stub" />

		</FrameLayout>

		</LinearLayout>

		</com.android.setupwizardlib.view.Illustration>

		<com.android.setupwizardlib.view.NavigationBar
		android:id="@+id/suw_layout_navigation_bar"
		style="@style/SuwNavBarTheme"
		android:layout_width="match_parent"
		android:layout_height="@dimen/suw_navbar_height" />

		</LinearLayout>

res/layout/suw_no_scroll_template_header.xml

0 → 100644

+76 −0

Original line number	Diff line number	Diff line
		<?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.
		-->

		<!-- IMPORTANT NOTE: Even if this layout is used with a view that handles its scroll internally,
		like WebView or RecyclerView, the illustration will not scroll away, since this view doesn't
		know about the scrolling view at all. It is recommended that you add the illustration as a
		header to the RecyclerView or avoid using this layout (e.g. use suw_no_scroll_template_short
		instead of suw_no_scroll_template) -->
		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:tools="http://schemas.android.com/tools"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="vertical">

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="0dp"
		android:layout_weight="1"
		android:orientation="vertical">

		<com.android.setupwizardlib.view.Illustration
		android:id="@+id/suw_layout_decor"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:background="@drawable/suw_layout_background"
		android:elevation="@dimen/suw_title_area_elevation"
		android:tag="stickyContainer"
		tools:ignore="UnusedAttribute">

		<TextView
		android:id="@+id/suw_layout_title"
		style="@style/SuwHeaderTitle"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:tag="sticky" />

		</com.android.setupwizardlib.view.Illustration>

		<include layout="@layout/suw_progress_bar_stub" />

		<FrameLayout
		android:id="@+id/suw_layout_content"
		android:layout_width="match_parent"
		android:layout_height="0dp"
		android:layout_weight="1">

		<!-- Temporary solution to work with PreferenceFragment v14 -->
		<FrameLayout android:id="@android:id/list_container"
		android:layout_width="match_parent"
		android:layout_height="match_parent" />

		</FrameLayout>

		</LinearLayout>

		<com.android.setupwizardlib.view.NavigationBar
		android:id="@+id/suw_layout_navigation_bar"
		style="@style/SuwNavBarTheme"
		android:layout_width="match_parent"
		android:layout_height="@dimen/suw_navbar_height" />

		</LinearLayout>