diff options
author | Andrew Lee <anwlee@google.com> | 2015-03-06 12:06:31 -0800 |
---|---|---|
committer | Andrew Lee <anwlee@google.com> | 2015-03-06 14:30:43 -0800 |
commit | dc500de99ccb42393d6dae3ecf4748b560775019 (patch) | |
tree | 420e9d38af0462a58e37590ed9c203dd350fbc98 /res | |
parent | 8321e39655e1586c752dcd3622aba3d04e5576a7 (diff) |
Remove OverlappingPaneLayout.
- Remove the OverlappingPaneLayout, which is no longer needed
since the recents card has been removed.
- Known Issue: SearchBar is no longer hidden on scroll.
- Known Issue: shouldShowActionBar does not return correct value.
I plan to fix these KIs in a follow up CL, but going for incremental
changes for now to try to keep it apparent what is being done.
Bug: 19372817
Change-Id: I9ae1ca19820c87f252863074a5bcab6923b03558
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/lists_fragment.xml | 127 |
1 files changed, 61 insertions, 66 deletions
diff --git a/res/layout/lists_fragment.xml b/res/layout/lists_fragment.xml index 26f62c7d8..98a1422c0 100644 --- a/res/layout/lists_fragment.xml +++ b/res/layout/lists_fragment.xml @@ -14,84 +14,79 @@ limitations under the License. --> -<com.android.dialer.widget.OverlappingPaneLayout +<FrameLayout 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" > - <!-- TODO: Apply background color to ActionBar instead of a FrameLayout. For now, this is the - easiest way to preserve correct pane scrolling and searchbar collapse/expand behaviors. --> - <FrameLayout + <LinearLayout android:layout_width="match_parent" - android:layout_height="@dimen/action_bar_height_large" - android:background="@color/actionbar_background_color" /> + android:layout_height="match_parent" + android:orientation="vertical"> - <FrameLayout + <!-- TODO: Apply background color to ActionBar instead of a FrameLayout. For now, this is + the easiest way to preserve correct pane scrolling and searchbar collapse/expand + behaviors. --> + <FrameLayout + android:layout_width="match_parent" + android:layout_height="@dimen/action_bar_height_large" + android:background="@color/actionbar_background_color" /> + + <com.android.contacts.common.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="match_parent"> + android:layout_height="@dimen/tab_height" + android:layout_alignParentTop="true" > <LinearLayout - android:layout_width="match_parent" + android:id="@+id/remove_view_content" android:layout_height="match_parent" - android:orientation="vertical"> - - <com.android.contacts.common.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" /> + 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 - android:id="@+id/remove_view" - android:layout_width="match_parent" - 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> + </com.android.dialer.list.RemoveView > + +</FrameLayout> |