diff options
Diffstat (limited to 'java/com/android/dialer/main/impl/res')
7 files changed, 146 insertions, 54 deletions
diff --git a/java/com/android/dialer/main/impl/res/layout/bottom_nav_bar_layout.xml b/java/com/android/dialer/main/impl/res/layout/bottom_nav_bar_layout.xml new file mode 100644 index 000000000..67c1a20df --- /dev/null +++ b/java/com/android/dialer/main/impl/res/layout/bottom_nav_bar_layout.xml @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2018 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License + --> +<com.android.dialer.main.impl.BottomNavBar + xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="horizontal" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@color/dialer_theme_color" + android:elevation="8dp"> + + <include + android:id="@+id/speed_dial_tab" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + layout="@layout/bottom_nav_item"/> + + <include + android:id="@+id/call_log_tab" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + layout="@layout/bottom_nav_item"/> + + <include + android:id="@+id/contacts_tab" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + layout="@layout/bottom_nav_item"/> + + <include + android:id="@+id/voicemail_tab" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + layout="@layout/bottom_nav_item"/> +</com.android.dialer.main.impl.BottomNavBar>
\ No newline at end of file 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 new file mode 100644 index 000000000..28ad964dd --- /dev/null +++ b/java/com/android/dialer/main/impl/res/layout/bottom_nav_item.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2018 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License + --> +<com.android.dialer.main.impl.BottomNavItem + xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:minWidth="80dp" + android:paddingTop="8dp" + android:paddingBottom="10dp" + android:paddingStart="12dp" + android:paddingEnd="12dp" + android:gravity="center" + android:background="?android:selectableItemBackgroundBorderless"> + + <ImageView + android:id="@+id/bottom_nav_item_image" + android:layout_width="24dp" + android:layout_height="24dp" + android:layout_marginBottom="6dp"/> + + <TextView + android:id="@+id/bottom_nav_item_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textSize="12sp"/> +</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 73b2eae33..969bbe413 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 @@ -14,55 +14,44 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License --> -<FrameLayout +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" - android:id="@+id/container" + android:id="@+id/root_layout" android:layout_width="match_parent" android:layout_height="match_parent"> - <TextView + <android.support.v7.widget.Toolbar + android:id="@+id/toolbar" + android:layout_height="wrap_content" android:layout_width="match_parent" - android:layout_height="match_parent" - android:textColor="@android:color/secondary_text_dark_nodisable"/> + android:minHeight="?attr/actionBarSize" + android:background="@color/dialer_theme_color" + app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" + app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/> - <android.support.design.widget.CoordinatorLayout + <FrameLayout + android:id="@+id/fragment_container" android:layout_width="match_parent" - android:layout_height="match_parent"> - - <android.support.design.widget.AppBarLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:theme="@style/AppBarTheme"> - - <android.support.v7.widget.Toolbar - android:id="@+id/toolbar" - android:layout_height="wrap_content" - android:layout_width="match_parent" - android:background="?android:attr/colorPrimary"/> - - <android.support.design.widget.TabLayout - android:id="@+id/tab_layout" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="?android:attr/colorPrimary" - app:tabIndicatorColor="?android:attr/colorAccent" - app:layout_scrollFlags="enterAlwaysCollapsed"/> - </android.support.design.widget.AppBarLayout> + android:layout_height="match_parent" + android:layout_below="@+id/toolbar" + android:layout_above="@+id/bottom_nav_bar"/> - <android.support.v4.view.ViewPager - android:id="@+id/pager" - android:layout_width="match_parent" - android:layout_height="match_parent" - app:layout_behavior="@string/appbar_scrolling_view_behavior"/> + <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"/> - <android.support.design.widget.FloatingActionButton - android:id="@+id/fab" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="bottom|end" - android:layout_margin="16dp" - android:src="@drawable/quantum_ic_dialpad_white_24" - app:backgroundTint="?android:attr/colorAccent"/> - </android.support.design.widget.CoordinatorLayout> -</FrameLayout>
\ No newline at end of file + <android.support.design.widget.FloatingActionButton + android:id="@+id/fab" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_above="@+id/bottom_nav_bar" + android:layout_alignParentEnd="true" + android:layout_margin="16dp" + android:src="@drawable/quantum_ic_dialpad_white_24" + app:backgroundTint="?android:attr/colorAccent"/> +</RelativeLayout>
\ No newline at end of file diff --git a/java/com/android/dialer/main/impl/res/menu/main_menu.xml b/java/com/android/dialer/main/impl/res/menu/main_menu.xml index 09bcbf823..08d711eb1 100644 --- a/java/com/android/dialer/main/impl/res/menu/main_menu.xml +++ b/java/com/android/dialer/main/impl/res/menu/main_menu.xml @@ -24,13 +24,6 @@ app:showAsAction="always"/> <item - android:id="@+id/contacts" - android:icon="@drawable/quantum_ic_person_white_24" - android:title="@string/contacts" - android:contentDescription="@string/description_contacts" - app:showAsAction="always"/> - - <item android:id="@+id/call_history" android:title="@string/tab_title_call_history" app:showAsAction="collapseActionView"/> diff --git a/java/com/android/dialer/main/impl/res/values/colors.xml b/java/com/android/dialer/main/impl/res/values/colors.xml new file mode 100644 index 000000000..3d348653c --- /dev/null +++ b/java/com/android/dialer/main/impl/res/values/colors.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2017 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License + --> +<resources> + <color name="bottom_nav_icon_selected">#FFFFFF</color> + <color name="bottom_nav_icon_deselected">#B2FFFFFF</color> +</resources> 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 d3eb6d73e..abf44ddae 100644 --- a/java/com/android/dialer/main/impl/res/values/strings.xml +++ b/java/com/android/dialer/main/impl/res/values/strings.xml @@ -41,6 +41,8 @@ <string name="tab_title_speed_dial">Speed Dial</string> <!-- Tab text to show users their voicemails [CHAR LIMIT=10] --> <string name="tab_title_voicemail">Voicemail</string> + <!-- Tab text to show users their contacts [CHAR LIMIT=10] --> + <string name="tab_title_contacts">Contacts</string> <!-- Show users their settings [CHAR LIMIT=20] --> <string name="settings">Settings</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 38c50081b..f94897a8b 100644 --- a/java/com/android/dialer/main/impl/res/values/styles.xml +++ b/java/com/android/dialer/main/impl/res/values/styles.xml @@ -20,9 +20,4 @@ <item name="android:colorPrimaryDark">@color/dialer_theme_color_dark</item> <item name="android:colorAccent">@color/dialer_secondary_color</item> </style> - - <style name="AppBarTheme" parent="Theme.AppCompat"> - <item name="android:colorPrimary">@color/dialtacts_theme_color</item> - <item name="android:colorAccent">@color/dialer_secondary_color</item> - </style> </resources> |