diff options
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/attrs.xml | 7 | ||||
| -rw-r--r-- | res/values/colors.xml | 3 | ||||
| -rw-r--r-- | res/values/config.xml | 29 | ||||
| -rw-r--r-- | res/values/dimens.xml | 16 | ||||
| -rw-r--r-- | res/values/strings.xml | 20 |
5 files changed, 24 insertions, 51 deletions
diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 125856287..9ed824b44 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -27,6 +27,13 @@ <skip /> + <!-- DrawableStateProxyView specific attributes. These attributes are used to customize + a DrawableStateProxyView view in XML files. --> + <declare-styleable name="DrawableStateProxyView"> + <!-- The source view to delegate touch presses events to. --> + <attr name="sourceViewId" format="integer" /> + </declare-styleable> + <!-- Cling specific attributes. These attributes are used to customize the cling in XML files. --> <declare-styleable name="Cling"> diff --git a/res/values/colors.xml b/res/values/colors.xml index 9c1206902..c2e1e7b4d 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -23,9 +23,6 @@ <color name="delete_target_hover_tint">#DAFF0000</color> <color name="info_target_hover_tint">#DA0099CC</color> - <!-- The alpha/color to apply to the drag image --> - <color name="drag_view_multiply_color">#CCFFFFFF</color> - <color name="bubble_dark_background">#20000000</color> <color name="appwidget_error_color">#FCCC</color> diff --git a/res/values/config.xml b/res/values/config.xml index 9ea7b9ad3..31ef18a13 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -6,21 +6,9 @@ <!-- AllApps/Customize/AppsCustomize --> <!-- The alpha of the AppsCustomize bg in spring loaded mode --> <integer name="config_appsCustomizeSpringLoadedBgAlpha">45</integer> - <!-- Fade in/out duration of icons being dragged from the trays --> - <integer name="config_dragAppsCustomizeIconFadeInDuration">150</integer> - <integer name="config_dragAppsCustomizeIconFadeOutDuration">200</integer> - <integer name="config_dragAppsCustomizeIconFadeAlpha">100</integer> <integer name="config_workspaceUnshrinkTime">300</integer> <!-- Out of 100, the percent to shrink the workspace during spring loaded mode. --> <integer name="config_workspaceSpringLoadShrinkPercentage">80</integer> - <!-- When items are dropped on the mini screens in customize mode, we have a bounce animation - of the bright green hover outline, and then fade out the outline at the end. These are - the values used in that animation --> - <integer name="config_screenOnDropScalePercent">120</integer> - <integer name="config_screenOnDropScaleUpDuration">200</integer> - <integer name="config_screenOnDropScaleDownDuration">200</integer> - <integer name="config_screenOnDropAlphaFadeDelay">350</integer> - <integer name="config_screenOnDropAlphaFadeDuration">50</integer> <!-- Fade/zoom in/out duration & scale in the AllApps transition. Note: This should be less than the workspaceShrinkTime as they happen together. --> @@ -55,11 +43,6 @@ <integer name="config_crosshairsFadeInTime">600</integer> - <!-- When dragging an item on the workspace, how much bigger (in pixels) the dragged view - should be, as compared to the original view. If 0, it will not be scaled at all. - Should be an even number, for pixel alignment. --> - <integer name="config_dragViewExtraPixels">40</integer> - <!-- The duration (in ms) of the fade animation on the object outlines, used when we are dragging objects around on the home screen. --> <integer name="config_dragOutlineFadeTime">900</integer> @@ -69,6 +52,7 @@ <!-- Parameters controlling the animation for when an item is dropped on the home screen, and it animates from its old position to the new one. --> + <integer name="config_dropAnimMinDuration">100</integer> <integer name="config_dropAnimMaxDuration">500</integer> <!-- The duration of the UserFolder opening and closing animation --> @@ -77,14 +61,9 @@ <!-- The distance at which the animation should take the max duration --> <integer name="config_dropAnimMaxDist">800</integer> - <!-- Workspace screens are cached to bitmaps only when they're smaller than a certain size - (maxScaleForUsingWorkspaceScreenBitmapCache), since the bitmap cache itself is smaller - than the view itself (workspaceScreenBitmapCacheScale) --> - <integer name="config_workspaceScreenBitmapCacheScale">20</integer> - <integer name="config_maxScaleForUsingWorkspaceScreenBitmapCache">50</integer> - - <!-- When shrinking the workspace, this is the percentage of its original size. --> - <integer name="config_workspaceShrinkPercent">17</integer> + <!-- Properties controlling the workspace fade-out during dragging --> + <integer name="config_dragFadeOutAlpha">80</integer> + <integer name="config_dragFadeOutDuration">250</integer> <!-- Folder max bounds and max number of items. Note: folder_max_count_x * folder_max_count_y >= folder_max_num_items. When these are set to -1, they are automatically determined. --> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 4ed16893e..890e2167a 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -73,7 +73,6 @@ <dimen name="apps_customize_max_gap">18dp</dimen> <dimen name="apps_customize_widget_cell_width_gap">10dp</dimen> <dimen name="apps_customize_widget_cell_height_gap">8dp</dimen> - <dimen name="title_texture_width">120px</dimen> <!-- height of the bottom row of controls --> <dimen name="button_bar_height">62dip</dimen> @@ -85,21 +84,9 @@ <dimen name="button_bar_width_right_padding">0dp</dimen> <dimen name="button_bar_height_plus_padding">70dp</dimen> - <!-- extra horizontal spacing between mini screen thumbnails ie. in all - apps and in customization mode --> - <dimen name="smallScreenExtraSpacing">0dip</dimen> - - <!-- Vertical spacing between edge of screen and mini cell layouts when they - are minimized to the bottom in all apps --> - <dimen name="allAppsSmallScreenVerticalMarginLandscape">30dip</dimen> - <dimen name="allAppsSmallScreenVerticalMarginPortrait">60dip</dimen> - <!-- Drag padding to add to the bottom of drop targets --> <dimen name="drop_target_drag_padding">14dp</dimen> - <!-- padding between the delete zone drawable and text --> - <dimen name="delete_zone_drawable_padding">8dip</dimen> - <!-- roughly a status bar (for vertically centering the all apps home icon in landscape) --> <dimen name="status_bar_height">25dip</dimen> @@ -113,6 +100,9 @@ the drag view should be offset from the position of the original view. --> <dimen name="dragViewOffsetX">0dp</dimen> <dimen name="dragViewOffsetY">-8dp</dimen> + <!-- When dragging an item, how much bigger (fixed dps) the dragged view + should be. If 0, it will not be scaled at all. --> + <dimen name="dragViewScale">8dp</dimen> <!-- Padding applied to AppWidgets --> <dimen name="app_widget_preview_padding_left">8dp</dimen> diff --git a/res/values/strings.xml b/res/values/strings.xml index 72a915d78..a9b14d05a 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -51,7 +51,7 @@ <!-- External-drop widget error string. This is the error that is shown when you drag and item into the homescreen and it is unable to fit, or an error is encountered. [CHAR_LIMIT=50] --> - <string name="external_drop_widget_error">Couldn\'t drop item onto this Home screen.</string> + <string name="external_drop_widget_error">Couldn\'t drop item on this Home screen.</string> <!-- External-drop widget pick title. This is shown as the title of the dialog which allows you to pick which widgets to handle a particular drop if there are multiple choices. [CHAR_LIMIT=35] --> @@ -93,7 +93,7 @@ s --> <string name="shortcut_duplicate">Shortcut \"<xliff:g id="name" example="Browser">%s</xliff:g>\" already exists.</string> <!-- Title of dialog when user is selecting shortcut to add to homescreen --> - <string name="title_select_shortcut">Select shortcut</string> + <string name="title_select_shortcut">Choose shortcut</string> <!-- Title of dialog when user is selecting an application to add to homescreen --> <string name="title_select_application">Choose app</string> @@ -176,17 +176,17 @@ s --> <!-- Permission short label --> <string name="permlab_uninstall_shortcut">uninstall shortcuts</string> <!-- Permission description --> - <string name="permdesc_uninstall_shortcut">Allows an app to remove + <string name="permdesc_uninstall_shortcut">Allows the app to remove shortcuts without user intervention.</string> <!-- Permission short label --> <string name="permlab_read_settings">read Home settings and shortcuts</string> <!-- Permission description --> - <string name="permdesc_read_settings">Allows an app to read the settings and + <string name="permdesc_read_settings">Allows the app to read the settings and shortcuts in Home.</string> <!-- Permission short label --> <string name="permlab_write_settings">write Home settings and shortcuts</string> <!-- Permission description --> - <string name="permdesc_write_settings">Allows an app to change the settings and + <string name="permdesc_write_settings">Allows the app to change the settings and shortcuts in Home.</string> <!-- Widgets: --> @@ -239,16 +239,16 @@ s --> <!-- Folder accessibility --> <!-- The format string for when a folder is opened, speaks the dimensions --> - <string name="folder_opened">Folder opened, %1$d by %2$d</string> + <string name="folder_opened">Folder opened, <xliff:g id="width" example="5">%1$d</xliff:g> by <xliff:g id="height" example="3">%2$d</xliff:g></string> <!-- Instruction that clicking outside will close folder --> - <string name="folder_tap_to_close">Tap to close folder</string> + <string name="folder_tap_to_close">Touch to close folder</string> <!-- Instruction that clicking outside will commit folder rename --> - <string name="folder_tap_to_rename">Tap to commit rename</string> + <string name="folder_tap_to_rename">Touch to save rename</string> <!-- Indication that folder closed --> <string name="folder_closed">Folder closed</string> <!-- Folder renamed format --> - <string name="folder_renamed">Folder renamed to %1$s</string> + <string name="folder_renamed">Folder renamed to <xliff:g id="name" example="Games">%1$s</xliff:g></string> <!-- Folder name format --> - <string name="folder_name_format">Folder: %1$s</string> + <string name="folder_name_format">Folder: <xliff:g id="name" example="Games">%1$s</xliff:g></string> </resources> |