diff options
author | Andrew Lee <anwlee@google.com> | 2014-06-10 17:07:54 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-10 17:07:54 +0000 |
commit | 469e9df00dab07ce3f810d3ffa9a3261f1b71b52 (patch) | |
tree | d6ec83d816932587accdcd929f8cad768015f4fc /res/layout | |
parent | e69850453ec566cee019b098c60a28b61a49e090 (diff) | |
parent | 1896344b53ddf6cdaf17dc02a05c45f587879d99 (diff) |
Merge "Revise remove view target positioning." into lmp-preview-dev
Diffstat (limited to 'res/layout')
-rw-r--r-- | res/layout/dialtacts_activity.xml | 43 | ||||
-rw-r--r-- | res/layout/lists_fragment.xml | 86 |
2 files changed, 68 insertions, 61 deletions
diff --git a/res/layout/dialtacts_activity.xml b/res/layout/dialtacts_activity.xml index c7a788da8..71e58cb48 100644 --- a/res/layout/dialtacts_activity.xml +++ b/res/layout/dialtacts_activity.xml @@ -35,49 +35,8 @@ android:layout_height="match_parent" android:layout_width="match_parent" android:id="@+id/dialtacts_frame" - android:clipChildren="false" - > - </FrameLayout> - <!-- Search entry box and remove view --> - <FrameLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:id="@+id/search_and_remove_view_container" - android:visibility="gone" - > - </FrameLayout> + android:clipChildren="false" /> </RelativeLayout> - <com.android.dialer.list.RemoveView - android:layout_width="match_parent" - android:layout_height="56dp" - android:id="@+id/remove_view" - android:layout_alignParentTop="true" - > - <LinearLayout - android:id="@+id/remove_view_container" - android:layout_height="match_parent" - android:layout_width="match_parent" - android:gravity="center" - android:orientation="horizontal" - android:visibility="gone" > - <ImageView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:id="@+id/remove_view_icon" - android:src="@drawable/ic_remove" - android:contentDescription="@string/remove_contact" - /> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:id="@+id/remove_view_text" - android:textSize="@dimen/remove_text_size" - android:textColor="@color/remove_text_color" - android:text="@string/remove_contact" - /> - </LinearLayout> - </com.android.dialer.list.RemoveView > <FrameLayout android:id="@+id/floating_action_button_container" android:layout_width="@dimen/floating_action_button_width" diff --git a/res/layout/lists_fragment.xml b/res/layout/lists_fragment.xml index 02dcbe3a0..1de8364b7 100644 --- a/res/layout/lists_fragment.xml +++ b/res/layout/lists_fragment.xml @@ -16,10 +16,11 @@ <com.android.dialer.widget.OverlappingPaneLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/lists_frame" android:layout_width="match_parent" android:layout_height="match_parent" - android:animateLayoutChanges="true" - android:id="@+id/lists_frame"> + android:animateLayoutChanges="true" > + <ListView android:id="@+id/shortcut_card_list" android:layout_width="match_parent" @@ -29,24 +30,71 @@ android:clipToPadding="false" android:fadingEdge="none" android:divider="@null" /> - <LinearLayout + + <FrameLayout android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> - <com.android.dialer.list.ViewPagerTabs - android:id="@+id/lists_pager_header" + android:layout_height="match_parent"> + + <LinearLayout android:layout_width="match_parent" - android:layout_height="@dimen/tab_height" - android:textAllCaps="true" - android:orientation="horizontal" - android:layout_gravity="top" - android:elevation="@dimen/tab_elevation" - style="@style/DialtactsActionBarTabTextStyle" /> - <android.support.v4.view.ViewPager - android:id="@+id/lists_pager" + android:layout_height="match_parent" + android:orientation="vertical"> + + <com.android.dialer.list.ViewPagerTabs + android:id="@+id/lists_pager_header" + android:layout_width="match_parent" + android:layout_height="@dimen/tab_height" + android:textAllCaps="true" + android:orientation="horizontal" + android:layout_gravity="top" + android:elevation="@dimen/tab_elevation" + style="@style/DialtactsActionBarTabTextStyle" /> + + <android.support.v4.view.ViewPager + android:id="@+id/lists_pager" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1" /> + + </LinearLayout> + + <com.android.dialer.list.RemoveView + android:id="@+id/remove_view" android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="1"> - </android.support.v4.view.ViewPager> - </LinearLayout> + android:layout_height="@dimen/tab_height" + android:layout_alignParentTop="true" > + + <LinearLayout + android:id="@+id/remove_view_content" + android:layout_height="match_parent" + android:layout_width="match_parent" + android:background="@color/actionbar_background_color" + android:gravity="center" + android:orientation="horizontal" + android:visibility="gone" > + + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:layout_marginBottom="8dp" + android:id="@+id/remove_view_icon" + android:src="@drawable/ic_remove" + android:contentDescription="@string/remove_contact" + android:tint="@color/remove_text_color" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:id="@+id/remove_view_text" + android:textSize="@dimen/remove_text_size" + android:textColor="@color/remove_text_color" + android:text="@string/remove_contact" /> + + </LinearLayout> + + </com.android.dialer.list.RemoveView > + + </FrameLayout> + </com.android.dialer.widget.OverlappingPaneLayout> |