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

Commit 209f90ff authored by erfanian's avatar erfanian Committed by android-build-merger
Browse files

Merge "Add filtration logic to Assisted Dialing Settings." am: 7370d93a am: 24fc672b 

am: dc13737d

Change-Id: I4b80c5733bb4b539eb11c14b4ad569da201033ff
parents 1b05c804 dc13737d

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

0 → 100644
+22 −0
Original line number Diff line number Diff line 
<!-- Copyright (C) 2017 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.

-->

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

    package="com.android.dialer.assisteddialing">



  <uses-sdk

      android:minSdkVersion="23"

      android:targetSdkVersion="24"/>



</manifest>
 
 No newline at end of file

java/com/android/dialer/assisteddialing/ConcreteCreator.java

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import android.support.annotation.NonNull; 
import android.support.annotation.VisibleForTesting;

import android.support.v4.os.UserManagerCompat;

import android.telephony.TelephonyManager;

import com.android.dialer.assisteddialing.ui.R;

import com.android.dialer.common.LogUtil;

import com.android.dialer.configprovider.ConfigProvider;

import com.android.dialer.configprovider.ConfigProviderBindings;

java/com/android/dialer/assisteddialing/CountryCodeProvider.java

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ import java.util.stream.Collectors; 
/** A class to provide the appropriate country codes related to assisted dialing. */

@TargetApi(VERSION_CODES.N)

@SuppressWarnings("AndroidApiChecker") // Java 8 APIs

final class CountryCodeProvider {

public final class CountryCodeProvider {



  // TODO(erfanian): Ensure the below standard is consistent between libphonenumber and the

  // platform.

java/com/android/dialer/assisteddialing/res/values/strings.xml

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

<!-- Copyright (C) 2017 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.

-->

<resources>

  <!-- Key for the assisted dialing setting toggle-->

  <string name="assisted_dialing_setting_toggle_key" translatable="false">assisted_dialing_setting_toggle_key</string>



  <!-- Key for the assisted dialing home country setting-->

  <string name="assisted_dialing_setting_cc_key" translatable="false">assisted_dialing_setting_cc_key</string>

</resources>
 
 No newline at end of file

java/com/android/dialer/assisteddialing/ui/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
     limitations under the License.

-->

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

    package="com.android.dialer.assisteddialing">

    package="com.android.dialer.assisteddialing.ui">



  <uses-sdk

      android:minSdkVersion="23"