PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix text alignment and simplify layouts." into jb-mr1.1-dev

Browse Source
This commit is contained in:
Jeff Sharkey
2012-11-30 17:44:48 -08:00
committed by Android (Google) Code Review
parent b0f3f8dbea 6f8cd76870
commit c3f76cf130
4 changed files with 103 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
res/layout/app_percentage_item.xml
View File

@@ -26,8 +26,8 @@
<ImageView <ImageView
android:id="@android:id/icon" android:id="@android:id/icon"
android:layout_width="48dip" android:layout_width="@android:dimen/app_icon_size"
android:layout_height="48dip" android:layout_height="@android:dimen/app_icon_size"
android:layout_rowSpan="3" android:layout_rowSpan="3"
android:layout_marginEnd="8dip" android:layout_marginEnd="8dip"
android:scaleType="centerInside" android:scaleType="centerInside"
@@ -37,10 +37,11 @@
android:id="@android:id/title" android:id="@android:id/title"
android:layout_width="0dip" android:layout_width="0dip"
android:layout_gravity="fill_horizontal" android:layout_gravity="fill_horizontal"
android:layout_marginTop="2dip"
android:singleLine="true" android:singleLine="true"
android:ellipsize="marquee" android:ellipsize="marquee"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textDirection="locale" /> android:textAlignment="viewStart" />
<TextView <TextView
android:id="@android:id/text1" android:id="@android:id/text1"

2
res/layout/dream_info_row.xml
View File

@@ -54,7 +54,7 @@
android:ellipsize="end" android:ellipsize="end"
android:singleLine="true" android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textDirection="locale" android:textAlignment="viewStart"
android:labelFor="@android:id/button2" /> android:labelFor="@android:id/button2" />
<!-- Dream radio button --> <!-- Dream radio button -->

92
res/layout/manage_applications_item.xml
View File

@@ -17,68 +17,54 @@
*/ */
--> -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight" android:minHeight="?android:attr/listPreferredItemHeight"
android:orientation="horizontal" android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="6dip" android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:paddingStart="6dip" android:paddingTop="8dip"
android:paddingTop="5dip" android:paddingBottom="8dip"
android:paddingBottom="5dip" android:columnCount="4">
android:gravity="center_vertical" >
<ImageView android:id="@+id/app_icon" <ImageView
android:id="@+id/app_icon"
android:layout_width="@android:dimen/app_icon_size" android:layout_width="@android:dimen/app_icon_size"
android:layout_height="@android:dimen/app_icon_size" android:layout_height="@android:dimen/app_icon_size"
android:layout_marginEnd="11dip" android:layout_rowSpan="2"
android:layout_gravity="center_vertical" android:layout_marginEnd="8dip"
android:scaleType="fitCenter" android:scaleType="centerInside"
android:contentDescription="@null"/> android:contentDescription="@null" />
<TextView
android:id="@+id/app_name"
android:layout_width="0dip"
android:layout_columnSpan="2"
android:layout_gravity="fill_horizontal"
android:layout_marginTop="2dip"
android:singleLine="true"
android:ellipsize="marquee"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textAlignment="viewStart" />
<LinearLayout
android:orientation="vertical"
android:layout_width="0px"
android:layout_weight="1"
android:layout_height="wrap_content" >
<TextView android:id="@+id/app_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textStyle="bold"
android:singleLine="true"
android:ellipsize="marquee"
android:layout_marginBottom="2dip" />
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:baselineAlignedChildIndex="0" >
<TextView android:id="@+id/app_size"
android:layout_marginTop="-4dip"
android:layout_gravity="center_vertical|start"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textAppearance="?android:attr/textAppearanceSmall" />
<TextView android:id="@+id/app_disabled"
android:layout_marginTop="-4dip"
android:layout_gravity="center_vertical|end"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
android:visibility="gone"
android:textAppearance="?android:attr/textAppearanceSmall"
android:text="@string/disabled" />
</LinearLayout>
</LinearLayout>
<CheckBox android:id="@+id/app_on_sdcard" <CheckBox android:id="@+id/app_on_sdcard"
android:layout_width="wrap_content" android:layout_marginStart="8dip"
android:layout_height="wrap_content"
android:layout_marginStart="5dip"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_rowSpan="2"
android:visibility="gone" android:visibility="gone"
android:clickable="false" android:clickable="false"
android:focusable="false" /> android:focusable="false" />
</LinearLayout>
<TextView
android:id="@+id/app_size"
android:layout_width="0dip"
android:layout_gravity="fill_horizontal"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textAlignment="viewStart" />
<TextView
android:id="@+id/app_disabled"
android:layout_marginStart="8dip"
android:textAppearance="?android:attr/textAppearanceSmall" />
</GridLayout>

