Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d98f4137 authored by d34d's avatar d34d Committed by Andy Mast
Browse files

Enroll fingerprint via SetupWizard [1/2] 

Change-Id: Id50627f24017766b996ade46104edb3f5c198aa9

Conflicts:
	res/values/cm_strings.xml
parent a9247cdd

AndroidManifest.xml

+21 −0
Original line number Diff line number Diff line
@@ -1198,6 +1198,7 @@ 
            android:windowSoftInputMode="stateVisible|adjustResize"/>



        <activity android:name="SetupChooseLockGeneric"

            android:screenOrientation="portrait"

            android:taskAffinity="com.android.wizard"

            android:theme="@style/SetupWizardDisableAppStartingTheme"

            android:label="@string/lock_settings_picker_title">
@@ -1225,6 +1226,13 @@ 


        <activity android:name="SetupChooseLockPattern"

            android:exported="false"

            android:screenOrientation="portrait"

            android:taskAffinity="com.android.wizard"

            android:theme="@style/SetupWizardDisableAppStartingTheme" />



        <activity android:name="SetupChooseLockPatternSize"

            android:exported="false"

            android:screenOrientation="portrait"

            android:taskAffinity="com.android.wizard"

            android:theme="@style/SetupWizardDisableAppStartingTheme" />
@@ -1236,8 +1244,21 @@ 
            android:theme="@style/FingerprintEnrollment"

            android:screenOrientation="portrait"/>



        <activity android:name="SetupEnrollFingerprint"

            android:exported="false"

            android:screenOrientation="portrait"

            android:taskAffinity="com.android.wizard"

            android:theme="@style/SetupWizardDisableAppStartingTheme"

            android:label="@string/lock_settings_picker_title">

            <intent-filter>

                <action android:name="com.android.settings.SETUP_FINGERPRINT" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

        </activity>



        <activity android:name="SetupChooseLockPassword"

            android:exported="false"

            android:screenOrientation="portrait"

            android:taskAffinity="com.android.wizard"

            android:theme="@style/SetupWizardDisableAppStartingTheme"

            android:windowSoftInputMode="stateVisible|adjustResize" />

res/drawable/setup_illustration_lock_screen_condensed.xml

0 → 100644
+24 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2015 The CyanogenMod 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.

-->



<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

    <item>

        <shape android:shape="rectangle">

            <size android:height="80dp" android:width="1dp"/>

            <solid android:color="@color/setup_wizard_header_title_background_color"/>

        </shape>

    </item>

</layer-list>
 
 No newline at end of file

res/layout/setup_finger_list.xml

0 → 100644
+40 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     Copyright (C) 2015 The CyanogenMod Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical" >



    <TextView

        android:id="@+id/manage_fingerprints"

        android:layout_width="match_parent"

        android:layout_height="48dp"

        android:gravity="center_vertical"

        android:textSize="16sp"

        android:textColor="@color/manage_fingerprints_primary_color"

        android:layout_marginStart="16dp"/>



    <ListView

        android:id="@+id/list"

        android:layout_width="match_parent"

        android:layout_height="wrap_content" />



    <fragment android:name="com.android.setupwizard.navigationbar.SetupWizardNavBar"

        android:id="@+id/navigation_bar"

        style="@style/setup_wizard_navbar_style" />



</LinearLayout>

res/layout/setup_template.xml

+1 −2
Original line number Diff line number Diff line
@@ -31,8 +31,7 @@ 


        <RelativeLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:clipChildren="false">

            android:layout_height="wrap_content">



            <com.android.settings.widget.SetupWizardIllustration

                android:id="@+id/setup_illustration"

res/layout/setup_template_condensed.xml

0 → 100644
+73 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

    Copyright (C) 2014 The Android Open Source Project



    Licensed under the Apache License, Version 2.0 (the "License");

    you may not use this file except in compliance with the License.

    You may obtain a copy of the License at



        http://www.apache.org/licenses/LICENSE-2.0



    Unless required by applicable law or agreed to in writing, software

    distributed under the License is distributed on an "AS IS" BASIS,

    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

    See the License for the specific language governing permissions and

    limitations under the License.

-->



<LinearLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical">



    <ScrollView

        android:id="@+id/bottom_scroll_view"

        android:layout_width="match_parent"

        android:layout_height="0dp"

        android:layout_weight="1"

        android:fillViewport="true">



        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="vertical">



            <com.android.settings.widget.SetupWizardIllustration

                android:id="@+id/setup_illustration"

                android:layout_width="match_parent"

                android:layout_height="80dp"

                android:elevation="@dimen/setup_wizard_title_area_elevation"

                android:background="@drawable/setup_illustration_bg"

                android:foreground="@drawable/setup_illustration_lock_screen_condensed"

                android:tag="stickyContainer">



                <TextView

                    android:id="@+id/title"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:tag="sticky"

                    android:layout_gravity="bottom"

                    style="@style/SetupTitleLockSecurity"/>



            </com.android.settings.widget.SetupWizardIllustration>



            <FrameLayout

                android:id="@+id/setup_content"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:clipChildren="false"/>



        </LinearLayout>



    </ScrollView>



    <fragment android:name="com.android.setupwizard.navigationbar.SetupWizardNavBar"

        android:id="@+id/navigation_bar"

        android:layout_width="match_parent"

        android:layout_height="56dip"

        style="@style/setup_wizard_navbar_style"/>



</LinearLayout>