PawletOS/lineageos_setupwizard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SUW: use setupdesign layout & theming

Browse Source 
Change-Id: I4841b701a8952035bd633d73368e80075d17e42a
This commit is contained in:
Timi Rautamäki
2021-08-21 08:58:14 +00:00
parent d186af21f8
commit 5e2f7f2dfe
30 changed files with 828 additions and 935 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Android.bp
View File

@@ -32,6 +32,7 @@ android_app {
static_libs: [
"androidx.core_core",
"SettingsLib",
"setupcompat",
"setupdesign",
"org.lineageos.platform.internal",

2
AndroidManifest.xml
View File

@@ -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">

30
res/layout-land/sim_missing_page.xml
View File

@@ -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,14 +15,20 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<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"
<FrameLayout
android:id="@+id/page"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1">
@@ -30,19 +37,15 @@
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="match_parent"
style="@style/PageContent">
style="@style/SudContentFrame">
<TextView
android:layout_width="0px"
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" />
android:text="@string/sim_missing_summary"
style="@style/SudItemTitle.GlifDescription" />
<ImageView
android:id="@+id/sim_slot_image"
@@ -50,8 +53,9 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:scaleType="fitEnd"
android:src="@drawable/sim"/>
android:src="@drawable/sim" />
</LinearLayout>
</FrameLayout>
</LinearLayout>
</LinearLayout>
</com.google.android.setupdesign.GlifLayout>

35
res/layout/choose_data_sim_page.xml
View File

@@ -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,20 +15,26 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<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"
android:background="@color/primary">
android:layout_height="match_parent">
<include layout="@layout/header_condensed" />
<FrameLayout android:id="@+id/page"
<FrameLayout
android:id="@+id/page"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1">
<ScrollView android:layout_width="match_parent"
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true">
@@ -37,17 +43,13 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/PageContent"
style="@style/SudContentFrame"
android:visibility="gone">
<TextView
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"
style="@style/SudDescription.Glif"
android:text="@string/choose_data_sim_summary" />
<include layout="@layout/divider" />
@@ -62,7 +64,7 @@
android:layout_width="match_parent"
android:layout_height="8dp"
android:layout_gravity="top"
android:visibility="gone"/>
android:visibility="gone" />
</FrameLayout>
<com.google.android.setupdesign.view.NavigationBar
@@ -71,4 +73,5 @@
android:layout_width="match_parent"
android:layout_height="@dimen/sud_navbar_height" />
</LinearLayout>
</LinearLayout>
</com.google.android.setupdesign.GlifLayout>

11
res/layout/finish_activity.xml
View File

@@ -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,7 +50,8 @@
</LinearLayout>
<ImageView android:id="@+id/reveal"
<ImageView
android:id="@+id/reveal"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/reveal"

47
res/layout/header_condensed.xml
View File

@@ -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>

46
res/layout/intro_restore_activity.xml
View File

@@ -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,13 +15,17 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<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"
android:background="@color/primary">
<include layout="@layout/header_condensed" />
android:layout_height="match_parent">
<FrameLayout android:id="@+id/page"
android:layout_width="match_parent"
@@ -36,33 +40,21 @@
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">
style="@style/SudContentFrame">
<TextView
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" />
android:text="@string/intro_restore_subtitle"
style="@style/SudItemTitle.GlifDescription" />
<Button
android:id="@+id/intro_restore_button"
android:layout_width="wrap_content"
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"
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"/>
android:layout_marginTop="24dp"
android:text="@string/intro_restore_button"
style="@style/SudGlifButton.Primary" />
</LinearLayout>
</ScrollView>
@@ -73,4 +65,6 @@
style="@style/SudNavBarTheme"
android:layout_width="match_parent"
android:layout_height="@dimen/sud_navbar_height" />
</LinearLayout>
</LinearLayout>
</com.google.android.setupdesign.GlifLayout>

53
res/layout/location_settings.xml
View File

@@ -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,20 +15,26 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<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"
android:background="@color/primary">
android:layout_height="match_parent">
<include layout="@layout/header_condensed" />
<FrameLayout android:id="@+id/page"
<FrameLayout
android:id="@+id/page"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1">
<ScrollView android:layout_width="match_parent"
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true">
@@ -36,16 +42,7 @@
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:textSize="15sp"
android:layout_marginBottom="@dimen/summary_margin_bottom"
android:paddingLeft="@dimen/content_margin_left"
android:paddingRight="@dimen/content_margin_right"
style="@style/PageSummaryText" />
style="@style/SudContentFrame">
<LinearLayout
android:id="@+id/location"
@@ -62,27 +59,18 @@
android:id="@+id/location_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" />
android:clickable="false"
style="@style/SudCheckBox.Multiline" />
<TextView
android:id="@+id/location_summary"
android:layout_width="0px"
android:layout_width="wrap_content"
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" />
style="@style/SudCheckBox.Multiline" />
</LinearLayout>
</LinearLayout>
</ScrollView>
</FrameLayout>
@@ -93,4 +81,5 @@
android:layout_width="match_parent"
android:layout_height="@dimen/sud_navbar_height" />
</LinearLayout>
</LinearLayout>
</com.google.android.setupdesign.GlifLayout>

42
res/layout/mobile_data_settings.xml
View File

@@ -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,28 +15,34 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<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"
android:background="@color/primary">
<include layout="@layout/header_condensed" />
android:layout_height="match_parent">
<ProgressBar
android:id="@+id/progress"
style="?android:attr/progressBarStyleHorizontal"
style="@style/SudFourColorIndeterminateProgressBar"
android:indeterminateOnly="true"
android:layout_width="match_parent"
android:layout_height="8dp"
android:visibility="gone"/>
android:visibility="gone" />
<FrameLayout android:id="@+id/page"
<FrameLayout
android:id="@+id/page"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1">
<ScrollView android:layout_width="match_parent"
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true">
@@ -45,18 +51,14 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/PageContent">
style="@style/SudContentFrame">
<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" />
android:text="@string/enable_mobile_data_summary"
style="@style/SudDescription.Glif" />
<include layout="@layout/divider" />
@@ -95,7 +97,8 @@
android:duplicateParentState="true"
android:clickable="false"
android:textOff="@string/no"
android:textOn="@string/yes"/>
android:textOn="@string/yes"
style="@style/SudSwitchStyle" />
</LinearLayout>
<include layout="@layout/divider" />
@@ -110,4 +113,5 @@
android:layout_width="match_parent"
android:layout_height="@dimen/sud_navbar_height" />
</LinearLayout>
</LinearLayout>
</com.google.android.setupdesign.GlifLayout>

41
res/layout/setup_biometric.xml
View File

@@ -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,20 +15,25 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<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"
android:background="@color/primary">
<include layout="@layout/header_condensed" />
android:layout_height="match_parent">
<FrameLayout android:id="@+id/page"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1">
<ScrollView android:layout_width="match_parent"
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true">
@@ -36,17 +41,13 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/PageContent">
style="@style/SudContentFrame">
<TextView
android:id="@+id/setup_biometric_summary"
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/SudItemContainer.Verbose"/>
<TextView
android:layout_width="match_parent"
@@ -74,17 +75,12 @@
android:textSize="16sp"
android:textStyle="bold"/>
<TextView
<Button
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"/>
android:text="@string/biometric_setup_screen_lock_setup"
style="@style/SudGlifButton.Primary" />
</LinearLayout>
</ScrollView>
@@ -96,4 +92,5 @@
android:layout_width="match_parent"
android:layout_height="@dimen/sud_navbar_height" />
</LinearLayout>
</LinearLayout>
</com.google.android.setupdesign.GlifLayout>

38
res/layout/setup_datetime_page.xml
View File

@@ -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,20 +15,26 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<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"
android:background="@color/primary">
android:layout_height="match_parent">
<include layout="@layout/header_condensed" />
<FrameLayout android:id="@+id/page"
<FrameLayout
android:id="@+id/page"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1">
<ScrollView android:layout_width="match_parent"
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true">
@@ -36,22 +42,19 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/PageContent">
style="@style/SudContentFrame">
<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" />
android:text="@string/date_time_summary"
style="@style/SudItemTitle.GlifDescription" />
<Spinner
android:id="@+id/timezone_list"
android:layout_width="290dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
android:saveEnabled="false"/>
<TwoLineListItem
@@ -118,4 +121,5 @@
android:layout_width="match_parent"
android:layout_height="@dimen/sud_navbar_height" />
</LinearLayout>
</LinearLayout>
</com.google.android.setupdesign.GlifLayout>

3
res/layout/setup_device_specific.xml
View File

@@ -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" />

72
res/layout/setup_lineage_settings.xml
View File

@@ -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,21 +15,26 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<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"
android:background="@color/primary">
android:layout_height="match_parent">
<include layout="@layout/header_condensed" />
<FrameLayout android:id="@+id/page"
<FrameLayout
android:id="@+id/page"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1">
<ScrollView android:layout_width="match_parent"
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true">
@@ -37,20 +42,16 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
style="@style/PageContent">
style="@style/SudContentFrame">
<!-- 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"
style="@style/SudItemTitle.GlifDescription"
android:text="@string/services_explanation"
android:clickable="true"/>
android:clickable="true" />
<!-- Whether or not to enable metrics -->
<LinearLayout
@@ -68,23 +69,16 @@
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"/>
android:clickable="false"
style="@style/SudCheckBox.Multiline" />
<TextView
android:id="@+id/enable_metrics_summary"
android:layout_width="0px"
android:layout_width="wrap_content"
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"/>
android:text="@string/services_metrics_label"
style="@style/SudCheckBox.Multiline" />
</LinearLayout>
@@ -104,26 +98,18 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top"
android:layout_marginTop="5dp"
android:duplicateParentState="true"
android:clickable="false" />
android:clickable="false"
style="@style/SudCheckBox.Multiline" />
<TextView
android:id="@+id/nav_keys_summary"
android:layout_width="0px"
android:layout_width="wrap_content"
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"/>
android:text="@string/services_os_nav_keys_label"
style="@style/SudCheckBox.Multiline" />
</LinearLayout>
</LinearLayout>
</ScrollView>
</FrameLayout>
@@ -134,4 +120,6 @@
android:layout_width="match_parent"
android:layout_height="@dimen/sud_navbar_height" />
</LinearLayout>
</LinearLayout>
</com.google.android.setupdesign.GlifLayout>

24
res/layout/setup_loading_page.xml
View File

@@ -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,13 +15,17 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<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"
android:background="@color/primary">
<include layout="@layout/header_condensed" />
android:layout_height="match_parent">
<ProgressBar
android:id="@+id/progressBar1"
@@ -32,11 +36,12 @@
android:paddingStart="0dp"
android:paddingEnd="0dp" />
<FrameLayout android:id="@+id/page"
<FrameLayout
android:id="@+id/page"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
style="@style/PageContent"/>
style="@style/SudContentFrame"/>
<com.google.android.setupdesign.view.NavigationBar
android:id="@+id/navigation_bar"
@@ -44,4 +49,5 @@
android:layout_width="match_parent"
android:layout_height="@dimen/sud_navbar_height" />
</LinearLayout>
</LinearLayout>
</com.google.android.setupdesign.GlifLayout>

27
res/layout/setup_locale.xml
View File

@@ -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,21 +15,24 @@
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">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="@color/primary">
android:orientation="vertical">
<include layout="@layout/header_condensed" />
<RelativeLayout android:layout_width="match_parent"
<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">
style="@style/SudContentFrame">
<org.lineageos.setupwizard.widget.LocalePicker
android:id="@+id/locale_list"
@@ -38,7 +41,8 @@
android:focusable="true"
android:focusableInTouchMode="true"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"/>
android:layout_centerHorizontal="true"
style="@style/LocaleWidget.Material.LocalePicker" />
</RelativeLayout>
@@ -48,4 +52,5 @@
android:layout_width="match_parent"
android:layout_height="@dimen/sud_navbar_height" />
</LinearLayout>
</LinearLayout>
</com.google.android.setupdesign.GlifLayout>

43
res/layout/setup_lockscreen.xml
View File

@@ -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,13 +15,17 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<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"
android:background="@color/primary">
<include layout="@layout/header_condensed" />
android:layout_height="match_parent">
<FrameLayout android:id="@+id/page"
android:layout_width="match_parent"
@@ -38,31 +42,21 @@
android:layout_height="wrap_content"
android:paddingStart="@dimen/content_margin_left"
android:paddingEnd="@dimen/content_margin_left"
style="@style/PageContent">
style="@style/SudContentFrame">
<TextView
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:text="@string/lockscreen_setup_summary"
style="@style/SudItemTitle.GlifDescription" />
<Button
android:id="@+id/setup_lockscreen"
android:layout_width="wrap_content"
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"
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"/>
android:layout_marginTop="24dp"
android:text="@string/lockscreen_setup_screen_lock_setup"
style="@style/SudGlifButton.Primary" />
</LinearLayout>
</ScrollView>
@@ -74,4 +68,5 @@
android:layout_width="match_parent"
android:layout_height="@dimen/sud_navbar_height" />
</LinearLayout>
</LinearLayout>
</com.google.android.setupdesign.GlifLayout>

32
res/layout/sim_missing_page.xml
View File

@@ -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,15 +15,20 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<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"
android:background="@color/primary">
android:layout_height="match_parent">
<include layout="@layout/header_condensed" />
<FrameLayout android:id="@+id/page"
<FrameLayout
android:id="@+id/page"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1">
@@ -32,18 +37,14 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
style="@style/PageContent">
style="@style/SudContentFrame">
<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" />
android:text="@string/sim_missing_summary"
style="@style/SudItemTitle.GlifDescription" />
<ImageView
android:id="@+id/sim_slot_image"
@@ -62,4 +63,5 @@
android:layout_width="match_parent"
android:layout_height="@dimen/sud_navbar_height" />
</LinearLayout>
</LinearLayout>
</com.google.android.setupdesign.GlifLayout>

64
res/layout/update_recovery_page.xml
View File

@@ -1,31 +1,40 @@
<?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"
<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"
android:background="@color/primary">
android:layout_height="match_parent">
<include layout="@layout/header_condensed" />
<FrameLayout android:id="@+id/page"
<FrameLayout
android:id="@+id/page"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1">
<ScrollView android:layout_width="match_parent"
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true">
@@ -33,26 +42,18 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
style="@style/PageContent">
style="@style/SudContentFrame">
<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"
style="@style/SudItemTitle.GlifDescription"
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"
style="@style/SudItemTitle.GlifDescription"
android:text="@string/update_recovery_warning" />
<LinearLayout
@@ -69,28 +70,19 @@
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:clickable="false"
style="@style/SudCheckBox.Multiline" />
<TextView
android:layout_width="0px"
android:layout_width="wrap_content"
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" />
</LinearLayout>
android:textStyle="bold"
style="@style/SudCheckBox.Multiline" />
</LinearLayout>
</LinearLayout>
</ScrollView>
</FrameLayout>
@@ -99,4 +91,6 @@
style="@style/SudNavBarTheme"
android:layout_width="match_parent"
android:layout_height="@dimen/sud_navbar_height" />
</LinearLayout>
</LinearLayout>
</com.google.android.setupdesign.GlifLayout>

21
res/layout/welcome_activity.xml
View File

@@ -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,14 +15,17 @@
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:layout_height="match_parent">
<LinearLayout
android:orientation="vertical"
android:background="@color/primary">
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageView
android:id="@+id/brand_logo"
@@ -33,7 +36,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"
@@ -41,4 +45,5 @@
android:layout_width="match_parent"
android:layout_height="@dimen/sud_navbar_height" />
</LinearLayout>
</LinearLayout>
</com.google.android.setupdesign.GlifLayout>

6
res/values/colors.xml
View File

@@ -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>

48
res/values/styles.xml
View File

@@ -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>

27
src/org/lineageos/setupwizard/BaseSetupWizardActivity.java
View File

@@ -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_FIRST_RUN;
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.net.wifi.WifiManager;
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 @@ public abstract class BaseSetupWizardActivity extends Activity implements Naviga
protected void onSetupStart() {
SetupWizardUtils.disableCaptivePortalDetection(getApplicationContext());
SetupWizardUtils.disableStatusBar(getApplicationContext());
SystemBarHelper.hideSystemBars(getWindow());
tryEnablingWifi();
}
@@ -563,7 +563,6 @@ public abstract class BaseSetupWizardActivity extends Activity implements Naviga
}
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 @@ public abstract class BaseSetupWizardActivity extends Activity implements Naviga
}
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 @@ public abstract class BaseSetupWizardActivity extends Activity implements Naviga
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;
}

