summaryrefslogtreecommitdiff
path: root/res/layout/dialtacts_activity.xml
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2014-04-02 16:49:38 -0700
committerYorke Lee <yorkelee@google.com>2014-04-14 17:57:27 -0700
commit86e21f733049560e77b92f17a58474312d72ec3e (patch)
treeca0923ca401f1b73f19c7e3ff30ae3478fb97886 /res/layout/dialtacts_activity.xml
parentfb8080e7627b91f25e4c13a270d2a7de8e5c609b (diff)
Add actionbar to Dialer
Initial changes to replace the fake actionbar affordances in Dialer with an actual actionBar. This puts the dialer in an intermediate hybrid state where we are now using the system actionbar for search, but the searchview is not yet themed to look like our old search bar, so this is definitely still WIP UI. This CL retains the fake action bar at the bottom of the screen to continue allowing quick access to call history while other changes are underway, but replaces the searchview and the overflow menu with framework provided actionbar functionality. Other related changes: * The searchview (in the top actionbar) is hidden when scrolling to devote the entire screen area to the speeddial list https://folio.googleplex.com/phone/L/0407/#/03.png * Functionality provided by the fake overflow menu has been moved to the real actionbar overflow menu * Various modifications to child fragments/listviews to take into account the existence of an actionbar * Cleaned up unneeded styles and related-dead code Bug: 13933082 Change-Id: Ifd855bd67af7bf2d2a403ef9556ade54e8d57ee6
Diffstat (limited to 'res/layout/dialtacts_activity.xml')
-rw-r--r--res/layout/dialtacts_activity.xml215
1 files changed, 91 insertions, 124 deletions
diff --git a/res/layout/dialtacts_activity.xml b/res/layout/dialtacts_activity.xml
index 2860886aa..2513216fc 100644
--- a/res/layout/dialtacts_activity.xml
+++ b/res/layout/dialtacts_activity.xml
@@ -15,143 +15,109 @@
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/dialtacts_mainlayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:focusable="true"
android:orientation="vertical"
+ android:focusable="true"
android:focusableInTouchMode="true"
android:clipChildren="false"
android:background="@color/background_dialer_light"
>
-
- <FrameLayout
+ <RelativeLayout
android:id="@+id/dialtacts_container"
android:layout_width="match_parent"
android:layout_height="0dp"
- android:layout_weight="1">
-
- <LinearLayout
- android:layout_width="match_parent"
+ android:layout_weight="1"
+ android:clipChildren="false">
+ <!-- The main contacts grid -->
+ <FrameLayout
android:layout_height="match_parent"
+ android:layout_width="match_parent"
+ android:id="@+id/dialtacts_frame"
android:clipChildren="false"
- android:orientation="vertical" >
-
- <!-- Search entry box and remove view -->
- <FrameLayout
+ >
+ </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"
+ >
+ <!-- TODO: This is set to visibility:gone for now, should be removed entirely -->
+ <LinearLayout
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:id="@+id/search_and_remove_view_container"
+ android:layout_height="@dimen/search_box_height"
+ android:id="@+id/search_view_container"
+ android:orientation="horizontal"
+ android:layout_marginTop="@dimen/search_top_margin"
+ android:layout_marginBottom="@dimen/search_bottom_margin"
+ android:layout_marginLeft="@dimen/search_margin_horizontal"
+ android:layout_marginRight="@dimen/search_margin_horizontal"
+ android:paddingLeft="@dimen/search_box_left_padding"
+ android:paddingRight="@dimen/search_box_right_padding"
+ android:background="@drawable/search_bg"
+ android:gravity="center_vertical"
+ android:visibility="gone"
>
- <LinearLayout
+ <EditText
+ android:id="@+id/search_view"
android:layout_width="match_parent"
- android:layout_height="@dimen/search_box_height"
- android:id="@+id/search_view_container"
- android:orientation="horizontal"
- android:layout_marginTop="@dimen/search_top_margin"
- android:layout_marginBottom="@dimen/search_bottom_margin"
- android:layout_marginLeft="@dimen/search_margin_horizontal"
- android:layout_marginRight="@dimen/search_margin_horizontal"
- android:paddingLeft="@dimen/search_box_left_padding"
- android:paddingRight="@dimen/search_box_right_padding"
- android:background="@drawable/search_bg"
- android:gravity="center_vertical"
- >
- <EditText
- android:id="@+id/search_view"
- android:layout_width="match_parent"
- android:layout_height="@dimen/search_box_icon_size"
- android:layout_weight="1"
- android:layout_marginLeft="@dimen/search_box_text_left_margin"
- android:textSize="@dimen/search_text_size"
- android:fontFamily="@string/search_font_family"
- android:textColor="@color/searchbox_text_color"
- android:textColorHint="@color/searchbox_hint_text_color"
- android:inputType="textFilter"/>
- <ImageView
- android:id="@+id/search_close_button"
- android:layout_height="@dimen/search_box_icon_size"
- android:layout_width="@dimen/search_box_icon_size"
- android:padding="6dp"
- android:src="@drawable/ic_close_dk"
- android:clickable="true"
- android:background="?android:attr/selectableItemBackground"
- android:contentDescription="@string/description_clear_search"
- android:visibility="gone" />
- <ImageView
- android:id="@+id/voice_search_button"
- android:layout_height="@dimen/search_box_icon_size"
- android:layout_width="@dimen/search_box_icon_size"
- android:padding="@dimen/search_box_icon_padding"
- android:src="@drawable/ic_voice_search"
- android:clickable="true"
- android:contentDescription="@string/description_start_voice_search"
- android:background="?android:attr/selectableItemBackground" />
- </LinearLayout>
- <com.android.dialer.list.RemoveView
- android:layout_width="match_parent"
- android:layout_height="56dp"
- android:id="@+id/remove_view_container"
- android:orientation="horizontal"
- android:gravity="center"
- 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"
- />
- </com.android.dialer.list.RemoveView>
- </FrameLayout>
-
- <!-- Relative Layout is used to contain the main contacts grid and the thin translucent
- horizontal divider line at the bottom of the contacts grid above the menu bar. -->
- <RelativeLayout android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_weight="1"
- android:clipChildren="false"
- >
- <!-- The main contacts grid -->
- <FrameLayout
- android:layout_height="match_parent"
- android:layout_width="match_parent"
- android:id="@+id/dialtacts_frame"
- android:clipChildren="false"
- android:layout_alignParentBottom="true"
- android:layout_alignParentTop="true"
- android:layout_alignParentLeft="true"
- android:layout_alignParentRight="true"
- >
- </FrameLayout>
- <!-- Thin translucent horizontal line at the bottom of the contacts grid. Floats
- above the contacts grid and has a translucent color. -->
- <View
- android:layout_height="2dp"
- android:layout_width="match_parent"
- android:background="@color/contacts_grid_bottom_border_color"
- android:layout_alignParentBottom="true"
- android:layout_alignParentLeft="true"
- android:layout_alignParentRight="true"
- />
- </RelativeLayout>
- <Space
- android:id="@+id/contact_tile_frame_spacer"
- android:layout_height="wrap_content"
+ android:layout_height="@dimen/search_box_icon_size"
+ android:layout_weight="1"
+ android:layout_marginLeft="@dimen/search_box_text_left_margin"
+ android:textSize="@dimen/search_text_size"
+ android:fontFamily="@string/search_font_family"
+ android:textColor="@color/searchbox_text_color"
+ android:textColorHint="@color/searchbox_hint_text_color"
+ android:inputType="textFilter"/>
+ <ImageView
+ android:id="@+id/search_close_button"
+ android:layout_height="@dimen/search_box_icon_size"
+ android:layout_width="@dimen/search_box_icon_size"
+ android:padding="6dp"
+ android:src="@drawable/ic_close_dk"
+ android:clickable="true"
+ android:background="?android:attr/selectableItemBackground"
+ android:contentDescription="@string/description_clear_search"
+ android:visibility="gone" />
+ <ImageView
+ android:id="@+id/voice_search_button"
+ android:layout_height="@dimen/search_box_icon_size"
+ android:layout_width="@dimen/search_box_icon_size"
+ android:padding="@dimen/search_box_icon_padding"
+ android:src="@drawable/ic_voice_search"
+ android:clickable="true"
+ android:contentDescription="@string/description_start_voice_search"
+ android:background="?android:attr/selectableItemBackground" />
+ </LinearLayout>
+ <com.android.dialer.list.RemoveView
android:layout_width="match_parent"
- android:layout_alignParentBottom="true"
- android:visibility="gone"/>
- </LinearLayout>
- </FrameLayout>
-
- <!-- Fake action bar -->
+ android:layout_height="56dp"
+ android:id="@+id/remove_view_container"
+ android:orientation="horizontal"
+ android:gravity="center">
+ <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"
+ />
+ </com.android.dialer.list.RemoveView>
+ </FrameLayout>
+ </RelativeLayout>
+ <!-- TODO: To be removed entirely and replaced with a floating action button -->
<FrameLayout
android:layout_height="@dimen/fake_action_bar_height"
android:layout_width="match_parent"
@@ -175,18 +141,19 @@
android:src="@drawable/ic_menu_dialpad_lt"/>
<ImageButton
android:id="@+id/dial_button"
- android:layout_width="@dimen/fake_menu_button_min_width"
- android:layout_height="match_parent"
+ android:layout_width="@dimen/fake_action_bar_height"
+ android:layout_height="@dimen/fake_action_bar_height"
android:layout_gravity="bottom|center"
android:background="@drawable/btn_call"
android:contentDescription="@string/description_dial_button"
android:src="@drawable/ic_dial_action_call"
android:visibility="gone" />
<ImageButton
- android:id="@+id/overflow_menu"
+ android:id="@+id/overflow_menu_button"
android:layout_width="@dimen/fake_menu_button_min_width"
android:layout_height="match_parent"
android:layout_gravity="bottom|end"
+ android:visibility="gone"
android:src="@drawable/ic_menu_overflow_lt"
android:contentDescription="@string/action_menu_overflow_description"
android:background="?android:attr/selectableItemBackground"/>