diff options
| author | Lalit Kansara <lkansara@codeaurora.org> | 2016-12-06 14:51:13 +0530 |
|---|---|---|
| committer | Lalit Kansara <lkansara@codeaurora.org> | 2016-12-06 14:51:13 +0530 |
| commit | 115b9c3755b01e4f80d9d10542c0b88f8f661bfa (patch) | |
| tree | 678d978b6ed01f0efcd722e08098bf3b9619ad04 /res/layout | |
| parent | 03ebc3fed807757491a9dbe9de615307b41ebd75 (diff) | |
| parent | 9bdcff7bdf72dd69f43c2b3d6fc20474130008c0 (diff) | |
| download | android_packages_apps_Dialer-115b9c3755b01e4f80d9d10542c0b88f8f661bfa.tar.gz android_packages_apps_Dialer-115b9c3755b01e4f80d9d10542c0b88f8f661bfa.tar.bz2 android_packages_apps_Dialer-115b9c3755b01e4f80d9d10542c0b88f8f661bfa.zip | |
Merge commit '9bdcff7bdf72dd69f43c2b3d6fc20474130008c0' into remote
Conflicts:
AndroidManifest.xml
InCallUI/src/com/android/incallui/Call.java
InCallUI/src/com/android/incallui/CallButtonPresenter.java
InCallUI/src/com/android/incallui/NotificationBroadcastReceiver.java
InCallUI/src/com/android/incallui/StatusBarNotifier.java
InCallUI/src/com/android/incallui/VideoCallPresenter.java
Change-Id: Ice78377f619bcd740170eff4393102329319f43d
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/call_log_activity.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/res/layout/call_log_activity.xml b/res/layout/call_log_activity.xml index 0109df7d6..aa1a6f44d 100644 --- a/res/layout/call_log_activity.xml +++ b/res/layout/call_log_activity.xml @@ -33,4 +33,8 @@ android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" /> + <RelativeLayout + android:id="@+id/floating_action_button_container" + android:layout_width="0dp" + android:layout_height="0dp" /> </LinearLayout> |