port commit 0867f866afc26957eabefd088ea07b52a8e43e65 from eelo-0.1 to eelo-0.2 (f7530417) · Commits · e / os / android_packages_apps_SetupWizard

AndroidManifest.xml

+28 −12

Original line number	Diff line number	Diff line
		@@ -2,6 +2,7 @@
		<!--
		Copyright (C) 2013 The CyanogenMod Project
		Copyright (C) 2017 The LineageOS Project
		Copyright (C) 2018 e.foundation

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		@@ -25,6 +26,7 @@
		<uses-permission android:name="android.permission.STATUS_BAR" />
		<uses-permission android:name="android.permission.WRITE_SETTINGS" />
		<uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />

		<uses-permission android:name="android.permission.SET_TIME_ZONE" />
		<uses-permission android:name="android.permission.SET_TIME" />
		<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
		@@ -256,6 +258,20 @@
		</intent-filter>
		</activity>

		<activity android:name=".EAccountManagerActivity"
		android:label="@string/activity_label_empty"
		android:excludeFromRecents="true"
		android:configChanges="mcc\|mnc"
		android:immersive="true"
		android:exported="false"
		android:windowSoftInputMode="stateAlwaysHidden">
		<intent-filter>
		<action android:name="org.lineageos.setupwizard.E_ACCOUNT_MANAGER_SETTINGS" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		</activity>


		<activity android:name=".FinishActivity"
		android:label="@string/activity_label_empty"
		android:excludeFromRecents="true"

res/drawable/ic_account_manager_screen.xml

0 → 100644

+30 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		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.
		-->
		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="24dp"
		android:height="24dp"
		android:viewportWidth="24"
		android:viewportHeight="24">

		<path
		android:pathData="M0 0h24v24H0z" />
		<path
		android:fillColor="@color/black"
		android:pathData="M18 8h-1V6c0-2.76-2.24-5-5-5S7 3.24 7 6v2H6c-1.1 0-2 .9-2 2v10c0 1.1 .9 2 2
		2h12c1.1 0 2-.9 2-2V10c0-1.1-.9-2-2-2zm-6 9c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9
		2-2 2zm3.1-9H8.9V6c0-1.71 1.39-3.1 3.1-3.1 1.71 0 3.1 1.39 3.1 3.1v2z" />
		</vector>
		No newline at end of file

res/layout/setup_e_account_manager.xml

0 → 100644

+70 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2018 e.foundation

		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"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:background="@color/primary">

		<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"
		android:paddingStart="@dimen/content_margin_left"
		android:paddingEnd="@dimen/content_margin_left"
		style="@style/PageContent">

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

		<Button
		android:id="@+id/setup_e_account_manager"
		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/e_account_manager_setup_configure"/>
		</LinearLayout>
		</ScrollView>
		</FrameLayout>
		<fragment android:name="com.android.setupwizard.navigationbar.SetupWizardNavBar"
		android:id="@+id/navigation_bar"
		style="@style/setup_wizard_navbar_style" />

res/raw/lineage_wizard_script.xml

+5 −2

Original line number	Diff line number	Diff line
		@@ -70,6 +70,10 @@
		</WizardAction>

		<WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCKSCREEN_SETTINGS;end" id="lockscreen_settings">
		<result wizard:action="e_account_manager_settings" />
		</WizardAction>

		<WizardAction wizard:uri="intent:#Intent;action=action=org.lineageos.setupwizard.E_ACCOUNT_MANAGER_SETTINGS;end" id="e_account_manager_settings">
		<result wizard:action="finish" />
		</WizardAction>

		@@ -77,5 +81,4 @@
		<result wizard:action="exit" />
		</WizardAction>
		<WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.EXIT;end" id="exit" />

		</WizardScript>

res/values/strings.xml

+3 −1

Original line number	Diff line number	Diff line
		@@ -105,5 +105,7 @@
		<string name="lockscreen_setup_summary"><b>Protect this device</b> and require a PIN, pattern, or password to unlock the screen</string>
		<string name="lockscreen_setup_screen_lock_setup">Set up</string>
		<!-- e.foundation -->
		<string name="eelo_start_synchronizer_err">Cannot start eelo synchronizer</string>
		<string name="e_account_manager_setup_title">Configure <b>/e/</b> account</string>
		<string name="e_account_manager_setup_summary">Save your /e/ identifiers in the account manager, thus you can simply reuse them later in other applications.</string>
		<string name="e_account_manager_setup_configure">Set up</string>
		</resources>