diff options
Diffstat (limited to 'java/com/android/dialer/main/impl/res')
4 files changed, 22 insertions, 6 deletions
diff --git a/java/com/android/dialer/main/impl/res/layout/bottom_nav_item.xml b/java/com/android/dialer/main/impl/res/layout/bottom_nav_item.xml index 28ad964dd..f9f2b6102 100644 --- a/java/com/android/dialer/main/impl/res/layout/bottom_nav_item.xml +++ b/java/com/android/dialer/main/impl/res/layout/bottom_nav_item.xml @@ -37,5 +37,6 @@ android:id="@+id/bottom_nav_item_text" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textSize="12sp"/> + android:textSize="12sp" + android:gravity="center_horizontal"/> </com.android.dialer.main.impl.BottomNavItem>
\ No newline at end of file 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 31ff19dd3..0b0652af5 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 @@ -21,10 +21,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - <include - android:id="@+id/toolbar" - layout="@layout/toolbar_layout"/> - + <!-- Holds SpeedDial, Call Log, Contacts and Voicemail fragments --> <FrameLayout android:id="@+id/fragment_container" android:layout_width="match_parent" @@ -32,14 +29,26 @@ android:layout_below="@+id/toolbar" android:layout_above="@+id/bottom_nav_bar"/> + <!-- BottomNavBar --> <include android:id="@+id/bottom_nav_bar" layout="@layout/bottom_nav_bar_layout" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_gravity="bottom" android:layout_alignParentBottom="true"/> + <!-- Holds search and dialpad fragments --> + <FrameLayout + android:id="@+id/search_fragment_container" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_below="@+id/toolbar"/> + + <!-- MainToolbar --> + <include + android:id="@+id/toolbar" + layout="@layout/toolbar_layout"/> + <android.support.design.widget.FloatingActionButton android:id="@+id/fab" android:layout_width="wrap_content" diff --git a/java/com/android/dialer/main/impl/res/values/strings.xml b/java/com/android/dialer/main/impl/res/values/strings.xml index ff136e877..f530fa2bf 100644 --- a/java/com/android/dialer/main/impl/res/values/strings.xml +++ b/java/com/android/dialer/main/impl/res/values/strings.xml @@ -22,6 +22,9 @@ TODO(38502365): Remove this once we're ready to launch the new UI. --> <string name="nui_shortcut_name">Phone NUI</string> + <!-- Title for the activity that dials the phone, when launched directly into the dialpad --> + <string name="dialpad_activity_title">Phone Keypad</string> + <!-- The description text for the call log tab. --> <string name="main_call_history_tab_description" tools:ignore="UnusedResources">Call history</string> diff --git a/java/com/android/dialer/main/impl/res/values/styles.xml b/java/com/android/dialer/main/impl/res/values/styles.xml index f94897a8b..26f880dc4 100644 --- a/java/com/android/dialer/main/impl/res/values/styles.xml +++ b/java/com/android/dialer/main/impl/res/values/styles.xml @@ -19,5 +19,8 @@ <item name="android:colorPrimary">@color/dialtacts_theme_color</item> <item name="android:colorPrimaryDark">@color/dialer_theme_color_dark</item> <item name="android:colorAccent">@color/dialer_secondary_color</item> + + <!-- Theme needed for DialpadFragment --> + <item name="dialpad_style">@style/Dialpad.Light</item> </style> </resources> |