diff options
| author | Suchand Ghosh <suchan@codeaurora.org> | 2014-09-15 10:44:02 +0530 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2016-08-24 08:18:14 -0600 |
| commit | d0d53cd2f934bdb853021a1650171c98c33c2b1d (patch) | |
| tree | a1d444805c473753426d0e635d512de1ea99e021 /res/layout | |
| parent | ec3ff334b643251a064a9285c261b7ffe4087bf5 (diff) | |
| download | android_packages_apps_Dialer-d0d53cd2f934bdb853021a1650171c98c33c2b1d.tar.gz android_packages_apps_Dialer-d0d53cd2f934bdb853021a1650171c98c33c2b1d.tar.bz2 android_packages_apps_Dialer-d0d53cd2f934bdb853021a1650171c98c33c2b1d.zip | |
Dialer app changes for IMS
IMS Conference URI UI changes
1. Add a new button for initiating conference
URI call in the Dial screen.
2. Send a intent for the conference call with a
extra to indicate the call type as conference.
IMS: Allow dial Conference call without URI List
Allow place conference call without URI List and
don't show error toast in this case.
IMS: Clean up Conference URI system property
Remove system property "persist.dbg.ims_volte_enable".
Add platform configuration flag and user's enhanced 4G
LTE setting to decide IMS capability.
IMS: Add participant support
Insert "add_participant" extra
to the dial intent.
IMS: Add participant support
Introduce add participant button in
call UI and send add participant to
Dialer.
Change-Id: I1173c6cc82bb3d008a70a3338c45901a2619f0e5
IMS: Fix dialer app crash issue due to NPE
FragmentActivity can be null if it's not yet
attach. So it can be null in such case.
Add null check to avoid NullPointerException.
CRs-Fixed: 1023212
Change-Id: Ib35c394dd10dea7526601824f11e5ebd9db459ce
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/dialtacts_activity.xml | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/res/layout/dialtacts_activity.xml b/res/layout/dialtacts_activity.xml index 782d4f310..bd7c09186 100644 --- a/res/layout/dialtacts_activity.xml +++ b/res/layout/dialtacts_activity.xml @@ -38,25 +38,34 @@ android:clipChildren="false" /> </FrameLayout> - <FrameLayout + <LinearLayout android:id="@+id/floating_action_button_container" android:background="@drawable/fab_blue" - android:layout_width="@dimen/floating_action_button_width" + android:layout_width="wrap_content" android:layout_height="@dimen/floating_action_button_height" android:layout_marginBottom="@dimen/floating_action_button_margin_bottom" - android:layout_gravity="center_horizontal|bottom" - app:layout_behavior="com.android.dialer.FloatingActionButtonBehavior"> + android:layout_gravity="center_horizontal|bottom"> + <!-- app:layout_behavior="com.android.dialer.FloatingActionButtonBehavior" --> <ImageButton android:id="@+id/floating_action_button" - android:background="@drawable/floating_action_button" android:layout_width="match_parent" android:layout_height="match_parent" + android:layout_gravity="bottom|left" + android:layout_weight="1" + android:background="@drawable/floating_action_button" android:contentDescription="@string/action_menu_dialpad_button" android:src="@drawable/fab_ic_dial"/> - - </FrameLayout> - + <ImageButton + android:id="@+id/dialConferenceButton" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_gravity="bottom|right" + android:layout_weight="1" + android:background="@drawable/floating_action_button" + android:contentDescription="@string/action_menu_dialpad_button" + android:src="@drawable/ic_add_group_holo_dark"/> + </LinearLayout> <!-- Host container for the contact tile drag shadow --> <FrameLayout android:id="@+id/activity_overlay" |