Improve layout of app ops details screen. (9a48eafe) · Commits · e / os / android_packages_apps_Settings

res/layout/app_ops_details_item.xml

+42 −47

Original line number	Original line	Diff line number	Diff line
	@@ -17,68 +17,36 @@
	*/		*/
	-->		-->

	<GridLayout xmlns:android="http://schemas.android.com/apk/res/android"		<RelativeLayout 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:paddingStart="?android:attr/listPreferredItemPaddingStart"		android:paddingStart="?android:attr/listPreferredItemPaddingStart"
	android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"		android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
	android:paddingTop="8dip"		android:paddingTop="8dip"
	android:paddingBottom="8dip"		android:paddingBottom="8dip">
	android:columnCount="3">

	<ImageView		<ImageView
	android:id="@+id/op_icon"		android:id="@+id/op_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_column="0"		android:layout_centerVertical="true"
	android:layout_row="0"
	android:layout_rowSpan="2"
	android:layout_marginEnd="8dip"		android:layout_marginEnd="8dip"
	android:scaleType="centerInside"		android:scaleType="centerInside"
	android:contentDescription="@null" />		android:contentDescription="@null" />

	<TextView		<LinearLayout
	android:id="@+id/op_name"		android:id="@+id/widget"
	android:layout_column="1"		android:layout_width="wrap_content"
	android:layout_row="0"
	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" />

	<TextView
	android:id="@+id/op_time"
	android:layout_column="1"
	android:layout_row="1"
	android:layout_width="0dp"
	android:layout_height="wrap_content"
	android:layout_gravity="fill_horizontal\|top"
	android:textAppearance="?android:attr/textAppearanceSmall"
	android:textAlignment="viewStart" />

	<TextView
	android:id="@+id/op_counts"
	android:layout_column="1"
	android:layout_row="2"
	android:layout_width="0dp"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:layout_gravity="fill_horizontal\|top"		android:layout_marginStart="8dip"
	android:textAppearance="?android:attr/textAppearanceSmall"		android:layout_alignParentEnd="true"
	android:textAlignment="viewStart" />		android:layout_centerVertical="true">

	<Spinner		<Spinner
	android:id="@+id/spinnerWidget"		android:id="@+id/spinnerWidget"
	android:layout_width="wrap_content"		android:layout_width="wrap_content"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:layout_gravity="center_vertical"
	android:layout_marginStart="8dip"
	android:layout_column="2"
	android:layout_row="0"
	android:layout_rowSpan="3"
	android:padding="8dip"		android:padding="8dip"
	android:focusable="false"		android:focusable="false"
	android:entries="@+array/app_ops_permissions" />		android:entries="@+array/app_ops_permissions" />
	@@ -87,14 +55,41 @@
	android:id="@+id/switchWidget"		android:id="@+id/switchWidget"
	android:layout_width="wrap_content"		android:layout_width="wrap_content"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:layout_gravity="center_vertical"
	android:layout_marginStart="8dip"
	android:layout_column="2"
	android:layout_row="0"
	android:layout_rowSpan="3"
	android:padding="8dip"		android:padding="8dip"
	android:focusable="false"		android:focusable="false"
	android:clickable="true" />		android:clickable="true" />

			</LinearLayout>

			<TextView
			android:id="@+id/op_name"
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:layout_toEndOf="@id/op_icon"
			android:layout_toStartOf="@id/widget"
			android:singleLine="true"
			android:ellipsize="marquee"
			android:textAppearance="?android:attr/textAppearanceMedium"
			android:textAlignment="viewStart" />

			<TextView
			android:id="@+id/op_time"
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:layout_toEndOf="@id/op_icon"
			android:layout_toStartOf="@id/widget"
			android:layout_below="@id/op_name"
			android:textAppearance="?android:attr/textAppearanceSmall"
			android:textAlignment="viewStart" />

			<TextView
			android:id="@+id/op_counts"
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:layout_toEndOf="@id/op_icon"
			android:layout_toStartOf="@id/widget"
			android:layout_below="@id/op_time"
			android:textAppearance="?android:attr/textAppearanceSmall"
			android:textAlignment="viewStart" />

	</GridLayout>		</RelativeLayout>

src/com/android/settings/applications/AppOpsDetails.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -177,9 +177,9 @@ public class AppOpsDetails extends InstrumentedFragment {
	entry.getTimeText(res, true));		entry.getTimeText(res, true));

	Spinner sp = (Spinner) view.findViewById(R.id.spinnerWidget);		Spinner sp = (Spinner) view.findViewById(R.id.spinnerWidget);
	sp.setVisibility(View.INVISIBLE);		sp.setVisibility(View.GONE);
	Switch sw = (Switch) view.findViewById(R.id.switchWidget);		Switch sw = (Switch) view.findViewById(R.id.switchWidget);
	sw.setVisibility(View.INVISIBLE);		sw.setVisibility(View.GONE);

	final int switchOp = AppOpsManager.opToSwitch(firstOp.getOp());		final int switchOp = AppOpsManager.opToSwitch(firstOp.getOp());
	int mode = mAppOps.checkOp(switchOp, entry.getPackageOps().getUid(),		int mode = mAppOps.checkOp(switchOp, entry.getPackageOps().getUid(),