diff options
| author | Eric Erfanian <erfanian@google.com> | 2017-03-20 20:40:36 +0000 |
|---|---|---|
| committer | Eric Erfanian <erfanian@google.com> | 2017-03-20 20:40:36 +0000 |
| commit | 30ccc4f3aa6da94f0bb8a01a880a6353b883b263 (patch) | |
| tree | 2f55365aaf87df9ba7c1fe0be56a7d0988eadf30 /java/com/android/dialer/app/res/layout-land | |
| parent | 06b6b56e9eaa91ebf757ea641e38a9c885fa40bd (diff) | |
Revert "Update AOSP Dialer source from internal google3 repository at cl/150622237"
This reverts commit 06b6b56e9eaa91ebf757ea641e38a9c885fa40bd.
Change-Id: Ida8c5ee67669524dc63b9adc60a6dd392cb9b9a6
Diffstat (limited to 'java/com/android/dialer/app/res/layout-land')
| -rw-r--r-- | java/com/android/dialer/app/res/layout-land/dialpad_fragment.xml | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/java/com/android/dialer/app/res/layout-land/dialpad_fragment.xml b/java/com/android/dialer/app/res/layout-land/dialpad_fragment.xml index 45ef933cb..8d8236a43 100644 --- a/java/com/android/dialer/app/res/layout-land/dialpad_fragment.xml +++ b/java/com/android/dialer/app/res/layout-land/dialpad_fragment.xml @@ -14,10 +14,9 @@ limitations under the License. --> <view xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - class="com.android.dialer.app.dialpad.DialpadFragment$DialpadSlidingRelativeLayout" - android:layout_width="match_parent" - android:layout_height="wrap_content"> + class="com.android.dialer.app.dialpad.DialpadFragment$DialpadSlidingRelativeLayout" + android:layout_width="match_parent" + android:layout_height="wrap_content"> <LinearLayout android:layout_width="match_parent" @@ -67,16 +66,25 @@ android:layout_height="@dimen/floating_action_button_margin_bottom" android:layout_alignParentBottom="true"/> - <android.support.design.widget.FloatingActionButton + <FrameLayout + android:id="@+id/dialpad_floating_action_button_container" + android:layout_width="@dimen/floating_action_button_width" + android:layout_height="@dimen/floating_action_button_height" + android:layout_above="@id/dialpad_floating_action_button_margin_bottom" + android:layout_centerHorizontal="true" + android:background="@drawable/fab_green"> + + <ImageButton android:id="@+id/dialpad_floating_action_button" - android:layout_width="@dimen/floating_action_button_width" - android:layout_height="@dimen/floating_action_button_height" - android:layout_above="@id/dialpad_floating_action_button_margin_bottom" - android:layout_centerHorizontal="true" - android:src="@drawable/quantum_ic_call_white_24" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@drawable/floating_action_button" android:contentDescription="@string/description_dial_button" - app:elevation="@dimen/floating_action_button_translation_z" - app:backgroundTint="@color/dialpad_fab_green"/> + android:src="@drawable/fab_ic_call"/> + + </FrameLayout> + </RelativeLayout> + </LinearLayout> </view> |