Merge "Create messenger preview screen for magnification gesture settings screen" into nyc-dev

res/drawable/conversation_message_icon.xml

@@ -0,0 +1,26 @@
+<!--
+    Copyright (C) 2015 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.
+-->
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+
+   <solid
+       android:color="#FF0000"/>
+
+   <size
+       android:width="42dp"
+        android:height="42dp"/>
+</shape>

res/layout/conversation_message_content.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/message_content"
+    android:orientation="vertical"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content" >
+
+    <com.android.settings.display.MessageBubbleBackground
+        android:id="@+id/message_text_and_info"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:minHeight="@dimen/conversation_message_contact_icon_size"
+        android:layout_marginTop="0dp" >
+
+        <TextView
+            android:id="@+id/message_text"
+            android:textSize="@dimen/conversation_message_text_size"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+
+        <TextView
+            android:id="@+id/message_status"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="@dimen/conversation_status_text_size" />
+
+    </com.android.settings.display.MessageBubbleBackground>
+
+</LinearLayout>

res/layout/conversation_message_icon.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 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.
+-->
+
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/conversation_icon"
+    android:layout_width="@dimen/conversation_message_contact_icon_size"
+    android:layout_height="@dimen/conversation_message_contact_icon_size"
+    android:fontFamily="sans-serif"
+    android:textStyle="bold"
+    android:textSize="@dimen/conversation_message_contact_icon_text_size"
+    android:gravity="center" />

res/layout/screen_zoom_preview_1.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
+<!-- Copyright (C) 2016 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.
@@ -14,10 +14,52 @@
      limitations under the License.
 -->
 
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout 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:scrollbars="none"
-    android:background="?android:attr/colorBackgroundFloating">
+    android:background="@color/conversation_background"
+    android:padding="@dimen/conversation_message_list_padding"
+    android:orientation="vertical" >
 
-</ScrollView>
+    <com.android.settings.display.ConversationMessageView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:incoming="false"
+        app:messageText="@string/screen_zoom_conversation_message_1"
+        app:timestampText="@string/screen_zoom_conversation_timestamp_1"
+        app:iconText="@string/screen_zoom_conversation_icon_alex"
+        app:iconTextColor="@color/message_icon_text_outgoing"
+        app:iconBackgroundColor="@color/message_icon_background_outgoing" />
+
+    <com.android.settings.display.ConversationMessageView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:incoming="true"
+        app:messageText="@string/screen_zoom_conversation_message_2"
+        app:timestampText="@string/screen_zoom_conversation_timestamp_2"
+        app:iconText="@string/screen_zoom_conversation_icon_pete"
+        app:iconTextColor="@color/message_icon_text_incoming"
+        app:iconBackgroundColor="@color/message_icon_background_incoming" />
+
+    <com.android.settings.display.ConversationMessageView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:incoming="false"
+        app:messageText="@string/screen_zoom_conversation_message_3"
+        app:timestampText="@string/screen_zoom_conversation_timestamp_3"
+        app:iconText="@string/screen_zoom_conversation_icon_alex"
+        app:iconTextColor="@color/message_icon_text_outgoing"
+        app:iconBackgroundColor="@color/message_icon_background_outgoing" />
+
+    <com.android.settings.display.ConversationMessageView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:incoming="true"
+        app:messageText="@string/screen_zoom_conversation_message_4"
+        app:timestampText="@string/screen_zoom_conversation_timestamp_4"
+        app:iconText="@string/screen_zoom_conversation_icon_pete"
+        app:iconTextColor="@color/message_icon_text_incoming"
+        app:iconBackgroundColor="@color/message_icon_background_incoming" />
+
+</LinearLayout>

res/values/attrs.xml

@@ -106,6 +106,16 @@
         <attr name="currentPageIndicatorColor" format="color" />
     </declare-styleable>
 
+    <!-- For ConversationMessageView -->
+    <declare-styleable name="ConversationMessageView">
+        <attr name="incoming" format="boolean" />
+        <attr name="messageText" format="reference" />
+        <attr name="timestampText" format="reference" />
+        <attr name="iconText" format="reference" />
+        <attr name="iconTextColor" format="reference|color" />
+        <attr name="iconBackgroundColor" format="reference|color" />
+    </declare-styleable>
+
     <attr name="switchBarTheme" format="reference" />
     <attr name="switchBarMarginStart" format="dimension" />
     <attr name="switchBarMarginEnd" format="dimension" />

res/values/colors.xml

@@ -111,7 +111,20 @@
     <color name="material_blue_500">#4285F4</color>
     <color name="material_blue_700">#3367D6</color>
 