4
src/org/lineageos/setupwizard/BiometricActivity.java
View File

@@ -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_FIRST_RUN;
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 @@ public class BiometricActivity extends SubBaseActivity {
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);*/

5
src/org/lineageos/setupwizard/LocationSettingsActivity.java
View File

@@ -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 @@ public class LocationSettingsActivity extends BaseSetupWizardActivity {
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);

1
src/org/lineageos/setupwizard/SetupWizardApp.java
View File

@@ -49,7 +49,6 @@ public class SetupWizardApp extends Application {
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";

5
src/org/lineageos/setupwizard/SetupWizardExitActivity.java
View File

@@ -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.content.Intent;
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 @@ public class SetupWizardExitActivity extends BaseSetupWizardActivity {
if (LOGV) {
Log.v(TAG, "onCreate savedInstanceState=" + savedInstanceState);
}
SystemBarHelper.showSystemBars(getWindow(), this);
SetupWizardUtils.enableStatusBar(this);
SetupWizardUtils.enableCaptivePortalDetection(this);
PhoneMonitor.onSetupFinished();

3
src/org/lineageos/setupwizard/SimMissingActivity.java
View File

@@ -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 @@ public class SimMissingActivity extends BaseSetupWizardActivity {
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));

3
src/org/lineageos/setupwizard/SubBaseActivity.java
View File

@@ -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 @@ public abstract class SubBaseActivity extends BaseSetupWizardActivity {
Log.d(TAG, "onCreate savedInstanceState=" + savedInstanceState);
}
super.onCreate(savedInstanceState);
setNextText(R.string.skip);
setNextAllowed(false);
if (savedInstanceState == null) {
onStartSubactivity();

4
src/org/lineageos/setupwizard/WelcomeActivity.java
View File

@@ -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 @@ public class WelcomeActivity extends BaseSetupWizardActivity {
@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);

1
src/org/lineageos/setupwizard/wizardmanager/WizardManager.java
View File

@@ -87,7 +87,6 @@ public class WizardManager extends Activity {
}
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);
}