Skip to content

Commit 2c22bb8

Browse files
Robert GreenwaltAndroid (Google) Code Review
Robert Greenwalt
authored and
Android (Google) Code Review
committed
Merge "Update Premium-SMS detection UI." into jb-mr1-dev
2 parents 4984ec7 + 5520ca7 commit 2c22bb8

File tree

3 files changed

+51
-21
lines changed

3 files changed

+51
-21
lines changed

‎core/res/res/layout/sms_short_code_confirmation_dialog.xml‎

Lines changed: 44 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -33,29 +33,54 @@
3333
android:paddingLeft="16dip"
3434
android:paddingRight="16dip"
3535
android:paddingTop="8dip"
36-
android:paddingBottom="8dip"/>
36+
android:paddingBottom="16dip" />
3737

38-
<LinearLayout android:id="@+id/sms_short_code_detail_layout"
39-
android:layout_width="match_parent"
38+
<TableLayout android:id="@+id/sms_short_code_detail_layout"
39+
android:shrinkColumns="1"
40+
android:layout_width="wrap_content"
4041
android:layout_height="wrap_content"
41-
android:orientation="horizontal"
42-
android:gravity="center_vertical"
43-
android:minHeight="@dimen/alert_dialog_title_height"
44-
android:layout_marginLeft="16dip"
45-
android:layout_marginRight="16dip">
46-
<ImageView android:id="@+id/sms_short_code_coins_icon"
42+
android:paddingLeft="16dip"
43+
android:paddingRight="16dip">
44+
45+
<TableRow
4746
android:layout_width="wrap_content"
48-
android:layout_height="wrap_content"
49-
android:paddingRight="8dip"
50-
android:src="@null" />
51-
<TextView android:id="@+id/sms_short_code_detail_message"
52-
style="?android:attr/textAppearanceMedium"
47+
android:layout_height="wrap_content" >
48+
49+
<ImageView android:id="@+id/sms_short_code_coins_icon"
50+
android:layout_width="wrap_content"
51+
android:layout_height="wrap_content"
52+
android:paddingLeft="8dip"
53+
android:paddingRight="8dip"
54+
android:src="@null" />
55+
<TextView android:id="@+id/sms_short_code_detail_message"
5356
android:layout_width="match_parent"
5457
android:layout_height="wrap_content" />
55-
</LinearLayout>
58+
</TableRow>
59+
60+
<TableRow
61+
android:layout_width="wrap_content"
62+
android:layout_height="wrap_content" >
63+
64+
<CheckBox android:id="@+id/sms_short_code_remember_choice_checkbox"
65+
android:layout_width="wrap_content"
66+
android:layout_height="wrap_content"
67+
android:paddingRight="8dip" />
68+
<TextView android:id="@+id/sms_short_code_remember_choice_text"
69+
android:layout_width="wrap_content"
70+
android:layout_height="wrap_content"
71+
android:text="@string/sms_short_code_remember_choice" />
72+
</TableRow>
73+
74+
<TableRow
75+
android:layout_width="wrap_content"
76+
android:layout_height="wrap_content" >
77+
78+
<Space android:layout_gravity="fill" />
79+
<TextView android:id="@+id/sms_short_code_remember_undo_instruction"
80+
android:layout_width="wrap_content"
81+
android:layout_height="wrap_content" />
82+
</TableRow>
83+
84+
</TableLayout>
5685

57-
<CheckBox android:id="@+id/sms_short_code_remember_choice_checkbox"
58-
android:layout_width="match_parent"
59-
android:layout_height="wrap_content"
60-
android:text="@string/sms_short_code_remember_choice" />
6186
</LinearLayout>

‎core/res/res/values/strings.xml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3107,15 +3107,18 @@
31073107
<!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
31083108
<string name="sms_short_code_confirm_message">&lt;b><xliff:g id="app_name">%1$s</xliff:g>&lt;/b> would like to send a message to &lt;b><xliff:g id="dest_address">%2$s</xliff:g>&lt;/b>.</string>
31093109
<!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
3110-
<string name="sms_short_code_details">This may cause charges on your mobile account.</string>
3110+
<string name="sms_short_code_details">This <font fgcolor="#ffffb060">may cause charges</font> on your mobile account.</string>
31113111
<!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
3112-
<string name="sms_premium_short_code_details">This will cause charges on your mobile account.</string>
3112+
<string name="sms_premium_short_code_details"><font fgcolor="#ffffb060">This will cause charges on your mobile account.</font></string>
31133113
<!-- Text of the approval button for the SMS short code confirmation dialog. [CHAR LIMIT=30] -->
31143114
<string name="sms_short_code_confirm_allow">Send</string>
31153115
<!-- Text of the cancel button for the SMS short code confirmation dialog. [CHAR LIMIT=30] -->
31163116
<string name="sms_short_code_confirm_deny">Cancel</string>
31173117
<!-- Text of the checkbox for the SMS short code confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
31183118
<string name="sms_short_code_remember_choice">Remember my choice</string>
3119+
<!-- Text shown when remember checkbox is checked to inform the user how they may undo the setting. [CHAR LIMIT=40] -->
3120+
<string name="sms_short_code_remember_undo_instruction">You can change this later in Settings\u00A0>\u00A0Apps"</string>
3121+
31193122
<!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
31203123
<string name="sms_short_code_confirm_always_allow">Always Allow</string>
31213124
<!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->

‎core/res/res/values/symbols.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,7 @@
216216
<java-symbol type="id" name="sms_short_code_detail_layout" />
217217
<java-symbol type="id" name="sms_short_code_detail_message" />
218218
<java-symbol type="id" name="sms_short_code_remember_choice_checkbox" />
219+
<java-symbol type="id" name="sms_short_code_remember_undo_instruction" />
219220

220221
<java-symbol type="attr" name="actionModeShareDrawable" />
221222
<java-symbol type="attr" name="alertDialogCenterButtons" />
@@ -758,6 +759,7 @@
758759
<java-symbol type="string" name="sms_short_code_confirm_message" />
759760
<java-symbol type="string" name="sms_short_code_details" />
760761
<java-symbol type="string" name="sms_premium_short_code_details" />
762+
<java-symbol type="string" name="sms_short_code_remember_undo_instruction" />
761763
<java-symbol type="string" name="submit" />
762764
<java-symbol type="string" name="sync_binding_label" />
763765
<java-symbol type="string" name="sync_do_nothing" />

0 commit comments

Comments
 (0)