diff options
| author | calderwoodra <calderwoodra@google.com> | 2018-01-17 13:17:27 -0800 |
|---|---|---|
| committer | Copybara-Service <copybara-piper@google.com> | 2018-01-17 14:39:41 -0800 |
| commit | 70a4b0929d8223ef0dc55b0f1b3790a892bb9043 (patch) | |
| tree | 4fafd44bbd24acef6860687043bd33fdf60f1f51 /java/com/android/dialer/main/impl/res | |
| parent | c1717ac3a92016cdfc80b5e61413ecfc41b45298 (diff) | |
Updated toolbar and dialpad interactions in NUI.
Toolbar, Dialpad, Bottom Nav, FAB and Search now all show
and hide properly according to the state of the application.
Follow up CLs will include:
- saving/restoring state
- sending query to search fragment to display results
Bug: 181512198
Test: MainActivityIntegrationTest
PiperOrigin-RevId: 182259200
Change-Id: I1309d8df2a5425bf051e52a459a1f78e1157fe08
Diffstat (limited to 'java/com/android/dialer/main/impl/res')
| -rw-r--r-- | java/com/android/dialer/main/impl/res/layout/main_activity.xml | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/java/com/android/dialer/main/impl/res/layout/main_activity.xml b/java/com/android/dialer/main/impl/res/layout/main_activity.xml index 0b0652af5..eb0d45e57 100644 --- a/java/com/android/dialer/main/impl/res/layout/main_activity.xml +++ b/java/com/android/dialer/main/impl/res/layout/main_activity.xml @@ -37,13 +37,20 @@ android:layout_height="wrap_content" android:layout_alignParentBottom="true"/> - <!-- Holds search and dialpad fragments --> + <!-- Holds search fragment --> <FrameLayout android:id="@+id/search_fragment_container" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_below="@+id/toolbar"/> + <!-- Holds Dialpad fragment --> + <FrameLayout + android:id="@+id/dialpad_fragment_container" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:elevation="10dp"/> + <!-- MainToolbar --> <include android:id="@+id/toolbar" |