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

Commit 708ba340 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge commit '46bf6237' into HEAD"

parents 5a3344c5 f02ed88c

Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ res_dirs := res \ 


LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs))

LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs))

LOCAL_ASSET_DIR := $(LOCAL_PATH)/assets



LOCAL_AAPT_FLAGS := \

    --auto-add-overlay \

AndroidManifest.xml

+21 −3
Original line number Diff line number Diff line
@@ -46,6 +46,8 @@ 
    <uses-permission android:name="com.android.voicemail.permission.READ_VOICEMAIL" />

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

    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>

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

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

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

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

    <!-- This tells the activity manager to not delay any of our activity
@@ -163,6 +165,17 @@ 
            </intent-filter>

        </activity>



        <activity android:name=".callstats.CallStatsDetailActivity"

            android:label="@string/callStatsDetailTitle"

            android:theme="@style/CallDetailActivityTheme"

            android:screenOrientation="portrait"

            android:icon="@mipmap/ic_launcher_phone" >

            <intent-filter>

                <action android:name="android.intent.action.VIEW" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

        </activity>



        <activity android:name="com.android.contacts.common.test.FragmentTestActivity">

            <intent-filter>

                <category android:name="android.intent.category.TEST"/>
@@ -240,9 +253,8 @@ 
        </receiver>



        <activity android:name=".SpeedDialListActivity"

            android:configChanges="orientation|screenSize|keyboardHidden"

            android:label="@string/set_speed_dial"

            android:theme="@style/SettingsStyle" >

            android:theme="@style/DialtactsTheme"

            android:label="@string/speed_dial_settings" >

            <intent-filter>

                <action android:name="android.intent.action.MAIN"/>

            </intent-filter>
@@ -302,5 +314,11 @@ 
                <action android:name="android.telecom.InCallService"/>

            </intent-filter>

        </service>



        <provider android:name="com.android.dialer.lookup.LookupProvider"

                  android:authorities="com.android.dialer.provider"

                  android:exported="false"

                  android:multiprocess="false" />



    </application>

</manifest>

assets/contacts_extensions.properties

0 → 100644
+1 −0
Original line number Diff line number Diff line 
extendedPhoneDirectories=com.android.dialer.lookup.ExtendedLookupDirectories

proguard.flags

+5 −0
Original line number Diff line number Diff line
@@ -12,4 +12,9 @@ 
@com.android.dialer.NeededForReflection *;

}



# Keep ExtendedLookupDirectories for assets/contacts_extensions.properties

-keep class com.android.dialer.lookup.ExtendedLookupDirectories extends * {

  *;

}



-verbose

res/color/setting_primary_color.xml

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

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

-->



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

    <item android:state_enabled="false"

          android:alpha="0.26"

          android:color="@color/dialtacts_primary_text_color"/>

    <item android:color="@color/dialtacts_primary_text_color"/>

</selector>