Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change I2e069577 into eclair

Browse Source 
* changes:
  Simplify the layout of all activities with a title and a progress bar.
This commit is contained in:
Android (Google) Code Review
2009-09-29 20:27:22 -04:00
parent 072c9e7473 534dcbc5a0
commit 91c6bdd203
1 changed files with 48 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
core/res/res/layout/screen_progress.xml
View File

@@ -20,58 +20,55 @@
This is the basic layout for a screen, with all of its features enabled. This is the basic layout for a screen, with all of its features enabled.
--> -->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:fitsSystemWindows="true" android:fitsSystemWindows="true"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
> >
<LinearLayout <RelativeLayout android:id="@android:id/title_container"
android:orientation="vertical" style="?android:attr/windowTitleBackgroundStyle"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="?android:attr/windowTitleSize"
> >
<RelativeLayout android:id="@android:id/title_container" <ProgressBar android:id="@+android:id/progress_circular"
style="?android:attr/windowTitleBackgroundStyle" style="?android:attr/progressBarStyleSmallTitle"
android:layout_width="fill_parent" android:layout_width="wrap_content"
android:layout_height="?android:attr/windowTitleSize" android:layout_height="wrap_content"
> android:layout_marginLeft="5dip"
<ProgressBar android:id="@+android:id/progress_circular" android:layout_alignParentRight="true"
style="?android:attr/progressBarStyleSmallTitle" android:layout_centerVertical="true"
android:layout_width="wrap_content" android:visibility="gone"
android:layout_height="wrap_content" android:max="10000"
android:layout_marginLeft="5dip"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:visibility="gone"
android:max="10000"
/>
<ProgressBar android:id="@+android:id/progress_horizontal"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="2dip"
android:layout_alignParentLeft="true"
android:layout_toLeftOf="@android:id/progress_circular"
android:layout_centerVertical="true"
android:visibility="gone"
android:max="10000"
/>
<TextView android:id="@android:id/title"
style="?android:attr/windowTitleStyle"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_alignParentLeft="true"
android:layout_toLeftOf="@android:id/progress_circular"
android:background="@null"
android:fadingEdge="horizontal"
android:gravity="center_vertical"
android:scrollHorizontally="true"
/>
</RelativeLayout>
<FrameLayout android:id="@android:id/content"
android:layout_width="fill_parent"
android:layout_height="0dip"
android:layout_weight="1"
android:foregroundGravity="fill_horizontal|top"
android:foreground="?android:attr/windowContentOverlay"
/> />
</LinearLayout> <ProgressBar android:id="@+android:id/progress_horizontal"
</FrameLayout> style="?android:attr/progressBarStyleHorizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="2dip"
android:layout_alignParentLeft="true"
android:layout_toLeftOf="@android:id/progress_circular"
android:layout_centerVertical="true"
android:visibility="gone"
android:max="10000"
/>
<TextView android:id="@android:id/title"
style="?android:attr/windowTitleStyle"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_alignParentLeft="true"
android:layout_toLeftOf="@android:id/progress_circular"
android:background="@null"
android:fadingEdge="horizontal"
android:gravity="center_vertical"
android:scrollHorizontally="true"
/>
</RelativeLayout>
<FrameLayout android:id="@android:id/content"
android:layout_width="fill_parent"
android:layout_height="0dip"
android:layout_weight="1"
android:foregroundGravity="fill_horizontal|top"
android:foreground="?android:attr/windowContentOverlay"
/>
</LinearLayout>