diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2012-11-08 06:13:17 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-08 06:13:17 -0800 |
| commit | 744c520472d59c59f5320e1b0cf0801418eba773 (patch) | |
| tree | d31ea472849e7619c433c822c088992501ad2105 | |
| parent | 71390072023ec559b88f7a06111ffb458d8880f9 (diff) | |
| parent | 08db1ceba24925cd8a710aa0153519351a9fa2c7 (diff) | |
| download | frameworks_base-744c520472d59c59f5320e1b0cf0801418eba773.zip frameworks_base-744c520472d59c59f5320e1b0cf0801418eba773.tar.gz frameworks_base-744c520472d59c59f5320e1b0cf0801418eba773.tar.bz2 | |
am 08db1ceb: am bbe5cafe: Merge "Add Coin graphic to premium-sms dialog." into jb-mr1.1-dev
* commit '08db1ceba24925cd8a710aa0153519351a9fa2c7':
Add Coin graphic to premium-sms dialog.
| -rw-r--r-- | core/res/res/drawable-hdpi/ic_coins_l.png | bin | 0 -> 2279 bytes | |||
| -rw-r--r-- | core/res/res/drawable-mdpi/ic_coins_l.png | bin | 0 -> 1451 bytes | |||
| -rw-r--r-- | core/res/res/drawable-xhdpi/ic_coins_l.png | bin | 0 -> 3233 bytes | |||
| -rw-r--r-- | core/res/res/layout/sms_short_code_confirmation_dialog.xml | 20 |
4 files changed, 13 insertions, 7 deletions
diff --git a/core/res/res/drawable-hdpi/ic_coins_l.png b/core/res/res/drawable-hdpi/ic_coins_l.png Binary files differnew file mode 100644 index 0000000..e1e3e2a --- /dev/null +++ b/core/res/res/drawable-hdpi/ic_coins_l.png diff --git a/core/res/res/drawable-mdpi/ic_coins_l.png b/core/res/res/drawable-mdpi/ic_coins_l.png Binary files differnew file mode 100644 index 0000000..a6d7abb --- /dev/null +++ b/core/res/res/drawable-mdpi/ic_coins_l.png diff --git a/core/res/res/drawable-xhdpi/ic_coins_l.png b/core/res/res/drawable-xhdpi/ic_coins_l.png Binary files differnew file mode 100644 index 0000000..84e7e72 --- /dev/null +++ b/core/res/res/drawable-xhdpi/ic_coins_l.png diff --git a/core/res/res/layout/sms_short_code_confirmation_dialog.xml b/core/res/res/layout/sms_short_code_confirmation_dialog.xml index ec39d97..d82f560 100644 --- a/core/res/res/layout/sms_short_code_confirmation_dialog.xml +++ b/core/res/res/layout/sms_short_code_confirmation_dialog.xml @@ -30,9 +30,9 @@ style="?android:attr/textAppearanceMedium" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingLeft="16dip" - android:paddingRight="16dip" - android:paddingTop="8dip" + android:paddingLeft="20dip" + android:paddingRight="20dip" + android:paddingTop="16dip" android:paddingBottom="16dip" /> <TableLayout android:id="@+id/sms_short_code_detail_layout" @@ -51,7 +51,7 @@ android:layout_height="wrap_content" android:paddingLeft="8dip" android:paddingRight="8dip" - android:src="@null" /> + android:src="@drawable/ic_coins_l" /> <TextView android:id="@+id/sms_short_code_detail_message" android:layout_width="match_parent" android:layout_height="wrap_content" /> @@ -60,14 +60,19 @@ <TableRow android:layout_width="wrap_content" android:layout_height="wrap_content" > - + <RelativeLayout android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingTop="12dip" + android:paddingLeft="8dip" > <CheckBox android:id="@+id/sms_short_code_remember_choice_checkbox" + android:paddingTop="11dip" android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingRight="8dip" /> + android:layout_height="wrap_content" /> + </RelativeLayout> <TextView android:id="@+id/sms_short_code_remember_choice_text" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:paddingTop="18dip" android:text="@string/sms_short_code_remember_choice" /> </TableRow> @@ -77,6 +82,7 @@ <Space android:layout_gravity="fill" /> <TextView android:id="@+id/sms_short_code_remember_undo_instruction" + android:paddingTop="10dip" android:layout_width="wrap_content" android:layout_height="wrap_content" /> </TableRow> |
