diff options
author | Maurice Lam <yukl@google.com> | 2015-04-18 20:11:59 -0700 |
---|---|---|
committer | Maurice Lam <yukl@google.com> | 2015-04-21 10:19:35 -0700 |
commit | 83301b5256e3fd930d620e8e9ad5f43cd388ba09 (patch) | |
tree | 71e2c358fabf8aee6166177d0dcb34efc5215609 /res/layout-sw600dp | |
parent | c3385dc11bacdcc4d8e7d614fd7133bb9e609cdb (diff) | |
download | packages_apps_Settings-83301b5256e3fd930d620e8e9ad5f43cd388ba09.zip packages_apps_Settings-83301b5256e3fd930d620e8e9ad5f43cd388ba09.tar.gz packages_apps_Settings-83301b5256e3fd930d620e8e9ad5f43cd388ba09.tar.bz2 |
[Setup] Use SetupWizardLayout
Use SetupWizardLayout for the screens that show in Settings to get
better visual consistency and new features like showing a progress
bar in list view.
Bug: 19594252
Change-Id: I53ab17a4c2d922a362e3762f1cdccb512f7d8f6e
Diffstat (limited to 'res/layout-sw600dp')
-rw-r--r-- | res/layout-sw600dp/setup_preference.xml | 77 | ||||
-rw-r--r-- | res/layout-sw600dp/setup_template.xml | 74 |
2 files changed, 0 insertions, 151 deletions
diff --git a/res/layout-sw600dp/setup_preference.xml b/res/layout-sw600dp/setup_preference.xml deleted file mode 100644 index cc12003..0000000 --- a/res/layout-sw600dp/setup_preference.xml +++ /dev/null @@ -1,77 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2014 Google Inc. - - 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="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> - - <com.android.settings.widget.SetupWizardIllustration - android:id="@+id/setup_illustration" - android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="1" - android:background="@drawable/setup_illustration_bg" - android:foreground="@drawable/setup_illustration"> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_marginTop="@dimen/setup_wizard_tablet_illustration_height" - android:orientation="vertical" - android:paddingLeft="@dimen/setup_wizard_card_port_margin_sides" - android:paddingRight="@dimen/setup_wizard_card_port_margin_sides"> - - <TextView - android:id="@+id/title" - style="@style/SetupCardTitle" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/wifi_setup_wizard_title" /> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="1" - android:background="@drawable/setup_wizard_card_bg" - android:elevation="@dimen/setup_wizard_card_elevation" - android:orientation="vertical"> - - <ListView - android:id="@android:id/list" - android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="1" - android:cacheColorHint="@android:color/transparent" - android:clipToPadding="false" - android:drawSelectorOnTop="false" - android:headerDividersEnabled="false" - android:scrollbarAlwaysDrawVerticalTrack="true" /> - - </LinearLayout> - - </LinearLayout> - - </com.android.settings.widget.SetupWizardIllustration> - - <fragment - android:id="@+id/navigation_bar" - android:name="com.android.setupwizard.navigationbar.SetupWizardNavBar" - style="@style/setup_wizard_navbar_style" /> - -</LinearLayout> - diff --git a/res/layout-sw600dp/setup_template.xml b/res/layout-sw600dp/setup_template.xml deleted file mode 100644 index 297e9fb..0000000 --- a/res/layout-sw600dp/setup_template.xml +++ /dev/null @@ -1,74 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2014 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="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> - - <com.android.settings.widget.SetupWizardIllustration - android:id="@+id/setup_illustration" - android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="1" - android:background="@drawable/setup_illustration_bg" - android:foreground="@drawable/setup_illustration"> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_marginTop="@dimen/setup_wizard_tablet_illustration_height" - android:orientation="vertical" - android:paddingStart="@dimen/setup_wizard_card_port_margin_sides" - android:paddingEnd="@dimen/setup_wizard_card_port_margin_sides"> - - <TextView - android:id="@+id/title" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/wifi_setup_title" - style="@style/SetupCardTitle"/> - - <ScrollView - android:id="@+id/bottom_scroll_view" - android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="1" - android:background="@drawable/setup_wizard_card_bg" - android:elevation="@dimen/setup_wizard_card_elevation" - android:fillViewport="true"> - - <FrameLayout - android:id="@+id/setup_content" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:clipChildren="false"/> - - </ScrollView> - - </LinearLayout> - - </com.android.settings.widget.SetupWizardIllustration> - - <fragment android:name="com.android.setupwizard.navigationbar.SetupWizardNavBar" - android:id="@+id/navigation_bar" - android:layout_width="match_parent" - android:layout_height="56dip" - style="@style/setup_wizard_navbar_style"/> - -</LinearLayout> - |