129
res/layout/running_processes_item.xml
View File

@@ -17,79 +17,68 @@
*/ */
--> -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight" android:minHeight="?android:attr/listPreferredItemHeight"
android:orientation="vertical" android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:gravity="fill" > android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:paddingTop="8dip"
android:paddingBottom="8dip"
android:columnCount="2">
<ImageView
android:id="@+id/icon"
android:layout_width="@android:dimen/app_icon_size"
android:layout_height="@android:dimen/app_icon_size"
android:layout_rowSpan="2"
android:layout_marginEnd="8dip"
android:scaleType="centerInside"
android:contentDescription="@null" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="0dip"
android:layout_height="wrap_content" android:layout_gravity="fill_horizontal"
android:layout_weight="1" android:layout_marginTop="2dip">
android:orientation="horizontal"
android:paddingEnd="6dip" <TextView
android:paddingStart="6dip" android:id="@+id/name"
android:gravity="center_vertical" > android:layout_width="0dip"
android:layout_height="wrap_content"
<ImageView android:id="@+id/icon" android:layout_weight="1"
android:layout_width="@android:dimen/app_icon_size" android:singleLine="true"
android:layout_height="@android:dimen/app_icon_size" android:ellipsize="marquee"
android:layout_marginEnd="11dip" android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_gravity="center_vertical" android:textAlignment="viewStart" />
android:scaleType="fitCenter"
android:contentDescription="@null" /> <TextView
android:id="@+id/size"
<LinearLayout android:layout_width="wrap_content"
android:orientation="vertical" android:layout_height="wrap_content"
android:layout_width="match_parent" android:layout_marginStart="8dip"
android:layout_height="wrap_content" > android:textAppearance="?android:attr/textAppearanceSmall" />
<LinearLayout
android:orientation="horizontal"
android:baselineAlignedChildIndex="0"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView android:id="@+id/name"
android:layout_width="0px"
android:layout_height="wrap_content"
android:layout_weight="1"
android:paddingEnd="4dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textStyle="bold"
android:singleLine="true"
android:ellipsize="marquee"
android:layout_marginBottom="2dip" />
<TextView android:id="@+id/size"
android:layout_gravity="center_vertical|end"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceSmall" />
</LinearLayout>
<LinearLayout
android:orientation="horizontal"
android:baselineAlignedChildIndex="0"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView android:id="@+id/description"
android:layout_gravity="center_vertical|start"
android:layout_width="0px"
android:layout_height="wrap_content"
android:layout_weight="1"
android:paddingEnd="4dip"
android:singleLine="true"
android:ellipsize="marquee"
android:textAppearance="?android:attr/textAppearanceSmall" />
<TextView android:id="@+id/uptime"
android:layout_gravity="center_vertical|end"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceSmall" />
</LinearLayout>
</LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="0dip"
android:layout_gravity="fill_horizontal">
<TextView
android:id="@+id/description"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textAlignment="viewStart" />
<TextView
android:id="@+id/uptime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dip"
android:textAppearance="?android:attr/textAppearanceSmall" />
</LinearLayout>
</GridLayout>