diff options
| author | Jin Cao <jinyan@google.com> | 2014-09-23 21:27:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-23 21:27:37 +0000 |
| commit | 7db2dd23b4b0f90d5784a5d353afbf37118dfd16 (patch) | |
| tree | 1af749af492a10c9611fa22c58d362349a6e5e14 /res | |
| parent | 9b5ad858ecaf3339670cf5b2a5870a08807a284c (diff) | |
| parent | f7720cb61d0e10b94dd048bf1f486898cd0d23f1 (diff) | |
| download | android_packages_apps_UnifiedEmail-7db2dd23b4b0f90d5784a5d353afbf37118dfd16.tar.gz android_packages_apps_UnifiedEmail-7db2dd23b4b0f90d5784a5d353afbf37118dfd16.tar.bz2 android_packages_apps_UnifiedEmail-7db2dd23b4b0f90d5784a5d353afbf37118dfd16.zip | |
Merge "Move FAB inside TL in 2-pane layout" into ub-gmail-ur14-dev
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout-sw600dp/floating_actions.xml | 93 | ||||
| -rw-r--r-- | res/layout/two_pane_activity.xml | 12 |
2 files changed, 49 insertions, 56 deletions
diff --git a/res/layout-sw600dp/floating_actions.xml b/res/layout-sw600dp/floating_actions.xml index 0a6cb450b..61d1b8a22 100644 --- a/res/layout-sw600dp/floating_actions.xml +++ b/res/layout-sw600dp/floating_actions.xml @@ -15,64 +15,47 @@ See the License for the specific language governing permissions and limitations under the License. --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" +<com.android.mail.ui.ActionableToastBar + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/toast_bar" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="bottom"> - - <com.android.mail.ui.ActionableToastBar - android:id="@+id/toast_bar" + android:layout_gravity="bottom" + android:layout_marginLeft="@dimen/floating_action_bar_margin" + android:layout_marginRight="@dimen/floating_action_bar_margin" + android:layout_marginBottom="@dimen/floating_action_bar_margin" + android:background="@drawable/snack_bar_edge_tablet" + android:clickable="true" + android:visibility="gone"> + + <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="bottom" - android:layout_marginLeft="@dimen/floating_action_bar_margin" - android:layout_marginRight="@dimen/floating_action_bar_margin" - android:layout_marginBottom="@dimen/floating_action_bar_margin" - android:background="@drawable/snack_bar_edge_tablet" - android:clickable="true" - android:visibility="gone"> + android:orientation="horizontal"> - <LinearLayout + <TextView + android:id="@+id/description_text" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:orientation="horizontal"> - - <TextView - android:id="@+id/description_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:layout_marginLeft="@dimen/snack_bar_margin_horizontal" - android:layout_marginRight="@dimen/snack_bar_margin_horizontal" - android:minWidth="240dp" - android:maxWidth="350dp" - android:paddingTop="@dimen/snack_bar_margin_vertical" - android:paddingBottom="@dimen/snack_bar_margin_vertical" - android:textColor="@android:color/white" /> - - <TextView - android:id="@+id/action_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:paddingTop="@dimen/snack_bar_margin_vertical" - android:paddingBottom="@dimen/snack_bar_margin_vertical" - android:textAllCaps="true" - android:textColor="@color/snack_bar_action_text_color" - style="@style/SnackBarActionTextStyle" /> - </LinearLayout> - - </com.android.mail.ui.ActionableToastBar> - - <Space - android:layout_width="0dp" - android:layout_height="match_parent" - android:layout_weight="1" /> - - <ImageButton - android:id="@+id/compose_button" - android:contentDescription="@string/compose" - android:focusable="false" - style="@style/FloatingActionButtonStyle" /> - -</LinearLayout> + android:layout_gravity="center_vertical" + android:layout_marginLeft="@dimen/snack_bar_margin_horizontal" + android:layout_marginRight="@dimen/snack_bar_margin_horizontal" + android:minWidth="240dp" + android:maxWidth="350dp" + android:paddingTop="@dimen/snack_bar_margin_vertical" + android:paddingBottom="@dimen/snack_bar_margin_vertical" + android:textColor="@android:color/white" /> + + <TextView + android:id="@+id/action_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:paddingTop="@dimen/snack_bar_margin_vertical" + android:paddingBottom="@dimen/snack_bar_margin_vertical" + android:textAllCaps="true" + android:textColor="@color/snack_bar_action_text_color" + style="@style/SnackBarActionTextStyle" /> + </LinearLayout> + +</com.android.mail.ui.ActionableToastBar> diff --git a/res/layout/two_pane_activity.xml b/res/layout/two_pane_activity.xml index a2ca3b6a8..5b525e3fb 100644 --- a/res/layout/two_pane_activity.xml +++ b/res/layout/two_pane_activity.xml @@ -52,7 +52,17 @@ android:id="@+id/conversation_list_pane" android:layout_width="0dp" android:layout_height="match_parent" - android:layout_gravity="left" /> + android:layout_gravity="left" > + <FrameLayout + android:id="@+id/conversation_list_place_holder" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + <ImageButton + android:id="@+id/compose_button" + android:layout_gravity="end|bottom" + android:contentDescription="@string/compose" + style="@style/FloatingActionButtonStyle" /> + </FrameLayout> <com.android.mail.ui.ConversationViewFrame android:id="@+id/conversation_pane" |