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

Commit 9a090c89 authored by Eric Erfanian's avatar Eric Erfanian
Browse files

Update AOSP Dialer source from internal google3 repository at cl/150392808 

Test: Treehugger

Notable this release:
* Reintroduce localization.

This CL updates the AOSP Dialer source with all the changes that have
gone into the private google3 repository. This includes all the
changes from 3/15/2017 to cl/150392808 (3/16/2017).

This goal of these drops is to keep the AOSP source in sync with the
internal google3 repository. Currently these sync are done by hand
with very minor modifications to the internal source code.

See the Android.mk file for list of modifications.

Our current goal is to do frequent drops (daily if possible) and
eventually switched to an automated process.

Change-Id: Ia16d68469c2ca1ff42c7fa31d922bdb78c4e244a
parent 2df4538e

Android.mk

+10 −3
Original line number Diff line number Diff line 
# Local modifications:

# * Dagger classes have been manually crafted.

# * Precompiled proto classes have been included.

# * b/36287059 Dagger classes have been manually crafted.

# * b/31757757 Precompiled proto classes have been included.

# * b/36215428 dialer/oem/res/values-mcc3* have been pruned

# * b/36383971 StubCallLocationModule modified to return null.

# * removed com.google.android.backup.api_key. This should be added to

#      the manifest in the top level directory.

# * removed com.google.android.geo.API_KEY key. This should be added to

#      the manifest files in java/com/android/incallui/calllocation/impl/

#      and /java/com/android/incallui/maps/impl/

# * b/35391680 apache temporarily included in the top level directory.

LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)
@@ -95,7 +103,6 @@ DIALER_MANIFEST_FILES += \ 
	$(BASE_DIR)/dialer/app/manifests/activities/AndroidManifest.xml \

	$(BASE_DIR)/dialer/app/voicemail/error/AndroidManifest.xml \

	$(BASE_DIR)/dialer/backup/AndroidManifest.xml \

	$(BASE_DIR)/dialer/binary/aosp/AndroidManifest.xml \

	$(BASE_DIR)/dialer/blocking/AndroidManifest.xml \

	$(BASE_DIR)/dialer/callcomposer/AndroidManifest.xml \

	$(BASE_DIR)/dialer/callcomposer/camera/AndroidManifest.xml \

AndroidManifest.xml

+5 −3
Original line number Diff line number Diff line
@@ -12,12 +12,12 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<!-- From java/com/android/dialer/binary/aosp/AndroidManifest.xml -->



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

  coreApp="true"

  package="com.android.dialer"

  android:versionCode="90000"

  android:versionName="9.0">

  android:versionCode="100000"

  android:versionName="10.0">



  <uses-sdk

    android:minSdkVersion="23"
@@ -111,6 +111,8 @@ 
    android:name="com.android.dialer.binary.aosp.AospDialerApplication"

    android:supportsRtl="true"

    android:usesCleartextTraffic="false">





  </application>



</manifest>

java/com/android/contacts/common/res/drawable-hdpi/ic_voicemail_avatar.png

−751 B (2.79 KiB)
Loading image diff...

java/com/android/contacts/common/res/drawable-mdpi/ic_voicemail_avatar.png

−368 B (1.71 KiB)
Loading image diff...

java/com/android/contacts/common/res/drawable-xhdpi/ic_voicemail_avatar.png

−1.08 KiB (3.69 KiB)
Loading image diff...