diff options
author | Jorge Ruesga <jorge@ruesga.com> | 2013-01-06 19:52:53 +0100 |
---|---|---|
committer | Marco Brohet <therbom@gmail.com> | 2013-01-07 12:19:59 +0100 |
commit | fb04a549891fad8d0f46bc2d26ba6bbf160002a3 (patch) | |
tree | 8002f62acf218e00dfe33667637a8d41132e23ea | |
parent | b38385b50b3a1323716b81502c08380f77ef8607 (diff) | |
download | android_packages_apps_CMFileManager-fb04a549891fad8d0f46bc2d26ba6bbf160002a3.tar.gz android_packages_apps_CMFileManager-fb04a549891fad8d0f46bc2d26ba6bbf160002a3.tar.bz2 android_packages_apps_CMFileManager-fb04a549891fad8d0f46bc2d26ba6bbf160002a3.zip |
CMFM: Display new fso datetimes props
Add to FsoPropertiesDialog the new fso datetimes properties:
- Last accessed
- Last modified
- Last changed
Remove old fso_properties_dialog_date string from translations.
Change-Id: I881658ae0fbc6c935995ffb4ad7a02172d06bb2c
Signed-off-by: jruesga <jorge@ruesga.com>
-rw-r--r-- | res/layout/fso_properties_dialog.xml | 58 | ||||
-rw-r--r-- | res/values-cs/strings.xml | 2 | ||||
-rw-r--r-- | res/values-da/strings.xml | 2 | ||||
-rw-r--r-- | res/values-de/strings.xml | 2 | ||||
-rw-r--r-- | res/values-el/strings.xml | 2 | ||||
-rw-r--r-- | res/values-es/strings.xml | 1 | ||||
-rw-r--r-- | res/values-fr/strings.xml | 2 | ||||
-rw-r--r-- | res/values-hu/strings.xml | 2 | ||||
-rw-r--r-- | res/values-it/strings.xml | 1 | ||||
-rw-r--r-- | res/values-ja/strings.xml | 2 | ||||
-rw-r--r-- | res/values-nl/strings.xml | 2 | ||||
-rwxr-xr-x | res/values-pt-rBR/strings.xml | 1 | ||||
-rw-r--r-- | res/values-pt-rPT/strings.xml | 2 | ||||
-rw-r--r-- | res/values-ro/strings.xml | 1 | ||||
-rw-r--r-- | res/values-ru/strings.xml | 1 | ||||
-rw-r--r-- | res/values-zh-rCN/strings.xml | 2 | ||||
-rw-r--r-- | res/values/strings.xml | 8 | ||||
-rw-r--r-- | src/com/cyanogenmod/filemanager/ui/dialogs/FsoPropertiesDialog.java | 35 |
18 files changed, 91 insertions, 35 deletions
diff --git a/res/layout/fso_properties_dialog.xml b/res/layout/fso_properties_dialog.xml index 7c4886bd..45c38450 100644 --- a/res/layout/fso_properties_dialog.xml +++ b/res/layout/fso_properties_dialog.xml @@ -264,22 +264,72 @@ 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" diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index 8e2fdee4..5d045d51 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -255,8 +255,6 @@ <string name="fso_properties_dialog_size">Velikost:</string> <!-- Fso Properties Dialog * Contains Label --> <string name="fso_properties_dialog_contains">Obsah:</string> - <!-- Fso Properties Dialog * Date Label --> - <string name="fso_properties_dialog_date">Poslední přístup:</string> <!-- Fso Properties Dialog * Owner Label --> <string name="fso_properties_dialog_owner">Vlastník:</string> <!-- Fso Properties Dialog * Group Label --> diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index 912d6136..50dff863 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -240,8 +240,6 @@ <string name="fso_properties_dialog_size">Størrelse:</string> <!-- Fso Properties Dialog * Contains Label --> <string name="fso_properties_dialog_contains">Indeholder:</string> - <!-- Fso Properties Dialog * Date Label --> - <string name="fso_properties_dialog_date">Sidst tilgået:</string> <!-- Fso Properties Dialog * Owner Label --> <string name="fso_properties_dialog_owner">Ejer:</string> <!-- Fso Properties Dialog * Group Label --> diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 64e47547..771c466a 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -244,8 +244,6 @@ <string name="fso_properties_dialog_size">Größe:</string> <!-- Fso Properties Dialog * Contains Label --> <string name="fso_properties_dialog_contains">Beinhaltet:</string> - <!-- Fso Properties Dialog * Date Label --> - <string name="fso_properties_dialog_date">Letzter Zugriff:</string> <!-- Fso Properties Dialog * Owner Label --> <string name="fso_properties_dialog_owner">Besitzer:</string> <!-- Fso Properties Dialog * Group Label --> diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index 07498439..054735e7 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -252,8 +252,6 @@ <string name="fso_properties_dialog_size">Μέγεθος:</string> <!-- Fso Properties Dialog * Contains Label --> <string name="fso_properties_dialog_contains">Περιέχει:</string> - <!-- Fso Properties Dialog * Date Label --> - <string name="fso_properties_dialog_date">Τελ. προσπέλαση:</string> <!-- Fso Properties Dialog * Owner Label --> <string name="fso_properties_dialog_owner">Ιδιοκτήτης:</string> <!-- Fso Properties Dialog * Group Label --> diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 757534b0..e8ff2af2 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -114,7 +114,6 @@ <string name="fso_properties_dialog_link">Enlace:</string> <string name="fso_properties_dialog_size">Tamaño:</string> <string name="fso_properties_dialog_contains">Contenido:</string> - <string name="fso_properties_dialog_date">Último acceso:</string> <string name="fso_properties_dialog_owner">Propietario:</string> <string name="fso_properties_dialog_group">Grupo:</string> <string name="fso_properties_dialog_others">Otros:</string> diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index a613de70..6168b209 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -235,8 +235,6 @@ <string name="fso_properties_dialog_size">Taille\u00A0:</string> <!-- Fso Properties Dialog * Contains Label --> <string name="fso_properties_dialog_contains">Contenu\u00A0:</string> - <!-- Fso Properties Dialog * Date Label --> - <string name="fso_properties_dialog_date">Dernier accès\u00A0:</string> <!-- Fso Properties Dialog * Owner Label --> <string name="fso_properties_dialog_owner">Propriétaire\u00A0:</string> <!-- Fso Properties Dialog * Group Label --> diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index ff1c00e5..b45cbb25 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -237,8 +237,6 @@ <string name="fso_properties_dialog_size">Méret:</string> <!-- Fso Properties Dialog * Contains Label --> <string name="fso_properties_dialog_contains">Tartalmaz:</string> - <!-- Fso Properties Dialog * Date Label --> - <string name="fso_properties_dialog_date">Utolsó hozzáférés:</string> <!-- Fso Properties Dialog * Owner Label --> <string name="fso_properties_dialog_owner">Tulajdonos:</string> <!-- Fso Properties Dialog * Group Label --> diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index b77007d2..09aa6d29 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -121,7 +121,6 @@ <string name="fso_properties_dialog_link">Link:</string> <string name="fso_properties_dialog_size">Dimensioni:</string> <string name="fso_properties_dialog_contains">Contiene:</string> - <string name="fso_properties_dialog_date">Ultimo accesso:</string> <string name="fso_properties_dialog_owner">Proprietario:</string> <string name="fso_properties_dialog_group">Gruppo:</string> <string name="fso_properties_dialog_others">Altri:</string> diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 9fd13bf6..b08fbac5 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -255,8 +255,6 @@ <string name="fso_properties_dialog_size">サイズ:</string> <!-- Fso Properties Dialog * Contains Label --> <string name="fso_properties_dialog_contains">内包数:</string> - <!-- Fso Properties Dialog * Date Label --> - <string name="fso_properties_dialog_date">最終アクセス:</string> <!-- Fso Properties Dialog * Owner Label --> <string name="fso_properties_dialog_owner">オーナー:</string> <!-- Fso Properties Dialog * Group Label --> diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index ab623c2d..6309451e 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -242,8 +242,6 @@ <string name="fso_properties_dialog_size">Grootte:</string> <!-- Fso Properties Dialog * Contains Label --> <string name="fso_properties_dialog_contains">Inhoud:</string> - <!-- Fso Properties Dialog * Date Label --> - <string name="fso_properties_dialog_date">Recente toegang:</string> <!-- Fso Properties Dialog * Owner Label --> <string name="fso_properties_dialog_owner">Eigenaar:</string> <!-- Fso Properties Dialog * Group Label --> diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml index 4efa616f..c32e2e50 100755 --- a/res/values-pt-rBR/strings.xml +++ b/res/values-pt-rBR/strings.xml @@ -116,7 +116,6 @@ <string name="fso_properties_dialog_link">Vínculo:</string> <string name="fso_properties_dialog_size">Tamanho:</string> <string name="fso_properties_dialog_contains">Contém:</string> - <string name="fso_properties_dialog_date">Último acesso:</string> <string name="fso_properties_dialog_owner">Proprietário:</string> <string name="fso_properties_dialog_group">Grupo:</string> <string name="fso_properties_dialog_others">Outros:</string> diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index 0d1cb33f..27f96133 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -256,8 +256,6 @@ <string name="fso_properties_dialog_size">Tamanho:</string> <!-- Fso Properties Dialog * Contains Label --> <string name="fso_properties_dialog_contains">Contém:</string> - <!-- Fso Properties Dialog * Date Label --> - <string name="fso_properties_dialog_date">Último acesso:</string> <!-- Fso Properties Dialog * Owner Label --> <string name="fso_properties_dialog_owner">Dono:</string> <!-- Fso Properties Dialog * Group Label --> diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index f2d174fa..9a52a18f 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -110,7 +110,6 @@ <string name="fso_properties_dialog_link">Link:</string>
<string name="fso_properties_dialog_size">Dimensiune:</string>
<string name="fso_properties_dialog_contains">Conţin:</string>
- <string name="fso_properties_dialog_date">Ultima accesare:</string>
<string name="fso_properties_dialog_owner">Proprietar:</string>
<string name="fso_properties_dialog_group">Grup:</string>
<string name="fso_properties_dialog_others">Altele:</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index ece85a73..28f7d33a 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -139,7 +139,6 @@ <string name="fso_properties_dialog_link">Ссылка:</string> <string name="fso_properties_dialog_size">Размер:</string> <string name="fso_properties_dialog_contains">Содержит:</string> - <string name="fso_properties_dialog_date">Посл. доступ:</string> <string name="fso_properties_dialog_owner">Владелец:</string> <string name="fso_properties_dialog_group">Группа:</string> <string name="fso_properties_dialog_others">Другое:</string> diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 23e322a0..c7478a12 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -252,8 +252,6 @@ <string name="fso_properties_dialog_size">大小:</string> <!-- Fso Properties Dialog * Contains Label --> <string name="fso_properties_dialog_contains">包含:</string> - <!-- Fso Properties Dialog * Date Label --> - <string name="fso_properties_dialog_date">最后一次访问:</string> <!-- Fso Properties Dialog * Owner Label --> <string name="fso_properties_dialog_owner">拥有者:</string> <!-- Fso Properties Dialog * Group Label --> diff --git a/res/values/strings.xml b/res/values/strings.xml index 4b1a243c..070e3dc2 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -276,8 +276,12 @@ <string name="fso_properties_dialog_size">Size:</string> <!-- Fso Properties Dialog * Contains Label --> <string name="fso_properties_dialog_contains">Contains:</string> - <!-- Fso Properties Dialog * Date Label --> - <string name="fso_properties_dialog_date">Last access:</string> + <!-- Fso Properties Dialog * Last Accessed Time Label --> + <string name="fso_properties_dialog_last_accessed_date">Accessed:</string> + <!-- Fso Properties Dialog * Last Modified Time Label --> + <string name="fso_properties_dialog_last_modified_date">Modified:</string> + <!-- Fso Properties Dialog * Last Changed Time --> + <string name="fso_properties_dialog_last_changed_date">Changed:</string> <!-- Fso Properties Dialog * Owner Label --> <string name="fso_properties_dialog_owner">Owner:</string> <!-- Fso Properties Dialog * Group Label --> diff --git a/src/com/cyanogenmod/filemanager/ui/dialogs/FsoPropertiesDialog.java b/src/com/cyanogenmod/filemanager/ui/dialogs/FsoPropertiesDialog.java index 87c38c83..95fa193a 100644 --- a/src/com/cyanogenmod/filemanager/ui/dialogs/FsoPropertiesDialog.java +++ b/src/com/cyanogenmod/filemanager/ui/dialogs/FsoPropertiesDialog.java @@ -253,7 +253,12 @@ public class FsoPropertiesDialog this.mTvSize = (TextView)contentView.findViewById(R.id.fso_properties_size); View vContatinsRow = contentView.findViewById(R.id.fso_properties_contains_row); this.mTvContains = (TextView)contentView.findViewById(R.id.fso_properties_contains); - TextView tvDate = (TextView)contentView.findViewById(R.id.fso_properties_date); + TextView tvLastAccessedTime = + (TextView)contentView.findViewById(R.id.fso_properties_last_accessed); + TextView tvLastModifiedTime = + (TextView)contentView.findViewById(R.id.fso_properties_last_modified); + TextView tvLastChangedTime = + (TextView)contentView.findViewById(R.id.fso_properties_last_changed); this.mSpnOwner = (Spinner)contentView.findViewById(R.id.fso_properties_owner); this.mSpnGroup = (Spinner)contentView.findViewById(R.id.fso_properties_group); this.mInfoMsgView = (TextView)contentView.findViewById(R.id.fso_info_msg); @@ -291,7 +296,21 @@ public class FsoPropertiesDialog this.mTvSize.setText(size); this.mTvContains.setText("-"); //$NON-NLS-1$ DateFormat df = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT); - tvDate.setText(df.format(this.mFso.getLastModifiedTime())); + try { + tvLastAccessedTime.setText(df.format(this.mFso.getLastAccessedTime())); + } catch (Exception e) { + tvLastAccessedTime.setText("-"); //$NON-NLS-1$ + } + try { + tvLastModifiedTime.setText(df.format(this.mFso.getLastModifiedTime())); + } catch (Exception e) { + tvLastModifiedTime.setText("-"); //$NON-NLS-1$ + } + try { + tvLastChangedTime.setText(df.format(this.mFso.getLastChangedTime())); + } catch (Exception e) { + tvLastChangedTime.setText("-"); //$NON-NLS-1$ + } //- Permissions String loadingMsg = this.mContext.getString(R.string.loading_message); @@ -1156,9 +1175,17 @@ public class FsoPropertiesDialog theme.setTextColor(this.mContext, (TextView)v, "text_color"); //$NON-NLS-1$ v = this.mContentView.findViewById(R.id.fso_properties_contains); theme.setTextColor(this.mContext, (TextView)v, "text_color"); //$NON-NLS-1$ - v = this.mContentView.findViewById(R.id.fso_properties_date_label); + v = this.mContentView.findViewById(R.id.fso_properties_last_accessed_label); + theme.setTextColor(this.mContext, (TextView)v, "text_color"); //$NON-NLS-1$ + v = this.mContentView.findViewById(R.id.fso_properties_last_accessed); + theme.setTextColor(this.mContext, (TextView)v, "text_color"); //$NON-NLS-1$ + v = this.mContentView.findViewById(R.id.fso_properties_last_modified_label); + theme.setTextColor(this.mContext, (TextView)v, "text_color"); //$NON-NLS-1$ + v = this.mContentView.findViewById(R.id.fso_properties_last_modified); + theme.setTextColor(this.mContext, (TextView)v, "text_color"); //$NON-NLS-1$ + v = this.mContentView.findViewById(R.id.fso_properties_last_changed_label); theme.setTextColor(this.mContext, (TextView)v, "text_color"); //$NON-NLS-1$ - v = this.mContentView.findViewById(R.id.fso_properties_date); + v = this.mContentView.findViewById(R.id.fso_properties_last_changed); theme.setTextColor(this.mContext, (TextView)v, "text_color"); //$NON-NLS-1$ v = this.mContentView.findViewById(R.id.fso_properties_owner_label); |