diff options
Diffstat (limited to 'res/values')
| -rwxr-xr-x | res/values/dimens.xml | 13 | ||||
| -rw-r--r-- | res/values/strings.xml | 22 | ||||
| -rw-r--r-- | res/values/styles.xml | 14 |
3 files changed, 29 insertions, 20 deletions
diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 865b029..bbe62a5 100755 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -48,12 +48,15 @@ <!-- Size of padding to give in the wifi list when there is no icon --> <dimen name="setup_list_no_icon_padding">56dp</dimen> <dimen name="setup_add_network_item_height">56dp</dimen> + <dimen name="setup_wizard_card_corner_radius">2dp</dimen> <dimen name="setup_wizard_card_elevation">5dp</dimen> - <dimen name="setup_wizard_card_margin_top">128dp</dimen> - <dimen name="setup_wizard_card_title_margin_top">256dp</dimen> - <dimen name="setup_wizard_card_title_padding_end">32dp</dimen> - <dimen name="setup_wizard_card_title_padding_start">56dp</dimen> - <dimen name="setup_wizard_card_title_padding_top">24dp</dimen> + <dimen name="setup_wizard_card_title_margin_top">0dp</dimen> + <dimen name="setup_wizard_card_title_padding_end">0dp</dimen> + <dimen name="setup_wizard_card_title_padding_start">0dp</dimen> + <dimen name="setup_wizard_card_title_padding_top">16dp</dimen> + <dimen name="setup_wizard_card_title_padding_bottom">28dp</dimen> + <dimen name="setup_wizard_card_port_margin_sides">56dp</dimen> + <dimen name="setup_wizard_card_land_margin_top">128dp</dimen> <dimen name="setup_wizard_margin_sides">40dp</dimen> <dimen name="divider_height">3dip</dimen> diff --git a/res/values/strings.xml b/res/values/strings.xml index 27509a5..86a3903 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -4411,8 +4411,8 @@ <string name="select_device_admin_msg">Device administrators</string> <!-- Message when there are no available device admins to display --> <string name="no_device_admins">No available device administrators</string> - <!-- Message displayed when the device admin can only be disabled by deleting the managed profile [CHAR_LIMIT=120] --> - <string name="managed_profile_device_admin_info">To stop <xliff:g id="app_name">%1$s</xliff:g> from accessing your work profile, remove the profile under Settings > Accounts.</string> + <!-- Message displayed when the device admin can only be disabled by deleting the work profile [CHAR_LIMIT=120] --> + <string name="managed_profile_device_admin_info">To stop <xliff:g id="app_name">%1$s</xliff:g> from accessing your work profile, remove the profile under Settings > Accounts</string> <!-- Title for personal device admins on the list [CHAR_LIMIT=25] --> <string name="personal_device_admin_title">Personal</string> <!-- Title for managed device admins on the list [CHAR_LIMIT=25] --> @@ -4439,7 +4439,7 @@ <!-- Title for screen to set a profile owner [CHAR LIMIT=40] --> <string name="profile_owner_add_title">Activate Profile Manager?</string> <!-- Warning when trying to add a profile owner admin after setup has completed. [CHAR LIMIT=none] --> - <string name="adding_profile_owner_warning">By proceeding, your User will be managed by your Administrator which may also be able to store associated data, in addition to your personal data.\n\nYour Administrator has the ability to monitor and manage settings, access, apps, and data associated with this User, including network activity and your device\’s location information.</string> + <string name="adding_profile_owner_warning">By proceeding, your User will be managed by your Administrator which may also be able to store associated data, in addition to your personal data.\n\nYour Administrator has the ability to monitor and manage settings, access, apps, and data associated with this User, including network activity and your device\'s location information.</string> <!-- Name to assign to a Network Access Point that was saved without a name --> <string name="untitled_apn">Untitled</string> @@ -4576,8 +4576,8 @@ <string name="sync_is_failing">Sync is currently experiencing problems. It will be back shortly.</string> <!-- Button label to add an account [CHAR LIMIT=20] --> <string name="add_account_label">Add account</string> - <!-- Label for the state of the managed profile [CHAR LIMIT=80] --> - <string name="managed_profile_not_available_label">Work profile is not available yet</string> + <!-- Label for the state of the work profile [CHAR LIMIT=80] --> + <string name="managed_profile_not_available_label">Work profile isn\'t available yet</string> <!-- Button label to remove the work profile [CHAR LIMIT=35] --> <string name="remove_managed_profile_label">Remove work profile</string> <!-- Data synchronization settings screen, title of setting that controls whether background data should be used [CHAR LIMIT=30] --> @@ -5184,7 +5184,7 @@ <string name="user_add_user_menu">Add user</string> <!-- User settings summary for a restricted profile [CHAR LIMIT=50] --> <string name="user_summary_restricted_profile">Restricted profile</string> - <!-- User settings summary for a managed profile [CHAR LIMIT=50] --> + <!-- User settings summary for a work profile [CHAR LIMIT=50] --> <string name="user_summary_managed_profile">Work profile</string> <!-- User settings warning that restricted profile needs a screen lock [CHAR LIMIT=NONE] --> <string name="user_need_lock_message">Before you can create a restricted profile, you\'ll need to set up a screen lock to protect your apps and personal data.</string> @@ -5194,7 +5194,7 @@ <string name="user_summary_not_set_up">Not set up</string> <!-- User summary to indicate that restricted profile is currently not set up [CHAR LIMIT=100] --> <string name="user_summary_restricted_not_set_up">Not set up - Restricted profile</string> - <!-- User summary to indicate that a managed profile is currently not set up [CHAR LIMIT=100] --> + <!-- User summary to indicate that a work profile is currently not set up [CHAR LIMIT=100] --> <string name="user_summary_managed_profile_not_set_up">Not set up - Work profile</string> <!-- User information string to represent the owner of the device [CHAR LIMIT=25] --> <string name="user_owner">Owner</string> @@ -5249,12 +5249,16 @@ <string name="user_confirm_remove_title">Remove this user?</string> <!-- Profile removal confirmation title [CHAR LIMIT=25] --> <string name="user_profile_confirm_remove_title">Remove this profile?</string> + <!-- Work profile removal confirmation title [CHAR LIMIT=25] --> + <string name="work_profile_confirm_remove_title">Remove work profile?</string> <!-- User (self) removal confirmation message [CHAR LIMIT=none] --> <string name="user_confirm_remove_self_message" product="tablet">You will lose your space and data on this tablet. You can\'t undo this action.</string> <!-- User (self) removal confirmation message [CHAR LIMIT=none] --> <string name="user_confirm_remove_self_message" product="default">You will lose your space and data on this phone. You can\'t undo this action.</string> <!-- User removal confirmation message [CHAR LIMIT=none] --> <string name="user_confirm_remove_message">All apps and data will be deleted.</string> + <!-- Work profile removal confirmation message [CHAR LIMIT=none] --> + <string name="work_profile_confirm_remove_message">All apps and data in this profile will be deleted.</string> <!-- User profile removal confirmation message [CHAR LIMIT=none] --> <string name="user_profile_confirm_remove_message">All apps and data will be deleted.</string> <!-- Setting label to show that a new user is being added [CHAR LIMIT=30] --> @@ -5792,7 +5796,7 @@ <string name="app_notification_sensitive_title">Sensitive</string> <!-- [CHAR LIMIT=NONE] App notification settings: Sensitive option description--> - <string name="app_notification_sensitive_summary">When the device is locked, hide any sensitive content from this app’s notifications</string> + <string name="app_notification_sensitive_summary">When the device is locked, hide any sensitive content from this app\'s notifications</string> <!-- [CHAR LIMIT=20] Notification settings: App notifications row summary when banned --> <string name="app_notification_row_banned">Blocked</string> @@ -5901,7 +5905,7 @@ <!-- [CHAR LIMIT=300] Screen pinning description --> <string name="screen_pinning_description">When this setting is turned on, you can put the device in a state that keeps the current screen in view.\n\nTo pin a screen:\n\n1. Turn this setting on.\n\n2. Open an app.\n\n3. Touch the Recents button.\n\n4. Touch the pin icon.</string> - <!-- Title for a managed (work) profile. [CHAR LIMIT=25] --> + <!-- Title for a work profile. [CHAR LIMIT=25] --> <string name="managed_user_title">Work profile</string> <!-- Summary Title for saying that the preference is experimental and will evolve over time due to User feedback. [CHAR LIMIT=NONE] --> diff --git a/res/values/styles.xml b/res/values/styles.xml index 1b08e0f..3f5f39d 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -174,15 +174,17 @@ <item name="android:paddingTop">@dimen/setup_title_padding_top</item> </style> - <!-- Alternate title style used for some tablet-landscape layouts --> - <style name="SetupCardTitle" parent="@android:style/TextAppearance.Material.Display1"> - <item name="android:layout_width">0dp</item> - <item name="android:layout_height">wrap_content</item> + <!-- Alternate title style used for some tablet layouts --> + <style name="SetupCardTitle"> <item name="android:layout_marginTop">@dimen/setup_wizard_card_title_margin_top</item> - <item name="android:layout_weight">6</item> - <item name="android:paddingStart">@dimen/setup_wizard_card_title_padding_start</item> + <item name="android:paddingBottom">@dimen/setup_wizard_card_title_padding_bottom</item> <item name="android:paddingEnd">@dimen/setup_wizard_card_title_padding_end</item> + <item name="android:paddingStart">@dimen/setup_wizard_card_title_padding_start</item> <item name="android:paddingTop">@dimen/setup_wizard_card_title_padding_top</item> + <item name="android:textAppearance">@style/TextAppearance.SetupWizardCardTitle</item> + </style> + + <style name="TextAppearance.SetupWizardCardTitle" parent="@android:style/TextAppearance.Material.Display1"> <item name="android:textColor">@android:color/white</item> </style> |