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

Commit 8fe1a312 authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge branch 'lollipop-mr1-release' of... 

Merge branch 'lollipop-mr1-release' of https://android.googlesource.com/platform/packages/apps/Dialer into cm-12.1

Change-Id: I594cec327dc6b576d765ba497fca0db6f91aa3ba
parents bee9691a 17c2f110

AndroidManifest.xml

+10 −4
Original line number Diff line number Diff line
@@ -297,7 +297,6 @@ 
                  android:launchMode="singleInstance"

                  android:configChanges="keyboardHidden"

                  android:exported="false"

                  android:process="com.android.incallui"

                  android:screenOrientation="nosensor" >

        </activity>
@@ -305,17 +304,24 @@ 
                 android:process="com.android.incallui">

        </service>



        <activity android:name="com.android.incallui.CircularRevealActivity"

                  android:theme="@style/Theme.CircularRevealAnimation"

                  android:exported="false"

                  android:configChanges="keyboardHidden|orientation"

                  android:launchMode="singleInstance"

                  android:noHistory="true"

                  android:excludeFromRecents="true"

                  android:screenOrientation="nosensor" />



        <!-- BroadcastReceiver for receiving Intents from Notification mechanism. -->

        <receiver android:name="com.android.incallui.InCallApp$NotificationBroadcastReceiver"

                  android:exported="false"

                  android:process="com.android.incallui">

                  android:exported="false">

            <intent-filter>

                <action android:name="com.android.incallui.ACTION_HANG_UP_ONGOING_CALL" />

            </intent-filter>

        </receiver>



        <service android:name="com.android.incallui.InCallServiceImpl"

                 android:process="com.android.incallui"

                 android:permission="android.permission.BIND_INCALL_SERVICE" >

            <intent-filter>

                <action android:name="android.telecom.InCallService"/>

res/drawable/action_button_background.xml

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

<!--

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

-->

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

    android:color="?android:attr/colorControlHighlight">

    <!-- Transparent background constrains the touch feedback ripple to the button, but also allows

         touch feedback ripples in the parent to show under the button. -->

    <item>

        <shape android:shape="rectangle"  >

            <solid android:color="@android:color/transparent" />

        </shape>

    </item>

</ripple>

res/layout/call_log_list_item.xml

+12 −12
Original line number Diff line number Diff line
@@ -14,8 +14,7 @@ 
     limitations under the License.

-->



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

    class="com.android.dialer.calllog.CallLogListItemView"

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

    android:id="@+id/call_log_list_item"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"
@@ -113,15 +112,6 @@ 
                        android:layout_marginEnd="@dimen/call_log_icon_margin"

                        android:layout_gravity="center_vertical"

                        />

                    <ImageView

                        android:id="@+id/call_account_icon"

                        android:layout_width="@dimen/call_provider_small_icon_size"

                        android:layout_height="@dimen/call_provider_small_icon_size"

                        android:layout_marginEnd="@dimen/call_log_icon_margin"

                        android:layout_gravity="center_vertical"

                        android:tint="?attr/call_log_secondary_text_color"

                        android:scaleType="centerInside"

                        />

                    <TextView

                        android:id="@+id/call_location_and_date"

                        android:layout_width="wrap_content"
@@ -133,6 +123,16 @@ 
                        android:singleLine="true"

                        />

                </LinearLayout>

                <TextView

                    android:id="@+id/call_account_label"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_marginEnd="@dimen/call_log_icon_margin"

                    android:textColor="?attr/call_log_secondary_text_color"

                    android:textSize="@dimen/call_log_secondary_text_size"

                    android:visibility="gone"

                    android:singleLine="true"

                    />

            </LinearLayout>

            <ImageView

                android:id="@+id/call_indicator_icon"
@@ -160,4 +160,4 @@ 
              android:layout="@layout/call_log_list_item_extra"

              android:layout_width="match_parent"

              android:layout_height="wrap_content"/>

</view>
 
</LinearLayout>

res/layout/call_log_list_item_actions.xml

+5 −5
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
        >

        <TextView

            android:id="@+id/call_back_action"

            android:background="@drawable/action_button_background"

            android:background="?android:attr/selectableItemBackground"

            android:gravity="center"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"
@@ -46,7 +46,7 @@ 
            android:singleLine="true"/>

        <TextView

            android:id="@+id/video_call_action"

            android:background="@drawable/action_button_background"

            android:background="?android:attr/selectableItemBackground"

            android:gravity="center"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"
@@ -62,7 +62,7 @@ 
            android:singleLine="true"/>

        <TextView

            android:id="@+id/voicemail_action"

            android:background="@drawable/action_button_background"

            android:background="?android:attr/selectableItemBackground"

            android:gravity="center"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"
@@ -78,7 +78,7 @@ 
            android:singleLine="true"/>

        <TextView

            android:id="@+id/details_action"

            android:background="@drawable/action_button_background"

            android:background="?android:attr/selectableItemBackground"

            android:gravity="center"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"
@@ -94,7 +94,7 @@ 
            android:singleLine="true"/>

        <TextView

            android:id="@+id/report_action"

            android:background="@drawable/action_button_background"

            android:background="?android:attr/selectableItemBackground"

            android:gravity="center"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"

res/layout/call_log_list_item_extra.xml

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 
        <ImageView android:id="@+id/dismiss_button"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:padding="@dimen/icon_padding"

            android:layout_gravity="center_vertical"

            android:layout_marginEnd="@dimen/call_log_icon_margin"

            android:src="@drawable/ic_close_dk"