Merge "New interface to pick a contact as attachment" am: 1dc43f0e09 am: 274d9478af
Change-Id: I3d251f9b3c79aa4f352a45aeebc8266681ec59c6
This commit is contained in:
@@ -0,0 +1,61 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright (C) 2020 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.
|
||||
-->
|
||||
<FrameLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="@android:color/white"
|
||||
android:importantForAccessibility="no" >
|
||||
|
||||
<FrameLayout
|
||||
android:id="@+id/mediapicker_enabled"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent" >
|
||||
|
||||
<TextView
|
||||
style="@style/ContactPickerHintText"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="top|center"
|
||||
android:layout_marginTop="16dp"
|
||||
android:text="@string/contact_picker_hint_text"
|
||||
android:importantForAccessibility="no" />
|
||||
|
||||
<ImageView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:scaleType="center"
|
||||
android:src="@drawable/ic_person_light_large"
|
||||
android:tint="@color/primary_color"
|
||||
android:importantForAccessibility="no"
|
||||
android:contentDescription="@null" />
|
||||
</FrameLayout>
|
||||
|
||||
<!-- This view will hide all other views if the required permission is not granted -->
|
||||
<TextView
|
||||
android:id="@+id/missing_permission_view"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:text="@string/enable_permission_procedure"
|
||||
android:contentDescription="@string/enable_permission_procedure_description"
|
||||
android:background="@android:color/white"
|
||||
android:gravity="center"
|
||||
android:visibility="gone" />
|
||||
|
||||
</FrameLayout>
|
||||
@@ -111,6 +111,8 @@
|
||||
<color name="audio_attachment_timer_text_color">#323232</color>
|
||||
<color name="audio_progress_bar_color">@color/primary_color</color>
|
||||
|
||||
<color name="contact_picker_hint_text_color">#40000000</color>
|
||||
|
||||
<color name="notification_sender_text">#9A9A9A</color>
|
||||
<color name="notification_secondary_text">#FFFFFF</color>
|
||||
<color name="notification_tertiary_text">#FFFFFF</color>
|
||||
|
||||
@@ -100,6 +100,9 @@
|
||||
<dimen name="audio_picker_text_size">16sp</dimen>
|
||||
<dimen name="audio_attachment_text_size">14sp</dimen>
|
||||
<dimen name="audio_progress_bar_height">6dp</dimen>
|
||||
|
||||
<dimen name="contact_picker_text_size">16sp</dimen>
|
||||
|
||||
<!-- Videos in the message list view should at least be this big in the smallest dimension -->
|
||||
<dimen name="video_message_min_size">320dp</dimen>
|
||||
<dimen name="attachment_rounded_corner_radius">3dp</dimen>
|
||||
|
||||
@@ -53,6 +53,7 @@
|
||||
<string name="mediapicker_cameraChooserDescription">Capture pictures or video</string>
|
||||
<string name="mediapicker_galleryChooserDescription">Choose images from this device</string>
|
||||
<string name="mediapicker_audioChooserDescription">Record audio</string>
|
||||
<string name="mediapicker_contactChooserDescription">Choose a contact from this device</string>
|
||||
<string name="mediapicker_gallery_title">Choose media</string>
|
||||
<string name="mediapicker_gallery_item_selected_content_description">The media is selected.</string>
|
||||
<string name="mediapicker_gallery_item_unselected_content_description">The media is unselected.</string>
|
||||
@@ -61,6 +62,9 @@
|
||||
<string name="mediapicker_gallery_image_item_description">image <xliff:g id="date">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g></string>
|
||||
<string name="mediapicker_gallery_image_item_description_no_date">image</string>
|
||||
<string name="mediapicker_audio_title">Record audio</string>
|
||||
<string name="mediapicker_contact_title">Choose a contact</string>
|
||||
<!-- Hint text on the contact picker -->
|
||||
<string name="contact_picker_hint_text">Click to open contacts list on this device</string>
|
||||
|
||||
<string name="action_share">Share</string>
|
||||
|
||||
|
||||
@@ -217,6 +217,11 @@
|
||||
<item name="android:paddingLeft">16dp</item>
|
||||
</style>
|
||||
|
||||
<style name="ContactPickerHintText">
|
||||
<item name="android:textSize">@dimen/contact_picker_text_size</item>
|
||||
<item name="android:textColor">@color/contact_picker_hint_text_color</item>
|
||||
</style>
|
||||
|
||||
<style name="VcardAttachmentSingleStyle">
|
||||
<item name="android:paddingRight">@dimen/message_text_left_right_padding</item>
|
||||
<item name="android:paddingLeft">@dimen/message_text_left_right_padding</item>
|
||||
|
||||
Reference in New Issue
Block a user