diff options
author | jruesga <jorge@ruesga.com> | 2012-10-27 03:21:55 +0200 |
---|---|---|
committer | jruesga <jorge@ruesga.com> | 2012-10-27 03:21:55 +0200 |
commit | 81cc580e8fc6ad87730218839959aa7d1de108a6 (patch) | |
tree | 74e4dacf2afd219f46a020a961b08e8746209818 /res | |
parent | 979af9dbd5549e592138d88996bdc375c4ab73f2 (diff) | |
download | android_packages_apps_CMFileManager-81cc580e8fc6ad87730218839959aa7d1de108a6.tar.gz android_packages_apps_CMFileManager-81cc580e8fc6ad87730218839959aa7d1de108a6.tar.bz2 android_packages_apps_CMFileManager-81cc580e8fc6ad87730218839959aa7d1de108a6.zip |
Delete confirmation dialog box title is wrong (Issue #18)
* New dialog title mode (no icons, except were they are needed [welcome
and picker])
* Title text without allCaps
* New title color
* Remove unused drawables
Diffstat (limited to 'res')
35 files changed, 34 insertions, 53 deletions
diff --git a/res/drawable-hdpi/ic_holo_light_compress.png b/res/drawable-hdpi/ic_holo_light_compress.png Binary files differdeleted file mode 100644 index 4f364800..00000000 --- a/res/drawable-hdpi/ic_holo_light_compress.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_holo_light_console.png b/res/drawable-hdpi/ic_holo_light_console.png Binary files differdeleted file mode 100644 index 6ff76490..00000000 --- a/res/drawable-hdpi/ic_holo_light_console.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_holo_light_edit.png b/res/drawable-hdpi/ic_holo_light_edit.png Binary files differdeleted file mode 100644 index 4a939679..00000000 --- a/res/drawable-hdpi/ic_holo_light_edit.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_holo_light_error.png b/res/drawable-hdpi/ic_holo_light_error.png Binary files differdeleted file mode 100644 index 4ae44491..00000000 --- a/res/drawable-hdpi/ic_holo_light_error.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_holo_light_open.png b/res/drawable-hdpi/ic_holo_light_open.png Binary files differdeleted file mode 100644 index 3db304fa..00000000 --- a/res/drawable-hdpi/ic_holo_light_open.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_holo_light_operation.png b/res/drawable-hdpi/ic_holo_light_operation.png Binary files differdeleted file mode 100644 index 6025e354..00000000 --- a/res/drawable-hdpi/ic_holo_light_operation.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_holo_light_properties.png b/res/drawable-hdpi/ic_holo_light_properties.png Binary files differdeleted file mode 100644 index c5f6c97b..00000000 --- a/res/drawable-hdpi/ic_holo_light_properties.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_holo_light_question.png b/res/drawable-hdpi/ic_holo_light_question.png Binary files differdeleted file mode 100644 index 8b14f2fd..00000000 --- a/res/drawable-hdpi/ic_holo_light_question.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_holo_light_send.png b/res/drawable-hdpi/ic_holo_light_send.png Binary files differdeleted file mode 100644 index 47ae1867..00000000 --- a/res/drawable-hdpi/ic_holo_light_send.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_holo_light_warning.png b/res/drawable-hdpi/ic_holo_light_warning.png Binary files differdeleted file mode 100644 index 05012c97..00000000 --- a/res/drawable-hdpi/ic_holo_light_warning.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_holo_light_compress.png b/res/drawable-mdpi/ic_holo_light_compress.png Binary files differdeleted file mode 100644 index beb5a0c9..00000000 --- a/res/drawable-mdpi/ic_holo_light_compress.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_holo_light_console.png b/res/drawable-mdpi/ic_holo_light_console.png Binary files differdeleted file mode 100644 index 57b4b643..00000000 --- a/res/drawable-mdpi/ic_holo_light_console.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_holo_light_edit.png b/res/drawable-mdpi/ic_holo_light_edit.png Binary files differdeleted file mode 100644 index f09b2e4c..00000000 --- a/res/drawable-mdpi/ic_holo_light_edit.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_holo_light_error.png b/res/drawable-mdpi/ic_holo_light_error.png Binary files differdeleted file mode 100644 index 097c3bc2..00000000 --- a/res/drawable-mdpi/ic_holo_light_error.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_holo_light_open.png b/res/drawable-mdpi/ic_holo_light_open.png Binary files differdeleted file mode 100644 index fda13f1b..00000000 --- a/res/drawable-mdpi/ic_holo_light_open.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_holo_light_operation.png b/res/drawable-mdpi/ic_holo_light_operation.png Binary files differdeleted file mode 100644 index 75a1d70e..00000000 --- a/res/drawable-mdpi/ic_holo_light_operation.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_holo_light_properties.png b/res/drawable-mdpi/ic_holo_light_properties.png Binary files differdeleted file mode 100644 index ec6a2bf8..00000000 --- a/res/drawable-mdpi/ic_holo_light_properties.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_holo_light_question.png b/res/drawable-mdpi/ic_holo_light_question.png Binary files differdeleted file mode 100644 index 0eb104b4..00000000 --- a/res/drawable-mdpi/ic_holo_light_question.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_holo_light_send.png b/res/drawable-mdpi/ic_holo_light_send.png Binary files differdeleted file mode 100644 index 8aa52bc7..00000000 --- a/res/drawable-mdpi/ic_holo_light_send.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_holo_light_warning.png b/res/drawable-mdpi/ic_holo_light_warning.png Binary files differdeleted file mode 100644 index dd647add..00000000 --- a/res/drawable-mdpi/ic_holo_light_warning.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_holo_light_compress.png b/res/drawable-xhdpi/ic_holo_light_compress.png Binary files differdeleted file mode 100644 index 4337c656..00000000 --- a/res/drawable-xhdpi/ic_holo_light_compress.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_holo_light_console.png b/res/drawable-xhdpi/ic_holo_light_console.png Binary files differdeleted file mode 100644 index f84bb91e..00000000 --- a/res/drawable-xhdpi/ic_holo_light_console.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_holo_light_edit.png b/res/drawable-xhdpi/ic_holo_light_edit.png Binary files differdeleted file mode 100644 index 1ead8fc3..00000000 --- a/res/drawable-xhdpi/ic_holo_light_edit.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_holo_light_error.png b/res/drawable-xhdpi/ic_holo_light_error.png Binary files differdeleted file mode 100644 index 3baea558..00000000 --- a/res/drawable-xhdpi/ic_holo_light_error.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_holo_light_open.png b/res/drawable-xhdpi/ic_holo_light_open.png Binary files differdeleted file mode 100644 index d1324014..00000000 --- a/res/drawable-xhdpi/ic_holo_light_open.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_holo_light_operation.png b/res/drawable-xhdpi/ic_holo_light_operation.png Binary files differdeleted file mode 100644 index 49176069..00000000 --- a/res/drawable-xhdpi/ic_holo_light_operation.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_holo_light_properties.png b/res/drawable-xhdpi/ic_holo_light_properties.png Binary files differdeleted file mode 100644 index a0a156a9..00000000 --- a/res/drawable-xhdpi/ic_holo_light_properties.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_holo_light_question.png b/res/drawable-xhdpi/ic_holo_light_question.png Binary files differdeleted file mode 100644 index 3f1d53c4..00000000 --- a/res/drawable-xhdpi/ic_holo_light_question.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_holo_light_send.png b/res/drawable-xhdpi/ic_holo_light_send.png Binary files differdeleted file mode 100644 index cdafd8ab..00000000 --- a/res/drawable-xhdpi/ic_holo_light_send.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_holo_light_warning.png b/res/drawable-xhdpi/ic_holo_light_warning.png Binary files differdeleted file mode 100644 index 7e8f1ee2..00000000 --- a/res/drawable-xhdpi/ic_holo_light_warning.png +++ /dev/null diff --git a/res/drawable/relevance.xml b/res/drawable/relevance.xml deleted file mode 100644 index 15a54a53..00000000 --- a/res/drawable/relevance.xml +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - ** Copyright (C) 2012 The CyanogenMod Project - ** - ** Licensed under the Apache License, Version 2.0 (the "License"); - ** you may not use this file except in compliance with the License. - ** You may obtain a copy of the License at - ** - ** http://www.apache.org/licenses/LICENSE-2.0 - ** - ** Unless required by applicable law or agreed to in writing, software - ** distributed under the License is distributed on an "AS IS" BASIS, - ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ** See the License for the specific language governing permissions and - ** limitations under the License. ---> -<shape xmlns:android="http://schemas.android.com/apk/res/android" - android:shape="rectangle" > - - <gradient - android:angle="45" - android:endColor="#80FF00FF" - android:startColor="#FFFF0000" /> - - <padding - android:bottom="7dp" - android:left="7dp" - android:right="7dp" - android:top="7dp" /> - - <corners android:radius="8dp" /> - -</shape>
\ No newline at end of file diff --git a/res/layout/dialog_title.xml b/res/layout/dialog_title.xml index c676f9b8..58bb9b16 100644 --- a/res/layout/dialog_title.xml +++ b/res/layout/dialog_title.xml @@ -23,7 +23,6 @@ android:layout_height="@dimen/smallest_row_height" android:layout_gravity="center_vertical" android:layout_marginLeft="@dimen/extra_margin" - android:layout_marginRight="@dimen/default_margin" android:contentDescription="@null" android:height="@dimen/smallest_row_height" android:width="@dimen/smallest_row_height" @@ -33,10 +32,9 @@ android:id="@+id/dialog_title_text" android:layout_width="match_parent" android:layout_height="@dimen/default_row_height" - android:layout_marginLeft="@dimen/default_margin" + android:layout_marginLeft="@dimen/extra_margin" android:layout_marginRight="@dimen/extra_margin" android:gravity="left|center_vertical" - android:textAllCaps="true" - android:textAppearance="@style/primary_text_appearance" /> + android:textAppearance="@style/dialog_title_text_appearance" /> </LinearLayout>
\ No newline at end of file diff --git a/res/values/dimen.xml b/res/values/dimen.xml index 0796c483..118c6db8 100644 --- a/res/values/dimen.xml +++ b/res/values/dimen.xml @@ -21,6 +21,8 @@ <dimen name="primary_text_size">14sp</dimen> <!-- The secondary text size --> <dimen name="secondary_text_size">12sp</dimen> + <!-- The dialog_title text size --> + <dimen name="dialog_title_text_size">16sp</dimen> <!-- The note text size --> <dimen name="note_text_size">9sp</dimen> <!-- The console text size --> diff --git a/res/values/strings.xml b/res/values/strings.xml index c757135c..e9649cd8 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -50,11 +50,6 @@ <!-- The search result name --> <string name="search_result_name">Search: <xliff:g id="terms">%1$s</xliff:g></string> - <!-- Messages for titles --> - <string name="title_warning">Warning</string> - <string name="title_error">Error</string> - <string name="title_question">Question</string> - <!-- Loading waiting message --> <string name="loading_message">Loading …</string> <!-- Computing message --> @@ -66,8 +61,17 @@ <!-- Error message --> <string name="error_message">Error.</string> - <!-- A console couldn't be created. Ask the user to change the access mode --> - <string name="msgs_change_to_prompt_access_mode"> + <!-- Warning dialog title --> + <string name="warning_title">Warning</string> + <!-- Error dialog title --> + <string name="error_title">Error detected</string> + <!-- Confirm operation dialog title --> + <string name="confirm_operation">Confirm operation</string> + + <!-- A console couldn't be created. Ask the user to change the access mode. Dialog Title --> + <string name="msgs_change_to_prompt_access_mode_title">Confirm switch</string> + <!-- A console couldn't be created. Ask the user to change the access mode. Dialog Messge --> + <string name="msgs_change_to_prompt_access_mode_msg"> The application is unable to gain privileges. The only way to run the app is to switch to non-privileged mode.\n\nApply this change?</string> @@ -78,8 +82,6 @@ privileged is allocated --> <string name="msgs_privileged_console_alloc_failed">The application is unable to gain privileges. \nChanging to non-privileged mode.</string> - <!-- Changing to other type of console failed --> - <string name="msgs_console_change_failed">Changing to the new type of access mode failed.</string> <!-- The selected setting was not applied or stored --> <string name="msgs_settings_save_failure">The setting could not be applied or stored.</string> <!-- The initial directory has an invalid or inaccessible reference --> @@ -199,7 +201,9 @@ <!-- Navigation View * View * Show symlinks option --> <string name="cm_filemanager_show_symlinks">Show symlinks</string> - <!-- Filesystem Info (no data) --> + <!-- Filesystem Info (no data). Dialog title --> + <string name="filesystem_info_warning_title">No information</string> + <!-- Filesystem Info (no data). Dialog message --> <string name="filesystem_info_warning_msg">There is no information available for the file system.</string> <!-- Filesystem Info * Filesystem couldn't be mounted --> <string name="filesystem_info_cant_be_mounted_msg"> @@ -329,6 +333,8 @@ <xliff:g id="path">%2$s</xliff:g></string> <!-- Search * Search query terms --> <string name="search_terms"><![CDATA[<b>Terms:</b>]]> <xliff:g id="terms">%1$s</xliff:g></string> + <!-- Search * Confirm search --> + <string name="search_few_characters_title">Confirm search</string> <!-- Search * Some terms of the search are too small. The operation could be very costly --> <string name="search_few_characters_msg">Some of the search terms has a small number characters. The operation could be very costly in time and system resources.\n\nDo you want to continue?</string> @@ -350,8 +356,10 @@ <string name="editor_file_not_found_msg">File not found.</string> <!-- Editor * File size exceed the limit --> <string name="editor_file_exceed_size_msg">The file is too big to be open inside this device.</string> - <!-- Editor * Editor is dirty, ask the user --> - <string name="editor_dirty_ask">There are unsaved changes.\n\nExit without saving?</string> + <!-- Editor * Editor is dirty, ask the user * Dialog title --> + <string name="editor_dirty_ask_title">Confirm exit</string> + <!-- Editor * Editor is dirty, ask the user * Dialog message --> + <string name="editor_dirty_ask_msg">There are unsaved changes.\n\nExit without saving?</string> <!-- Editor * Save operation success --> <string name="editor_successfully_saved">The file was successfully saved.</string> <!-- Editor * Read-only file mode --> @@ -495,8 +503,8 @@ <!-- Actions Dialog * Menu * Open parent folder --> <string name="actions_menu_open_parent_folder">Open parent</string> - <!-- Actions * Ask user prior to do an undone operation --> - <string name="actions_ask_undone_operation"> + <!-- Actions * Ask user prior to do an undone operation. Dialog message --> + <string name="actions_ask_undone_operation_msg"> This action cannot be undone. Do you want to continue?</string> <!-- Enter Name Dialog * Label --> @@ -518,11 +526,11 @@ <string name="associations_dialog_remember">Remember selection</string> <!-- Associations Dialog * Open with Title --> <string name="associations_dialog_openwith_title">Open with</string> - <!-- Associations Dialog * Open action --> + <!-- Associations Dialog * Open action (button title) --> <string name="associations_dialog_openwith_action">Open</string> <!-- Associations Dialog * Send with Title --> <string name="associations_dialog_sendwith_title">Send with</string> - <!-- Associations Dialog * Send action --> + <!-- Associations Dialog * Send action (button title) --> <string name="associations_dialog_sendwith_action">Send</string> <!-- Inline Autocomplete Widget * Tab message nothing to complete --> diff --git a/res/values/styles.xml b/res/values/styles.xml index 503e9e65..26c49f3c 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -60,6 +60,12 @@ <item name="android:textColor">@color/console_fg</item> <item name="android:textStyle">normal</item> </style> + <!-- The text appearance for dialog titles --> + <style name="dialog_title_text_appearance"> + <item name="android:textSize">@dimen/dialog_title_text_size</item> + <item name="android:textColor">@android:color/holo_blue_dark</item> + <item name="android:textStyle">bold</item> + </style> <!-- Breadcrumb Element --> <style name="breadcrumb_elemement"> |