summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/drawable/banner_button_selectable.xml18
-rw-r--r--res/layout/banner_sms_promo.xml81
-rw-r--r--res/layout/compose_message_activity.xml1
-rw-r--r--res/layout/conversation_list_screen.xml3
-rw-r--r--res/values/colors.xml9
-rw-r--r--res/values/dimens.xml4
-rw-r--r--res/values/strings.xml16
-rw-r--r--res/values/styles.xml12
-rw-r--r--res/xml/preferences.xml26
9 files changed, 167 insertions, 3 deletions
diff --git a/res/drawable/banner_button_selectable.xml b/res/drawable/banner_button_selectable.xml
new file mode 100644
index 00000000..8eae254c
--- /dev/null
+++ b/res/drawable/banner_button_selectable.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Google Inc.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item
+ android:state_pressed="true"
+ android:drawable="@color/banner_item_pressed" />
+ <item
+ android:state_activated="true"
+ android:drawable="@color/banner_item_activated" />
+ <item
+ android:state_selected="true"
+ android:drawable="@color/banner_item_selected" />
+ <item
+ android:drawable="@color/banner_item_transparent" />
+</selector>
diff --git a/res/layout/banner_sms_promo.xml b/res/layout/banner_sms_promo.xml
new file mode 100644
index 00000000..f778fbdc
--- /dev/null
+++ b/res/layout/banner_sms_promo.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2013 Google Inc.
+-->
+<!--
+ The outer FrameLayout required so we can set a background image with a drop shadow. If
+ we set that background image on the LinearLayout, the drop shadow is incorrectly displayed as
+ part of the LinearLayout itself.
+-->
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/banner_sms_promo"
+ android:orientation="vertical"
+ android:paddingLeft="16dip"
+ android:paddingRight="16dip"
+ android:paddingTop="@dimen/banner_s_space"
+ android:paddingBottom="@dimen/banner_s_space"
+ android:layout_width="match_parent"
+ android:layout_gravity="center_vertical"
+ android:layout_height="wrap_content"
+ android:background="@drawable/class_zero_background" >
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="0dip"
+ android:gravity="center_vertical"
+ android:paddingLeft="16dip"
+ android:paddingTop="@dimen/banner_s_space"
+ android:paddingBottom="@dimen/banner_s_space"
+ android:singleLine="false"
+ android:text="@string/banner_sms_promo_message"
+ android:layout_weight="1"
+ android:textStyle="normal"
+ style="@style/BannerWindowText"
+ />
+
+ <View
+ android:background="@color/translucent_white"
+ android:layout_marginTop="@dimen/banner_s_space"
+ android:layout_marginBottom="@dimen/banner_s_space"
+ android:layout_width="match_parent"
+ android:layout_height="1dip" />
+
+ <LinearLayout
+ android:orientation="horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical" >
+
+ <Button
+ android:id="@+id/dismiss_banner_sms_promo"
+ android:paddingLeft="@dimen/banner_m_space"
+ android:paddingRight="@dimen/banner_m_space"
+ android:layout_marginRight="@dimen/banner_s_space"
+ android:text="@string/banner_sms_promo_decline"
+ android:background="@drawable/banner_button_selectable"
+ android:layout_width="wrap_content"
+ android:layout_height="36dip"
+ android:textStyle="normal"
+ android:layout_weight=".5"
+ style="@style/BannerWindowText" />
+
+ <View
+ android:background="@color/translucent_white"
+ android:layout_width="1dip"
+ android:layout_height="16dip" />
+
+ <Button
+ android:id="@+id/accept_banner_sms_promo"
+ android:paddingLeft="@dimen/banner_m_space"
+ android:paddingRight="@dimen/banner_m_space"
+ android:layout_marginLeft="@dimen/banner_s_space"
+ android:text="@string/banner_sms_promo_accept"
+ android:background="@drawable/banner_button_selectable"
+ android:layout_width="wrap_content"
+ android:layout_height="36dip"
+ android:textStyle="normal"
+ android:layout_weight=".5"
+ style="@style/BannerWindowText" />
+ </LinearLayout>
+</LinearLayout>
diff --git a/res/layout/compose_message_activity.xml b/res/layout/compose_message_activity.xml
index 2c653f83..f6d48b26 100644
--- a/res/layout/compose_message_activity.xml
+++ b/res/layout/compose_message_activity.xml
@@ -122,6 +122,7 @@
<LinearLayout
android:id="@+id/bottom_panel"
+ android:visibility="gone"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/res/layout/conversation_list_screen.xml b/res/layout/conversation_list_screen.xml
index 1d3d91fc..bf3fa084 100644
--- a/res/layout/conversation_list_screen.xml
+++ b/res/layout/conversation_list_screen.xml
@@ -26,6 +26,7 @@
style="?android:attr/listViewWhiteStyle"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:layout_below="@+id/banner_sms_promo"
android:drawSelectorOnTop="false"
android:scrollbarStyle="insideOverlay"
android:background="@android:color/white"
@@ -38,4 +39,6 @@
android:gravity="center"
android:text="@string/loading_conversations"
android:textAppearance="?android:attr/textAppearanceMedium" />
+
+ <include layout="@layout/banner_sms_promo" />
</RelativeLayout>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 4c6b0bc5..943b49f9 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -39,4 +39,13 @@
<color name="widget_subject_text_color_read">#777777</color>
<color name="widget_subject_text_color_unread">#555555</color>
+ <color name="translucent_white">#ccffffff</color>
+
+ <color name="banner_item_transparent">#00000000</color>
+ <color name="banner_item_activated">#670099cc</color>
+ <color name="banner_item_selected">#cc0099cc</color>
+ <color name="banner_item_pressed">#6733b5e5</color>
+
+ <color name="text_shadow_color_light">#33000000</color>
+ <color name="solid_white">#ffffffff</color>
</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 6e6fd10b..b42a8578 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -17,4 +17,8 @@ All Rights Reserved. -->
<dimen name="widget_margin_left">0dip</dimen>
<dimen name="widget_margin_right">0dip</dimen>
<dimen name="widget_margin_bottom">0dip</dimen>
+
+ <!-- Bammer item spacing -->
+ <dimen name="banner_s_space">4dip</dimen>
+ <dimen name="banner_m_space">8dip</dimen>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ab771cb0..0aa96ae7 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -317,6 +317,15 @@
<!-- Settings screen, section heading for storage-specific settings -->
<string name="pref_sms_storage_title">Storage</string>
+ <!-- Title for SMS Disabled -->
+ <string name="pref_title_sms_disabled">SMS Disabled</string>
+ <!-- Summary for SMS Disabled -->
+ <string name="pref_summary_sms_disabled">Touch to make Messaging your default SMS app</string>
+ <!-- Title for SMS Enabled -->
+ <string name="pref_title_sms_enabled">SMS Enabled</string>
+ <!-- Summary for SMS Enabled -->
+ <string name="pref_summary_sms_enabled">Touch to change your default SMS app</string>
+
<!-- Settings item description for entering SIM card message screen -->
<string name="pref_summary_manage_sim_messages">Manage messages stored on your SIM card</string>
<!-- Settings item description for boolean MMS delivery report setting -->
@@ -783,5 +792,10 @@
<!-- Strings used forh MMS push of messages in outbox -->
<string name="label_mms_send_outbox_msg">MMS Wakeup</string>
<string name="desc_mms_send_outbox_msg">Sends out all MMSs from the outbox to the network</string>
-</resources>
+ <!-- Banner in conversation list for making Messaging the default SMS app -->
+ <string name="banner_sms_promo_message">Would you like to use Messaging as your default SMS app?</string>
+ <string name="banner_sms_promo_decline">No, thanks</string>
+ <string name="banner_sms_promo_accept">Yes!</string>
+
+</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 128631cf..d3792d12 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -44,4 +44,16 @@
<item name="android:textColor">#999999</item>
</style>
+ <style name="BannerWindowText">
+ <item name="android:textColor">@color/solid_white</item>
+ <item name="android:shadowColor">@color/text_shadow_color_light</item>
+ <item name="android:shadowDx">1</item>
+ <item name="android:shadowDy">2</item>
+ <item name="android:shadowRadius">1</item>
+ <item name="android:textSize">14sp</item>
+ <item name="android:ellipsize">end</item>
+ <item name="android:singleLine">true</item>
+ <item name="android:textStyle">italic</item>
+ </style>
+
</resources>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 54ebb4b9..648ae57f 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -17,8 +17,30 @@
* limitations under the License.
*/
-->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
- <PreferenceCategory android:title="@string/pref_sms_storage_title"
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ android:key="pref_key_root">
+ <Preference
+ android:key="pref_key_sms_disabled"
+ android:title="@string/pref_title_sms_disabled"
+ android:summary="@string/pref_summary_sms_disabled"
+ android:persistent="false">
+ <intent
+ android:action="android.provider.Telephony.ACTION_CHANGE_DEFAULT"
+ android:targetPackage="com.android.settings">
+ <extra android:name="package" android:value="com.android.mms"/>
+ </intent>
+ </Preference>
+ <Preference
+ android:key="pref_key_sms_enabled"
+ android:title="@string/pref_title_sms_enabled"
+ android:summary="@string/pref_summary_sms_enabled"
+ android:persistent="false">
+ <intent
+ android:action="android.settings.WIRELESS_SETTINGS"
+ android:targetPackage="com.android.settings">
+ </intent>
+ </Preference>
+ <PreferenceCategory android:title="@string/pref_sms_storage_title"
android:key="pref_key_storage_settings">
<!--
<Preference android:key="pref_key_mms_clear_history"
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 15:50:53 +0000