diff options
Diffstat (limited to 'java/com/android/dialer/main/impl/res')
3 files changed, 2 insertions, 52 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 969bbe413..31ff19dd3 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,14 +21,9 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - <android.support.v7.widget.Toolbar + <include android:id="@+id/toolbar" - android:layout_height="wrap_content" - android:layout_width="match_parent" - android:minHeight="?attr/actionBarSize" - android:background="@color/dialer_theme_color" - app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" - app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/> + layout="@layout/toolbar_layout"/> <FrameLayout android:id="@+id/fragment_container" 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 deleted file mode 100644 index 08d711eb1..000000000 --- a/java/com/android/dialer/main/impl/res/menu/main_menu.xml +++ /dev/null @@ -1,40 +0,0 @@ -<?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 - --> -<menu xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto"> - <item - android:id="@+id/search" - android:icon="@drawable/quantum_ic_search_white_24" - android:title="@string/search" - android:contentDescription="@string/description_search" - app:showAsAction="always"/> - - <item - android:id="@+id/call_history" - android:title="@string/tab_title_call_history" - app:showAsAction="collapseActionView"/> - - <item - android:id="@+id/settings" - android:title="@string/settings" - app:showAsAction="collapseActionView"/> - - <item - android:id="@+id/feedback" - android:title="@string/main_send_feedback" - app:showAsAction="collapseActionView"/> -</menu>
\ No newline at end of file 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 abf44ddae..ff136e877 100644 --- a/java/com/android/dialer/main/impl/res/values/strings.xml +++ b/java/com/android/dialer/main/impl/res/values/strings.xml @@ -43,9 +43,4 @@ <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> - <!-- Send feedback about the app [CHAR LIMIT=20] --> - <string name="main_send_feedback">Send feedback</string> </resources> |