SUW: use setupdesign layout & theming
Change-Id: I4841b701a8952035bd633d73368e80075d17e42a
diff --git a/Android.bp b/Android.bp
index d0e191e..a577115 100644
--- a/Android.bp
+++ b/Android.bp
@@ -32,6 +32,7 @@
static_libs: [
"androidx.core_core",
+ "SettingsLib",
"setupcompat",
"setupdesign",
"org.lineageos.platform.internal",
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ce81d12..6c966b0 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -58,7 +58,7 @@
<application android:label="@string/app_name"
android:icon="@mipmap/ic_launcher"
- android:theme="@style/Theme.Setup"
+ android:theme="@style/SudThemeGlifV3.Light"
android:uiOptions="none"
android:taskAffinity="com.android.wizard"
android:name=".SetupWizardApp">
diff --git a/res/layout-land/sim_missing_page.xml b/res/layout-land/sim_missing_page.xml
index f262adf..d2577b0 100644
--- a/res/layout-land/sim_missing_page.xml
+++ b/res/layout-land/sim_missing_page.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2015 The CyanogenMod Project
+ Copyright (C) 2017-2021 The LineageOS Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -14,44 +15,47 @@
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:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="match_parent">
+<com.google.android.setupdesign.GlifLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:id="@+id/setup_wizard_layout"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
- <include layout="@layout/header_condensed" />
+ <LinearLayout
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
- <FrameLayout android:id="@+id/page"
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_weight="1">
-
- <LinearLayout
- android:orientation="horizontal"
+ <FrameLayout
+ android:id="@+id/page"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- style="@style/PageContent">
+ android:layout_height="0dp"
+ android:layout_weight="1">
- <TextView
- android:layout_width="0px"
+ <LinearLayout
+ android:orientation="horizontal"
+ android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_weight="1"
- android:id="@+id/sim_missing"
- style="@style/PageSummaryText"
- android:textSize="15sp"
- android:layout_marginBottom="@dimen/summary_margin_bottom"
- android:paddingLeft="@dimen/content_margin_left"
- android:paddingRight="@dimen/content_margin_right"
- android:text="@string/sim_missing_summary" />
+ style="@style/SudContentFrame">
- <ImageView
- android:id="@+id/sim_slot_image"
- android:layout_width="0px"
- android:layout_height="match_parent"
- android:layout_weight="1"
- android:scaleType="fitEnd"
- android:src="@drawable/sim"/>
+ <TextView
+ android:layout_width="0px"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:id="@+id/sim_missing"
+ android:text="@string/sim_missing_summary"
+ style="@style/SudItemTitle.GlifDescription" />
- </LinearLayout>
- </FrameLayout>
-</LinearLayout>
+ <ImageView
+ android:id="@+id/sim_slot_image"
+ android:layout_width="0px"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:scaleType="fitEnd"
+ android:src="@drawable/sim" />
+
+ </LinearLayout>
+ </FrameLayout>
+ </LinearLayout>
+</com.google.android.setupdesign.GlifLayout>
diff --git a/res/layout/choose_data_sim_page.xml b/res/layout/choose_data_sim_page.xml
index 23cd5a5..fdac422 100644
--- a/res/layout/choose_data_sim_page.xml
+++ b/res/layout/choose_data_sim_page.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2015 The CyanogenMod Project
- Copyright (C) 2017 The LineageOS Project
+ Copyright (C) 2017-2021 The LineageOS Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -15,60 +15,63 @@
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:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="@color/primary">
+<com.google.android.setupdesign.GlifLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:id="@+id/setup_wizard_layout"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
- <include layout="@layout/header_condensed" />
+ <LinearLayout
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
- <FrameLayout android:id="@+id/page"
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_weight="1">
+ <FrameLayout
+ android:id="@+id/page"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1">
- <ScrollView android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:fillViewport="true">
-
- <LinearLayout
- android:id="@+id/page_view"
- android:orientation="vertical"
+ <ScrollView
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- style="@style/PageContent"
- android:visibility="gone">
+ android:layout_height="match_parent"
+ android:fillViewport="true">
- <TextView
+ <LinearLayout
+ android:id="@+id/page_view"
+ android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- style="@style/PageSummaryText"
- android:textSize="15sp"
- android:paddingLeft="@dimen/content_margin_left"
- android:paddingRight="@dimen/content_margin_right"
- android:paddingBottom="@dimen/summary_margin_bottom"
- android:text="@string/choose_data_sim_summary" />
+ style="@style/SudContentFrame"
+ android:visibility="gone">
- <include layout="@layout/divider" />
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ style="@style/SudDescription.Glif"
+ android:text="@string/choose_data_sim_summary" />
- </LinearLayout>
- </ScrollView>
+ <include layout="@layout/divider" />
- <ProgressBar
- android:id="@+id/progress"
- style="?android:attr/progressBarStyleHorizontal"
- android:indeterminateOnly="true"
+ </LinearLayout>
+ </ScrollView>
+
+ <ProgressBar
+ android:id="@+id/progress"
+ style="?android:attr/progressBarStyleHorizontal"
+ android:indeterminateOnly="true"
+ android:layout_width="match_parent"
+ android:layout_height="8dp"
+ android:layout_gravity="top"
+ android:visibility="gone" />
+ </FrameLayout>
+
+ <com.google.android.setupdesign.view.NavigationBar
+ android:id="@+id/navigation_bar"
+ style="@style/SudNavBarTheme"
android:layout_width="match_parent"
- android:layout_height="8dp"
- android:layout_gravity="top"
- android:visibility="gone"/>
- </FrameLayout>
+ android:layout_height="@dimen/sud_navbar_height" />
- <com.google.android.setupdesign.view.NavigationBar
- android:id="@+id/navigation_bar"
- style="@style/SudNavBarTheme"
- android:layout_width="match_parent"
- android:layout_height="@dimen/sud_navbar_height" />
-
-</LinearLayout>
+ </LinearLayout>
+</com.google.android.setupdesign.GlifLayout>
diff --git a/res/layout/finish_activity.xml b/res/layout/finish_activity.xml
index b9f0418..a80a560 100644
--- a/res/layout/finish_activity.xml
+++ b/res/layout/finish_activity.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2016 The CyanogenMod Project
- Copyright (C) 2017 The LineageOS Project
+ Copyright (C) 2017-2021 The LineageOS Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -28,8 +28,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:orientation="vertical"
- android:background="@color/primary">
+ android:orientation="vertical">
<ImageView
android:id="@+id/brand_logo"
@@ -40,7 +39,8 @@
android:adjustViewBounds="true"
android:scaleType="fitCenter"
android:gravity="center"
- android:padding="@dimen/content_margin_left"/>
+ android:padding="@dimen/content_margin_left"
+ style="@style/SudContentFrame"/>
<com.google.android.setupdesign.view.NavigationBar
android:id="@+id/navigation_bar"
@@ -50,10 +50,11 @@
</LinearLayout>
- <ImageView android:id="@+id/reveal"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="@drawable/reveal"
- android:visibility="invisible"/>
+ <ImageView
+ android:id="@+id/reveal"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@drawable/reveal"
+ android:visibility="invisible"/>
</org.lineageos.setupwizard.widget.ScrimInsetsFrameLayout>
diff --git a/res/layout/header_condensed.xml b/res/layout/header_condensed.xml
deleted file mode 100644
index b507b08..0000000
--- a/res/layout/header_condensed.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2015 The CyanogenMod Project
- Copyright (C) 2017 The LineageOS 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/header"
- android:layout_width="match_parent"
- android:layout_height="@dimen/header_condensed_height"
- android:paddingTop="48dp"
- android:orientation="vertical">
-
- <ImageView
- android:id="@+id/header_icon"
- android:layout_width="64dp"
- android:layout_height="wrap_content"
- android:paddingStart="8dp"
- android:paddingEnd="8dp"
- android:adjustViewBounds="true"
- android:scaleType="centerInside"
- android:visibility="gone"
- android:contentDescription="@null" />
-
- <TextView
- android:layout_width="match_parent"
- android:layout_height="64dp"
- android:layout_toEndOf="@id/header_icon"
- android:paddingEnd="8dp"
- android:typeface="monospace"
- android:gravity="center_vertical"
- android:maxLines="1"
- android:ellipsize="end"
- style="@style/PageTitle" />
-
-</RelativeLayout>
diff --git a/res/layout/intro_restore_activity.xml b/res/layout/intro_restore_activity.xml
index fd8cadc..0936605 100644
--- a/res/layout/intro_restore_activity.xml
+++ b/res/layout/intro_restore_activity.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2015 The CyanogenMod Project
- Copyright (C) 2017 The LineageOS Project
+ Copyright (C) 2017-2021 The LineageOS Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -15,62 +15,56 @@
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:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="@color/primary">
+<com.google.android.setupdesign.GlifLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:id="@+id/setup_wizard_layout"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
- <include layout="@layout/header_condensed" />
-
- <FrameLayout android:id="@+id/page"
+ <LinearLayout
+ android:orientation="vertical"
android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_weight="1">
+ android:layout_height="match_parent">
- <ScrollView android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:fillViewport="true">
+ <FrameLayout android:id="@+id/page"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1">
- <LinearLayout
- android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingStart="@dimen/content_margin_left"
- android:paddingEnd="@dimen/content_margin_left"
- style="@style/PageContent">
+ <ScrollView android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:fillViewport="true">
- <TextView
+ <LinearLayout
+ android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- style="@style/PageSummaryText"
- android:textSize="16sp"
- android:layout_marginBottom="@dimen/summary_margin_bottom"
- android:paddingRight="@dimen/location_text_margin_right"
- android:text="@string/intro_restore_subtitle" />
+ style="@style/SudContentFrame">
- <Button
- android:id="@+id/intro_restore_button"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingLeft="@dimen/content_margin_left"
- android:paddingRight="@dimen/location_text_margin_right"
- android:gravity="center"
- android:textSize="16sp"
- android:textAllCaps="true"
- android:textColor="@color/white"
- android:background="@color/accent"
- android:maxLines="1"
- android:ellipsize="end"
- android:text="@string/intro_restore_button"/>
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/intro_restore_subtitle"
+ style="@style/SudItemTitle.GlifDescription" />
- </LinearLayout>
- </ScrollView>
- </FrameLayout>
+ <Button
+ android:id="@+id/intro_restore_button"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="24dp"
+ android:text="@string/intro_restore_button"
+ style="@style/SudGlifButton.Primary" />
- <com.google.android.setupdesign.view.NavigationBar
- android:id="@+id/navigation_bar"
- style="@style/SudNavBarTheme"
- android:layout_width="match_parent"
- android:layout_height="@dimen/sud_navbar_height" />
-</LinearLayout>
+ </LinearLayout>
+ </ScrollView>
+ </FrameLayout>
+
+ <com.google.android.setupdesign.view.NavigationBar
+ android:id="@+id/navigation_bar"
+ style="@style/SudNavBarTheme"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/sud_navbar_height" />
+
+ </LinearLayout>
+</com.google.android.setupdesign.GlifLayout>
diff --git a/res/layout/location_settings.xml b/res/layout/location_settings.xml
index 80faaa3..094bc8b 100644
--- a/res/layout/location_settings.xml
+++ b/res/layout/location_settings.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2013 The CyanogenMod Project
- Copyright (C) 2017-2020 The LineageOS Project
+ Copyright (C) 2017-2021 The LineageOS Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -15,82 +15,71 @@
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:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="@color/primary">
+<com.google.android.setupdesign.GlifLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:id="@+id/setup_wizard_layout"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
- <include layout="@layout/header_condensed" />
+ <LinearLayout
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
- <FrameLayout android:id="@+id/page"
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_weight="1">
+ <FrameLayout
+ android:id="@+id/page"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1">
- <ScrollView android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:fillViewport="true">
-
- <LinearLayout
- android:orientation="vertical"
+ <ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
- style="@style/PageContent">
-
- <TextView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:textSize="15sp"
- android:layout_marginBottom="@dimen/summary_margin_bottom"
- android:paddingLeft="@dimen/content_margin_left"
- android:paddingRight="@dimen/content_margin_right"
- style="@style/PageSummaryText" />
+ android:fillViewport="true">
<LinearLayout
- android:id="@+id/location"
- android:orientation="horizontal"
+ android:orientation="vertical"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingLeft="@dimen/location_margin_left"
- android:paddingRight="@dimen/content_margin_right"
- android:background="?android:attr/selectableItemBackground"
- android:clickable="true">
+ android:layout_height="match_parent"
+ style="@style/SudContentFrame">
-
- <CheckBox
- android:id="@+id/location_checkbox"
- android:layout_width="wrap_content"
+ <LinearLayout
+ android:id="@+id/location"
+ android:orientation="horizontal"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_gravity="top"
- android:layout_marginTop="5dp"
- android:duplicateParentState="true"
- android:clickable="false" />
+ android:paddingLeft="@dimen/location_margin_left"
+ android:paddingRight="@dimen/content_margin_right"
+ android:background="?android:attr/selectableItemBackground"
+ android:clickable="true">
- <TextView
- android:id="@+id/location_summary"
- android:layout_width="0px"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:textSize="15sp"
- android:lineSpacingExtra="@dimen/setup_line_spacing"
- android:gravity="top"
- android:layout_marginLeft="@dimen/location_text_margin_left"
- android:layout_marginRight="@dimen/location_text_margin_right"
- android:paddingBottom="@dimen/content_margin_bottom"
- android:text="@string/location_access_summary"
- android:maxLines="5" />
+ <CheckBox
+ android:id="@+id/location_checkbox"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:duplicateParentState="true"
+ android:clickable="false"
+ style="@style/SudCheckBox.Multiline" />
+
+ <TextView
+ android:id="@+id/location_summary"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/location_access_summary"
+ style="@style/SudCheckBox.Multiline" />
+
+ </LinearLayout>
</LinearLayout>
+ </ScrollView>
+ </FrameLayout>
- </LinearLayout>
- </ScrollView>
- </FrameLayout>
+ <com.google.android.setupdesign.view.NavigationBar
+ android:id="@+id/navigation_bar"
+ style="@style/SudNavBarTheme"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/sud_navbar_height" />
- <com.google.android.setupdesign.view.NavigationBar
- android:id="@+id/navigation_bar"
- style="@style/SudNavBarTheme"
- android:layout_width="match_parent"
- android:layout_height="@dimen/sud_navbar_height" />
-
-</LinearLayout>
+ </LinearLayout>
+</com.google.android.setupdesign.GlifLayout>
diff --git a/res/layout/mobile_data_settings.xml b/res/layout/mobile_data_settings.xml
index 8a6f1e7..54bbd60 100644
--- a/res/layout/mobile_data_settings.xml
+++ b/res/layout/mobile_data_settings.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2013 The CyanogenMod Project
- Copyright (C) 2017 The LineageOS Project
+ Copyright (C) 2017-2021 The LineageOS Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -15,99 +15,103 @@
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:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="@color/primary">
+<com.google.android.setupdesign.GlifLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:id="@+id/setup_wizard_layout"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
- <include layout="@layout/header_condensed" />
-
- <ProgressBar
- android:id="@+id/progress"
- style="?android:attr/progressBarStyleHorizontal"
- android:indeterminateOnly="true"
+ <LinearLayout
+ android:orientation="vertical"
android:layout_width="match_parent"
- android:layout_height="8dp"
- android:visibility="gone"/>
+ android:layout_height="match_parent">
- <FrameLayout android:id="@+id/page"
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_weight="1">
+ <ProgressBar
+ android:id="@+id/progress"
+ style="@style/SudFourColorIndeterminateProgressBar"
+ android:indeterminateOnly="true"
+ android:layout_width="match_parent"
+ android:layout_height="8dp"
+ android:visibility="gone" />
- <ScrollView android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:fillViewport="true">
+ <FrameLayout
+ android:id="@+id/page"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1">
- <LinearLayout
- android:id="@+id/page_view"
- android:orientation="vertical"
+ <ScrollView
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- style="@style/PageContent">
-
- <TextView
- android:id="@+id/mobile_data_summary"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- style="@style/PageSummaryText"
- android:textSize="15sp"
- android:paddingLeft="@dimen/content_margin_left"
- android:paddingRight="@dimen/content_margin_right"
- android:paddingBottom="@dimen/summary_margin_bottom"
- android:text="@string/enable_mobile_data_summary" />
-
- <include layout="@layout/divider" />
+ android:layout_height="match_parent"
+ android:fillViewport="true">
<LinearLayout
- android:id="@+id/data"
+ android:id="@+id/page_view"
+ android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:minHeight="?android:attr/listPreferredItemHeight"
- android:gravity="center_vertical"
- android:paddingLeft="@dimen/content_margin_left"
- android:paddingRight="@dimen/data_switch_margin_right"
- android:background="?android:attr/selectableItemBackground"
- android:clickable="true">
-
- <ImageView
- android:id="@+id/signal"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:src="@drawable/ic_signal_0" />
+ style="@style/SudContentFrame">
<TextView
- android:id="@+id/enable_data_title"
- android:layout_width="0px"
+ android:id="@+id/mobile_data_summary"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_weight="1"
- android:textSize="14sp"
- android:layout_marginLeft="@dimen/carrier_text_margin_left"
- android:text="@string/setup_mobile_data_no_service"
- android:maxLines="4" />
+ android:text="@string/enable_mobile_data_summary"
+ style="@style/SudDescription.Glif" />
- <Switch
- android:id="@+id/data_switch"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
+ <include layout="@layout/divider" />
+
+ <LinearLayout
+ android:id="@+id/data"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:minHeight="?android:attr/listPreferredItemHeight"
android:gravity="center_vertical"
- android:duplicateParentState="true"
- android:clickable="false"
- android:textOff="@string/no"
- android:textOn="@string/yes"/>
+ android:paddingLeft="@dimen/content_margin_left"
+ android:paddingRight="@dimen/data_switch_margin_right"
+ android:background="?android:attr/selectableItemBackground"
+ android:clickable="true">
+
+ <ImageView
+ android:id="@+id/signal"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:src="@drawable/ic_signal_0" />
+
+ <TextView
+ android:id="@+id/enable_data_title"
+ android:layout_width="0px"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:textSize="14sp"
+ android:layout_marginLeft="@dimen/carrier_text_margin_left"
+ android:text="@string/setup_mobile_data_no_service"
+ android:maxLines="4" />
+
+ <Switch
+ android:id="@+id/data_switch"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:gravity="center_vertical"
+ android:duplicateParentState="true"
+ android:clickable="false"
+ android:textOff="@string/no"
+ android:textOn="@string/yes"
+ style="@style/SudSwitchStyle" />
+ </LinearLayout>
+
+ <include layout="@layout/divider" />
+
</LinearLayout>
+ </ScrollView>
+ </FrameLayout>
- <include layout="@layout/divider" />
+ <com.google.android.setupdesign.view.NavigationBar
+ android:id="@+id/navigation_bar"
+ style="@style/SudNavBarTheme"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/sud_navbar_height" />
- </LinearLayout>
- </ScrollView>
- </FrameLayout>
-
- <com.google.android.setupdesign.view.NavigationBar
- android:id="@+id/navigation_bar"
- style="@style/SudNavBarTheme"
- android:layout_width="match_parent"
- android:layout_height="@dimen/sud_navbar_height" />
-
-</LinearLayout>
+ </LinearLayout>
+</com.google.android.setupdesign.GlifLayout>
diff --git a/res/layout/setup_biometric.xml b/res/layout/setup_biometric.xml
index c8a5508..6c7d86d 100644
--- a/res/layout/setup_biometric.xml
+++ b/res/layout/setup_biometric.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2015 The CyanogenMod Project
- Copyright (C) 2017 The LineageOS Project
+ Copyright (C) 2017-2021 The LineageOS Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -15,85 +15,82 @@
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:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="@color/primary">
+<com.google.android.setupdesign.GlifLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:id="@+id/setup_wizard_layout"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
- <include layout="@layout/header_condensed" />
-
- <FrameLayout android:id="@+id/page"
+ <LinearLayout
+ android:orientation="vertical"
android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_weight="1">
+ android:layout_height="match_parent">
- <ScrollView android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:fillViewport="true">
+ <FrameLayout android:id="@+id/page"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1">
- <LinearLayout
- android:orientation="vertical"
+ <ScrollView
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- style="@style/PageContent">
+ android:layout_height="match_parent"
+ android:fillViewport="true">
- <TextView
- android:id="@+id/setup_biometric_summary"
+ <LinearLayout
+ android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- style="@style/PageSummaryText"
- android:textSize="16sp"
- android:paddingLeft="@dimen/content_margin_left"
- android:layout_marginBottom="@dimen/summary_margin_bottom"
- android:paddingRight="@dimen/location_text_margin_right"/>
+ style="@style/SudContentFrame">
- <TextView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="24dp"
- android:paddingLeft="@dimen/content_margin_left"
- android:paddingRight="@dimen/location_text_margin_right"
- android:drawableStart="@drawable/ic_check_mark"
- android:drawablePadding="24dp"
- android:gravity="center_vertical"
- android:textSize="16sp"
- android:textStyle="bold"
- android:text="@string/biometric_setup_backup_lock_method"/>
+ <TextView
+ android:id="@+id/setup_biometric_summary"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ style="@style/SudItemContainer.Verbose"/>
- <TextView
- android:id="@+id/setup_add_biometric"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="24dp"
- android:paddingLeft="@dimen/content_margin_left"
- android:paddingRight="@dimen/location_text_margin_right"
- android:drawableStart="@drawable/ic_check_mark"
- android:drawablePadding="24dp"
- android:gravity="center_vertical"
- android:textSize="16sp"
- android:textStyle="bold"/>
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="24dp"
+ android:paddingLeft="@dimen/content_margin_left"
+ android:paddingRight="@dimen/location_text_margin_right"
+ android:drawableStart="@drawable/ic_check_mark"
+ android:drawablePadding="24dp"
+ android:gravity="center_vertical"
+ android:textSize="16sp"
+ android:textStyle="bold"
+ android:text="@string/biometric_setup_backup_lock_method"/>
- <TextView
- android:id="@+id/setup_biometric"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingLeft="@dimen/content_margin_left"
- android:paddingRight="@dimen/location_text_margin_right"
- android:gravity="center_vertical"
- android:textSize="16sp"
- android:textAllCaps="true"
- android:textColor="@color/biometric_setup_text_color"
- android:text="@string/biometric_setup_screen_lock_setup"/>
+ <TextView
+ android:id="@+id/setup_add_biometric"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="24dp"
+ android:paddingLeft="@dimen/content_margin_left"
+ android:paddingRight="@dimen/location_text_margin_right"
+ android:drawableStart="@drawable/ic_check_mark"
+ android:drawablePadding="24dp"
+ android:gravity="center_vertical"
+ android:textSize="16sp"
+ android:textStyle="bold"/>
- </LinearLayout>
- </ScrollView>
- </FrameLayout>
+ <Button
+ android:id="@+id/setup_biometric"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/biometric_setup_screen_lock_setup"
+ style="@style/SudGlifButton.Primary" />
- <com.google.android.setupdesign.view.NavigationBar
- android:id="@+id/navigation_bar"
- style="@style/SudNavBarTheme"
- android:layout_width="match_parent"
- android:layout_height="@dimen/sud_navbar_height" />
+ </LinearLayout>
+ </ScrollView>
+ </FrameLayout>
-</LinearLayout>
+ <com.google.android.setupdesign.view.NavigationBar
+ android:id="@+id/navigation_bar"
+ style="@style/SudNavBarTheme"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/sud_navbar_height" />
+
+ </LinearLayout>
+</com.google.android.setupdesign.GlifLayout>
diff --git a/res/layout/setup_datetime_page.xml b/res/layout/setup_datetime_page.xml
index dd3b203..304d9f7 100644
--- a/res/layout/setup_datetime_page.xml
+++ b/res/layout/setup_datetime_page.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2013 The CyanogenMod Project
- Copyright (C) 2017 The LineageOS Project
+ Copyright (C) 2017-2021 The LineageOS Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -15,107 +15,111 @@
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:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="@color/primary">
+<com.google.android.setupdesign.GlifLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:id="@+id/setup_wizard_layout"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
- <include layout="@layout/header_condensed" />
-
- <FrameLayout android:id="@+id/page"
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_weight="1">
-
- <ScrollView android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:fillViewport="true">
-
- <LinearLayout
- android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- style="@style/PageContent">
-
- <TextView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- style="@style/PageSummaryText"
- android:textSize="16sp"
- android:paddingLeft="@dimen/content_margin_left"
- android:layout_marginBottom="@dimen/summary_margin_bottom"
- android:paddingRight="@dimen/location_text_margin_right"
- android:text="@string/date_time_summary" />
-
- <Spinner
- android:id="@+id/timezone_list"
- android:layout_width="290dp"
- android:layout_height="wrap_content"
- android:saveEnabled="false"/>
-
- <TwoLineListItem
- android:id="@+id/date_item"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:minHeight="?android:attr/listPreferredItemHeight"
- android:mode="twoLine"
- android:clickable="true"
- android:background="?android:attr/selectableItemBackground"
- android:gravity="center_vertical">
-
- <TextView
- android:id="@+id/date_title"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/setup_current_date"
- style="@style/SpinnerItem" />
-
- <TextView
- android:id="@+id/date_text"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_below="@id/date_title"
- android:layout_alignStart="@id/date_title"
- android:fontFamily="sans-serif-medium"
- style="@style/SpinnerItem" />
- </TwoLineListItem>
-
- <TwoLineListItem
- android:id="@+id/time_item"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:minHeight="?android:attr/listPreferredItemHeight"
- android:mode="twoLine"
- android:clickable="true"
- android:background="?android:attr/selectableItemBackground"
- android:gravity="center_vertical">
-
- <TextView
- android:id="@+id/time_title"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/setup_current_time"
- style="@style/SpinnerItem" />
-
- <TextView
- android:id="@+id/time_text"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_below="@id/time_title"
- android:layout_alignStart="@id/time_title"
- android:fontFamily="sans-serif-medium"
- style="@style/SpinnerItem" />
- </TwoLineListItem>
-
- </LinearLayout>
- </ScrollView>
- </FrameLayout>
-
- <com.google.android.setupdesign.view.NavigationBar
- android:id="@+id/navigation_bar"
- style="@style/SudNavBarTheme"
+ <LinearLayout
+ android:orientation="vertical"
android:layout_width="match_parent"
- android:layout_height="@dimen/sud_navbar_height" />
+ android:layout_height="match_parent">
-</LinearLayout>
+ <FrameLayout
+ android:id="@+id/page"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1">
+
+ <ScrollView
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:fillViewport="true">
+
+ <LinearLayout
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ style="@style/SudContentFrame">
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/date_time_summary"
+ style="@style/SudItemTitle.GlifDescription" />
+
+ <Spinner
+ android:id="@+id/timezone_list"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="24dp"
+ android:saveEnabled="false"/>
+
+ <TwoLineListItem
+ android:id="@+id/date_item"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:minHeight="?android:attr/listPreferredItemHeight"
+ android:mode="twoLine"
+ android:clickable="true"
+ android:background="?android:attr/selectableItemBackground"
+ android:gravity="center_vertical">
+
+ <TextView
+ android:id="@+id/date_title"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/setup_current_date"
+ style="@style/SpinnerItem" />
+
+ <TextView
+ android:id="@+id/date_text"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/date_title"
+ android:layout_alignStart="@id/date_title"
+ android:fontFamily="sans-serif-medium"
+ style="@style/SpinnerItem" />
+ </TwoLineListItem>
+
+ <TwoLineListItem
+ android:id="@+id/time_item"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:minHeight="?android:attr/listPreferredItemHeight"
+ android:mode="twoLine"
+ android:clickable="true"
+ android:background="?android:attr/selectableItemBackground"
+ android:gravity="center_vertical">
+
+ <TextView
+ android:id="@+id/time_title"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/setup_current_time"
+ style="@style/SpinnerItem" />
+
+ <TextView
+ android:id="@+id/time_text"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/time_title"
+ android:layout_alignStart="@id/time_title"
+ android:fontFamily="sans-serif-medium"
+ style="@style/SpinnerItem" />
+ </TwoLineListItem>
+
+ </LinearLayout>
+ </ScrollView>
+ </FrameLayout>
+
+ <com.google.android.setupdesign.view.NavigationBar
+ android:id="@+id/navigation_bar"
+ style="@style/SudNavBarTheme"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/sud_navbar_height" />
+
+ </LinearLayout>
+</com.google.android.setupdesign.GlifLayout>
diff --git a/res/layout/setup_device_specific.xml b/res/layout/setup_device_specific.xml
index 0b063ae..96528b4 100644
--- a/res/layout/setup_device_specific.xml
+++ b/res/layout/setup_device_specific.xml
@@ -19,5 +19,4 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:orientation="vertical"
- android:background="@color/primary" />
+ android:orientation="vertical" />
diff --git a/res/layout/setup_lineage_settings.xml b/res/layout/setup_lineage_settings.xml
index 732ce59..3e808ae 100644
--- a/res/layout/setup_lineage_settings.xml
+++ b/res/layout/setup_lineage_settings.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2015 The CyanogenMod Project
- Copyright (C) 2017,2019 The LineageOS Project
+ Copyright (C) 2017-2021 The LineageOS Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -15,123 +15,111 @@
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:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="@color/primary">
+<com.google.android.setupdesign.GlifLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:id="@+id/setup_wizard_layout"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+ <LinearLayout
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
- <include layout="@layout/header_condensed" />
+ <FrameLayout
+ android:id="@+id/page"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1">
- <FrameLayout android:id="@+id/page"
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_weight="1">
-
- <ScrollView android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:fillViewport="true">
-
- <LinearLayout
- android:orientation="vertical"
+ <ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
- style="@style/PageContent">
+ android:fillViewport="true">
- <!-- The caption about privacy policy -->
- <TextView
- android:id="@+id/privacy_policy"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:textSize="15sp"
- android:layout_marginBottom="@dimen/summary_margin_bottom"
- android:paddingLeft="@dimen/content_margin_left"
- android:paddingRight="@dimen/content_margin_right"
- style="@style/PageSummaryText"
- android:text="@string/services_explanation"
- android:clickable="true"/>
-
- <!-- Whether or not to enable metrics -->
<LinearLayout
- android:id="@+id/metrics"
- android:orientation="horizontal"
+ android:orientation="vertical"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingLeft="@dimen/location_margin_left"
- android:paddingRight="@dimen/content_margin_right"
- android:background="?android:attr/selectableItemBackground"
- android:clickable="true">
+ android:layout_height="match_parent"
+ style="@style/SudContentFrame">
-
- <CheckBox
- android:id="@+id/enable_metrics_checkbox"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="top"
- android:layout_marginTop="5dp"
- android:duplicateParentState="true"
- android:clickable="false"/>
-
+ <!-- The caption about privacy policy -->
<TextView
- android:id="@+id/enable_metrics_summary"
- android:layout_width="0px"
+ android:id="@+id/privacy_policy"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_weight="1"
- android:textSize="15sp"
- android:lineSpacingExtra="@dimen/setup_line_spacing"
- android:gravity="top"
- android:layout_marginLeft="@dimen/location_text_margin_left"
- android:layout_marginRight="@dimen/location_text_margin_right"
- android:paddingBottom="@dimen/content_margin_bottom"
- android:text="@string/services_metrics_label"/>
+ style="@style/SudItemTitle.GlifDescription"
+ android:text="@string/services_explanation"
+ android:clickable="true" />
+ <!-- Whether or not to enable metrics -->
+ <LinearLayout
+ android:id="@+id/metrics"
+ android:orientation="horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingLeft="@dimen/location_margin_left"
+ android:paddingRight="@dimen/content_margin_right"
+ android:background="?android:attr/selectableItemBackground"
+ android:clickable="true">
+
+
+ <CheckBox
+ android:id="@+id/enable_metrics_checkbox"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:duplicateParentState="true"
+ android:clickable="false"
+ style="@style/SudCheckBox.Multiline" />
+
+ <TextView
+ android:id="@+id/enable_metrics_summary"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/services_metrics_label"
+ style="@style/SudCheckBox.Multiline" />
+
+ </LinearLayout>
+
+ <!-- Checkbox for using on-screen nav keys -->
+ <LinearLayout
+ android:id="@+id/nav_keys"
+ android:orientation="horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingLeft="@dimen/location_margin_left"
+ android:paddingRight="@dimen/content_margin_right"
+ android:background="?android:attr/selectableItemBackground"
+ android:clickable="true">
+
+ <CheckBox
+ android:id="@+id/nav_keys_checkbox"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="top"
+ android:duplicateParentState="true"
+ android:clickable="false"
+ style="@style/SudCheckBox.Multiline" />
+
+ <TextView
+ android:id="@+id/nav_keys_summary"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/services_os_nav_keys_label"
+ style="@style/SudCheckBox.Multiline" />
+
+ </LinearLayout>
</LinearLayout>
+ </ScrollView>
+ </FrameLayout>
- <!-- Checkbox for using on-screen nav keys -->
- <LinearLayout
- android:id="@+id/nav_keys"
- android:orientation="horizontal"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingLeft="@dimen/location_margin_left"
- android:paddingRight="@dimen/content_margin_right"
- android:background="?android:attr/selectableItemBackground"
- android:clickable="true">
+ <com.google.android.setupdesign.view.NavigationBar
+ android:id="@+id/navigation_bar"
+ style="@style/SudNavBarTheme"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/sud_navbar_height" />
- <CheckBox
- android:id="@+id/nav_keys_checkbox"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="top"
- android:layout_marginTop="5dp"
- android:duplicateParentState="true"
- android:clickable="false" />
+ </LinearLayout>
+</com.google.android.setupdesign.GlifLayout>
-
- <TextView
- android:id="@+id/nav_keys_summary"
- android:layout_width="0px"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:textSize="15sp"
- android:lineSpacingExtra="@dimen/setup_line_spacing"
- android:gravity="top"
- android:layout_marginLeft="@dimen/location_text_margin_left"
- android:layout_marginRight="@dimen/location_text_margin_right"
- android:paddingBottom="@dimen/content_margin_bottom"
- android:text="@string/services_os_nav_keys_label"/>
-
- </LinearLayout>
-
- </LinearLayout>
- </ScrollView>
- </FrameLayout>
-
- <com.google.android.setupdesign.view.NavigationBar
- android:id="@+id/navigation_bar"
- style="@style/SudNavBarTheme"
- android:layout_width="match_parent"
- android:layout_height="@dimen/sud_navbar_height" />
-
-</LinearLayout>
diff --git a/res/layout/setup_loading_page.xml b/res/layout/setup_loading_page.xml
index e4df03b..0a3e7b9 100644
--- a/res/layout/setup_loading_page.xml
+++ b/res/layout/setup_loading_page.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2015 The CyanogenMod Project
- Copyright (C) 2017 The LineageOS Project
+ Copyright (C) 2017-2021 The LineageOS Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -15,33 +15,39 @@
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:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="@color/primary">
+<com.google.android.setupdesign.GlifLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:id="@+id/setup_wizard_layout"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
- <include layout="@layout/header_condensed" />
+ <LinearLayout
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
- <ProgressBar
- android:id="@+id/progressBar1"
- style="?android:attr/progressBarStyleHorizontal"
- android:indeterminateOnly="true"
- android:layout_width="match_parent"
- android:layout_height="8dp"
- android:paddingStart="0dp"
- android:paddingEnd="0dp" />
+ <ProgressBar
+ android:id="@+id/progressBar1"
+ style="?android:attr/progressBarStyleHorizontal"
+ android:indeterminateOnly="true"
+ android:layout_width="match_parent"
+ android:layout_height="8dp"
+ android:paddingStart="0dp"
+ android:paddingEnd="0dp" />
- <FrameLayout android:id="@+id/page"
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_weight="1"
- style="@style/PageContent"/>
+ <FrameLayout
+ android:id="@+id/page"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1"
+ style="@style/SudContentFrame"/>
- <com.google.android.setupdesign.view.NavigationBar
- android:id="@+id/navigation_bar"
- style="@style/SudNavBarTheme"
- android:layout_width="match_parent"
- android:layout_height="@dimen/sud_navbar_height" />
+ <com.google.android.setupdesign.view.NavigationBar
+ android:id="@+id/navigation_bar"
+ style="@style/SudNavBarTheme"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/sud_navbar_height" />
-</LinearLayout>
+ </LinearLayout>
+</com.google.android.setupdesign.GlifLayout>
diff --git a/res/layout/setup_locale.xml b/res/layout/setup_locale.xml
index a46a4a7..672d4f2 100644
--- a/res/layout/setup_locale.xml
+++ b/res/layout/setup_locale.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2013 The CyanogenMod Project
- Copyright (C) 2017 The LineageOS Project
+ Copyright (C) 2017-2021 The LineageOS Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -15,37 +15,42 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<LinearLayout
+<com.google.android.setupdesign.GlifLayout
xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:id="@+id/setup_wizard_layout"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical"
- android:background="@color/primary">
+ android:layout_height="match_parent">
- <include layout="@layout/header_condensed" />
-
- <RelativeLayout android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_weight="1"
- android:gravity="center"
- android:paddingLeft="@dimen/content_margin_left"
- android:paddingRight="@dimen/content_margin_left">
-
- <org.lineageos.setupwizard.widget.LocalePicker
- android:id="@+id/locale_list"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:focusable="true"
- android:focusableInTouchMode="true"
- android:layout_alignParentBottom="true"
- android:layout_centerHorizontal="true"/>
-
- </RelativeLayout>
-
- <com.google.android.setupdesign.view.NavigationBar
- android:id="@+id/navigation_bar"
- style="@style/SudNavBarTheme"
+ <LinearLayout
android:layout_width="match_parent"
- android:layout_height="@dimen/sud_navbar_height" />
+ android:layout_height="match_parent"
+ android:orientation="vertical">
-</LinearLayout>
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1"
+ android:gravity="center"
+ style="@style/SudContentFrame">
+
+ <org.lineageos.setupwizard.widget.LocalePicker
+ android:id="@+id/locale_list"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:focusable="true"
+ android:focusableInTouchMode="true"
+ android:layout_alignParentBottom="true"
+ android:layout_centerHorizontal="true"
+ style="@style/LocaleWidget.Material.LocalePicker" />
+
+ </RelativeLayout>
+
+ <com.google.android.setupdesign.view.NavigationBar
+ android:id="@+id/navigation_bar"
+ style="@style/SudNavBarTheme"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/sud_navbar_height" />
+
+ </LinearLayout>
+</com.google.android.setupdesign.GlifLayout>
diff --git a/res/layout/setup_lockscreen.xml b/res/layout/setup_lockscreen.xml
index 8a61dd2..299cc05 100644
--- a/res/layout/setup_lockscreen.xml
+++ b/res/layout/setup_lockscreen.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2015 The CyanogenMod Project
- Copyright (C) 2017 The LineageOS Project
+ Copyright (C) 2017-2021 The LineageOS Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -15,63 +15,58 @@
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:orientation="vertical"
+<com.google.android.setupdesign.GlifLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:id="@+id/setup_wizard_layout"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="@color/primary">
+ android:layout_height="match_parent">
- <include layout="@layout/header_condensed" />
-
- <FrameLayout android:id="@+id/page"
+ <LinearLayout
+ android:orientation="vertical"
android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_weight="1">
+ android:layout_height="match_parent">
- <ScrollView android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:fillViewport="true">
+ <FrameLayout android:id="@+id/page"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1">
- <LinearLayout
- android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingStart="@dimen/content_margin_left"
- android:paddingEnd="@dimen/content_margin_left"
- style="@style/PageContent">
+ <ScrollView android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:fillViewport="true">
- <TextView
+ <LinearLayout
+ android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- style="@style/PageSummaryText"
- android:textSize="16sp"
- android:layout_marginBottom="@dimen/summary_margin_bottom"
- android:paddingRight="@dimen/location_text_margin_right"
- android:text="@string/lockscreen_setup_summary" />
+ android:paddingStart="@dimen/content_margin_left"
+ android:paddingEnd="@dimen/content_margin_left"
+ style="@style/SudContentFrame">
- <Button
- android:id="@+id/setup_lockscreen"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingLeft="@dimen/content_margin_left"
- android:paddingRight="@dimen/location_text_margin_right"
- android:gravity="center"
- android:textSize="16sp"
- android:textAllCaps="true"
- android:textColor="@color/white"
- android:background="@color/accent"
- android:maxLines="1"
- android:ellipsize="end"
- android:text="@string/lockscreen_setup_screen_lock_setup"/>
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/lockscreen_setup_summary"
+ style="@style/SudItemTitle.GlifDescription" />
- </LinearLayout>
- </ScrollView>
- </FrameLayout>
+ <Button
+ android:id="@+id/setup_lockscreen"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="24dp"
+ android:text="@string/lockscreen_setup_screen_lock_setup"
+ style="@style/SudGlifButton.Primary" />
- <com.google.android.setupdesign.view.NavigationBar
- android:id="@+id/navigation_bar"
- style="@style/SudNavBarTheme"
- android:layout_width="match_parent"
- android:layout_height="@dimen/sud_navbar_height" />
+ </LinearLayout>
+ </ScrollView>
+ </FrameLayout>
-</LinearLayout>
+ <com.google.android.setupdesign.view.NavigationBar
+ android:id="@+id/navigation_bar"
+ style="@style/SudNavBarTheme"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/sud_navbar_height" />
+
+ </LinearLayout>
+</com.google.android.setupdesign.GlifLayout>
diff --git a/res/layout/sim_missing_page.xml b/res/layout/sim_missing_page.xml
index 6ad2cfc..f53a080 100644
--- a/res/layout/sim_missing_page.xml
+++ b/res/layout/sim_missing_page.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2015 The CyanogenMod Project
- Copyright (C) 2017 The LineageOS Project
+ Copyright (C) 2017-2021 The LineageOS Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -15,51 +15,53 @@
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:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="@color/primary">
+<com.google.android.setupdesign.GlifLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:id="@+id/setup_wizard_layout"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
- <include layout="@layout/header_condensed" />
-
- <FrameLayout android:id="@+id/page"
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_weight="1">
-
- <LinearLayout
- android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- style="@style/PageContent">
-
- <TextView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:id="@+id/sim_missing"
- style="@style/PageSummaryText"
- android:textSize="15sp"
- android:layout_marginBottom="@dimen/summary_margin_bottom"
- android:paddingLeft="@dimen/content_margin_left"
- android:paddingRight="@dimen/content_margin_right"
- android:text="@string/sim_missing_summary" />
-
- <ImageView
- android:id="@+id/sim_slot_image"
- android:layout_width="match_parent"
- android:layout_height="0px"
- android:layout_weight="1"
- android:scaleType="fitEnd"
- android:src="@drawable/sim"/>
-
- </LinearLayout>
- </FrameLayout>
-
- <com.google.android.setupdesign.view.NavigationBar
- android:id="@+id/navigation_bar"
- style="@style/SudNavBarTheme"
+ <LinearLayout
+ android:orientation="vertical"
android:layout_width="match_parent"
- android:layout_height="@dimen/sud_navbar_height" />
+ android:layout_height="match_parent">
-</LinearLayout>
+ <FrameLayout
+ android:id="@+id/page"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1">
+
+ <LinearLayout
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ style="@style/SudContentFrame">
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:id="@+id/sim_missing"
+ android:text="@string/sim_missing_summary"
+ style="@style/SudItemTitle.GlifDescription" />
+
+ <ImageView
+ android:id="@+id/sim_slot_image"
+ android:layout_width="match_parent"
+ android:layout_height="0px"
+ android:layout_weight="1"
+ android:scaleType="fitEnd"
+ android:src="@drawable/sim"/>
+
+ </LinearLayout>
+ </FrameLayout>
+
+ <com.google.android.setupdesign.view.NavigationBar
+ android:id="@+id/navigation_bar"
+ style="@style/SudNavBarTheme"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/sud_navbar_height" />
+
+ </LinearLayout>
+</com.google.android.setupdesign.GlifLayout>
diff --git a/res/layout/update_recovery_page.xml b/res/layout/update_recovery_page.xml
index f513f12..0f91393 100644
--- a/res/layout/update_recovery_page.xml
+++ b/res/layout/update_recovery_page.xml
@@ -1,102 +1,96 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2015 The CyanogenMod Project
- Copyright (C) 2017 The LineageOS Project
+ Copyright (C) 2017-2021 The LineageOS 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:orientation="vertical"
+<com.google.android.setupdesign.GlifLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:id="@+id/setup_wizard_layout"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="@color/primary">
+ android:layout_height="match_parent">
- <include layout="@layout/header_condensed" />
+ <LinearLayout
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
- <FrameLayout android:id="@+id/page"
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_weight="1">
+ <FrameLayout
+ android:id="@+id/page"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1">
- <ScrollView android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:fillViewport="true">
-
- <LinearLayout
- android:orientation="vertical"
+ <ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
- style="@style/PageContent">
-
- <TextView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:textSize="16sp"
- android:layout_marginBottom="@dimen/summary_margin_bottom"
- android:paddingLeft="@dimen/content_margin_left"
- android:paddingRight="@dimen/content_margin_right"
- style="@style/PageSummaryText"
- android:text="@string/update_recovery_description" />
-
- <TextView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:textSize="16sp"
- android:layout_marginBottom="@dimen/summary_margin_bottom"
- android:paddingLeft="@dimen/content_margin_left"
- android:paddingRight="@dimen/content_margin_right"
- style="@style/PageSummaryText"
- android:text="@string/update_recovery_warning" />
+ android:fillViewport="true">
<LinearLayout
- android:id="@+id/update_recovery_checkbox_view"
- android:orientation="horizontal"
+ android:orientation="vertical"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingLeft="@dimen/location_margin_left"
- android:paddingRight="@dimen/content_margin_right"
- android:background="?android:attr/selectableItemBackground"
- android:clickable="true">
-
- <CheckBox
- android:id="@+id/update_recovery_checkbox"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="top"
- android:layout_marginTop="5dp"
- android:layout_marginBottom="5dp"
- android:duplicateParentState="true"
- android:clickable="false" />
+ android:layout_height="match_parent"
+ style="@style/SudContentFrame">
<TextView
- android:layout_width="0px"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_weight="1"
- android:textSize="15sp"
- android:textStyle="bold"
- android:lineSpacingExtra="@dimen/setup_line_spacing"
- android:gravity="top"
- android:layout_gravity="center_vertical"
- android:layout_marginLeft="@dimen/location_text_margin_left"
- android:layout_marginRight="@dimen/location_text_margin_right"
- android:text="@string/update_recovery_setting"
- android:maxLines="5" />
+ style="@style/SudItemTitle.GlifDescription"
+ android:text="@string/update_recovery_description" />
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ style="@style/SudItemTitle.GlifDescription"
+ android:text="@string/update_recovery_warning" />
+
+ <LinearLayout
+ android:id="@+id/update_recovery_checkbox_view"
+ android:orientation="horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingLeft="@dimen/location_margin_left"
+ android:paddingRight="@dimen/content_margin_right"
+ android:background="?android:attr/selectableItemBackground"
+ android:clickable="true">
+
+ <CheckBox
+ android:id="@+id/update_recovery_checkbox"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:duplicateParentState="true"
+ android:clickable="false"
+ style="@style/SudCheckBox.Multiline" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/update_recovery_setting"
+ android:textStyle="bold"
+ style="@style/SudCheckBox.Multiline" />
+
+ </LinearLayout>
</LinearLayout>
+ </ScrollView>
+ </FrameLayout>
- </LinearLayout>
- </ScrollView>
- </FrameLayout>
+ <com.google.android.setupdesign.view.NavigationBar
+ android:id="@+id/navigation_bar"
+ style="@style/SudNavBarTheme"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/sud_navbar_height" />
- <com.google.android.setupdesign.view.NavigationBar
- android:id="@+id/navigation_bar"
- style="@style/SudNavBarTheme"
- android:layout_width="match_parent"
- android:layout_height="@dimen/sud_navbar_height" />
-</LinearLayout>
+ </LinearLayout>
+</com.google.android.setupdesign.GlifLayout>
diff --git a/res/layout/welcome_activity.xml b/res/layout/welcome_activity.xml
index 605a6a4..0515c95 100644
--- a/res/layout/welcome_activity.xml
+++ b/res/layout/welcome_activity.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2016 The CyanogenMod Project
- Copyright (C) 2017 The LineageOS Project
+ Copyright (C) 2017-2021 The LineageOS Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -15,30 +15,35 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<LinearLayout
+<com.google.android.setupdesign.GlifLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/root"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:id="@+id/setup_wizard_layout"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical"
- android:background="@color/primary">
+ android:layout_height="match_parent">
- <ImageView
- android:id="@+id/brand_logo"
+ <LinearLayout
+ android:orientation="vertical"
android:layout_width="match_parent"
- android:layout_height="0px"
- android:layout_weight="1"
- android:src="@drawable/logo"
- android:adjustViewBounds="true"
- android:scaleType="fitCenter"
- android:gravity="center"
- android:padding="@dimen/content_margin_left"/>
+ android:layout_height="match_parent">
- <com.google.android.setupdesign.view.NavigationBar
- android:id="@+id/navigation_bar"
- style="@style/SudNavBarTheme"
- android:layout_width="match_parent"
- android:layout_height="@dimen/sud_navbar_height" />
+ <ImageView
+ android:id="@+id/brand_logo"
+ android:layout_width="match_parent"
+ android:layout_height="0px"
+ android:layout_weight="1"
+ android:src="@drawable/logo"
+ android:adjustViewBounds="true"
+ android:scaleType="fitCenter"
+ android:gravity="center"
+ android:padding="@dimen/content_margin_left"
+ style="@style/SudContentFrame" />
+
+ <com.google.android.setupdesign.view.NavigationBar
+ android:id="@+id/navigation_bar"
+ style="@style/SudNavBarTheme"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/sud_navbar_height" />
-</LinearLayout>
+ </LinearLayout>
+</com.google.android.setupdesign.GlifLayout>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 4e5bedb..81fb5aa 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2013 The CyanogenMod Project
- Copyright (C) 2017 The LineageOS Project
+ Copyright (C) 2017-2021 The LineageOS Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -32,4 +32,8 @@
<color name="header_condensed_bg">@color/primary</color>
<color name="button_bar_background">@color/primary</color>
<color name="biometric_setup_text_color">#167C80</color>
+
+ <!-- Partner customization -->
+ <color name="sud_glif_background_color_light">@color/white</color>
+ <color name="sud_color_accent_glif_v3_light">@color/accent</color>
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 3aa373b..f2b4f86 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2013 The CyanogenMod Project
+ Copyright (C) 2017-2021 The LineageOS Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -15,53 +16,6 @@
limitations under the License.
-->
<resources>
- <style name="Theme.Setup" parent="@android:style/Theme.Material.Light">
- <item name="android:windowActionBar">false</item>
- <item name="android:windowNoTitle">true</item>
- <item name="android:windowIsTranslucent">true</item>
- <item name="android:windowBackground">@android:color/transparent</item>
- <item name="android:colorPrimary">@color/primary</item>
- <item name="android:colorPrimaryDark">@color/primary</item>
- <item name="android:colorAccent">@color/accent</item>
- <item name="android:textColorLink">@color/accent</item>
- <item name="android:statusBarColor">@android:color/transparent</item>
- <item name="android:windowAnimationStyle">@style/ActivityAnimations</item>
- <item name="android:windowLightStatusBar">true</item>
- <item name="localePickerStyle">@style/LocaleWidget.Material.LocalePicker</item>
- </style>
-
- <style name="ActivityAnimations" parent="@android:style/Animation.Activity">
- <item name="android:activityOpenEnterAnimation">@anim/translucent_enter</item>
- <item name="android:activityOpenExitAnimation">@anim/translucent_exit</item>
- <item name="android:activityCloseEnterAnimation">@anim/translucent_enter</item>
- <item name="android:activityCloseExitAnimation">@anim/translucent_exit</item>
- <item name="android:taskToFrontEnterAnimation">@anim/translucent_enter</item>
- <item name="android:taskToFrontExitAnimation">@anim/translucent_exit</item>
- <item name="android:taskToBackEnterAnimation">@anim/translucent_enter</item>
- <item name="android:taskToBackExitAnimation">@anim/translucent_exit</item>
- </style>
-
- <style name="PageContainer">
- <item name="android:textColor">@color/primary_text</item>
- <item name="android:background">@color/page_background</item>
- </style>
-
- <style name="PageContent">
- <item name="android:background">@color/page_background</item>
- <item name="android:paddingTop">@dimen/content_margin_top</item>
- </style>
-
- <style name="PageTitle">
- <item name="android:id">@android:id/title</item>
- <item name="android:textSize">20sp</item>
- <item name="android:textColor">@color/black</item>
- </style>
-
- <style name="PageSummaryText">
- <item name="android:id">@android:id/summary</item>
- <item name="android:lineSpacingExtra">@dimen/setup_line_spacing</item>
- </style>
-
<style name="SpinnerItem">
<item name="android:textSize">15sp</item>
<item name="android:paddingLeft">@dimen/content_margin_left</item>
diff --git a/src/org/lineageos/setupwizard/BaseSetupWizardActivity.java b/src/org/lineageos/setupwizard/BaseSetupWizardActivity.java
index 684328e..ae4f1c9 100644
--- a/src/org/lineageos/setupwizard/BaseSetupWizardActivity.java
+++ b/src/org/lineageos/setupwizard/BaseSetupWizardActivity.java
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2016 The CyanogenMod Project
- * Copyright (C) 2017-2020 The LineageOS Project
+ * Copyright (C) 2017-2021 The LineageOS Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -30,7 +30,6 @@
import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_HAS_MULTIPLE_USERS;
import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_RESULT_CODE;
import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_SCRIPT_URI;
-import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_USE_IMMERSIVE;
import static org.lineageos.setupwizard.SetupWizardApp.LOGV;
import android.annotation.NonNull;
@@ -48,19 +47,21 @@
import android.os.Bundle;
import android.os.UserHandle;
import android.os.UserManager;
+import android.text.TextUtils;
import android.util.Log;
import android.view.View;
import android.view.ViewTreeObserver;
import android.view.animation.Animation;
import android.view.animation.AnimationUtils;
import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.TextView;
+
+import com.android.settingslib.Utils;
import com.google.android.setupdesign.view.NavigationBar;
import com.google.android.setupdesign.view.NavigationBar.NavigationBarListener;
import com.google.android.setupcompat.util.SystemBarHelper;
import com.google.android.setupcompat.util.WizardManagerHelper;
+import com.google.android.setupdesign.GlifLayout;
import org.lineageos.setupwizard.util.SetupWizardUtils;
@@ -364,7 +365,6 @@
protected void onSetupStart() {
SetupWizardUtils.disableCaptivePortalDetection(getApplicationContext());
SetupWizardUtils.disableStatusBar(getApplicationContext());
- SystemBarHelper.hideSystemBars(getWindow());
tryEnablingWifi();
}
@@ -563,7 +563,6 @@
}
intent.putExtra(EXTRA_FIRST_RUN, isFirstRun());
intent.putExtra(EXTRA_HAS_MULTIPLE_USERS, hasMultipleUsers());
- intent.putExtra(EXTRA_USE_IMMERSIVE, true);
startActivity(intent);
}
@@ -573,7 +572,6 @@
}
intent.putExtra(EXTRA_FIRST_RUN, isFirstRun());
intent.putExtra(EXTRA_HAS_MULTIPLE_USERS, hasMultipleUsers());
- intent.putExtra(EXTRA_USE_IMMERSIVE, true);
startActivityForResult(intent, requestCode);
}
@@ -709,16 +707,21 @@
setContentView(getLayoutResId());
}
if (getTitleResId() != -1) {
- TextView title = (TextView) findViewById(android.R.id.title);
- title.setText(getTitleResId());
+ final CharSequence headerText = TextUtils.expandTemplate(getText(getTitleResId()));
+ getGlifLayout().setHeaderText(headerText);
}
if (getIconResId() != -1) {
- ImageView icon = (ImageView) findViewById(R.id.header_icon);
- icon.setImageResource(getIconResId());
- icon.setVisibility(View.VISIBLE);
+ final GlifLayout layout = getGlifLayout();
+ final Drawable icon = getDrawable(getIconResId()).mutate();
+ icon.setTintList(Utils.getColorAccent(layout.getContext()));
+ layout.setIcon(icon);
}
}
+ protected GlifLayout getGlifLayout() {
+ return requireViewById(R.id.setup_wizard_layout);
+ }
+
protected int getLayoutResId() {
return -1;
}
diff --git a/src/org/lineageos/setupwizard/BiometricActivity.java b/src/org/lineageos/setupwizard/BiometricActivity.java
index c338556..21235aa 100644
--- a/src/org/lineageos/setupwizard/BiometricActivity.java
+++ b/src/org/lineageos/setupwizard/BiometricActivity.java
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2016 The CyanogenMod Project
- * Copyright (C) 2017-2018,2020 The LineageOS Project
+ * Copyright (C) 2017-2021 The LineageOS Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -25,7 +25,6 @@
import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_MATERIAL_LIGHT;
import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_THEME;
import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_TITLE;
-import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_USE_IMMERSIVE;
import static org.lineageos.setupwizard.SetupWizardApp.REQUEST_CODE_SETUP_BIOMETRIC;
import android.content.Intent;
@@ -86,7 +85,6 @@
Intent intent = new Intent(ACTION_SETUP_BIOMETRIC);
intent.putExtra(EXTRA_FIRST_RUN, true);
intent.putExtra(EXTRA_ALLOW_SKIP, true);
- intent.putExtra(EXTRA_USE_IMMERSIVE, true);
intent.putExtra(EXTRA_THEME, EXTRA_MATERIAL_LIGHT);
intent.putExtra(EXTRA_AUTO_FINISH, false);
/*intent.putExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_FALLBACK, true);*/
diff --git a/src/org/lineageos/setupwizard/LocationSettingsActivity.java b/src/org/lineageos/setupwizard/LocationSettingsActivity.java
index 4924f5c..ad32023 100644
--- a/src/org/lineageos/setupwizard/LocationSettingsActivity.java
+++ b/src/org/lineageos/setupwizard/LocationSettingsActivity.java
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2016 The CyanogenMod Project
- * Copyright (C) 2017-2020 The LineageOS Project
+ * Copyright (C) 2017-2021 The LineageOS Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -40,9 +40,6 @@
super.onCreate(savedInstanceState);
setNextText(R.string.next);
- TextView summaryView = (TextView) findViewById(android.R.id.summary);
- summaryView.setText(R.string.location_services_summary);
-
mLocationAccess = (CheckBox) findViewById(R.id.location_checkbox);
mLocationManager = getSystemService(LocationManager.class);
View locationAccessView = findViewById(R.id.location);
diff --git a/src/org/lineageos/setupwizard/SetupWizardApp.java b/src/org/lineageos/setupwizard/SetupWizardApp.java
index ac970ad..993d532 100644
--- a/src/org/lineageos/setupwizard/SetupWizardApp.java
+++ b/src/org/lineageos/setupwizard/SetupWizardApp.java
@@ -49,7 +49,6 @@
public static final String EXTRA_FIRST_RUN = "firstRun";
public static final String EXTRA_ALLOW_SKIP = "allowSkip";
public static final String EXTRA_AUTO_FINISH = "wifi_auto_finish_on_connect";
- public static final String EXTRA_USE_IMMERSIVE = "useImmersiveMode";
public static final String EXTRA_HAS_MULTIPLE_USERS = "hasMultipleUsers";
public static final String EXTRA_THEME = "theme";
public static final String EXTRA_MATERIAL_LIGHT = "material_light";
diff --git a/src/org/lineageos/setupwizard/SetupWizardExitActivity.java b/src/org/lineageos/setupwizard/SetupWizardExitActivity.java
index 3a3aaea..baa822f 100644
--- a/src/org/lineageos/setupwizard/SetupWizardExitActivity.java
+++ b/src/org/lineageos/setupwizard/SetupWizardExitActivity.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2017 The LineageOS Project
+ * Copyright (C) 2017-2021 The LineageOS Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -26,8 +26,6 @@
import android.os.Bundle;
import android.util.Log;
-import com.google.android.setupcompat.util.SystemBarHelper;
-
import org.lineageos.setupwizard.util.PhoneMonitor;
import org.lineageos.setupwizard.util.SetupWizardUtils;
@@ -41,7 +39,6 @@
if (LOGV) {
Log.v(TAG, "onCreate savedInstanceState=" + savedInstanceState);
}
- SystemBarHelper.showSystemBars(getWindow(), this);
SetupWizardUtils.enableStatusBar(this);
SetupWizardUtils.enableCaptivePortalDetection(this);
PhoneMonitor.onSetupFinished();
diff --git a/src/org/lineageos/setupwizard/SimMissingActivity.java b/src/org/lineageos/setupwizard/SimMissingActivity.java
index e30c92c..e769425 100644
--- a/src/org/lineageos/setupwizard/SimMissingActivity.java
+++ b/src/org/lineageos/setupwizard/SimMissingActivity.java
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2016 The CyanogenMod Project
- * Copyright (C) 2017-2020 The LineageOS Project
+ * Copyright (C) 2017-2021 The LineageOS Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -42,7 +42,6 @@
if (!mPhoneMonitor.simMissing()) {
finishAction(RESULT_OK);
}
- setNextText(R.string.skip);
final int simLocation = getResources().getInteger(
R.integer.sim_image_type);
ImageView simLogo = ((ImageView)findViewById(R.id.sim_slot_image));
diff --git a/src/org/lineageos/setupwizard/SubBaseActivity.java b/src/org/lineageos/setupwizard/SubBaseActivity.java
index d85d6ff..25b883c 100644
--- a/src/org/lineageos/setupwizard/SubBaseActivity.java
+++ b/src/org/lineageos/setupwizard/SubBaseActivity.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2017-2020 The LineageOS Project
+ * Copyright (C) 2017-2021 The LineageOS Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -50,7 +50,6 @@
Log.d(TAG, "onCreate savedInstanceState=" + savedInstanceState);
}
super.onCreate(savedInstanceState);
- setNextText(R.string.skip);
setNextAllowed(false);
if (savedInstanceState == null) {
onStartSubactivity();
diff --git a/src/org/lineageos/setupwizard/WelcomeActivity.java b/src/org/lineageos/setupwizard/WelcomeActivity.java
index 63dcc54..7f6aac2 100644
--- a/src/org/lineageos/setupwizard/WelcomeActivity.java
+++ b/src/org/lineageos/setupwizard/WelcomeActivity.java
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2016 The CyanogenMod Project
- * Copyright (C) 2017-2018,2020 The LineageOS Project
+ * Copyright (C) 2017-2021 The LineageOS Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -33,7 +33,7 @@
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- mRootView = findViewById(R.id.root);
+ mRootView = findViewById(R.id.setup_wizard_layout);
setNextText(R.string.next);
setBackText(R.string.emergency_call);
setBackDrawable(null);
diff --git a/src/org/lineageos/setupwizard/wizardmanager/WizardManager.java b/src/org/lineageos/setupwizard/wizardmanager/WizardManager.java
index 2a5c6df..9e05aad 100644
--- a/src/org/lineageos/setupwizard/wizardmanager/WizardManager.java
+++ b/src/org/lineageos/setupwizard/wizardmanager/WizardManager.java
@@ -87,7 +87,6 @@
}
private void addExtras(Intent intent) {
- intent.putExtra(WizardManagerHelper.EXTRA_USE_IMMERSIVE_MODE, true);
intent.putExtra(EXTRA_FIRST_RUN, true);
intent.putExtra(WizardManagerHelper.EXTRA_THEME, ThemeHelper.THEME_MATERIAL_LIGHT);
}