summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorSanket Padawe <sanketpadawe@google.com>2015-07-08 18:06:09 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-08 18:06:09 +0000
commit854ad87a6693b2b8bdbcd6d53ad94260d05d5b8f (patch)
tree7bc90c8b944ec244043a41fb0427d51b899ee2d0 /res
parent1de8dd104ee2140df70e6679c92d41ab8ef33add (diff)
parente1c464601f1b1c0278551296cd7bdd50f96f4071 (diff)
downloadandroid_packages_apps_Bluetooth-854ad87a6693b2b8bdbcd6d53ad94260d05d5b8f.tar.gz
android_packages_apps_Bluetooth-854ad87a6693b2b8bdbcd6d53ad94260d05d5b8f.tar.bz2
android_packages_apps_Bluetooth-854ad87a6693b2b8bdbcd6d53ad94260d05d5b8f.zip
am e1c46460: Merge "Locale based string alignment changes in BT." into mnc-dev
* commit 'e1c464601f1b1c0278551296cd7bdd50f96f4071': Locale based string alignment changes in BT.
Diffstat (limited to 'res')
-rw-r--r--res/layout/incoming_dialog.xml2
-rw-r--r--res/values/styles.xml4
2 files changed, 3 insertions, 3 deletions
diff --git a/res/layout/incoming_dialog.xml b/res/layout/incoming_dialog.xml
index 7e7bb5b56..3f183d4cf 100644
--- a/res/layout/incoming_dialog.xml
+++ b/res/layout/incoming_dialog.xml
@@ -21,7 +21,7 @@
<LinearLayout
android:layout_height="wrap_content"
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:orientation="vertical">
<TextView
diff --git a/res/values/styles.xml b/res/values/styles.xml
index cd6116e2b..8e85faf75 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -24,7 +24,7 @@
</style>
<style name="file_transfer_item_label">
- <item name="android:layout_width">wrap_content</item>
+ <item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_marginStart">20dip</item>
<item name="android:layout_marginEnd">20dip</item>
@@ -35,7 +35,7 @@
</style>
<style name="file_transfer_item_content">
- <item name="android:layout_width">wrap_content</item>
+ <item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_marginStart">20dip</item>
<item name="android:layout_marginEnd">20dip</item>