summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2014-07-09 21:42:59 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-07-09 14:50:30 +0000
commitaa156251eb0414b8c6546c98769789dc28b38140 (patch)
tree864e631291c90730f535f909162b145fac50fe71
parent4eb6927a685f729617d1692d147dd6a589f51510 (diff)
parent588b79939f79c33e0062f276e2c5159d5d6e068d (diff)
downloadplatform_packages_services_Telephony-l-preview.tar.gz
platform_packages_services_Telephony-l-preview.tar.bz2
platform_packages_services_Telephony-l-preview.zip
Merge "progress_large id defined incorrectly"android-l-preview_r2l-preview
-rw-r--r--res/layout/otacall_card.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/res/layout/otacall_card.xml b/res/layout/otacall_card.xml
index d90e940d2..74b31e8f0 100644
--- a/res/layout/otacall_card.xml
+++ b/res/layout/otacall_card.xml
@@ -89,7 +89,7 @@
/>
<!-- Progress bar -->
- <ProgressBar android:id="@+android:id/progress_large"
+ <ProgressBar android:id="@+id/progress_large"
style="?android:attr/progressBarStyleHorizontal"
android:layout_marginTop="20dip"
android:layout_width="match_parent"