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

Commit 96ffe625 authored by NathanielWaggoner's avatar NathanielWaggoner Committed by Rajesh Yengisetty
Browse files

Dialer DeepLink Integration 

NOTES-53

Change-Id: I90fe73dff9615a9955e61700fe9a712e6a5952ed
(cherry picked from commit abec0f3e)
parent 3406e431

AndroidManifest_cm.xml

+3 −0
Original line number Original line Diff line number Diff line
@@ -23,6 +23,9 @@ 
    <uses-permission android:name="com.cyanogen.ambient.permission.BIND_INCALL_SERVICE" />

    <uses-permission android:name="com.cyanogen.ambient.permission.BIND_INCALL_SERVICE" />

    <uses-permission android:name="com.cyanogen.ambient.permission.PLUGIN_STATUS_CHANGED" />

    <uses-permission android:name="com.cyanogen.ambient.permission.PLUGIN_STATUS_CHANGED" />

    <uses-permission android:name="com.cyanogen.ambient.permission.PUBLISH_DISCOVERY_NUDGE" />

    <uses-permission android:name="com.cyanogen.ambient.permission.PUBLISH_DISCOVERY_NUDGE" />

    <!-- Connect to AmbientCore to use DeepLink Plugins -->

    <uses-permission android:name="com.cyanogen.ambient.permission.BIND_DEEPLINK_SERVICE" />

    <uses-permission android:name="com.cyanogen.ambient.permission.READ_DEEPLINK_DATABASE" />





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

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

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

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

res/layout/call_log_list_item.xml

+23 −7
Original line number Original line Diff line number Diff line
@@ -74,6 +74,20 @@ 
                    android:gravity="center_vertical"

                    android:gravity="center_vertical"

                    android:layout_marginStart="@dimen/call_log_list_item_info_margin_start">

                    android:layout_marginStart="@dimen/call_log_list_item_info_margin_start">





                    <LinearLayout

                        android:id="@+id/nameWrapper"

                        android:layout_width="wrap_content"

                        android:layout_height="wrap_content"

                        android:orientation="horizontal">



                        <ImageView

                            android:id="@+id/hasNotes"

                            android:visibility="gone"

                            android:layout_width="@dimen/call_log_primary_text_size"

                            android:layout_height="@dimen/call_log_primary_text_size"

                            android:layout_marginEnd="@dimen/call_log_name_margin_bottom"

                            android:layout_gravity="center_vertical" />



                        <TextView

                        <TextView

                            android:id="@+id/name"

                            android:id="@+id/name"

                            android:layout_width="wrap_content"

                            android:layout_width="wrap_content"
@@ -84,6 +98,8 @@ 
                            android:textSize="@dimen/call_log_primary_text_size"

                            android:textSize="@dimen/call_log_primary_text_size"

                            android:singleLine="true" />

                            android:singleLine="true" />





                    </LinearLayout>



                    <TextView

                    <TextView

                        android:id="@+id/spamInfo"

                        android:id="@+id/spamInfo"

                        android:layout_width="wrap_content"

                        android:layout_width="wrap_content"

res/layout/call_log_list_item_actions.xml

+14 −0
Original line number Original line Diff line number Diff line
@@ -63,6 +63,20 @@ 




    </LinearLayout>

    </LinearLayout>





    <LinearLayout

        android:id="@+id/view_note_action"

        style="@style/CallLogActionStyle">



        <ImageView

            android:id="@+id/view_note_action_icon"

            style="@style/CallLogActionIconStyle" />



        <TextView

            style="@style/CallLogActionTextStyle"

            android:text="@string/search_shortcut_view_note" />



    </LinearLayout>



    <LinearLayout

    <LinearLayout

        android:id="@+id/create_new_contact_action"

        android:id="@+id/create_new_contact_action"

        style="@style/CallLogActionStyle">

        style="@style/CallLogActionStyle">

res/values/cm_strings.xml

+7 −0
Original line number Original line Diff line number Diff line
@@ -172,4 +172,11 @@ 




    <!-- Label of the button displayed when the call log is empty. Allows the user to make a call. -->

    <!-- Label of the button displayed when the call log is empty. Allows the user to make a call. -->

    <string name="recentCalls_empty_action_cm">Make a call</string>

    <string name="recentCalls_empty_action_cm">Make a call</string>



    <!-- Label of the button to view a note from a call log entry with associated DeepLink -->

    <string name="search_shortcut_view_note">View note</string>



    <!-- Note DeepLink mod settings summary in Dialer -->

    <string name="note_mod_settings_summary">Take notes from anywhere</string>



</resources>
 
</resources>

src/com/android/dialer/DialerApplication.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -25,7 +25,7 @@ import com.android.dialer.discovery.WifiCallStatusNudgeListener; 
import com.android.dialer.incall.InCallMetricsHelper;

import com.android.dialer.incall.InCallMetricsHelper;

import com.android.phone.common.incall.DialerDataSubscription;

import com.android.phone.common.incall.DialerDataSubscription;

import com.android.dialer.util.MetricsHelper;

import com.android.dialer.util.MetricsHelper;



import com.android.dialer.deeplink.DeepLinkIntegrationManager;





public class DialerApplication extends Application {

public class DialerApplication extends Application {
@@ -48,6 +48,7 @@ public class DialerApplication extends Application { 
        MetricsHelper.init(this);

        MetricsHelper.init(this);

        WifiCallStatusNudgeListener.init(this);

        WifiCallStatusNudgeListener.init(this);

        InCallMetricsHelper.init(this);

        InCallMetricsHelper.init(this);

        DeepLinkIntegrationManager.getInstance().setUp(this);

        Trace.endSection();

        Trace.endSection();





    }

    }