LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Fix incorrect external resource creation"

Browse Source
This commit is contained in:
Adam Lesinski
2014-06-26 16:52:49 +00:00
committed by Android (Google) Code Review
parent 60d8cebd04 0f2beb163a
commit a75e45ab61
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/ApiDemos/res/layout/fragment_tabs_fragment.xml
View File

@@ -41,7 +41,7 @@
android:layout_weight="0"/> android:layout_weight="0"/>
<FrameLayout <FrameLayout
android:id="@+android:id/realtabcontent" android:id="@+id/realtabcontent"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="1"/> android:layout_weight="1"/>

8
samples/ApiDemos/res/layout/progressbar_2.xml
View File

@@ -19,21 +19,21 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<ProgressBar android:id="@+android:id/progress_large" <ProgressBar android:id="@+id/progress_large"
style="?android:attr/progressBarStyleLarge" style="?android:attr/progressBarStyleLarge"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<ProgressBar android:id="@+android:id/progress" <ProgressBar android:id="@+id/progress"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<ProgressBar android:id="@+android:id/progress_small" <ProgressBar android:id="@+id/progress_small"
style="?android:attr/progressBarStyleSmall" style="?android:attr/progressBarStyleSmall"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<ProgressBar android:id="@+android:id/progress_small_title" <ProgressBar android:id="@+id/progress_small_title"
style="?android:attr/progressBarStyleSmallTitle" style="?android:attr/progressBarStyleSmallTitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />