CMFM: Fix filesystem and fso dialog layouts (663db102) · Commits · e / os / android_packages_apps_CMFileManager

res/layout/filesystem_info_dialog.xml

+5 −0

res/layout/fso_properties_dialog.xml

+187 −174

Original line number	Original line	Diff line number	Diff line
	@@ -102,6 +102,7 @@
	android:layout_width="match_parent"		android:layout_width="match_parent"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:layout_margin="@dimen/default_margin"		android:layout_margin="@dimen/default_margin"
			android:paddingRight="@dimen/double_margin"
	android:gravity="left\|center_vertical"		android:gravity="left\|center_vertical"
	android:singleLine="false"		android:singleLine="false"
	android:textAppearance="@style/secondary_text_appearance" />		android:textAppearance="@style/secondary_text_appearance" />
	@@ -126,6 +127,7 @@
	android:layout_width="match_parent"		android:layout_width="match_parent"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:layout_margin="@dimen/default_margin"		android:layout_margin="@dimen/default_margin"
			android:paddingRight="@dimen/double_margin"
	android:gravity="left\|center_vertical"		android:gravity="left\|center_vertical"
	android:singleLine="false"		android:singleLine="false"
	android:maxLines="5"		android:maxLines="5"
	@@ -151,6 +153,7 @@
	android:layout_width="match_parent"		android:layout_width="match_parent"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:layout_margin="@dimen/default_margin"		android:layout_margin="@dimen/default_margin"
			android:paddingRight="@dimen/double_margin"
	android:gravity="left\|center_vertical"		android:gravity="left\|center_vertical"
	android:singleLine="false"		android:singleLine="false"
	android:textAppearance="@style/secondary_text_appearance" />		android:textAppearance="@style/secondary_text_appearance" />
	@@ -176,6 +179,7 @@
	android:layout_width="match_parent"		android:layout_width="match_parent"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:layout_margin="@dimen/default_margin"		android:layout_margin="@dimen/default_margin"
			android:paddingRight="@dimen/double_margin"
	android:gravity="left\|center_vertical"		android:gravity="left\|center_vertical"
	android:singleLine="false"		android:singleLine="false"
	android:textAppearance="@style/secondary_text_appearance" />		android:textAppearance="@style/secondary_text_appearance" />
	@@ -202,6 +206,7 @@
	android:layout_width="match_parent"		android:layout_width="match_parent"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:layout_margin="@dimen/default_margin"		android:layout_margin="@dimen/default_margin"
			android:paddingRight="@dimen/double_margin"
	android:gravity="left\|center_vertical"		android:gravity="left\|center_vertical"
	android:singleLine="false"		android:singleLine="false"
	android:textAppearance="@style/secondary_text_appearance" />		android:textAppearance="@style/secondary_text_appearance" />
	@@ -226,6 +231,7 @@
	android:layout_width="match_parent"		android:layout_width="match_parent"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:layout_margin="@dimen/default_margin"		android:layout_margin="@dimen/default_margin"
			android:paddingRight="@dimen/double_margin"
	android:gravity="left\|center_vertical"		android:gravity="left\|center_vertical"
	android:singleLine="false"		android:singleLine="false"
	android:textAppearance="@style/secondary_text_appearance" />		android:textAppearance="@style/secondary_text_appearance" />
	@@ -252,6 +258,7 @@
	android:layout_width="match_parent"		android:layout_width="match_parent"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:layout_margin="@dimen/default_margin"		android:layout_margin="@dimen/default_margin"
			android:paddingRight="@dimen/double_margin"
	android:gravity="left\|center_vertical"		android:gravity="left\|center_vertical"
	android:singleLine="false"		android:singleLine="false"
	android:textAppearance="@style/secondary_text_appearance" />		android:textAppearance="@style/secondary_text_appearance" />
	@@ -276,6 +283,7 @@
	android:layout_width="match_parent"		android:layout_width="match_parent"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:layout_margin="@dimen/default_margin"		android:layout_margin="@dimen/default_margin"
			android:paddingRight="@dimen/double_margin"
	android:gravity="left\|center_vertical"		android:gravity="left\|center_vertical"
	android:singleLine="false"		android:singleLine="false"
	android:textAppearance="@style/secondary_text_appearance" />		android:textAppearance="@style/secondary_text_appearance" />
	@@ -283,7 +291,7 @@
	</TableLayout>		</TableLayout>
	</ScrollView>		</ScrollView>

	<!-- Permissions -->		<!-- Owner/Permissions -->
	<ScrollView		<ScrollView
	android:id="@+id/fso_tab_permissions"		android:id="@+id/fso_tab_permissions"
	android:layout_width="match_parent"		android:layout_width="match_parent"
	@@ -367,194 +375,199 @@
	<TableLayout		<TableLayout
	android:layout_width="match_parent"		android:layout_width="match_parent"
	android:layout_height="wrap_content" >		android:layout_height="wrap_content" >

	<!-- Title -->
	<TableRow		<TableRow
	android:layout_marginLeft="@dimen/extra_large_margin"		android:layout_marginLeft="@dimen/extra_large_margin"
	android:layout_marginRight="@dimen/extra_large_margin" >		android:layout_marginRight="@dimen/extra_large_margin" >

			<!-- Labels -->
			<LinearLayout
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:orientation="vertical">
	<TextView		<TextView
	android:layout_width="wrap_content"		android:layout_width="wrap_content"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:layout_weight="1"
	android:layout_margin="@dimen/default_margin"		android:layout_margin="@dimen/default_margin"
	android:gravity="left\|center_vertical"		android:gravity="left\|center_vertical"
	android:text="@null"		android:text="@null"
	android:textAppearance="@style/primary_text_appearance" />		android:textAppearance="@style/primary_text_appearance" />
			<LinearLayout
	<TextView		android:layout_width="wrap_content"
	android:id="@+id/fso_properties_permissions_special_label"		android:layout_height="wrap_content">
			<CheckBox
	android:layout_width="0dip"		android:layout_width="0dip"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:layout_weight="1"		android:layout_marginTop="@dimen/default_margin"
			android:layout_marginBottom="@dimen/default_margin"
			android:visibility="invisible" />
			<TextView
			android:id="@+id/fso_properties_permissions_owner_label"
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
	android:layout_margin="@dimen/default_margin"		android:layout_margin="@dimen/default_margin"
	android:gravity="center"		android:gravity="left\|center_vertical"
	android:text="@string/fso_properties_dialog_special"		android:text="@string/fso_properties_dialog_owner"
	android:textAppearance="@style/primary_text_appearance" />		android:textAppearance="@style/primary_text_appearance" />
			</LinearLayout>
	<TextView		<LinearLayout
	android:id="@+id/fso_properties_permissions_read_label"		android:layout_width="wrap_content"
			android:layout_height="wrap_content">
			<CheckBox
	android:layout_width="0dip"		android:layout_width="0dip"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:layout_weight="1"		android:layout_marginTop="@dimen/default_margin"
			android:layout_marginBottom="@dimen/default_margin"
			android:visibility="invisible" />
			<TextView
			android:id="@+id/fso_properties_permissions_group_label"
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
	android:layout_margin="@dimen/default_margin"		android:layout_margin="@dimen/default_margin"
	android:gravity="center"		android:gravity="left\|center_vertical"
	android:text="@string/fso_properties_dialog_read"		android:text="@string/fso_properties_dialog_group"
	android:textAppearance="@style/primary_text_appearance" />		android:textAppearance="@style/primary_text_appearance" />
			</LinearLayout>
	<TextView		<LinearLayout
	android:id="@+id/fso_properties_permissions_write_label"		android:layout_width="wrap_content"
			android:layout_height="wrap_content">
			<CheckBox
	android:layout_width="0dip"		android:layout_width="0dip"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:layout_weight="1"		android:layout_marginTop="@dimen/default_margin"
			android:layout_marginBottom="@dimen/default_margin"
			android:visibility="invisible" />
			<TextView
			android:id="@+id/fso_properties_permissions_others_label"
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
	android:layout_margin="@dimen/default_margin"		android:layout_margin="@dimen/default_margin"
	android:gravity="center"		android:gravity="left\|center_vertical"
	android:text="@string/fso_properties_dialog_write"		android:text="@string/fso_properties_dialog_others"
	android:textAppearance="@style/primary_text_appearance" />		android:textAppearance="@style/primary_text_appearance" />
			</LinearLayout>
			</LinearLayout>

			<!-- Special -->
			<LinearLayout
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:orientation="vertical">
	<TextView		<TextView
	android:id="@+id/fso_properties_permissions_execute_label"		android:id="@+id/fso_properties_permissions_special_label"
	android:layout_width="0dip"		android:layout_width="wrap_content"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:layout_weight="1"
	android:layout_margin="@dimen/default_margin"		android:layout_margin="@dimen/default_margin"
	android:gravity="center"		android:layout_gravity="center"
	android:text="@string/fso_properties_dialog_execute"		android:text="@string/fso_properties_dialog_special"
	android:textAppearance="@style/primary_text_appearance" />		android:textAppearance="@style/primary_text_appearance" />
	</TableRow>		<CheckBox
			android:id="@+id/fso_permissions_owner_special"
	<!-- Owner -->		android:layout_width="wrap_content"
	<TableRow		android:layout_height="wrap_content"
	android:layout_marginLeft="@dimen/extra_large_margin"		android:layout_margin="@dimen/default_margin" />
	android:layout_marginRight="@dimen/extra_large_margin" >		<CheckBox
			android:id="@+id/fso_permissions_group_special"
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:layout_margin="@dimen/default_margin" />
			<CheckBox
			android:id="@+id/fso_permissions_others_special"
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:layout_margin="@dimen/default_margin" />
			</LinearLayout>

			<!-- Read -->
			<LinearLayout
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:orientation="vertical">
	<TextView		<TextView
	android:id="@+id/fso_properties_permissions_owner_label"		android:id="@+id/fso_properties_permissions_read_label"
	android:layout_width="wrap_content"		android:layout_width="wrap_content"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:layout_weight="1"
	android:layout_margin="@dimen/default_margin"		android:layout_margin="@dimen/default_margin"
	android:gravity="left\|center_vertical"		android:layout_gravity="center"
	android:text="@string/fso_properties_dialog_owner"		android:text="@string/fso_properties_dialog_read"
	android:textAppearance="@style/primary_text_appearance" />		android:textAppearance="@style/primary_text_appearance" />

	<CheckBox		<CheckBox
	android:id="@+id/fso_permissions_owner_read"		android:id="@+id/fso_permissions_owner_read"
	android:layout_width="0dip"		android:layout_width="wrap_content"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:layout_weight="1"
	android:layout_margin="@dimen/default_margin" />		android:layout_margin="@dimen/default_margin" />

	<CheckBox		<CheckBox
	android:id="@+id/fso_permissions_owner_write"		android:id="@+id/fso_permissions_group_read"
	android:layout_width="0dip"		android:layout_width="wrap_content"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:layout_weight="1"
	android:layout_margin="@dimen/default_margin" />		android:layout_margin="@dimen/default_margin" />

	<CheckBox		<CheckBox
	android:id="@+id/fso_permissions_owner_execute"		android:id="@+id/fso_permissions_others_read"
	android:layout_width="0dip"		android:layout_width="wrap_content"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:layout_weight="1"
	android:layout_margin="@dimen/default_margin" />		android:layout_margin="@dimen/default_margin" />
			</LinearLayout>

	<CheckBox		<!-- Write -->
	android:id="@+id/fso_permissions_owner_special"		<LinearLayout
	android:layout_width="0dip"		android:layout_width="wrap_content"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:layout_weight="1"		android:orientation="vertical">
	android:layout_margin="@dimen/default_margin" />
	</TableRow>

	<!-- Group -->
	<TableRow
	android:layout_marginLeft="@dimen/extra_large_margin"
	android:layout_marginRight="@dimen/extra_large_margin" >

	<TextView		<TextView
	android:id="@+id/fso_properties_permissions_group_label"		android:id="@+id/fso_properties_permissions_write_label"
	android:layout_width="wrap_content"		android:layout_width="wrap_content"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:layout_weight="1"
	android:layout_margin="@dimen/default_margin"		android:layout_margin="@dimen/default_margin"
	android:gravity="left\|center_vertical"		android:layout_gravity="center"
	android:text="@string/fso_properties_dialog_group"		android:text="@string/fso_properties_dialog_write"
	android:textAppearance="@style/primary_text_appearance" />		android:textAppearance="@style/primary_text_appearance" />

	<CheckBox		<CheckBox
	android:id="@+id/fso_permissions_group_read"		android:id="@+id/fso_permissions_owner_write"
	android:layout_width="0dip"		android:layout_width="wrap_content"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:layout_weight="1"
	android:layout_margin="@dimen/default_margin" />		android:layout_margin="@dimen/default_margin" />

	<CheckBox		<CheckBox
	android:id="@+id/fso_permissions_group_write"		android:id="@+id/fso_permissions_group_write"
	android:layout_width="0dip"		android:layout_width="wrap_content"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:layout_weight="1"
	android:layout_margin="@dimen/default_margin" />		android:layout_margin="@dimen/default_margin" />

	<CheckBox		<CheckBox
	android:id="@+id/fso_permissions_group_execute"		android:id="@+id/fso_permissions_others_write"
	android:layout_width="0dip"		android:layout_width="wrap_content"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:layout_weight="1"
	android:layout_margin="@dimen/default_margin" />		android:layout_margin="@dimen/default_margin" />
			</LinearLayout>

	<CheckBox		<!-- Execute -->
	android:id="@+id/fso_permissions_group_special"		<LinearLayout
	android:layout_width="0dip"		android:layout_width="wrap_content"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:layout_weight="1"		android:orientation="vertical">
	android:layout_margin="@dimen/default_margin" />
	</TableRow>

	<!-- Others -->
	<TableRow
	android:layout_marginLeft="@dimen/extra_large_margin"
	android:layout_marginRight="@dimen/extra_large_margin" >

	<TextView		<TextView
	android:id="@+id/fso_properties_permissions_others_label"		android:id="@+id/fso_properties_permissions_execute_label"
	android:layout_width="wrap_content"		android:layout_width="wrap_content"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:layout_weight="1"
	android:layout_margin="@dimen/default_margin"		android:layout_margin="@dimen/default_margin"
	android:gravity="left\|center_vertical"		android:layout_gravity="center"
	android:text="@string/fso_properties_dialog_others"		android:text="@string/fso_properties_dialog_execute"
	android:textAppearance="@style/primary_text_appearance" />		android:textAppearance="@style/primary_text_appearance" />

	<CheckBox		<CheckBox
	android:id="@+id/fso_permissions_others_read"		android:id="@+id/fso_permissions_owner_execute"
	android:layout_width="0dip"		android:layout_width="wrap_content"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:layout_weight="1"
	android:layout_margin="@dimen/default_margin" />		android:layout_margin="@dimen/default_margin" />

	<CheckBox		<CheckBox
	android:id="@+id/fso_permissions_others_write"		android:id="@+id/fso_permissions_group_execute"
	android:layout_width="0dip"		android:layout_width="wrap_content"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:layout_weight="1"
	android:layout_margin="@dimen/default_margin" />		android:layout_margin="@dimen/default_margin" />

	<CheckBox		<CheckBox
	android:id="@+id/fso_permissions_others_execute"		android:id="@+id/fso_permissions_others_execute"
	android:layout_width="0dip"		android:layout_width="wrap_content"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:layout_weight="1"
	android:layout_margin="@dimen/default_margin" />		android:layout_margin="@dimen/default_margin" />
			</LinearLayout>

	<CheckBox
	android:id="@+id/fso_permissions_others_special"
	android:layout_width="0dip"
	android:layout_height="wrap_content"
	android:layout_weight="1"
	android:layout_margin="@dimen/default_margin" />
	</TableRow>		</TableRow>

	</TableLayout>		</TableLayout>

	<!-- Info message -->		<!-- Info message -->

