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

Commit 8826f81d authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊
Browse files

Merge branch 'epic326-u-a14' into 'v1-u' 

Port changes from android 13

See merge request !60
parents 485dad0f a3f457b2

AndroidManifest.xml

+14 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />

    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />

    <uses-permission android:name="android.permission.MANAGE_USERS" />

    <uses-permission android:name="android.permission.MANAGE_USER_OEM_UNLOCK_STATE" />

    <uses-permission android:name="android.permission.CHANGE_COMPONENT_ENABLED_STATE" />

    <uses-permission android:name="android.permission.EXPAND_STATUS_BAR" />

    <uses-permission android:name="lineageos.permission.HARDWARE_ABSTRACTION_ACCESS" />
@@ -256,6 +257,19 @@ 
            </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=".backup.RestoreIntroActivity"

            android:label="@string/activity_label_empty"

privapp_whitelist_org.lineageos.setupwizard.xml

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
        <permission name="android.permission.GET_ACCOUNTS_PRIVILEGED" />

        <permission name="android.permission.INTERACT_ACROSS_USERS" />

        <permission name="android.permission.MANAGE_USERS" />

        <permission name="android.permission.MANAGE_USER_OEM_UNLOCK_STATE" />

        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE" />

        <permission name="android.permission.SET_TIME" />

        <permission name="android.permission.SET_TIME_ZONE" />

res/drawable/ic_account_manager_screen.xml

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

<!--

    Copyright (c) 2017 The LineageOS Project

    Copyright (c) 2018-2021 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.

-->

<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="?android:colorControlNormal"

        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,5c1.66,0 3,1.34 3,3s-1.34,3 -3,3 -3,-1.34 -3,-3 1.34,-3 3,-3zM12,19.2c-2.5,0 -4.71,-1.28 -6,-3.22 0.03,-1.99 4,-3.08 6,-3.08 1.99,0 5.97,1.09 6,3.08 -1.29,1.94 -3.5,3.22 -6,3.22z" />

</vector>

res/drawable/logo.xml

+19 −11
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     SPDX-FileCopyrightText: 2017-2022 The LineageOS Project

     SPDX-License-Identifier: Apache-2.0

    Copyright (c) 2018-2022 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.

-->

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

    android:width="512dp"

    android:height="260dp"

    android:viewportWidth="512"

    android:viewportHeight="260">



    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="1024.0"

    android:viewportHeight="1024.0">

    <path

        android:fillColor="@color/lineage_accent"

        android:pathData="M416,128a39.92,39.92,0,0,0-31.11,14.87l-1.5-.6A294.79,294.79,0,0,0,336,128.14s0-.09,0-.14a80,80,0,1,0-160,0s0,.09,0,.13l-1.72

.38 a293.48,293.48,0,0,0-45.67,13.76l-1.5 .6

a40,40,0,1,0,7.39,14.28h0a277.33,277.33,0,0,1,43.1-13,80,80,0,0,0,156.73,0,277.3,277.3,0,0,1,43.11,13h0A40,40,0,1,0,416,128ZM96,192a24,24,0,1,1,24-24A24,24,0,0,1,96,192Zm160,0a64,64,0,1,1,64-64A64.07,64.07,0,0,1,256,192Zm160,0a24,24,0,1,1,24-24A24,24,0,0,1,416,192ZM288,128a32,32,0,1,1-32-32A32,32,0,0,1,288,128Z" />

        android:fillColor="#FFFFFF"

        android:pathData="M511.9,578.8c-65.6,0 -119,-53.4 -119,-119c0,-65.6 53.4,-119 119,-119s119,53.4 119,119c0,12.4 -10.1,22.5 -22.5,22.5h-96.5c-12.4,0 -22.5,-10.1 -22.5,-22.5c0,-12.4 10.1,-22.5 22.5,-22.5h70.5c-9.5,-29.8 -37.6,-51.5 -70.5,-51.5c-40.8,0 -74,33.2 -74,74c0,40.8 33.2,74 74,74c12.4,0 22.5,10.1 22.5,22.5C534.4,568.7 524.3,578.8 511.9,578.8z" />

</vector>

res/layout/setup_e_account_manager.xml

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

<!--

     Copyright (C) 2018-2021 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"

                        style="@style/SudItemTitle.GlifDescription"

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



                    <Button

                        android:id="@+id/create_account"

                        android:layout_width="match_parent"

                        android:layout_height="wrap_content"

                        android:text="@string/create_account"

                        android:textSize="14sp"

                        android:textAllCaps="true"

                        android:layout_marginEnd="16dp"

                        android:layout_marginStart="16dp"

                        android:layout_marginTop="80dp"

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



                    <Button

                        android:id="@+id/sign_in"

                        android:text="@string/sign_in"

                        android:textSize="14sp"

                        android:textAllCaps="true"

                        android:layout_gravity="center"

                        android:layout_width="wrap_content"

                        android:layout_height="wrap_content"

                        android:layout_marginTop="8dp"

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







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