diff options
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/attrs.xml | 33 | ||||
| -rw-r--r-- | res/values/colors.xml | 11 | ||||
| -rw-r--r-- | res/values/config.xml | 23 | ||||
| -rw-r--r-- | res/values/dimens.xml | 35 | ||||
| -rw-r--r-- | res/values/strings.xml | 46 | ||||
| -rw-r--r-- | res/values/styles.xml | 75 |
6 files changed, 115 insertions, 108 deletions
diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 0006a7455..65f8f22a6 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -25,17 +25,8 @@ <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"> - <!-- Used to identify how to draw the cling bg --> - <attr name="drawIdentifier" format="string" /> - </declare-styleable> - - <!-- Page Indicator specific attributes. These attributes are used to customize - the cling in XML files. --> + <!-- Page Indicator specific attributes. --> <declare-styleable name="PageIndicator"> - <!-- Used to identify how to draw the cling bg --> <attr name="windowSize" format="integer" /> </declare-styleable> @@ -98,16 +89,16 @@ <!-- A spacing override for the icons within a page --> <attr name="pageLayoutWidthGap" format="dimension" /> <attr name="pageLayoutHeightGap" format="dimension" /> - <!-- The padding of the pages that are dynamically created per page --> - <attr name="pageLayoutPaddingTop" format="dimension" /> - <attr name="pageLayoutPaddingBottom" format="dimension" /> - <attr name="pageLayoutPaddingLeft" format="dimension" /> - <attr name="pageLayoutPaddingRight" format="dimension" /> <!-- The page indicator for this workspace --> <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"> @@ -123,10 +114,6 @@ <attr name="widgetCountX" format="integer" /> <!-- Number of widgets vertically --> <attr name="widgetCountY" format="integer" /> - <!-- The x index of the item to be focused in the cling --> - <attr name="clingFocusedX" format="integer" /> - <!-- The y index of the item to be focused in the cling --> - <attr name="clingFocusedY" format="integer" /> </declare-styleable> <!-- XML attributes used by default_workspace.xml --> @@ -151,9 +138,9 @@ <attr name="workspace" format="reference" /> </declare-styleable> - <!-- Only used in the device overlays --> - <declare-styleable name="CustomClingTitleText"> - </declare-styleable> - <declare-styleable name="CustomClingText"> + <declare-styleable name="PreloadIconDrawable"> + <attr name="background" format="reference" /> + <attr name="ringOutset" format="dimension" /> + <attr name="indicatorSize" format="dimension" /> </declare-styleable> </resources> diff --git a/res/values/colors.xml b/res/values/colors.xml index ffee05f18..29837eaf7 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -22,8 +22,10 @@ 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="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> @@ -31,10 +33,9 @@ <color name="workspace_all_apps_and_delete_zone_text_shadow_color">#A0000000</color> <color name="workspace_icon_text_color">#FFF</color> - <color name="apps_customize_icon_text_color">#FFF</color> - <color name="folder_items_text_color">#FF333333</color> - <color name="folder_items_glow_color">#FFCCCCCC</color> + <color name="quantum_panel_text_color">#FF666666</color> + <color name="quantum_panel_text_shadow_color">#FFC4C4C4</color> <color name="outline_color">#FFFFFFFF</color> - - <color name="first_run_cling_circle_background_color">#64b1ea</color> + <color name="widget_text_panel">#FF374248</color> + </resources> diff --git a/res/values/config.xml b/res/values/config.xml index b512ffe67..96bd13bbb 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -17,12 +17,16 @@ <!-- Max number of page indicators to show --> <integer name="config_maxNumberOfPageIndicatorsToShow">21</integer> + <!-- App data backup and restore. To enble backup, register with an android backup service. + http://developer.android.com/guide/topics/data/backup.html#BackupKey --> + <bool name="enable_backup">false</bool> + <!-- DragController --> <integer name="config_flingToDeleteMinVelocity">-1500</integer> <!-- AllApps/Customize/AppsCustomize --> <!-- The alpha of the AppsCustomize bg in spring loaded mode --> - <integer name="config_appsCustomizeSpringLoadedBgAlpha">65</integer> + <integer name="config_workspaceScrimAlpha">55</integer> <integer name="config_workspaceUnshrinkTime">300</integer> <integer name="config_overviewTransitionTime">250</integer> @@ -31,14 +35,20 @@ <!-- 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_appsCustomizeZoomInTime">350</integer> <integer name="config_appsCustomizeZoomOutTime">600</integer> <integer name="config_appsCustomizeZoomScaleFactor">7</integer> <integer name="config_appsCustomizeFadeInTime">250</integer> <integer name="config_appsCustomizeFadeOutTime">200</integer> <integer name="config_appsCustomizeWorkspaceShrinkTime">300</integer> - <integer name="config_appsCustomizeWorkspaceAnimationStagger">40</integer> - <integer name="config_workspaceAppsCustomizeAnimationStagger">100</integer> + + <integer name="config_appsCustomizeConcealTime">250</integer> + <integer name="config_appsCustomizeItemsAlphaStagger">60</integer> + + <!-- This constant stores the ratio of the all apps button drawable which + is used for internal (baked-in) padding --> + <integer name="config_allAppsButtonPaddingPercent">17</integer> <integer name="config_workspaceDefaultScreen">0</integer> @@ -69,7 +79,9 @@ <integer name="config_dropAnimMaxDuration">500</integer> <!-- The duration of the UserFolder opening and closing animation --> - <integer name="config_folderAnimDuration">120</integer> + <integer name="config_folderExpandDuration">120</integer> + <integer name="config_materialFolderExpandDuration">200</integer> + <integer name="config_materialFolderExpandStagger">60</integer> <!-- The distance at which the animation should take the max duration --> <integer name="config_dropAnimMaxDist">800</integer> @@ -81,9 +93,6 @@ <!-- Camera distance for the overscroll effect --> <integer name="config_cameraDistance">8000</integer> - <!-- Whether or not to use custom clings if a custom workspace layout is passed in --> - <bool name="config_useCustomClings">false</bool> - <!-- Hotseat --> <bool name="hotseat_transpose_layout_with_orientation">true</bool> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 1eca5b382..2c9e689c6 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -18,8 +18,8 @@ <!-- 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">48dp</dimen> - <dimen name="dynamic_grid_page_indicator_height">24dp</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> @@ -29,21 +29,12 @@ <dimen name="dynamic_grid_overview_bar_spacer_width">68dp</dimen> <!-- Cling --> - <dimen name="clingPunchThroughGraphicCenterRadius">94dp</dimen> - <dimen name="folderClingMarginTop">20dp</dimen> - <!-- The offset for the text in the cling --> - <dimen name="cling_text_block_offset_x">0dp</dimen> - <dimen name="cling_text_block_offset_y">0dp</dimen> - <!-- entries for custom clings, will be set in overlays --> - <add-resource type="dimen" name="custom_cling_margin_top" /> - <add-resource type="dimen" name="custom_cling_margin_right" /> - <add-resource type="dimen" name="custom_cling_margin_left" /> - - <dimen name="cling_title_text_size">20sp</dimen> - <dimen name="cling_text_size">14sp</dimen> - <dimen name="cling_alt_title_text_size">24sp</dimen> - <dimen name="cling_alt_text_size">16sp</dimen> - <dimen name="cling_hint_text_size">14sp</dimen> + <dimen name="cling_migration_logo_height">240dp</dimen> + <dimen name="cling_migration_logo_width">165dp</dimen> + <dimen name="cling_migration_bg_size">400dp</dimen> + <dimen name="cling_migration_bg_shift">-200dp</dimen> + <dimen name="cling_migration_content_margin">16dp</dimen> + <dimen name="cling_migration_content_width">280dp</dimen> <!-- Workspace --> <dimen name="workspace_max_gap">16dp</dimen> @@ -62,6 +53,7 @@ <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> <!-- The AppsCustomize page indicator --> <dimen name="apps_customize_page_indicator_height">12dp</dimen> @@ -88,9 +80,8 @@ <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_margin_top">4dp</dimen> - <dimen name="app_widget_preview_label_margin_left">2dp</dimen> - <dimen name="app_widget_preview_label_margin_right">2dp</dimen> + <dimen name="app_widget_preview_label_vertical_padding">8dp</dimen> + <dimen name="app_widget_preview_label_horizontal_padding">8dp</dimen> <!-- Padding applied to shortcut previews --> <dimen name="shortcut_preview_padding_left">0dp</dimen> @@ -101,4 +92,8 @@ <!-- 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> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 9cb6c293b..ff3509bc5 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -20,6 +20,16 @@ <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <!-- General --> <skip /> + + <!-- URI used to import old favorites. [DO NOT TRANSLATE] --> + <string name="old_launcher_provider_uri" translatable="false">content://com.android.launcher2.settings/favorites?notify=true</string> + + <!-- Permission to receive the com.android.launcher3.action.LAUNCH intent --> + <string name="receive_launch_broadcasts_permission" translatable="false">com.android.launcher3.permission.RECEIVE_LAUNCH_BROADCASTS</string> + + <!-- Permission to receive the com.android.launcher3.action.FIRST_LOAD_COMPLETE intent --> + <string name="receive_first_load_broadcast_permission" translatable="false">com.android.launcher3.permission.RECEIVE_FIRST_LOAD_BROADCAST</string> + <!-- Application name --> <string name="application_name">Launcher3</string> <!-- Accessibility-facing application name --> @@ -30,6 +40,8 @@ <string name="folder_name"></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> + <!-- SafeMode shortcut error string --> + <string name="safemode_shortcut_error">Downloaded app disabled in Safe mode</string> <!-- Labels for the tabs in the customize drawer --> <string name="widgets_tab_label">Widgets</string> @@ -181,6 +193,9 @@ s --> <!-- Text to show user in place of a gadget when we can't display it properly --> <string name="gadget_error_text">Problem loading widget</string> + <!-- Text to show user in place of a gadget when it is not yet initialized. --> + <string name="gadget_setup_text">Setup</string> + <!-- 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> @@ -228,6 +243,12 @@ s --> <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] --> @@ -262,4 +283,29 @@ s --> <string name="wallpaper_button_text">Wallpapers</string> <!-- 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> + <!-- 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. --> + <string name="abandoned_search">Search</string> + <!-- Title for abandoned promise dialog. --> + <string name="abandoned_promises_title">This app is not installed</string> + <!-- Explanation for abandoned promise dialog. "The first 'it' refers to the shortcut icon. + The second "it" refers to the app. --> + <string name="abandoned_promise_explanation">The app for this icon isn\'t installed. + You can remove it, or search for the app and install it manually. + </string> </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index c18dccbab..56a205fd1 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -18,53 +18,6 @@ --> <resources> - <style name="ClingButton"> - <item name="android:layout_width">wrap_content</item> - <item name="android:layout_height">wrap_content</item> - <item name="android:paddingTop">15dp</item> - <item name="android:paddingBottom">15dp</item> - <item name="android:paddingLeft">50dp</item> - <item name="android:paddingRight">50dp</item> - <item name="android:text">@string/cling_dismiss</item> - <item name="android:textColor">#ffffff</item> - <item name="android:textStyle">bold</item> - <item name="android:textSize">16sp</item> - <item name="android:background">@drawable/cling_button_bg</item> - </style> - <style name="ClingTitleText"> - <item name="android:layout_width">wrap_content</item> - <item name="android:layout_height">wrap_content</item> - <item name="android:layout_marginBottom">5dp</item> - <item name="android:textSize">@dimen/cling_title_text_size</item> - <item name="android:textColor">#ffffff</item> - <item name="android:fontFamily">sans-serif-condensed</item> - </style> - <style name="ClingText"> - <item name="android:layout_width">wrap_content</item> - <item name="android:layout_height">wrap_content</item> - <item name="android:textSize">@dimen/cling_text_size</item> - <item name="android:textColor">#80000000</item> - <item name="android:lineSpacingMultiplier">1.1</item> - </style> - <style name="ClingAltTitleText"> - <item name="android:layout_width">wrap_content</item> - <item name="android:layout_height">wrap_content</item> - <item name="android:textSize">@dimen/cling_alt_title_text_size</item> - <item name="android:textColor">#49C0EC</item> - </style> - <style name="ClingAltText"> - <item name="android:layout_width">wrap_content</item> - <item name="android:layout_height">wrap_content</item> - <item name="android:textSize">@dimen/cling_alt_text_size</item> - <item name="android:textColor">#49C0EC</item> - </style> - <style name="ClingHintText"> - <item name="android:layout_width">wrap_content</item> - <item name="android:layout_height">wrap_content</item> - <item name="android:textSize">@dimen/cling_hint_text_size</item> - <item name="android:textColor">#80ffffff</item> - <item name="android:fontFamily">sans-serif-condensed</item> - </style> <style name="WorkspaceIcon"> <item name="android:layout_width">match_parent</item> @@ -86,11 +39,19 @@ <style name="WorkspaceIcon.AppsCustomize"> <item name="android:background">@null</item> - <item name="android:textColor">@color/apps_customize_icon_text_color</item> + <item name="android:textColor">@color/quantum_panel_text_color</item> <item name="android:drawablePadding">@dimen/dynamic_grid_icon_drawable_padding</item> - <item name="android:shadowRadius">4.0</item> - <item name="android:shadowColor">#FF000000</item> + <item name="android:shadowRadius">0</item> + <item name="customShadows">false</item> </style> + + <style name="WorkspaceIcon.Folder"> + <item name="android:background">@null</item> + <item name="android:textColor">@color/quantum_panel_text_color</item> + <item name="android:shadowRadius">0</item> + <item name="customShadows">false</item> + </style> + <style name="SearchDropTargetBar"> </style> <style name="SearchButton"> @@ -146,11 +107,19 @@ <item name="android:shadowRadius">2.0</item> </style> - <!-- Overridden in device overlays --> - <style name="CustomClingTitleText"> + <style name="PreloadIcon"> + <item name="background">@drawable/virtual_preload</item> + <item name="indicatorSize">4dp</item> + <item name="ringOutset">4dp</item> </style> - <style name="CustomClingText"> + + <style name="PreloadIcon.Folder"> + <item name="background">@drawable/virtual_preload_folder</item> + <item name="indicatorSize">4dp</item> + <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> |