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

Commit 2bbf4d07 authored by vince-bourgmayer's avatar vince-bourgmayer Committed by Nihar Thakkar
Browse files

port commit 81a14902 and... 

port commit 81a14902 and df6c9001 to e-0.2


(cherry picked from commit b88e5445)
parent 5a0cd6da

java/com/android/dialer/backup/AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 


  <!-- Android backup service key -->

  <!-- https://developer.android.com/google/backup/signup.html -->

  <meta-data

  <!--<meta-data

      android:name="com.google.android.backup.api_key"

      android:value="AEdPqrEAAAAIn3-Y3JKit1mrzfvcdbVhUiJn2ICtKfhGYLy0Bg"/>

      android:value="AEdPqrEAAAAIn3-Y3JKit1mrzfvcdbVhUiJn2ICtKfhGYLy0Bg"/>-->

</manifest>
 
 No newline at end of file

java/com/android/dialer/dialpadview/res/drawable-hdpi/ic_dialer_fork_add_call.png

100755 → 100644
(1.61 KiB)

File mode changed from 100755 to 100644.

View file

java/com/android/dialer/dialpadview/res/drawable-hdpi/ic_dialer_fork_tt_keypad.png

100755 → 100644
(2.36 KiB)

File mode changed from 100755 to 100644.

View file

java/com/android/dialer/lookup/ForwardLookup.java

+2 −8
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.dialer.lookup;



import com.android.dialer.phonenumbercache.ContactInfo;

import com.android.dialer.lookup.google.GoogleForwardLookup;

import com.android.dialer.lookup.openstreetmap.OpenStreetMapForwardLookup;



import android.content.Context;
@@ -35,9 +34,7 @@ public abstract class ForwardLookup { 
        if (INSTANCE == null || !isInstance(provider)) {

            Log.d(TAG, "Chosen forward lookup provider: " + provider);



            if (provider.equals(LookupSettings.FLP_GOOGLE)) {

                INSTANCE = new GoogleForwardLookup(context);

            } else if (provider.equals(LookupSettings.FLP_OPENSTREETMAP)) {

            if (provider.equals(LookupSettings.FLP_OPENSTREETMAP)) {

                INSTANCE = new OpenStreetMapForwardLookup(context);

            }

        }
@@ -46,10 +43,7 @@ public abstract class ForwardLookup { 
    }



    private static boolean isInstance(String provider) {

        if (provider.equals(LookupSettings.FLP_GOOGLE)

                && INSTANCE instanceof GoogleForwardLookup) {

            return true;

        } else if (provider.equals(LookupSettings.FLP_OPENSTREETMAP)

        if (provider.equals(LookupSettings.FLP_OPENSTREETMAP)

                && INSTANCE instanceof OpenStreetMapForwardLookup) {

            return true;

        } else {