+    <color name="message_text_incoming">#ffffffff</color>
+    <color name="message_text_outgoing">#ff323232</color>
+    <color name="timestamp_text_outgoing">#99323232</color>
+    <color name="timestamp_text_incoming">#99ffffff</color>
+    <color name="message_bubble_incoming">#689f38</color>
+    <color name="message_bubble_outgoing">#ffffffff</color>
+    <color name="conversation_background">#eeeeee</color>
+    <color name="message_icon_background_incoming">#689f38</color>
+    <color name="message_icon_text_incoming">#ffffffff</color>
+    <color name="message_icon_background_outgoing">#4285f4</color>
+    <color name="message_icon_text_outgoing">#ffffffff</color>
+
+    <color name="seek_bar_preference_preview_text">#fff</color>
     <!-- Black at 80% opacity -->
-    <color name="seek_bar_preference_preview_border_tint">#CC000000</color>
+    <color name="seek_bar_preference_preview_border_tint">#cc000000</color>
 
 </resources>

res/values/dimens.xml

@@ -258,6 +258,18 @@
     <!-- Display, Screen zoom -->
     <dimen name="screen_zoom_preview_height">240dp</dimen>
     <dimen name="screen_zoom_preview_app_icon_width">88dp</dimen>
+    <dimen name="conversation_message_list_padding">10dp</dimen>
+    <dimen name="conversation_message_contact_icon_size">42dp</dimen>
+    <dimen name="conversation_message_contact_icon_text_size">32sp</dimen>
+    <dimen name="conversation_message_text_size">16sp</dimen>
+    <dimen name="conversation_status_text_size">12sp</dimen>
+    <dimen name="conversation_bubble_width_snap">20dp</dimen>
+    <dimen name="message_bubble_arrow_width">9dp</dimen>
+    <dimen name="message_padding_default">18dp</dimen>
+    <dimen name="message_text_left_right_padding">14dp</dimen>
+    <dimen name="message_text_top_padding">10dp</dimen>
+    <dimen name="message_text_bottom_padding">12dp</dimen>
+    <dimen name="message_metadata_top_padding">4dp</dimen>
 
     <!-- Accessibility Settings -->
     <dimen name="accessibility_layout_margin_start_end">24dp</dimen>

res/values/strings.xml

@@ -6887,6 +6887,27 @@
          density in raw pixels per inch rather than using a relative description. [CHAR LIMIT=24] -->
     <string name="screen_zoom_summary_custom">Custom (<xliff:g id="densityDpi" example="160">%d</xliff:g>)</string>
 
+    <!-- Name Initial shown in the conversation message icon. [CHAR LIMIT=1] -->
+    <string name="screen_zoom_conversation_icon_alex">A</string>
+    <!-- Name Initial shown in the conversation message icon. [CHAR LIMIT=1] -->
+    <string name="screen_zoom_conversation_icon_pete">P</string>
+    <!-- Conversation message body of the messaging app preview screen. [CHAR LIMIT=NONE] -->
+    <string name="screen_zoom_conversation_message_1">Hi Pete!</string>
+    <!-- Conversation message body of the messaging app preview screen. [CHAR LIMIT=NONE] -->
+    <string name="screen_zoom_conversation_message_2">Hey, want to grab coffee and catch up today?</string>
+    <!-- Conversation message body of the messaging app preview screen. [CHAR LIMIT=NONE] -->
+    <string name="screen_zoom_conversation_message_3">Sounds great. I know of a good place not too far from here.</string>
+    <!-- Conversation message body of the messaging app preview screen. [CHAR LIMIT=NONE] -->
+    <string name="screen_zoom_conversation_message_4">Perfect!</string>
+    <!-- Conversation message timestamp of the messaging app preview screen. [CHAR LIMIT=20] -->
+    <string name="screen_zoom_conversation_timestamp_1">Tue 6:00PM</string>
+    <!-- Conversation message timestamp of the messaging app preview screen. [CHAR LIMIT=20] -->
+    <string name="screen_zoom_conversation_timestamp_2">Tue 6:01PM</string>
+    <!-- Conversation message timestamp of the messaging app preview screen. [CHAR LIMIT=20] -->
+    <string name="screen_zoom_conversation_timestamp_3">Tue 6:02PM</string>
+    <!-- Conversation message timestamp of the messaging app preview screen. [CHAR LIMIT=20] -->
+    <string name="screen_zoom_conversation_timestamp_4">Tue 6:03PM</string>
+
     <!-- Button to show all top-level settings items [CHAR LIMIT=20] -->
     <string name="see_all">See all</string>
     <!-- Button to show less top-level settings items [CHAR LIMIT=20] -->