diff options
| author | Evan Charlton <evanc@google.com> | 2014-11-19 15:28:37 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-19 15:28:37 +0000 |
| commit | e178702eff18f178a6537a88537efea07adaaead (patch) | |
| tree | 06279b1d95ecaa449604370b404dff0b22b244e0 /res | |
| parent | c851c7ee3bd83e8fffda607ec8cbdd3f42e9f61e (diff) | |
| parent | 75ce6d3132f43fdf5587ae9a81e1c42c499e5090 (diff) | |
| download | android_packages_apps_PhoneCommon-e178702eff18f178a6537a88537efea07adaaead.tar.gz android_packages_apps_PhoneCommon-e178702eff18f178a6537a88537efea07adaaead.tar.bz2 android_packages_apps_PhoneCommon-e178702eff18f178a6537a88537efea07adaaead.zip | |
am 75ce6d31: am 0830cf64: Update ILD rate to match redlines
* commit '75ce6d3132f43fdf5587ae9a81e1c42c499e5090':
Update ILD rate to match redlines
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/dialpad_view.xml | 39 | ||||
| -rw-r--r-- | res/values/dimens.xml | 3 |
2 files changed, 24 insertions, 18 deletions
diff --git a/res/layout/dialpad_view.xml b/res/layout/dialpad_view.xml index 8ac4cf2..12b1a68 100644 --- a/res/layout/dialpad_view.xml +++ b/res/layout/dialpad_view.xml @@ -25,37 +25,40 @@ android:clickable="true" > <!-- Text field where call rate is displayed for ILD calls. --> - <RelativeLayout + <LinearLayout android:id="@+id/rate_container" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingTop="8dp" + android:orientation="vertical" android:visibility="gone"> - <TextView android:id="@+id/ild_country" + <LinearLayout + android:id="@+id/ild_container" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentStart="true" - android:layout_alignParentTop="true" - android:layout_marginStart="@dimen/dialpad_digits_padding" /> + android:orientation="horizontal" + android:layout_gravity="center_horizontal" + android:layout_marginTop="@dimen/ild_margin_height" + android:layout_marginBottom="@dimen/ild_margin_height"> - <TextView android:id="@+id/ild_rate" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textStyle="bold" - android:layout_marginStart="4dp" - android:layout_toEndOf="@id/ild_country" /> + <TextView android:id="@+id/ild_country" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> + + <TextView android:id="@+id/ild_rate" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="4dp" + android:textStyle="bold" /> + + </LinearLayout> <View android:layout_width="match_parent" android:layout_height="1dp" - android:background="#e3e3e3" - android:layout_marginTop="8dp" - android:layout_below="@id/ild_country" - android:layout_alignParentStart="true" - android:layout_alignParentEnd="true" /> + android:background="#e3e3e3" /> - </RelativeLayout> + </LinearLayout> <!-- Text field and possibly soft menu button above the keypad where the digits are displayed. --> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 068ca85..30f34e3 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -59,4 +59,7 @@ <dimen name="floating_action_button_margin_bottom">16dp</dimen> <!-- Offset of bottom margin of the floating action button used when dialpad is up --> <dimen name="floating_action_button_dialpad_margin_bottom_offset">4dp</dimen> + + <!-- Top/Bottom padding around the ILD rate display box. --> + <dimen name="ild_margin_height">10dp</dimen> </resources> |