diff options
author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-07-25 00:32:47 +0100 |
---|---|---|
committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-07-25 00:32:47 +0100 |
commit | f587ad6fd760c78eae8fe7a59104f43a7ea84f3d (patch) | |
tree | 1c8f9d691d69b893902c7c2d467a3df0555b2615 /res/layout/uninstall_confirm.xml | |
parent | a4b300d057b74e848de622c33c2206281d0df631 (diff) | |
parent | b1a5960af6814e38ae7dcd771d25c1d8ab1dcae6 (diff) | |
download | android_packages_apps_PackageInstaller-f587ad6fd760c78eae8fe7a59104f43a7ea84f3d.tar.gz android_packages_apps_PackageInstaller-f587ad6fd760c78eae8fe7a59104f43a7ea84f3d.tar.bz2 android_packages_apps_PackageInstaller-f587ad6fd760c78eae8fe7a59104f43a7ea84f3d.zip |
Merge tag 'android-4.3_r2.1' into cm-10.2
Android 4.3 release 2.1
Conflicts:
res/values-nl/strings.xml
Change-Id: I6b4a88abd08a4a2f2cecbc4ea5b86bbc736d2dd6
Diffstat (limited to 'res/layout/uninstall_confirm.xml')
-rw-r--r-- | res/layout/uninstall_confirm.xml | 8 |
1 files changed, 4 insertions, 4 deletions
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" |