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

Commit c840b23d authored by Abhishek Aggarwal's avatar Abhishek Aggarwal
Browse files

Merge branch '5390-master-e_account_settings' into 'master' 

5390 master e account settings

See merge request !43
parents b401ce62 46d65a0e

app/build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ dependencies { 
    implementation 'androidx.paging:paging-runtime-ktx:2.1.0'

    implementation 'androidx.preference:preference:1.1.0'

    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha03'

    implementation 'com.google.android:flexbox:1.1.0'

    implementation 'com.google.android.flexbox:flexbox:3.0.0'

    implementation 'com.google.android.material:material:1.2.0-alpha03'

    implementation 'androidx.browser:browser:1.0.0'

app/src/main/res/xml/account_authenticator_eelo_address_book.xml

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
  -->



<account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"

    android:accountPreferences="@xml/sync_prefs"

    android:accountPreferences="@xml/sync_prefs_eelo"

    android:accountType="@string/account_type_eelo_address_book"

    android:icon="@drawable/ic_account_provider_eelo"

    android:label="@string/account_title_eelo_address_book"

app/src/main/res/xml/eelo_account_authenticator.xml

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
  -->



<account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"

    android:accountPreferences="@xml/sync_prefs"

    android:accountPreferences="@xml/sync_prefs_eelo"

    android:accountType="@string/eelo_account_type"

    android:icon="@drawable/ic_account_provider_eelo"

    android:label="@string/eelo_account_name"

app/src/main/res/xml/sync_prefs.xml

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



<!--

  ~ Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).

  ~ All rights reserved. This program and the accompanying materials
@@ -13,15 +12,13 @@ 


    <PreferenceScreen

        android:iconSpaceReserved="true"

        android:summary="@string/advanced_account_summary"

        android:title="@string/advanced_account_title"

        android:summary="@string/manage_account_description"

        android:title="@string/manage_accounts"

        android:order="300"

        settings:allowDividerBelow="false">

        settings:allowDividerAbove="false">

        <intent

            android:action="ACTION_VIEW"

            android:targetClass="foundation.e.drive.activity.AccountsActivity"

            android:targetPackage="foundation.e.drive" />

            android:targetClass="foundation.e.accountmanager.ui.AccountsActivity"

            android:targetPackage="foundation.e.accountmanager" />

    </PreferenceScreen>

</PreferenceScreen>

app/src/main/res/xml/sync_prefs_eelo.xml

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



<!--

  ~ Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).

  ~ All rights reserved. This program and the accompanying materials

  ~ are made available under the terms of the GNU Public License v3.0

  ~ which accompanies this distribution, and is available at

  ~ http://www.gnu.org/licenses/gpl.html

  -->



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

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



    <PreferenceScreen

        android:iconSpaceReserved="true"

        android:summary="@string/advanced_account_summary"

        android:title="@string/advanced_account_title"

        android:order="300"

        settings:allowDividerBelow="false">

        <intent

            android:action="ACTION_VIEW"

            android:targetClass="foundation.e.drive.activity.AccountsActivity"

            android:targetPackage="foundation.e.drive" />

    </PreferenceScreen>

</PreferenceScreen>