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

Commit 2b89d571 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge branch '1111-t-find-my-device' into 'v3.0-t' 

Find my Device based on a13 developments

See merge request !73
parents c76c9314 0bc05c82

AndroidManifest.xml

+13 −0
Original line number Diff line number Diff line
@@ -308,6 +308,19 @@ 
            </intent-filter>

        </activity>

		

	<activity android:name=".FindMyDeviceActivity"

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

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

            </intent-filter>

        </activity>



        <activity android:name=".backup.RestoreIntroActivity"

                  android:label="@string/activity_label_empty"

                  android:excludeFromRecents="true"

res/drawable/ic_find_my_device.xml

0 → 100644
+28 −0
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"

    android:viewportWidth="42"

    android:viewportHeight="42"

    android:width="42dp"

    android:height="42dp">

    <path

        android:pathData="M33.25 1.75H15.75C13.825 1.75 12.25 3.325 12.25 5.25V8.75H15.75V7H33.25V35H15.75V33.25H12.25L12.25 36.75C12.25 38.675 13.825 40.25 15.75 40.25H33.25C35.175 40.25 36.75 38.675 36.75 36.75V5.25C36.75 3.325 35.175 1.75 33.25 1.75Z"

        android:fillColor="#0086FF" />

    <path

        android:pathData="M14.7945 13.8886C18.1115 14.2545 20.7445 16.8875 21.1104 20.2045H22.749V21.7954H21.1104C20.7445 25.1125 18.1115 27.7454 14.7945 28.1113V29.75H13.2036V28.1113C9.88652 27.7454 7.25357 25.1125 6.88766 21.7954H5.24902V20.2045H6.88766C7.25357 16.8875 9.88652 14.2545 13.2036 13.8886V12.25H14.7945V13.8886ZM9.62483 21C9.62483 18.5828 11.5826 16.625 13.9998 16.625C16.417 16.625 18.3748 18.5828 18.3748 21C18.3748 23.4172 16.417 25.375 13.9998 25.375C11.5826 25.375 9.62483 23.4172 9.62483 21Z"

        android:fillType="evenOdd"

        android:fillColor="#0086FF" />

    <path

        android:pathData="M14 19.25C13.0331 19.25 12.25 20.0331 12.25 21C12.25 21.9669 13.0331 22.75 14 22.75C14.9669 22.75 15.75 21.9669 15.75 21C15.75 20.0331 14.9669 19.25 14 19.25Z"

        android:fillColor="#0086FF" />

    <path

        android:pathData="M19.25 19.25H22.75V22.75H19.25V19.25Z"

        android:fillColor="#0086FF" />

    <path

        android:pathData="M12.25 12.25H15.75V15.75H12.25V12.25Z"

        android:fillColor="#0086FF" />

    <path

        android:pathData="M5.25 19.25H8.75V22.75H5.25V19.25Z"

        android:fillColor="#0086FF" />

    <path

        android:pathData="M12.25 26.25H15.75V29.75H12.25V26.25Z"

        android:fillColor="#0086FF" />

</vector>
 
 No newline at end of file

res/layout/setup_find_my_device.xml

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

<!--

     Copyright (C) 2018-2025 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.

-->

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

        style="@style/SudContentFrame">



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



                    <TextView

                        android:layout_width="match_parent"

                        android:layout_height="wrap_content"

                        android:textSize="16sp"

                        android:textColor="?android:attr/textColorPrimary"

                        android:text="@string/find_my_device_setup_summary_part_1" />



                    <TextView

                        android:layout_width="match_parent"

                        android:layout_height="wrap_content"

                        android:textSize="16sp"

                        android:textColor="?android:attr/textColorPrimary"

                        android:text="@string/find_my_device_setup_summary_part_2" />



                    <Button

                        android:id="@+id/activate_find_my_device"

                        android:layout_width="match_parent"

                        android:layout_height="wrap_content"

                        android:text="@string/activate_find_my_device"

                        android:textSize="14sp"

                        android:textAllCaps="true"

                        android:layout_marginEnd="16dp"

                        android:layout_marginStart="16dp"

                        android:layout_marginTop="80dp"

                        style="@style/SudGlifButton.Primary" />

                </LinearLayout>

            </ScrollView>

        </FrameLayout>



        <org.lineageos.setupwizard.NavigationLayout

            android:id="@+id/navigation_bar"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            app:showSkipButton="false" />



    </LinearLayout>

</com.google.android.setupdesign.GlifLayout>

res/raw/lineage_wizard_script.xml

+6 −0
Original line number Diff line number Diff line
@@ -81,6 +81,12 @@ 
        <result wizard:action="e_account_manager_settings" />

    </WizardAction>



    <WizardAction

        wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.E_FIND_MY_DEVICE_SETTINGS;end"

        id="e_find_my_device_settings">

        <result wizard:action="theme_settings" />

    </WizardAction>

	

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

        <result wizard:action="finish" />

    </WizardAction>

res/values-de/e_strings.xml

+5 −0
Original line number Diff line number Diff line
@@ -27,4 +27,9 @@ 
    <string name="activate_parental_control">Elternaufsicht aktivieren</string>

    <string name="parental_control_setup_title">Elternaufsicht einstellen</string>

    <string name="parental_control_setup_summary">Diese App bietet einen Schutz gegen unangemessene Inhalte für Ihre Kinder und Jugendliche. Sie können diese Funktion aktivieren, wenn Sie Ihr Gerät den Kindern leihen oder wenn das Gerät für sie bestimmt ist. Für mehr Informationen besuchen Sie bitte</string>

	

	<string name="activate_find_my_device">Find my Device aktivieren</string>

	<string name="find_my_device_setup_title">Find my Device einrichten</string>

	<string name="find_my_device_setup_summary_part_1">Find my Device hilft Ihnen, den Standort dieses Telefons zu ermitteln, falls Sie es verlegt haben.</string>

	<string name="find_my_device_setup_summary_part_2">Erstellen Sie einen Geheimcode und senden Sie ihn einfach per SMS an dieses Gerät. Es antwortet automatisch mit den Koordinaten Ihres Telefons.</string>	

</resources>
 
 No newline at end of file