diff options
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/attrs.xml | 45 | ||||
| -rw-r--r-- | res/values/colors.xml | 28 | ||||
| -rw-r--r-- | res/values/config.xml | 46 | ||||
| -rw-r--r-- | res/values/dimens.xml | 97 | ||||
| -rw-r--r-- | res/values/strings.xml | 221 | ||||
| -rw-r--r-- | res/values/styles.xml | 26 |
6 files changed, 213 insertions, 250 deletions
diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 3331cdec4..827332ad7 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -18,6 +18,19 @@ <resources> + <!-- BubbleTextView specific attributes. --> + <declare-styleable name="BubbleTextView"> + <attr name="layoutHorizontal" format="boolean" /> + <attr name="iconSizeOverride" format="dimension" /> + <attr name="iconDisplay" format="integer"> + <enum name="workspace" value="0" /> + <enum name="all_apps" value="1" /> + <enum name="widget_section" value="2" /> + </attr> + <attr name="deferShadowGeneration" format="boolean" /> + <attr name="customShadows" format="boolean" /> + </declare-styleable> + <!-- Page Indicator specific attributes. --> <declare-styleable name="PageIndicator"> <attr name="windowSize" format="integer" /> @@ -59,16 +72,6 @@ <attr name="maxGap" format="dimension" /> </declare-styleable> - <!-- StrokedTextView specific attributes. --> - <declare-styleable name="StrokedTextView"> - <!-- The color of the stroke outline --> - <attr name="strokeColor" format="color" /> - <!-- The color of the text --> - <attr name="strokeTextColor" format="color" /> - <!-- The width of the stroke --> - <attr name="strokeWidth" format="float" /> - </declare-styleable> - <!-- PagedView specific attributes. These attributes are used to customize a PagedView view in XML files. --> <declare-styleable name="PagedView"> @@ -80,28 +83,6 @@ <attr name="pageIndicator" format="reference" /> </declare-styleable> - <declare-styleable name="BubbleTextView"> - <!-- A spacing override for the icons within a page --> - <attr name="customShadows" format="boolean" /> - </declare-styleable> - - <!-- AppsCustomizePagedView specific attributes. These attributes are used to - customize an AppsCustomizePagedView in xml files. --> - <declare-styleable name="AppsCustomizePagedView"> - <!-- Max number of cells of applications horizontally --> - <attr name="maxAppCellCountX" format="integer" /> - <!-- Max number of cells of applications vertically --> - <attr name="maxAppCellCountY" format="integer" /> - <!-- Horizontal spacing between widgets and wallpapers --> - <attr name="widgetCellWidthGap" format="dimension" /> - <!-- Vertical spacing between widgets --> - <attr name="widgetCellHeightGap" format="dimension" /> - <!-- Number of widgets horizontally --> - <attr name="widgetCountX" format="integer" /> - <!-- Number of widgets vertically --> - <attr name="widgetCountY" format="integer" /> - </declare-styleable> - <!-- XML attributes used by default_workspace.xml --> <declare-styleable name="Favorite"> <attr name="className" format="string" /> diff --git a/res/values/colors.xml b/res/values/colors.xml index 2daf9fe12..51e4d40a5 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -20,20 +20,34 @@ <resources> <!-- The color tints to apply to the text and drag view when hovering over the delete target or the info target --> - <color name="delete_target_hover_tint">#DAFF0000</color> - <color name="info_target_hover_tint">#DA0099CC</color> + <color name="delete_target_hover_tint">#FFC1C1C1</color> + <color name="uninstall_target_hover_tint">#FFF0592B</color> + <color name="info_target_hover_tint">#FF009688</color> <color name="cling_scrim_background">#80000000</color> - <color name="bubble_dark_background">#20000000</color> <color name="focused_background">#80c6c5c5</color> - <color name="appwidget_error_color">#FCCC</color> - <color name="workspace_icon_text_color">#FFF</color> + <color name="workspace_edge_effect_color">#FFFFFFFF</color> + <color name="folder_edge_effect_color">#FF757575</color> + <color name="quantum_panel_text_color">#FF666666</color> - <color name="quantum_panel_text_shadow_color">#FFC4C4C4</color> + <color name="quantum_panel_bg_color">#FFF5F5F5</color> + <color name="quantum_panel_bg_color_dark">#FF374248</color> + <color name="outline_color">#FFFFFFFF</color> - <color name="widget_text_panel">#FF374248</color> + <!-- Containers --> + <color name="container_fastscroll_thumb_inactive_color">#42000000</color> + <color name="container_fastscroll_thumb_active_color">#009688</color> + + <!-- All Apps --> + <color name="all_apps_grid_section_text_color">#009688</color> + + <!-- Widgets view --> + <color name="widgets_view_fastscroll_thumb_inactive_color">#42FFFFFF</color> + <color name="widgets_view_section_text_color">#FFFFFF</color> + <color name="widgets_view_item_text_color">#C4C4C4</color> + <color name="widgets_cell_color">#263238</color> </resources> diff --git a/res/values/config.xml b/res/values/config.xml index cbec51216..b2ba7a986 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -1,12 +1,7 @@ <resources> <!-- Dynamic Grid --> - <integer name="config_dynamic_grid_max_long_edge_cell_count">6</integer> - <integer name="config_dynamic_grid_max_short_edge_cell_count">5</integer> - <integer name="config_dynamic_grid_min_edge_cell_count">3</integer> <!-- Out of 100, the percent of space the overview bar should try and take vertically. --> <integer name="config_dynamic_grid_overview_icon_zone_percentage">20</integer> - <!-- Out of 100, the percent to shrink the workspace during overview mode. --> - <integer name="config_dynamic_grid_overview_scale_percentage">80</integer> <!-- Miscellaneous --> <bool name="config_largeHeap">false</bool> @@ -23,23 +18,24 @@ <!-- DragController --> <integer name="config_flingToDeleteMinVelocity">-1500</integer> + <item type="id" name="drag_event_parity" /> -<!-- AllApps/Customize/AppsCustomize --> +<!-- AllApps & Launcher transitions --> <!-- The alpha of the AppsCustomize bg in spring loaded mode --> <integer name="config_workspaceScrimAlpha">55</integer> - <integer name="config_workspaceUnshrinkTime">300</integer> + <integer name="config_allAppsTransitionTime">100</integer> <integer name="config_overviewTransitionTime">250</integer> <!-- Out of 100, the percent to shrink the workspace during spring loaded mode. --> <integer name="config_workspaceSpringLoadShrinkPercentage">80</integer> + <!-- Out of 100, the percent to shrink the workspace during overview mode. --> + <integer name="config_workspaceOverviewShrinkPercentage">70</integer> - <!-- Fade/zoom in/out duration & scale in the AllApps transition. - Note: This should be less than the workspaceShrinkTime as they happen together. --> - <integer name="config_appsCustomizeRevealTime">220</integer> - <integer name="config_appsCustomizeWorkspaceShrinkTime">300</integer> - - <integer name="config_appsCustomizeConcealTime">250</integer> - <integer name="config_appsCustomizeItemsAlphaStagger">60</integer> + <!-- Fade/zoom in/out duration & scale in a Launcher overlay transition. + Note: This should be less than the config_overlayTransitionTime as they happen together. --> + <integer name="config_overlayRevealTime">220</integer> + <integer name="config_overlayTransitionTime">300</integer> + <integer name="config_overlayItemsAlphaStagger">60</integer> <!-- This constant stores the ratio of the all apps button drawable which is used for internal (baked-in) padding --> @@ -47,20 +43,7 @@ <integer name="config_workspaceDefaultScreen">0</integer> - <!-- Tab transition animation duration --> - <integer name="config_tabTransitionDuration">250</integer> - - <!-- The slope, in percent, of the drag movement needed to drag an item out of - AppsCustomize (y / x * 100%) --> - <integer name="config_appsCustomizeDragSlopeThreshold">150</integer> - <!-- Workspace --> - <!-- Whether or not the drop targets drop down as opposed to fade in --> - <bool name="config_useDropTargetDownTransition">false</bool> - - <!-- The transition duration for the background of the drop targets --> - <integer name="config_dropTargetBgTransitionDuration">0</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> @@ -81,10 +64,6 @@ <!-- The distance at which the animation should take the max duration --> <integer name="config_dropAnimMaxDist">800</integer> - <!-- Properties controlling the workspace fade-out during dragging --> - <integer name="config_dragFadeOutAlpha">80</integer> - <integer name="config_dragFadeOutDuration">250</integer> - <!-- Hotseat --> <bool name="hotseat_transpose_layout_with_orientation">true</bool> @@ -104,4 +83,9 @@ <item type="id" name="action_uninstall" /> <item type="id" name="action_info" /> <item type="id" name="action_add_to_workspace" /> + <item type="id" name="action_move" /> + <item type="id" name="action_move_to_workspace" /> + <item type="id" name="action_move_screen_backwards" /> + <item type="id" name="action_move_screen_forwards" /> + <item type="id" name="action_resize" /> </resources> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 54689ec25..589d69666 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -15,20 +15,24 @@ --> <resources> + <dimen name="app_icon_size">64dp</dimen> + <!-- Dynamic Grid --> <dimen name="dynamic_grid_edge_margin">6dp</dimen> <dimen name="dynamic_grid_search_bar_max_width">500dp</dimen> <dimen name="dynamic_grid_search_bar_height">56dp</dimen> <dimen name="dynamic_grid_page_indicator_height">20dp</dimen> <dimen name="dynamic_grid_icon_drawable_padding">4dp</dimen> - <dimen name="dynamic_grid_all_apps_cell_padding">18dp</dimen> <dimen name="dynamic_grid_workspace_page_spacing">8dp</dimen> <dimen name="dynamic_grid_overview_min_icon_zone_height">80dp</dimen> <dimen name="dynamic_grid_overview_max_icon_zone_height">120dp</dimen> <dimen name="dynamic_grid_overview_bar_item_width">80dp</dimen> <dimen name="dynamic_grid_overview_bar_spacer_width">20dp</dimen> +<!-- App Widget resize frame --> <dimen name="default_widget_padding">8dp</dimen> + <dimen name="widget_handle_margin">13dp</dimen> + <dimen name="resize_frame_background_padding">24dp</dimen> <!-- Cling --> <dimen name="cling_migration_logo_height">240dp</dimen> @@ -40,60 +44,89 @@ <!-- Workspace --> <dimen name="workspace_max_gap">16dp</dimen> - <dimen name="workspace_overscroll_drawable_padding">0dp</dimen> <!-- QSB --> <dimen name="toolbar_button_vertical_padding">4dip</dimen> <dimen name="toolbar_button_horizontal_padding">12dip</dimen> -<!-- AllApps/Customize/AppsCustomize --> - <!-- The height of the tab bar - if this changes, we should update the - external icon width/height above to compensate --> - <dimen name="apps_customize_tab_bar_height">52dp</dimen> - <dimen name="apps_customize_tab_bar_margin_top">0dp</dimen> - <dimen name="app_icon_size">48dp</dimen> - <dimen name="apps_customize_horizontal_padding">0dp</dimen> +<!-- Container --> + <!-- Note: This needs to match the fixed insets for the search box. --> + <dimen name="container_bounds_inset">8dp</dimen> + <!-- Notes: container_bounds_inset - quantum_panel_outer_padding --> + <dimen name="container_bounds_minus_quantum_panel_padding_inset">4dp</dimen> + + <dimen name="container_fastscroll_thumb_min_width">4dp</dimen> + <dimen name="container_fastscroll_thumb_max_width">8dp</dimen> + <dimen name="container_fastscroll_thumb_height">64dp</dimen> + <dimen name="container_fastscroll_thumb_touch_inset">-24dp</dimen> + <dimen name="container_fastscroll_popup_size">72dp</dimen> + <dimen name="container_fastscroll_popup_text_size">48dp</dimen> + +<!-- All Apps --> + <dimen name="all_apps_grid_view_start_margin">0dp</dimen> + <dimen name="all_apps_grid_section_y_offset">8dp</dimen> + <dimen name="all_apps_grid_section_text_size">24sp</dimen> + <dimen name="all_apps_search_bar_height">48dp</dimen> + <dimen name="all_apps_search_bar_prediction_bar_padding">8dp</dimen> + <dimen name="all_apps_icon_top_bottom_padding">8dp</dimen> + <dimen name="all_apps_icon_width_gap">24dp</dimen> + <!-- The top padding should account for the existing all_apps_list_top_bottom_padding --> + <dimen name="all_apps_prediction_icon_top_padding">8dp</dimen> + <dimen name="all_apps_prediction_icon_bottom_padding">18dp</dimen> + <dimen name="all_apps_list_top_bottom_padding">8dp</dimen> + +<!-- Widget tray --> + <dimen name="widget_container_inset">8dp</dimen> + <dimen name="widget_preview_label_vertical_padding">8dp</dimen> + <dimen name="widget_preview_label_horizontal_padding">8dp</dimen> + <dimen name="widget_preview_horizontal_padding">8dp</dimen> + + <dimen name="widget_section_height">56dp</dimen> + <dimen name="widget_section_icon_size">40dp</dimen> + <dimen name="widget_section_vertical_padding">8dp</dimen> + <dimen name="widget_section_horizontal_padding">16dp</dimen> - <!-- The AppsCustomize page indicator --> - <dimen name="apps_customize_page_indicator_height">12dp</dimen> - <dimen name="apps_customize_page_indicator_margin">4dp</dimen> - <dimen name="apps_customize_page_indicator_offset">16dp</dimen> + <dimen name="widget_row_padding">8dp</dimen> + <dimen name="widget_row_divider">2dp</dimen> + + <!-- Padding applied to shortcut previews --> + <dimen name="shortcut_preview_padding_left">0dp</dimen> + <dimen name="shortcut_preview_padding_right">0dp</dimen> + <dimen name="shortcut_preview_padding_top">0dp</dimen> +<!-- Dragging --> <!-- Drag padding to add to the bottom of drop targets --> <dimen name="drop_target_drag_padding">14dp</dimen> <dimen name="drop_target_text_size">14sp</dimen> -<!-- Dragging --> <!-- the area at the edge of the screen that makes the workspace go left or right while you're dragging. --> <dimen name="scroll_zone">20dp</dimen> - <!-- When dragging items on the workspace, the number of dps by which the position of - the drag view should be offset from the position of the original view. --> - <dimen name="dragViewOffsetX">0dp</dimen> - <dimen name="dragViewOffsetY">0dp</dimen> - <!-- When dragging an item, how much bigger (fixed dps) the dragged view - should be. If 0, it will not be scaled at all. --> + <!-- 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">12dp</dimen> - <!-- Padding applied to AppWidget previews --> - <dimen name="app_widget_preview_padding_left">16dp</dimen> - <dimen name="app_widget_preview_padding_right">16dp</dimen> - <dimen name="app_widget_preview_padding_top">32dp</dimen> - <dimen name="app_widget_preview_label_vertical_padding">8dp</dimen> - <dimen name="app_widget_preview_label_horizontal_padding">8dp</dimen> + <!-- Elevation for the drag view. It should be larger than elevation of all other drag sources + and drop targets like all-apps and folders --> + <dimen name="drag_elevation">30dp</dimen> - <!-- Padding applied to shortcut previews --> - <dimen name="shortcut_preview_padding_left">0dp</dimen> - <dimen name="shortcut_preview_padding_right">0dp</dimen> - <dimen name="shortcut_preview_padding_top">0dp</dimen> +<!-- Theme --> + <dimen name="quantum_panel_outer_padding">4dp</dimen> <!-- Folders --> <!-- The amount that the preview contents are inset from the preview background --> <dimen name="folder_preview_padding">4dp</dimen> - <dimen name="folder_name_padding">10dp</dimen> <!-- Sizes for managed profile badges --> <dimen name="profile_badge_size">24dp</dimen> - <dimen name="profile_badge_margin">4dp</dimen> + <dimen name="profile_badge_margin">5dp</dimen> + <dimen name="profile_badge_minimum_top">2dp</dimen> + +<!-- Shadows and outlines --> + <dimen name="blur_size_thin_outline">1dp</dimen> + <dimen name="blur_size_medium_outline">2dp</dimen> + <dimen name="blur_size_click_shadow">4dp</dimen> + <dimen name="click_shadow_high_shift">2dp</dimen> + </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 8b7e6c199..88f149bd0 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -32,12 +32,10 @@ <!-- Application name --> <string name="application_name">Launcher3</string> - <!-- Accessibility-facing application name --> - <string name="home">Home</string> - <!-- Name for all applications running as this uid. --> - <string name="uid_name">Android Core Apps</string> <!-- Default folder name --> <string name="folder_name"></string> + <!-- Work folder name --> + <string name="work_folder_name">Work</string> <!-- Displayed when user selects a shortcut for an app that was uninstalled [CHAR_LIMIT=none]--> <string name="activity_not_found">App isn\'t installed.</string> <!-- Displayed when user selects a shortcut for an app that is current not available [CHAR_LIMIT=none]--> @@ -46,81 +44,36 @@ <string name="safemode_shortcut_error">Downloaded app disabled in Safe mode</string> <!-- SafeMode widget error string --> <string name="safemode_widget_error">Widgets disabled in Safe mode</string> - <!-- Labels for the tabs in the customize drawer --> - <string name="widgets_tab_label">Widgets</string> - - <string name="widget_adder">Widgets</string> <string name="toggle_weight_watcher">Show Mem</string> - <!-- AppsCustomize pane --> + <!-- Widgets --> <!-- Message to tell the user to press and hold on a widget to add it [CHAR_LIMIT=50] --> <string name="long_press_widget_to_add">Touch & hold to pick up a widget.</string> <!-- The format string for the dimensions of a widget in the drawer --> <!-- There is a special version of this format string for Farsi --> <string name="widget_dims_format">%1$d \u00d7 %2$d</string> - <!-- External-drop widget pick label format string [CHAR_LIMIT=25] --> - <string name="external_drop_widget_pick_format" translatable="false">%1$s (%2$d \u00d7 %3$d)</string> - <!-- 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 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] --> - <string name="external_drop_widget_pick_title">Choose widget to create</string> - - <!-- Folders --> - <skip /> - <!-- Label of Folder name field in Rename folder dialog box --> - <string name="rename_folder_label">Folder name</string> - <!-- Title of dialog box --> - <string name="rename_folder_title">Rename folder</string> - <!-- Buttons in Rename folder dialog box --> - <string name="rename_action">OK</string> - <!-- Buttons in Rename folder dialog box --> - <string name="cancel_action">Cancel</string> - - <!-- Shortcuts --> + <!-- All Apps --> + <!-- Search bar text in the apps view. [CHAR_LIMIT=50] --> + <string name="all_apps_search_bar_hint">Search Apps</string> + <!-- Loading apps text. [CHAR_LIMIT=50] --> + <string name="all_apps_loading_message">Loading Apps…</string> + <!-- No-search-results text. [CHAR_LIMIT=50] --> + <string name="all_apps_no_search_results">No Apps found matching \"<xliff:g id="query" example="Android">%1$s</xliff:g>\"</string> + + <!-- Drag and drop --> <skip /> - <!-- Title of dialog box --> - <string name="menu_item_add_item">Add to Home screen</string> - <!-- Options in "Add to Home" dialog box; Title of the group containing the list of all apps --> - <string name="group_applications">Apps</string> - <!-- Options in "Add to Home" dialog box; Title of the group containing the list of all shortcut -s --> - <string name="group_shortcuts">Shortcuts</string> - <!-- Options in "Add to Home" dialog box; Title of the group containing the list of all widgets/gadgets --> - <string name="group_widgets">Widgets</string> - <!-- Error message when user has filled all their home screens --> - <string name="completely_out_of_space">No more room on your Home screens.</string> <!-- Error message when user has filled a home screen --> <string name="out_of_space">No more room on this Home screen.</string> <!-- Error message when user has filled the hotseat --> <string name="hotseat_out_of_space">No more room in the Favorites tray</string> - <!-- Error message when user tries to drop an invalid item on the hotseat --> - <string name="invalid_hotseat_item">This widget is too large for the Favorites tray</string> - <!-- Message displayed when a shortcut is created by an external application --> - <string name="shortcut_installed">Shortcut \"<xliff:g id="name" example="Browser">%s</xliff:g>\" created.</string> - <!-- Message displayed when a shortcut is uninstalled by an external application --> - <string name="shortcut_uninstalled">Shortcut \"<xliff:g id="name" example="Browser">%s</xliff:g>\" was removed.</string> - <!-- Message displayed when an external application attemps to create a shortcut that already exists --> - <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">Choose shortcut</string> - <!-- Title of dialog when user is selecting an application to add to homescreen --> - <string name="title_select_application">Choose app</string> <!-- All applications label --> <string name="all_apps_button_label">Apps</string> <!-- Label for button in all applications label to go back home (to the workspace / desktop) for accessibilty (spoken when the button gets focus). --> <string name="all_apps_home_button_label">Home</string> - <!-- Label for trash icon in All Apps. The icon/widget will become completely unavailable on the - device. [CHAR_LIMIT=30]--> - <string name="delete_zone_label_all_apps">Uninstall</string> <!-- Label for delete drop target. [CHAR_LIMIT=20] --> <string name="delete_target_label">Remove</string> @@ -129,35 +82,6 @@ s --> <!-- Label for the info icon. [CHAR_LIMIT=20] --> <string name="info_target_label">App info</string> - <!-- Accessibility: AllApps button --> - <string name="accessibility_all_apps_button">Apps</string> - <!-- Accessibility: Delete button --> - <string name="accessibility_delete_button">Remove</string> - - <!-- Label for trash icon in All Apps, when an updated system app is selected. The update will - be uninstalled. [CHAR_LIMIT=30] --> - <string name="delete_zone_label_all_apps_system_app">Uninstall update</string> - - <!-- URL pointing to help text. If empty, no link to help will be created [DO NOT TRANSLATE] --> - <string name="help_url" translatable="false"></string> - - <!-- Strings for the contextual action bar (CAB) in All Apps --> - <skip /> - <!-- Describes the button for uninstalling the currently selected application. - Text is not displayed, but provided for accessibility. [CHAR_LIMIT=none] --> - <string name="cab_menu_delete_app">Uninstall app</string> - <!-- Describes the button for getting details/info about currently selected application. - Text is not displayed, but provided for accessibility. [CHAR_LIMIT=none] --> - <string name="cab_menu_app_info">App details</string> - <!-- Appears in the CAB when an app is selected in All Apps or Customize mode. [CHAR_LIMIT=50] --> - <string name="cab_app_selection_text">1 app selected</string> - <!-- Appears in the CAB when a widget is selected in Customize mode. [CHAR_LIMIT=50] --> - <string name="cab_widget_selection_text">1 widget selected</string> - <!-- Appears in the CAB when a folder is selected in Customize mode. [CHAR_LIMIT=50] --> - <string name="cab_folder_selection_text">1 folder selected</string> - <!-- Appears in the CAB when a shortcut is selected in Customize mode. [CHAR_LIMIT=50] --> - <string name="cab_shortcut_selection_text">1 shortcut selected</string> - <!-- Permissions: --> <skip /> <!-- Permission short label --> @@ -166,11 +90,6 @@ s --> <string name="permdesc_install_shortcut">Allows an app to add shortcuts without user intervention.</string> <!-- Permission short label --> - <string name="permlab_uninstall_shortcut">uninstall shortcuts</string> - <!-- Permission description --> - <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 the app to read the settings and @@ -193,38 +112,20 @@ s --> <!-- Text to inform the user that they can't uninstall a system application --> <string name="uninstall_system_app_text">This is a system app and can\'t be uninstalled.</string> - <!-- Title of the Android Dreams (screensaver) module --> - <string name="dream_name">Rocket Launcher</string> - <!-- Default folder title --> <string name="folder_hint_text">Unnamed Folder</string> <!-- Accessibility --> <skip /> - <!-- The format string for Workspace descriptions [CHAR_LIMIT=none] --> - <string name="workspace_description_format">Home screen %1$d</string> - <!-- The format string for default page scroll text [CHAR_LIMIT=none] --> <string name="default_scroll_format">Page %1$d of %2$d</string> <!-- The format string for Workspace page scroll text [CHAR_LIMIT=none] --> <string name="workspace_scroll_format">Home screen %1$d of %2$d</string> - <!-- The format string for AppsCustomize Apps page scroll text [CHAR_LIMIT=none] --> - <string name="apps_customize_apps_scroll_format">Apps page %1$d of %2$d</string> - <!-- The format string for AppsCustomize Apps page scroll text [CHAR_LIMIT=none] --> - <string name="apps_customize_widgets_scroll_format">Widgets page %1$d of %2$d</string> <!-- Clings --> <!-- The title text for the workspace cling [CHAR_LIMIT=30] --> <string name="first_run_cling_title">Welcome</string> - <!-- The description of how to use the workspace [CHAR_LIMIT=60] --> - <string name="first_run_cling_description">Make yourself at home.</string> - <!-- The description of how to use the workspace [CHAR_LIMIT=60] --> - <string name="first_run_cling_custom_content_hint"></string> - <!-- The description of how to use the workspace [CHAR_LIMIT=60] --> - <string name="first_run_cling_search_bar_hint"></string> - <!-- The description of how to use the workspace [CHAR_LIMIT=60] --> - <string name="first_run_cling_create_screens_hint">Create more screens for apps and folders</string> <!-- The title text for the migration cling [CHAR_LIMIT=30] --> <string name="migration_cling_title">Copy your app icons</string> <!-- The description of what migration does [CHAR_LIMIT=70] --> @@ -233,24 +134,12 @@ s --> <string name="migration_cling_copy_apps">COPY ICONS</string> <!-- The description of the button to use the default launcher layout [CHAR_LIMIT=30] --> <string name="migration_cling_use_default">START FRESH</string> - <!-- The title text for the workspace cling [CHAR_LIMIT=30] --> - <string name="workspace_cling_title">Organize your space</string> - <!-- The description of how to use the workspace [CHAR_LIMIT=70] --> - <string name="workspace_cling_move_item">Touch & hold background to manage wallpaper, widgets and settings.</string> <!-- The title text for workspace longpress action [CHAR_LIMIT=40] --> <string name="workspace_cling_longpress_title">Wallpapers, widgets, & settings</string> <!-- The description of how to use the workspace [CHAR_LIMIT=70] --> <string name="workspace_cling_longpress_description">Touch & hold background to customize</string> <!-- The description of the button to dismiss the cling [CHAR_LIMIT=30] --> <string name="workspace_cling_longpress_dismiss">GOT IT</string> - <!-- The title text for the Folder cling [CHAR_LIMIT=30] --> - <string name="folder_cling_title">Here\'s a folder</string> - <!-- The description of how to create a folder [CHAR_LIMIT=70] --> - <string name="folder_cling_create_folder">To create one like this, touch & hold an app, then move it over another.</string> - <!-- The text on the button to dismiss a cling [CHAR_LIMIT=30] --> - <string name="cling_dismiss">OK</string> - <!-- Error message on dummy custom cling layout [DO NOT TRANSLATE] --> - <string name="dummy_custom_cling_error_message">Error: custom workspace layout passed in but custom cling was not overwritten</string> <!-- Folder accessibility --> <!-- The format string for when a folder is opened, speaks the dimensions --> @@ -277,19 +166,13 @@ s --> <!-- Text for settings button --> <string name="settings_button_text">Settings</string> - <!-- Label on an icon that references an uninstalled package, that is going to be installed at some point. [CHAR_LIMIT=15] --> - <string name="package_state_enqueued">Waiting</string> - <!-- Label on an icon that references an uninstalled package, that is currently being downloaded. [CHAR_LIMIT=15] --> - <string name="package_state_downloading">Downloading</string> - <!-- Label on an icon that references an uninstalled package, that is currently being installed. [CHAR_LIMIT=15] --> - <string name="package_state_installing">Installing</string> + <!-- Strings for settings --> + <!-- Title for Allow Rotation setting. [CHAR LIMIT=50] --> + <string name="allow_rotation_title">Allow rotation</string> + <!-- Label on an icon that references an uninstalled package, for which we have no information about when it might be installed. [CHAR_LIMIT=15] --> <string name="package_state_unknown">Unknown</string> - <!-- Label on an icon that references an uninstalled package, for which restore from market has failed. [CHAR_LIMIT=15] --> - <string name="package_state_error">Not restored</string> - <!-- Button for abandoned promises dialog, that removes all abandoned promise icons. --> - <string name="abandoned_clean_all">Remove All</string> <!-- Button for abandoned promises dialog, to removes this abandoned promise icon. --> <string name="abandoned_clean_this">Remove</string> <!-- Button for abandoned promise dialog, to search in the market for the missing package. --> @@ -304,5 +187,75 @@ s --> <!-- Strings for accessibility actions --> <!-- Accessibility action to add an app to workspace. [CHAR_LIMIT=30] --> - <string name="action_add_to_workspace">Add To Workspace</string> + <string name="action_add_to_workspace">Add to Home screen</string> + + <!-- Accessibility action to move item to the current location. [CHAR_LIMIT=30] --> + <string name="action_move_here">Move item here</string> + + <!-- Accessibility confirmation for item added to workspace. --> + <string name="item_added_to_workspace">Item added to home screen</string> + + <!-- Accessibility confirmation for item removed. --> + <string name="item_removed">Item removed</string> + + <!-- Accessibility action to move an item on the workspace. [CHAR_LIMIT=30] --> + <string name="action_move">Move item</string> + + <!-- Accessibility description to move item to empty cell. --> + <string name="move_to_empty_cell">Move to row <xliff:g id="number" example="1">%1$s</xliff:g> column <xliff:g id="number" example="1">%2$s</xliff:g></string> + + <!-- Accessibility description to move item inside a folder. --> + <string name="move_to_position">Move to position <xliff:g id="number" example="1">%1$s</xliff:g></string> + + <!-- Accessibility description to move item to the hotseat. --> + <string name="move_to_hotseat_position">Move to favorites position <xliff:g id="number" example="1">%1$s</xliff:g></string> + + <!-- Accessibility confirmation for item move. --> + <string name="item_moved">Item moved</string> + + <!-- Accessibility description to move item into an existing folder. --> + <string name="add_to_folder">Add to folder: <xliff:g id="name" example="Games">%1$s</xliff:g></string> + + <!-- Accessibility description to move item into an existing folder containing an app. --> + <string name="add_to_folder_with_app">Add to folder with <xliff:g id="name" example="Messenger">%1$s</xliff:g></string> + + <!-- Accessibility confirmation for item added to folder. --> + <string name="added_to_folder">Item added to folder</string> + + <!-- Accessibility description to create folder with another item. --> + <string name="create_folder_with">Create folder with: <xliff:g id="name" example="Game">%1$s</xliff:g></string> + + <!-- Accessibility confirmation for folder created. --> + <string name="folder_created">Folder created</string> + + <!-- Accessibility action to move an item from folder to workspace. [CHAR_LIMIT=30] --> + <string name="action_move_to_workspace">Move to Home screen</string> + + <!-- Accessibility action to move an homescreen to the left. [CHAR_LIMIT=30] --> + <string name="action_move_screen_left">Move screen to left</string> + + <!-- Accessibility action to move an homescreen to the right. [CHAR_LIMIT=30] --> + <string name="action_move_screen_right">Move screen to right</string> + + <!-- Accessibility confirmation when a screen was moved. --> + <string name="screen_moved">Screen moved</string> + + <!-- Accessibility action to resize a widget. [CHAR_LIMIT=30] --> + <string name="action_resize">Resize</string> + + <!-- Accessibility action to increase width of a widget. [CHAR_LIMIT=30] --> + <string name="action_increase_width">Increase width</string> + + <!-- Accessibility action to increase height of a widget. [CHAR_LIMIT=30] --> + <string name="action_increase_height">Increase height</string> + + <!-- Accessibility action to decrease width of a widget. [CHAR_LIMIT=30] --> + <string name="action_decrease_width">Decrease width</string> + + <!-- Accessibility action to decrease height of a widget. [CHAR_LIMIT=30] --> + <string name="action_decrease_height">Decrease height</string> + + <!-- Accessibility confirmation for widget resize. --> + <string name="widget_resized">Widget resized to width <xliff:g id="number" example="2">%1$s</xliff:g> height <xliff:g id="number" example="1">%2$s</xliff:g></string> + </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index 77798f174..7d60cbe0a 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -18,8 +18,15 @@ --> <resources> + <style name="Theme.Light.CustomOverscroll" parent="@android:style/Theme.DeviceDefault"> + <item name="android:colorEdgeEffect">@color/folder_edge_effect_color</item> + </style> + + <style name="Theme.Dark.CustomOverscroll" parent="@android:style/Theme.DeviceDefault"> + <item name="android:colorEdgeEffect">@color/workspace_edge_effect_color</item> + </style> - <style name="WorkspaceIcon"> + <style name="Icon"> <item name="android:layout_width">match_parent</item> <item name="android:layout_height">match_parent</item> <item name="android:layout_gravity">center</item> @@ -32,11 +39,7 @@ <item name="android:fontFamily">sans-serif-condensed</item> </style> - <style name="WorkspaceIcon.Portrait"></style> - - <style name="WorkspaceIcon.Landscape"></style> - - <style name="WorkspaceIcon.AppsCustomize"> + <style name="Icon.AllApps"> <item name="android:background">@null</item> <item name="android:textColor">@color/quantum_panel_text_color</item> <item name="android:drawablePadding">@dimen/dynamic_grid_icon_drawable_padding</item> @@ -44,7 +47,7 @@ <item name="customShadows">false</item> </style> - <style name="WorkspaceIcon.Folder"> + <style name="Icon.Folder"> <item name="android:background">@null</item> <item name="android:textColor">@color/quantum_panel_text_color</item> <item name="android:shadowRadius">0</item> @@ -58,7 +61,7 @@ <item name="android:layout_height">match_parent</item> </style> - <style name="DropTargetButton.Base"> + <style name="DropTargetButtonBase"> <item name="android:layout_width">wrap_content</item> <item name="android:layout_height">match_parent</item> <item name="android:layout_gravity">center</item> @@ -76,7 +79,7 @@ <item name="android:shadowRadius">4.0</item> </style> - <style name="DropTargetButton" parent="DropTargetButton.Base"></style> + <style name="DropTargetButton" parent="DropTargetButtonBase" /> <style name="PreloadIcon"> <item name="background">@drawable/virtual_preload</item> @@ -90,9 +93,4 @@ <item name="ringOutset">4dp</item> </style> - <!-- Overridden in device overlays --> - <style name="PagedViewWidgetImageView"> - <item name="android:paddingLeft">@dimen/app_widget_preview_padding_left</item> - </style> - </resources> |