res/values/dimen.xml

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -40,6 +40,8 @@
	<dimen name="extra_margin">8dp</dimen>		<dimen name="extra_margin">8dp</dimen>
	<!-- An extra margin -->		<!-- An extra margin -->
	<dimen name="extra_large_margin">16dp</dimen>		<dimen name="extra_large_margin">16dp</dimen>
			<!-- Double margin -->
			<dimen name="double_margin">24dp</dimen>
	<!-- A small margin -->		<!-- A small margin -->
	<dimen name="small_margin">2dp</dimen>		<dimen name="small_margin">2dp</dimen>
	<!-- The minimal margin -->		<!-- The minimal margin -->

src/com/cyanogenmod/filemanager/ui/dialogs/FsoPropertiesDialog.java

+8 −10

Original line number	Original line	Diff line number	Diff line
	@@ -111,7 +111,7 @@ public class FsoPropertiesDialog
	/**		/**
	* @hide		* @hide
	*/		*/
	CheckBox[] mChkUserPermission;		private CheckBox[] mChkUserPermission;
	private CheckBox[] mChkGroupPermission;		private CheckBox[] mChkGroupPermission;
	private CheckBox[] mChkOthersPermission;		private CheckBox[] mChkOthersPermission;
	private TextView mInfoMsgView;		private TextView mInfoMsgView;
	@@ -889,19 +889,19 @@ public class FsoPropertiesDialog
	chkPermissions[0] = (CheckBox)rootView.findViewById(		chkPermissions[0] = (CheckBox)rootView.findViewById(
	ResourcesHelper.getIdentifier(		ResourcesHelper.getIdentifier(
	res, "id", //$NON-NLS-1$		res, "id", //$NON-NLS-1$
	String.format("fso_permissions_%s_read", type))); //$NON-NLS-1$		String.format("fso_permissions_%s_special", type))); //$NON-NLS-1$
	chkPermissions[1] = (CheckBox)rootView.findViewById(		chkPermissions[1] = (CheckBox)rootView.findViewById(
	ResourcesHelper.getIdentifier(		ResourcesHelper.getIdentifier(
	res, "id", //$NON-NLS-1$		res, "id", //$NON-NLS-1$
	String.format("fso_permissions_%s_write", type))); //$NON-NLS-1$		String.format("fso_permissions_%s_read", type))); //$NON-NLS-1$
	chkPermissions[2] = (CheckBox)rootView.findViewById(		chkPermissions[2] = (CheckBox)rootView.findViewById(
	ResourcesHelper.getIdentifier(		ResourcesHelper.getIdentifier(
	res, "id", //$NON-NLS-1$		res, "id", //$NON-NLS-1$
	String.format("fso_permissions_%s_execute", type))); //$NON-NLS-1$		String.format("fso_permissions_%s_write", type))); //$NON-NLS-1$
	chkPermissions[3] = (CheckBox)rootView.findViewById(		chkPermissions[3] = (CheckBox)rootView.findViewById(
	ResourcesHelper.getIdentifier(		ResourcesHelper.getIdentifier(
	res, "id", //$NON-NLS-1$		res, "id", //$NON-NLS-1$
	String.format("fso_permissions_%s_special", type))); //$NON-NLS-1$		String.format("fso_permissions_%s_execute", type))); //$NON-NLS-1$
	return chkPermissions;		return chkPermissions;
	}		}

	@@ -1098,19 +1098,17 @@ public class FsoPropertiesDialog
	* @param spinner The spinner		* @param spinner The spinner
	*/		*/
	private void adjustSpinnerSize(final Spinner spinner) {		private void adjustSpinnerSize(final Spinner spinner) {
			final View v = this.mContentView.findViewById(R.id.fso_properties_dialog_tabhost);
	spinner.post(new Runnable() {		spinner.post(new Runnable() {
	@Override		@Override
	public void run() {		public void run() {
	// Align with the last checkbox of the column		// Align with the last checkbox of the column
	CheckBox cb = FsoPropertiesDialog.this.mChkUserPermission[3];		int vW = v.getMeasuredWidth();
	int cbW = cb.getMeasuredWidth();
	int[] cbPos = new int[2];
	cb.getLocationInWindow(cbPos);
	int[] cbSpn = new int[2];		int[] cbSpn = new int[2];
	spinner.getLocationInWindow(cbSpn);		spinner.getLocationInWindow(cbSpn);

	// Set the width		// Set the width
	spinner.getLayoutParams().width = (cbPos[0] - cbSpn[0]) + cbW;		spinner.getLayoutParams().width = vW - cbSpn[0];
	}		}
	});		});
	}		}