diff options
author | Fabrice Di Meglio <fdimeglio@google.com> | 2013-03-21 21:52:54 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-03-21 21:52:54 +0000 |
commit | 2c26dc9d6d0f28856b99affe7cfe294c4d975069 (patch) | |
tree | 0f3bdb4433e04f46765a21b55ea436f25ba2f6a0 /res/layout | |
parent | 341c4f81e7ff728943309468f28e2466ba3ee9ab (diff) | |
parent | 8f193212ed48f38f54e7f78ca8789758cf9a0c7b (diff) | |
download | android_packages_apps_PackageInstaller-2c26dc9d6d0f28856b99affe7cfe294c4d975069.tar.gz android_packages_apps_PackageInstaller-2c26dc9d6d0f28856b99affe7cfe294c4d975069.tar.bz2 android_packages_apps_PackageInstaller-2c26dc9d6d0f28856b99affe7cfe294c4d975069.zip |
am 8f193212: Merge "Fix bug #8133419 Android Download Manager/Installer should be mirrored for RTL languages" into jb-mr2-dev
* commit '8f193212ed48f38f54e7f78ca8789758cf9a0c7b':
Fix bug #8133419 Android Download Manager/Installer should be mirrored for RTL languages
Diffstat (limited to 'res/layout')
-rw-r--r-- | res/layout/app_details.xml | 16 | ||||
-rw-r--r-- | res/layout/install_confirm.xml | 4 | ||||
-rw-r--r-- | res/layout/op_progress.xml | 12 | ||||
-rw-r--r-- | res/layout/uninstall_confirm.xml | 8 | ||||
-rw-r--r-- | res/layout/uninstall_progress.xml | 6 |
5 files changed, 23 insertions, 23 deletions
diff --git a/res/layout/app_details.xml b/res/layout/app_details.xml index 7f35d729..0e2cd071 100644 --- a/res/layout/app_details.xml +++ b/res/layout/app_details.xml @@ -24,17 +24,17 @@ installation screens android:id="@+id/app_snippet" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingLeft="16dip" - android:paddingRight="16dip" + android:paddingStart="16dip" + android:paddingEnd="16dip" android:paddingTop="24dip" > <ImageView android:id="@+id/app_icon" android:layout_width="32dip" android:layout_height="32dip" - android:layout_marginLeft="8dip" + android:layout_marginStart="8dip" android:background="@color/transparent" - android:layout_alignParentLeft="true" - android:gravity="left" + android:layout_alignParentStart="true" + android:gravity="start" android:scaleType="centerCrop"/> <TextView android:id="@+id/app_name" android:layout_width="wrap_content" @@ -44,12 +44,12 @@ installation screens android:textColor="?android:attr/textColorPrimary" android:shadowColor="@color/shadow" android:shadowRadius="2" - android:layout_toRightOf="@id/app_icon" + android:layout_toEndOf="@id/app_icon" android:singleLine="true" android:layout_centerInParent="true" - android:paddingRight="16dip" + android:paddingEnd="16dip" android:paddingTop="3dip" - android:paddingLeft="16dip" + android:paddingStart="16dip" android:ellipsize="end"/> <FrameLayout android:id="@+id/top_divider" diff --git a/res/layout/install_confirm.xml b/res/layout/install_confirm.xml index f9fb3591..86ea1652 100644 --- a/res/layout/install_confirm.xml +++ b/res/layout/install_confirm.xml @@ -120,7 +120,7 @@ <Button android:id="@+id/cancel_button" android:layout_width="0dip" android:layout_height="wrap_content" - android:layout_gravity="left" + android:layout_gravity="start" android:layout_weight="1" android:text="@string/cancel" android:maxLines="2" @@ -129,7 +129,7 @@ <Button android:id="@+id/ok_button" android:layout_width="0dip" android:layout_height="wrap_content" - android:layout_gravity="right" + android:layout_gravity="end" android:layout_weight="1" android:text="@string/next" android:maxLines="2" diff --git a/res/layout/op_progress.xml b/res/layout/op_progress.xml index 6b269403..1c2cef53 100644 --- a/res/layout/op_progress.xml +++ b/res/layout/op_progress.xml @@ -45,7 +45,7 @@ <Button android:id="@+id/done_button" android:layout_width="0dip" android:layout_height="wrap_content" - android:layout_gravity="left" + android:layout_gravity="start" android:layout_weight="1" android:text="@string/done" android:maxLines="2" @@ -54,7 +54,7 @@ <Button android:id="@+id/launch_button" android:layout_width="0dip" android:layout_height="wrap_content" - android:layout_gravity="right" + android:layout_gravity="end" android:layout_weight="1" android:text="@string/launch" android:maxLines="2" @@ -82,11 +82,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@id/app_snippet" - android:gravity="left" + android:gravity="start" android:text="@string/installing" android:paddingTop="16dip" - android:paddingLeft="32dip" - android:paddingRight="32dip" + android:paddingStart="32dip" + android:paddingEnd="32dip" android:textAppearance="?android:attr/textAppearanceMedium" /> <!-- This explanation text is shown only after the progress bar below goes away. --> @@ -96,7 +96,7 @@ android:layout_above="@id/buttons_panel" android:layout_below="@id/center_text" android:paddingTop="8dip" - android:paddingLeft="16dip" + android:paddingStart="16dip" android:paddingBottom="16dip"> <TextView android:id="@+id/center_explanation" diff --git a/res/layout/uninstall_confirm.xml b/res/layout/uninstall_confirm.xml index 9ef0036c..f604023f 100644 --- a/res/layout/uninstall_confirm.xml +++ b/res/layout/uninstall_confirm.xml @@ -57,8 +57,8 @@ android:layout_height="wrap_content" android:textColor="?android:attr/textColorSecondary" android:textAppearance="?android:attr/textAppearanceMedium" - android:paddingLeft="24dip" - android:paddingRight="24dip" /> + android:paddingStart="24dip" + android:paddingEnd="24dip" /> </LinearLayout> @@ -88,7 +88,7 @@ <Button android:id="@+id/cancel_button" android:layout_width="0dip" android:layout_height="wrap_content" - android:layout_gravity="left" + android:layout_gravity="start" android:layout_weight="1" android:text="@string/cancel" android:maxLines="2" @@ -97,7 +97,7 @@ <Button android:id="@+id/ok_button" android:layout_width="0dip" android:layout_height="wrap_content" - android:layout_gravity="right" + android:layout_gravity="end" android:layout_weight="1" android:text="@string/ok" android:maxLines="2" diff --git a/res/layout/uninstall_progress.xml b/res/layout/uninstall_progress.xml index bd1854b1..ff80fe11 100644 --- a/res/layout/uninstall_progress.xml +++ b/res/layout/uninstall_progress.xml @@ -82,8 +82,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentTop="true" - android:paddingLeft="24dip" - android:paddingRight="24dip" + android:paddingStart="24dip" + android:paddingEnd="24dip" android:paddingTop="8dip" android:paddingBottom="8dip" android:fillViewport="false"> @@ -92,7 +92,7 @@ android:id="@+id/center_text" android:layout_width="match_parent" android:layout_height="wrap_content" - android:gravity="left" + android:gravity="start" android:text="@string/uninstalling" android:textAppearance="?android:attr/textAppearanceMedium"/> </ScrollView> |