diff options
author | calderwoodra <calderwoodra@google.com> | 2018-01-10 13:51:31 -0800 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-01-10 15:24:35 -0800 |
commit | 065c9a4138c613801abd3ece8d7a276332fc8eb1 (patch) | |
tree | 21f051a205fdbc3ce337f2863719dd98dd59ea85 /java/com/android/dialer/main/impl/toolbar/res/layout | |
parent | 9810e261e0f52ebd5948a9efe9317fed0d19f664 (diff) |
Added Search Bar to NUI.
This change only adds the views but doesn't implement any logic
or functionality. That will come in a future CL. A decision was
made here about whether to create a new search bar or reuse the
old one. I opted to make a new one to avoid breaking the old one
while it's still being used.
Bug: 64655802
Test: n/a
PiperOrigin-RevId: 181512198
Change-Id: Ib377b1d99f4eb8100204ac9a110dc5899bced392
Diffstat (limited to 'java/com/android/dialer/main/impl/toolbar/res/layout')
-rw-r--r-- | java/com/android/dialer/main/impl/toolbar/res/layout/expanded_search_bar.xml | 62 | ||||
-rw-r--r-- | java/com/android/dialer/main/impl/toolbar/res/layout/toolbar_layout.xml | 96 |
2 files changed, 158 insertions, 0 deletions
diff --git a/java/com/android/dialer/main/impl/toolbar/res/layout/expanded_search_bar.xml b/java/com/android/dialer/main/impl/toolbar/res/layout/expanded_search_bar.xml new file mode 100644 index 000000000..f814a766d --- /dev/null +++ b/java/com/android/dialer/main/impl/toolbar/res/layout/expanded_search_bar.xml @@ -0,0 +1,62 @@ +<?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. +--> +<RelativeLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/search_box_expanded" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:visibility="gone"> + + <ImageButton + android:id="@+id/search_back_button" + android:layout_width="48dp" + android:layout_height="48dp" + android:layout_marginStart="16dp" + android:layout_centerVertical="true" + android:background="?attr/selectableItemBackgroundBorderless" + android:contentDescription="@string/action_menu_back_from_search" + android:src="@drawable/quantum_ic_arrow_back_vd_theme_24" + android:tint="@color/dialer_theme_color"/> + + <EditText + android:id="@+id/search_view" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_toEndOf="@+id/search_back_button" + android:layout_toStartOf="@+id/search_close_button" + android:layout_centerVertical="true" + android:layout_marginStart="8dp" + android:background="@null" + android:imeOptions="flagNoExtractUi" + android:inputType="textFilter" + android:maxLines="1" + android:textColor="@color/dialer_secondary_text_color" + android:textColorHint="@color/dialer_edit_text_hint_color" + android:textCursorDrawable="@drawable/custom_cursor" + android:textSize="16sp"/> + + <ImageView + android:id="@+id/search_close_button" + android:layout_width="48dp" + android:layout_height="48dp" + android:layout_alignParentEnd="true" + android:layout_centerVertical="true" + android:scaleType="center" + android:background="?attr/selectableItemBackgroundBorderless" + android:contentDescription="@string/description_clear_search" + android:src="@drawable/quantum_ic_close_vd_theme_24" + android:tint="@color/dialer_secondary_text_color"/> +</RelativeLayout>
\ No newline at end of file diff --git a/java/com/android/dialer/main/impl/toolbar/res/layout/toolbar_layout.xml b/java/com/android/dialer/main/impl/toolbar/res/layout/toolbar_layout.xml new file mode 100644 index 000000000..27b37e80f --- /dev/null +++ b/java/com/android/dialer/main/impl/toolbar/res/layout/toolbar_layout.xml @@ -0,0 +1,96 @@ +<?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.toolbar.MainToolbar + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:id="@+id/toolbar" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="?attr/actionBarSize" + android:background="@color/dialer_theme_color" + app:contentInsetStart="0dp" + app:contentInsetEnd="0dp" + app:theme="@style/ThemeOverlay.AppCompat.Light"> + + <com.android.dialer.main.impl.toolbar.SearchBarView + android:id="@+id/search_view_container" + android:layout_width="match_parent" + android:layout_height="48dp" + android:layout_marginStart="8dp" + android:layout_marginTop="8dp" + android:layout_marginBottom="8dp" + android:layout_marginEnd="8dp" + android:background="@drawable/rounded_corner" + android:elevation="4dp" + android:theme="@style/Theme.AppCompat.Light"> + + <RelativeLayout + android:id="@+id/search_box_collapsed" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="?android:selectableItemBackground" + android:gravity="center_vertical"> + + <ImageView + android:id="@+id/search_magnifying_glass" + android:layout_width="48dp" + android:layout_height="48dp" + android:layout_marginStart="8dp" + android:layout_centerVertical="true" + android:importantForAccessibility="no" + android:scaleType="center" + android:src="@drawable/quantum_ic_search_vd_theme_24" + android:tint="@color/dialer_secondary_text_color"/> + + <TextView + android:id="@+id/search_box_start_search" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_toEndOf="@+id/search_magnifying_glass" + android:layout_toStartOf="@+id/voice_search_button" + android:layout_marginStart="8dp" + android:fontFamily="sans-serif" + android:gravity="center_vertical" + android:hint="@string/dialer_hint_find_contact" + android:textColorHint="@color/dialer_secondary_text_color" + android:textSize="16dp"/> + + <ImageView + android:id="@+id/voice_search_button" + android:layout_width="48dp" + android:layout_height="48dp" + android:layout_toStartOf="@+id/main_options_menu_button" + android:background="?android:attr/selectableItemBackgroundBorderless" + android:contentDescription="@string/description_start_voice_search" + android:scaleType="center" + android:src="@drawable/quantum_ic_mic_vd_theme_24" + android:tint="@color/dialer_secondary_text_color"/> + + <ImageButton + android:id="@+id/main_options_menu_button" + android:layout_width="48dp" + android:layout_height="48dp" + android:layout_alignParentEnd="true" + android:background="?android:attr/selectableItemBackgroundBorderless" + android:contentDescription="@string/action_menu_overflow_description" + android:scaleType="center" + android:src="@drawable/quantum_ic_more_vert_vd_theme_24" + android:tint="@color/dialer_secondary_text_color"/> + </RelativeLayout> + + <include layout="@layout/expanded_search_bar"/> + </com.android.dialer.main.impl.toolbar.SearchBarView> +</com.android.dialer.main.impl.toolbar.MainToolbar>
\ No newline at end of file |