am d6cfeba9: Merge "Updated Wifi Assistant to support RTL." into lmp-dev

* commit 'd6cfeba9f717fe043efc56d4bdf18a18e4bb9bff':
  Updated Wifi Assistant to support RTL.
This commit is contained in:
PauloftheWest
2014-09-02 13:12:01 +00:00
committed by Android Git Automerger
7 changed files with 7 additions and 6 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

View File

@@ -20,15 +20,11 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="vertical" android:orientation="vertical">
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:paddingTop="@dimen/wifi_assistant_padding"
android:paddingBottom="@dimen/wifi_assistant_padding">
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content"> android:layout_height="@dimen/wifi_assistant_height">
<ImageView <ImageView
android:id="@+id/cardBackground" android:id="@+id/cardBackground"
@@ -44,6 +40,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/wifi_assistant_text_padding" android:layout_marginLeft="@dimen/wifi_assistant_text_padding"
android:gravity="start" android:gravity="start"
android:paddingStart="@dimen/wifi_assistant_padding_start_end"
android:paddingTop="@dimen/wifi_assistant_padding_top_bottom"
android:text="@string/wifi_assistant_intro_setup" android:text="@string/wifi_assistant_intro_setup"
style="@style/WifiAssistantText" /> style="@style/WifiAssistantText" />

View File

@@ -170,6 +170,9 @@
<dimen name="wifi_assistant_padding_start_end">16dp</dimen> <dimen name="wifi_assistant_padding_start_end">16dp</dimen>
<dimen name="wifi_assistant_padding">25dp</dimen> <dimen name="wifi_assistant_padding">25dp</dimen>
<dimen name="wifi_assistant_text_padding">16dp</dimen> <dimen name="wifi_assistant_text_padding">16dp</dimen>
<dimen name="wifi_assistant_height">182dp</dimen>
<dimen name="wifi_assistant_image_top">32dp</dimen>
<dimen name="wifi_assistant_image_start">24dp</dimen>
<!-- CryptKeeper top margin for password/pin screen --> <!-- CryptKeeper top margin for password/pin screen -->
<dimen name="crypt_keeper_password_top_margin">88dip</dimen> <dimen name="crypt_keeper_password_top_margin">88dip</dimen>