diff options
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/bookmarks_item.xml | 2 | ||||
| -rw-r--r-- | res/layout/editor.xml | 1 | ||||
| -rw-r--r-- | res/layout/filesystem_info_dialog.xml | 5 | ||||
| -rw-r--r-- | res/layout/fso_properties_dialog.xml | 419 | ||||
| -rw-r--r-- | res/layout/history_item.xml | 2 | ||||
| -rw-r--r-- | res/layout/inline_autocomplete.xml | 3 | ||||
| -rw-r--r-- | res/layout/input_name_dialog.xml | 2 | ||||
| -rw-r--r-- | res/layout/navigation.xml | 1 |
8 files changed, 253 insertions, 182 deletions
diff --git a/res/layout/bookmarks_item.xml b/res/layout/bookmarks_item.xml index f1c7acca..fc8e4be5 100644 --- a/res/layout/bookmarks_item.xml +++ b/res/layout/bookmarks_item.xml @@ -17,7 +17,7 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="wrap_content" android:layout_height="@dimen/default_row_height" - android:background="@drawable/holo_selector" > + android:background="@drawable/holo_list_selector_deselected" > <ImageView android:id="@+id/bookmarks_item_icon" diff --git a/res/layout/editor.xml b/res/layout/editor.xml index af78d622..177d377e 100644 --- a/res/layout/editor.xml +++ b/res/layout/editor.xml @@ -46,6 +46,7 @@ android:gravity="top|left" android:cursorVisible="true" android:background="@null" + android:imeOptions="actionDone|flagNoFullscreen" android:inputType="textMultiLine|textImeMultiLine" android:text="@null" android:textAppearance="@style/secondary_text_appearance" /> diff --git a/res/layout/filesystem_info_dialog.xml b/res/layout/filesystem_info_dialog.xml index b5c0aa81..4e46e1c0 100644 --- a/res/layout/filesystem_info_dialog.xml +++ b/res/layout/filesystem_info_dialog.xml @@ -128,6 +128,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="@dimen/default_margin" + android:paddingRight="@dimen/double_margin" android:gravity="left|center_vertical" android:singleLine="false" android:textAppearance="@style/secondary_text_appearance" /> @@ -152,6 +153,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="@dimen/default_margin" + android:paddingRight="@dimen/double_margin" android:gravity="left|center_vertical" android:singleLine="false" android:textAppearance="@style/secondary_text_appearance" /> @@ -176,6 +178,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="@dimen/default_margin" + android:paddingRight="@dimen/double_margin" android:gravity="left|center_vertical" android:singleLine="false" android:textAppearance="@style/secondary_text_appearance" /> @@ -200,6 +203,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="@dimen/default_margin" + android:paddingRight="@dimen/double_margin" android:gravity="left|center_vertical" android:singleLine="false" android:maxLines="5" @@ -225,6 +229,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="@dimen/default_margin" + android:paddingRight="@dimen/double_margin" android:gravity="left|center_vertical" android:singleLine="false" android:textAppearance="@style/secondary_text_appearance" /> diff --git a/res/layout/fso_properties_dialog.xml b/res/layout/fso_properties_dialog.xml index 65c962ff..45c38450 100644 --- a/res/layout/fso_properties_dialog.xml +++ b/res/layout/fso_properties_dialog.xml @@ -102,6 +102,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="@dimen/default_margin" + android:paddingRight="@dimen/double_margin" android:gravity="left|center_vertical" android:singleLine="false" android:textAppearance="@style/secondary_text_appearance" /> @@ -126,6 +127,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="@dimen/default_margin" + android:paddingRight="@dimen/double_margin" android:gravity="left|center_vertical" android:singleLine="false" android:maxLines="5" @@ -151,6 +153,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="@dimen/default_margin" + android:paddingRight="@dimen/double_margin" android:gravity="left|center_vertical" android:singleLine="false" android:textAppearance="@style/secondary_text_appearance" /> @@ -176,6 +179,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="@dimen/default_margin" + android:paddingRight="@dimen/double_margin" android:gravity="left|center_vertical" android:singleLine="false" android:textAppearance="@style/secondary_text_appearance" /> @@ -202,6 +206,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="@dimen/default_margin" + android:paddingRight="@dimen/double_margin" android:gravity="left|center_vertical" android:singleLine="false" android:textAppearance="@style/secondary_text_appearance" /> @@ -226,6 +231,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="@dimen/default_margin" + android:paddingRight="@dimen/double_margin" android:gravity="left|center_vertical" android:singleLine="false" android:textAppearance="@style/secondary_text_appearance" /> @@ -252,30 +258,82 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="@dimen/default_margin" + android:paddingRight="@dimen/double_margin" android:gravity="left|center_vertical" android:singleLine="false" android:textAppearance="@style/secondary_text_appearance" /> </TableRow> - <!-- Date --> + <!-- Last Accessed Time --> <TableRow android:layout_marginLeft="@dimen/extra_large_margin" android:layout_marginRight="@dimen/extra_large_margin" > <TextView - android:id="@+id/fso_properties_date_label" + android:id="@+id/fso_properties_last_accessed_label" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="@dimen/default_margin" android:gravity="left|center_vertical" - android:text="@string/fso_properties_dialog_date" + android:text="@string/fso_properties_dialog_last_accessed_date" android:textAppearance="@style/primary_text_appearance" /> <TextView - android:id="@+id/fso_properties_date" + android:id="@+id/fso_properties_last_accessed" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="@dimen/default_margin" + android:paddingRight="@dimen/double_margin" + android:gravity="left|center_vertical" + android:singleLine="false" + android:textAppearance="@style/secondary_text_appearance" /> + </TableRow> + + <!-- Last Modified Time --> + <TableRow + android:layout_marginLeft="@dimen/extra_large_margin" + android:layout_marginRight="@dimen/extra_large_margin" > + + <TextView + android:id="@+id/fso_properties_last_modified_label" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="@dimen/default_margin" + android:gravity="left|center_vertical" + android:text="@string/fso_properties_dialog_last_modified_date" + android:textAppearance="@style/primary_text_appearance" /> + + <TextView + android:id="@+id/fso_properties_last_modified" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="@dimen/default_margin" + android:paddingRight="@dimen/double_margin" + android:gravity="left|center_vertical" + android:singleLine="false" + android:textAppearance="@style/secondary_text_appearance" /> + </TableRow> + + <!-- Last Changed Time --> + <TableRow + android:layout_marginLeft="@dimen/extra_large_margin" + android:layout_marginRight="@dimen/extra_large_margin" > + + <TextView + android:id="@+id/fso_properties_last_changed_label" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="@dimen/default_margin" + android:gravity="left|center_vertical" + android:text="@string/fso_properties_dialog_last_changed_date" + android:textAppearance="@style/primary_text_appearance" /> + + <TextView + android:id="@+id/fso_properties_last_changed" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="@dimen/default_margin" + android:paddingRight="@dimen/double_margin" android:gravity="left|center_vertical" android:singleLine="false" android:textAppearance="@style/secondary_text_appearance" /> @@ -283,7 +341,7 @@ </TableLayout> </ScrollView> - <!-- Permissions --> + <!-- Owner/Permissions --> <ScrollView android:id="@+id/fso_tab_permissions" android:layout_width="match_parent" @@ -367,194 +425,199 @@ <TableLayout android:layout_width="match_parent" android:layout_height="wrap_content" > - - <!-- Title --> <TableRow android:layout_marginLeft="@dimen/extra_large_margin" android:layout_marginRight="@dimen/extra_large_margin" > - <TextView + <!-- Labels --> + <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_weight="1" - android:layout_margin="@dimen/default_margin" - android:gravity="left|center_vertical" - android:text="@null" - android:textAppearance="@style/primary_text_appearance" /> - - <TextView - android:id="@+id/fso_properties_permissions_special_label" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:layout_margin="@dimen/default_margin" - android:gravity="center" - android:text="@string/fso_properties_dialog_special" - android:textAppearance="@style/primary_text_appearance" /> - - <TextView - android:id="@+id/fso_properties_permissions_read_label" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:layout_margin="@dimen/default_margin" - android:gravity="center" - android:text="@string/fso_properties_dialog_read" - android:textAppearance="@style/primary_text_appearance" /> - - <TextView - android:id="@+id/fso_properties_permissions_write_label" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:layout_margin="@dimen/default_margin" - android:gravity="center" - android:text="@string/fso_properties_dialog_write" - android:textAppearance="@style/primary_text_appearance" /> - - <TextView - android:id="@+id/fso_properties_permissions_execute_label" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:layout_margin="@dimen/default_margin" - android:gravity="center" - android:text="@string/fso_properties_dialog_execute" - android:textAppearance="@style/primary_text_appearance" /> - </TableRow> - - <!-- Owner --> - <TableRow - android:layout_marginLeft="@dimen/extra_large_margin" - android:layout_marginRight="@dimen/extra_large_margin" > - - <TextView - android:id="@+id/fso_properties_permissions_owner_label" + android:orientation="vertical"> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="@dimen/default_margin" + android:gravity="left|center_vertical" + android:text="@null" + android:textAppearance="@style/primary_text_appearance" /> + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content"> + <CheckBox + android:layout_width="0dip" + android:layout_height="wrap_content" + 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:gravity="left|center_vertical" + android:text="@string/fso_properties_dialog_owner" + android:textAppearance="@style/primary_text_appearance" /> + </LinearLayout> + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content"> + <CheckBox + android:layout_width="0dip" + android:layout_height="wrap_content" + 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:gravity="left|center_vertical" + android:text="@string/fso_properties_dialog_group" + android:textAppearance="@style/primary_text_appearance" /> + </LinearLayout> + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content"> + <CheckBox + android:layout_width="0dip" + android:layout_height="wrap_content" + 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:gravity="left|center_vertical" + android:text="@string/fso_properties_dialog_others" + android:textAppearance="@style/primary_text_appearance" /> + </LinearLayout> + </LinearLayout> + + <!-- Special --> + <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_weight="1" - android:layout_margin="@dimen/default_margin" - android:gravity="left|center_vertical" - android:text="@string/fso_properties_dialog_owner" - android:textAppearance="@style/primary_text_appearance" /> - - <CheckBox - android:id="@+id/fso_permissions_owner_read" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:layout_margin="@dimen/default_margin" /> - - <CheckBox - android:id="@+id/fso_permissions_owner_write" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:layout_margin="@dimen/default_margin" /> - - <CheckBox - android:id="@+id/fso_permissions_owner_execute" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:layout_margin="@dimen/default_margin" /> - - <CheckBox - android:id="@+id/fso_permissions_owner_special" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:layout_margin="@dimen/default_margin" /> - </TableRow> - - <!-- Group --> - <TableRow - android:layout_marginLeft="@dimen/extra_large_margin" - android:layout_marginRight="@dimen/extra_large_margin" > - - <TextView - android:id="@+id/fso_properties_permissions_group_label" + android:orientation="vertical"> + <TextView + android:id="@+id/fso_properties_permissions_special_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="@dimen/default_margin" + android:layout_gravity="center" + android:text="@string/fso_properties_dialog_special" + android:textAppearance="@style/primary_text_appearance" /> + <CheckBox + android:id="@+id/fso_permissions_owner_special" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="@dimen/default_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:layout_weight="1" - android:layout_margin="@dimen/default_margin" - android:gravity="left|center_vertical" - android:text="@string/fso_properties_dialog_group" - android:textAppearance="@style/primary_text_appearance" /> - - <CheckBox - android:id="@+id/fso_permissions_group_read" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:layout_margin="@dimen/default_margin" /> - - <CheckBox - android:id="@+id/fso_permissions_group_write" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:layout_margin="@dimen/default_margin" /> - - <CheckBox - android:id="@+id/fso_permissions_group_execute" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:layout_margin="@dimen/default_margin" /> - - <CheckBox - android:id="@+id/fso_permissions_group_special" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:layout_margin="@dimen/default_margin" /> - </TableRow> - - <!-- Others --> - <TableRow - android:layout_marginLeft="@dimen/extra_large_margin" - android:layout_marginRight="@dimen/extra_large_margin" > - - <TextView - android:id="@+id/fso_properties_permissions_others_label" + android:orientation="vertical"> + <TextView + android:id="@+id/fso_properties_permissions_read_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="@dimen/default_margin" + android:layout_gravity="center" + android:text="@string/fso_properties_dialog_read" + android:textAppearance="@style/primary_text_appearance" /> + <CheckBox + android:id="@+id/fso_permissions_owner_read" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="@dimen/default_margin" /> + <CheckBox + android:id="@+id/fso_permissions_group_read" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="@dimen/default_margin" /> + <CheckBox + android:id="@+id/fso_permissions_others_read" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="@dimen/default_margin" /> + </LinearLayout> + + <!-- Write --> + <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_weight="1" - android:layout_margin="@dimen/default_margin" - android:gravity="left|center_vertical" - android:text="@string/fso_properties_dialog_others" - android:textAppearance="@style/primary_text_appearance" /> - - <CheckBox - android:id="@+id/fso_permissions_others_read" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:layout_margin="@dimen/default_margin" /> - - <CheckBox - android:id="@+id/fso_permissions_others_write" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:layout_margin="@dimen/default_margin" /> - - <CheckBox - android:id="@+id/fso_permissions_others_execute" - android:layout_width="0dip" + android:orientation="vertical"> + <TextView + android:id="@+id/fso_properties_permissions_write_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="@dimen/default_margin" + android:layout_gravity="center" + android:text="@string/fso_properties_dialog_write" + android:textAppearance="@style/primary_text_appearance" /> + <CheckBox + android:id="@+id/fso_permissions_owner_write" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="@dimen/default_margin" /> + <CheckBox + android:id="@+id/fso_permissions_group_write" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="@dimen/default_margin" /> + <CheckBox + android:id="@+id/fso_permissions_others_write" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="@dimen/default_margin" /> + </LinearLayout> + + <!-- Execute --> + <LinearLayout + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_weight="1" - android:layout_margin="@dimen/default_margin" /> + android:orientation="vertical"> + <TextView + android:id="@+id/fso_properties_permissions_execute_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="@dimen/default_margin" + android:layout_gravity="center" + android:text="@string/fso_properties_dialog_execute" + android:textAppearance="@style/primary_text_appearance" /> + <CheckBox + android:id="@+id/fso_permissions_owner_execute" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="@dimen/default_margin" /> + <CheckBox + android:id="@+id/fso_permissions_group_execute" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="@dimen/default_margin" /> + <CheckBox + android:id="@+id/fso_permissions_others_execute" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + 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> - </TableLayout> <!-- Info message --> diff --git a/res/layout/history_item.xml b/res/layout/history_item.xml index 4fca6ff1..2ef5fe97 100644 --- a/res/layout/history_item.xml +++ b/res/layout/history_item.xml @@ -17,7 +17,7 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="wrap_content" android:layout_height="@dimen/default_row_height" - android:background="@drawable/holo_selector" > + android:background="@drawable/holo_list_selector_deselected" > <ImageView android:id="@+id/history_item_icon" diff --git a/res/layout/inline_autocomplete.xml b/res/layout/inline_autocomplete.xml index 3938cb40..e6d1c518 100644 --- a/res/layout/inline_autocomplete.xml +++ b/res/layout/inline_autocomplete.xml @@ -27,6 +27,7 @@ android:gravity="top" android:hint="@null" android:inputType="none" + android:imeOptions="actionDone|flagNoFullscreen" android:paddingLeft="@dimen/small_buttom_width" android:singleLine="false" android:textColor="@android:color/darker_gray" @@ -46,7 +47,7 @@ android:gravity="top" android:hint="@null" android:inputType="textNoSuggestions|textImeMultiLine" - android:imeOptions="actionDone" + android:imeOptions="actionDone|flagNoFullscreen" android:paddingLeft="@dimen/small_buttom_width" android:singleLine="false" android:textColor="@color/black_transparent" diff --git a/res/layout/input_name_dialog.xml b/res/layout/input_name_dialog.xml index 3ff195f2..2ec64d78 100644 --- a/res/layout/input_name_dialog.xml +++ b/res/layout/input_name_dialog.xml @@ -40,7 +40,7 @@ android:layout_marginLeft="@dimen/extra_large_margin" android:layout_marginRight="@dimen/extra_large_margin" android:ems="@integer/default_edit_text_ems" - android:imeOptions="actionDone" + android:imeOptions="actionDone|flagNoFullscreen" android:scrollHorizontally="true" android:selectAllOnFocus="true" android:inputType="textNoSuggestions"> diff --git a/res/layout/navigation.xml b/res/layout/navigation.xml index f77033c7..68df9c4f 100644 --- a/res/layout/navigation.xml +++ b/res/layout/navigation.xml @@ -17,6 +17,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:filemanager="http://schemas.android.com/apk/res/com.cyanogenmod.filemanager" + android:id="@+id/navigation_layout" android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical"> |