Merge "Fix text alignment and simplify layouts." into jb-mr1.1-dev (c3f76cf1) · Commits · e / os / android_packages_apps_Settings

res/layout/app_percentage_item.xml

+4 −3

Original line number	Diff line number	Diff line
		@@ -26,8 +26,8 @@

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

		<TextView
		android:id="@android:id/text1"

res/layout/dream_info_row.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -54,7 +54,7 @@
		android:ellipsize="end"
		android:singleLine="true"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:textDirection="locale"
		android:textAlignment="viewStart"
		android:labelFor="@android:id/button2" />

		<!-- Dream radio button -->

res/layout/manage_applications_item.xml

+39 −53

Original line number	Diff line number	Diff line
		@@ -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_height="wrap_content"
		android:minHeight="?android:attr/listPreferredItemHeight"
		android:orientation="horizontal"
		android:paddingEnd="6dip"
		android:paddingStart="6dip"
		android:paddingTop="5dip"
		android:paddingBottom="5dip"
		android:gravity="center_vertical" >
		android:paddingStart="?android:attr/listPreferredItemPaddingStart"
		android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
		android:paddingTop="8dip"
		android:paddingBottom="8dip"
		android:columnCount="4">

		<ImageView android:id="@+id/app_icon"
		<ImageView
		android:id="@+id/app_icon"
		android:layout_width="@android:dimen/app_icon_size"
		android:layout_height="@android:dimen/app_icon_size"
		android:layout_marginEnd="11dip"
		android:layout_gravity="center_vertical"
		android:scaleType="fitCenter"
		android:layout_rowSpan="2"
		android:layout_marginEnd="8dip"
		android:scaleType="centerInside"
		android:contentDescription="@null" />

		<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"
		<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: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>
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:textAlignment="viewStart" />

		<CheckBox android:id="@+id/app_on_sdcard"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginStart="5dip"
		android:layout_marginStart="8dip"
		android:layout_gravity="center_vertical"
		android:layout_rowSpan="2"
		android:visibility="gone"
		android:clickable="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>

res/layout/running_processes_item.xml

+59 −70

Original line number	Diff line number	Diff line
		@@ -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_height="wrap_content"
		android:minHeight="?android:attr/listPreferredItemHeight"
		android:orientation="vertical"
		android:gravity="fill" >
		android:paddingStart="?android:attr/listPreferredItemPaddingStart"
		android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
		android:paddingTop="8dip"
		android:paddingBottom="8dip"
		android:columnCount="2">

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_weight="1"
		android:orientation="horizontal"
		android:paddingEnd="6dip"
		android:paddingStart="6dip"
		android:gravity="center_vertical" >

		<ImageView android:id="@+id/icon"
		<ImageView
		android:id="@+id/icon"
		android:layout_width="@android:dimen/app_icon_size"
		android:layout_height="@android:dimen/app_icon_size"
		android:layout_marginEnd="11dip"
		android:layout_gravity="center_vertical"
		android:scaleType="fitCenter"
		android:layout_rowSpan="2"
		android:layout_marginEnd="8dip"
		android:scaleType="centerInside"
		android:contentDescription="@null" />

		<LinearLayout
		android:orientation="vertical"
		android:layout_width="match_parent"
		android:layout_height="wrap_content" >
		<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_width="0dip"
		android:layout_gravity="fill_horizontal"
		android:layout_marginTop="2dip">

		<TextView
		android:id="@+id/name"
		android:layout_width="0dip"
		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:textAppearance="?android:attr/textAppearanceMedium"
		android:textAlignment="viewStart" />

		<TextView
		android:id="@+id/size"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_weight="0"
		android:singleLine="true"
		android:layout_marginStart="8dip"
		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_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: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:textAppearance="?android:attr/textAppearanceSmall"
		android:textAlignment="viewStart" />

		<TextView
		android:id="@+id/uptime"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_weight="0"
		android:singleLine="true"
		android:layout_marginStart="8dip"
		android:textAppearance="?android:attr/textAppearanceSmall" />

		</LinearLayout>
		</LinearLayout>
		</LinearLayout>
		</LinearLayout>

		</GridLayout>