diff options
Diffstat (limited to 'res')
24 files changed, 152 insertions, 18 deletions
diff --git a/res/drawable-hdpi/wifi_assistant_card.png b/res/drawable-hdpi/wifi_assistant_card.png Binary files differnew file mode 100644 index 0000000..5a7e6d1 --- /dev/null +++ b/res/drawable-hdpi/wifi_assistant_card.png diff --git a/res/drawable-hdpi/wifi_assistant_card_tablet.png b/res/drawable-hdpi/wifi_assistant_card_tablet.png Binary files differnew file mode 100644 index 0000000..d309533 --- /dev/null +++ b/res/drawable-hdpi/wifi_assistant_card_tablet.png diff --git a/res/drawable-mdpi/wifi_assistant_card.png b/res/drawable-mdpi/wifi_assistant_card.png Binary files differnew file mode 100644 index 0000000..bb2114c --- /dev/null +++ b/res/drawable-mdpi/wifi_assistant_card.png diff --git a/res/drawable-mdpi/wifi_assistant_card_tablet.png b/res/drawable-mdpi/wifi_assistant_card_tablet.png Binary files differnew file mode 100644 index 0000000..0ca411c --- /dev/null +++ b/res/drawable-mdpi/wifi_assistant_card_tablet.png diff --git a/res/drawable-xhdpi/wifi_assistant_card.png b/res/drawable-xhdpi/wifi_assistant_card.png Binary files differnew file mode 100644 index 0000000..1f8a5b9 --- /dev/null +++ b/res/drawable-xhdpi/wifi_assistant_card.png diff --git a/res/drawable-xhdpi/wifi_assistant_card_tablet.png b/res/drawable-xhdpi/wifi_assistant_card_tablet.png Binary files differnew file mode 100644 index 0000000..570a663 --- /dev/null +++ b/res/drawable-xhdpi/wifi_assistant_card_tablet.png diff --git a/res/drawable-xxhdpi/wifi_assistant_card.png b/res/drawable-xxhdpi/wifi_assistant_card.png Binary files differnew file mode 100644 index 0000000..65211cd --- /dev/null +++ b/res/drawable-xxhdpi/wifi_assistant_card.png diff --git a/res/drawable-xxhdpi/wifi_assistant_card_tablet.png b/res/drawable-xxhdpi/wifi_assistant_card_tablet.png Binary files differnew file mode 100644 index 0000000..2941b14 --- /dev/null +++ b/res/drawable-xxhdpi/wifi_assistant_card_tablet.png diff --git a/res/drawable-xxxhdpi/wifi_assistant_card.png b/res/drawable-xxxhdpi/wifi_assistant_card.png Binary files differnew file mode 100644 index 0000000..e79330b --- /dev/null +++ b/res/drawable-xxxhdpi/wifi_assistant_card.png diff --git a/res/drawable-xxxhdpi/wifi_assistant_card_tablet.png b/res/drawable-xxxhdpi/wifi_assistant_card_tablet.png Binary files differnew file mode 100644 index 0000000..54120fb --- /dev/null +++ b/res/drawable-xxxhdpi/wifi_assistant_card_tablet.png diff --git a/res/layout/crypt_keeper_password_entry.xml b/res/layout/crypt_keeper_password_entry.xml index b26f542..ecbfefd 100644 --- a/res/layout/crypt_keeper_password_entry.xml +++ b/res/layout/crypt_keeper_password_entry.xml @@ -33,17 +33,16 @@ > <include layout="@layout/crypt_keeper_password_field" /> </LinearLayout> - <!-- Emergency call button. - Text and icon are set by CryptKeeper.updateEmergencyCallButtonState() --> + Text is set by CryptKeeper.updateEmergencyCallButtonState() --> <Button android:id="@+id/emergencyCallButton" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" android:layout_marginTop="16dip" - style="@*android:style/Widget.Button.Transparent" + style="?android:attr/borderlessButtonStyle" android:textSize="14sp" android:drawablePadding="6dip" - /> + /> </LinearLayout> diff --git a/res/layout/crypt_keeper_password_field.xml b/res/layout/crypt_keeper_password_field.xml index 97afe6a..9a2a24d 100644 --- a/res/layout/crypt_keeper_password_field.xml +++ b/res/layout/crypt_keeper_password_field.xml @@ -28,6 +28,7 @@ android:inputType="textPassword" android:imeOptions="flagForceAscii|actionDone" android:textAppearance="?android:attr/textAppearanceMedium" + android:gravity="center_horizontal" /> <ImageView android:id="@+id/switch_ime_button" diff --git a/res/layout/crypt_keeper_pattern_entry.xml b/res/layout/crypt_keeper_pattern_entry.xml index a59d36f..2538809 100644 --- a/res/layout/crypt_keeper_pattern_entry.xml +++ b/res/layout/crypt_keeper_pattern_entry.xml @@ -41,8 +41,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:layout_marginTop="16dip" - style="@*android:style/Widget.Button.Transparent" - android:textSize="14sp" + style="?android:attr/borderlessButtonStyle" android:drawablePadding="6dip" /> diff --git a/res/layout/crypt_keeper_pin_entry.xml b/res/layout/crypt_keeper_pin_entry.xml index dfc5fb5..0f1f1e7 100644 --- a/res/layout/crypt_keeper_pin_entry.xml +++ b/res/layout/crypt_keeper_pin_entry.xml @@ -41,8 +41,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:layout_marginTop="16dip" - style="@*android:style/Widget.Button.Transparent" - android:textSize="14sp" + style="?android:attr/borderlessButtonStyle" android:drawablePadding="6dip" /> diff --git a/res/layout/crypt_keeper_pin_field.xml b/res/layout/crypt_keeper_pin_field.xml index 270b26b..dd9d233 100644 --- a/res/layout/crypt_keeper_pin_field.xml +++ b/res/layout/crypt_keeper_pin_field.xml @@ -28,6 +28,7 @@ android:inputType="numberPassword" android:imeOptions="flagForceAscii|actionDone" android:textAppearance="?android:attr/textAppearanceMedium" + android:gravity="center_horizontal" /> <ImageView android:id="@+id/switch_ime_button" diff --git a/res/layout/wifi_assistant_card.xml b/res/layout/wifi_assistant_card.xml new file mode 100644 index 0000000..a1917ba --- /dev/null +++ b/res/layout/wifi_assistant_card.xml @@ -0,0 +1,90 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 The Android Open Source 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. +--> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/wifi_assistant_card" + android:background="@android:color/transparent" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:gravity="center_vertical" + android:orientation="vertical" + android:padding="@dimen/wifi_assistant_padding"> + + <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="fill_parent" + android:layout_height="wrap_content"> + + <ImageView + android:id="@+id/cardBackground" + android:background="@color/setup_add_wifi_network_text_color" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:src="@drawable/wifi_assistant_card" /> + + <TextView + android:id="@+id/backgroundText" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="@dimen/wifi_assistant_text_padding" + android:gravity="start" + android:text="@string/wifi_assistant_intro_setup" + style="@style/WifiAssistantText" /> + + </RelativeLayout> + + <TextView + android:id="@+id/wifi_assistant_text" + android:background="@android:color/transparent" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:layout_marginBottom="@dimen/wifi_assistant_padding_top_bottom" + android:layout_marginTop="@dimen/wifi_assistant_padding_top_bottom" + android:layout_marginLeft="@dimen/wifi_assistant_padding_start_end" + android:layout_marginRight="@dimen/wifi_assistant_padding_start_end" + android:gravity="start" + android:text="@string/wifi_assistant_title_message" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:background="@android:color/transparent" + android:layout_height="wrap_content" + android:layout_width="fill_parent" + android:gravity="end" + android:orientation="horizontal"> + + <Button + android:id="@+id/no_thanks_button" + android:background="@android:color/white" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:text="@string/wifi_assistant_no_thanks" + android:paddingLeft="@dimen/wifi_assistant_text_padding" + android:paddingRight="@dimen/wifi_assistant_text_padding" /> + + <Button + android:id="@+id/setup" + android:background="@android:color/white" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:paddingLeft="@dimen/wifi_assistant_text_padding" + android:paddingRight="@dimen/wifi_assistant_text_padding" + android:text="@string/wifi_assistant_setup" + style="@style/WifiAssistantButton" /> + + </LinearLayout> + +</LinearLayout> diff --git a/res/values-h480dp/dimens.xml b/res/values-h480dp/dimens.xml index 6610b4f..d5e3e27 100644 --- a/res/values-h480dp/dimens.xml +++ b/res/values-h480dp/dimens.xml @@ -16,4 +16,10 @@ <resources> <dimen name="battery_history_chart_height">160dp</dimen> + + <!-- Dimensions for Wifi Assistant Card --> + <dimen name="wifi_assistant_padding_top_bottom">16dp</dimen> + <dimen name="wifi_assistant_padding_start_end">16dp</dimen> + <dimen name="wifi_assistant_padding">25dp</dimen> + <dimen name="wifi_assistant_text_padding">16dp</dimen> </resources> diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml index d35d973..8d560ea 100755 --- a/res/values-sw600dp/dimens.xml +++ b/res/values-sw600dp/dimens.xml @@ -70,4 +70,9 @@ <dimen name="search_result_item_image_margin_start">24dp</dimen> <dimen name="search_result_item_image_margin_end">32dp</dimen> + <!-- Dimensions for Wifi Assistant Card --> + <dimen name="wifi_assistant_padding_top_bottom">24dp</dimen> + <dimen name="wifi_assistant_padding_start_end">24dp</dimen> + <dimen name="wifi_assistant_padding">25dp</dimen> + <dimen name="wifi_assistant_text_padding">24dp</dimen> </resources> diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml index b1d084f..981c936 100644 --- a/res/values-sw720dp/dimens.xml +++ b/res/values-sw720dp/dimens.xml @@ -50,4 +50,9 @@ <dimen name="switchbar_subsettings_margin_start">80dp</dimen> <dimen name="switchbar_subsettings_margin_end">80dp</dimen> + <!-- Dimensions for Wifi Assistant Card --> + <dimen name="wifi_assistant_padding_top_bottom">24dp</dimen> + <dimen name="wifi_assistant_padding_start_end">24dp</dimen> + <dimen name="wifi_assistant_padding">25dp</dimen> + <dimen name="wifi_assistant_text_padding">24dp</dimen> </resources> diff --git a/res/values/colors.xml b/res/values/colors.xml index 0b3ea39..b523801 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -40,6 +40,7 @@ <color name="setup_divider_color_dark">#33ffffff</color> <color name="setup_divider_color_light">#33000000</color> <color name="setup_add_wifi_network_text_color">#ff009587</color> + <color name="setup_add_wifi_network_background_color">#ff009587</color> <color name="circle_avatar_frame_color">#ffffffff</color> <color name="circle_avatar_frame_shadow_color">#80000000</color> @@ -50,6 +51,10 @@ <color name="lock_pattern_view_success_color">@color/theme_accent</color> <color name="lock_pattern_view_error_color">#fff4511e</color> + <color name="unlock_pattern_view_regular_color">@android:color/white</color> + <color name="unlock_pattern_view_success_color">@color/theme_accent</color> + <color name="unlock_pattern_view_error_color">#fff4511e</color> + <!-- Palette colors referenced by top-level themes. --> <color name="theme_primary">#ff263238</color> <color name="theme_primary_dark">#ff21272b</color> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 32a2fff..ae654e4 100755 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -165,4 +165,10 @@ <dimen name="search_suggestion_item_image_margin_start">32dp</dimen> <dimen name="search_suggestion_item_image_margin_end">16dp</dimen> + <!-- Dimensions for Wifi Assistant Card --> + <dimen name="wifi_assistant_padding_top_bottom">16dp</dimen> + <dimen name="wifi_assistant_padding_start_end">16dp</dimen> + <dimen name="wifi_assistant_padding">25dp</dimen> + <dimen name="wifi_assistant_text_padding">16dp</dimen> + </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 04e0b9a..4f71c97 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -646,11 +646,15 @@ <!-- Main Settings screen settings summary text for the "Wireless controls" setting --> <string name="radio_controls_summary">Manage Wi\u2011Fi, Bluetooth, airplane mode, cellular networks, & VPNs</string> - <!-- check box cellular data title [CHAR LIMIT=30]--> + <!-- check box cellular data title [CHAR LIMIT=30] --> <string name="cellular_data_title">Cellular data</string> - <!-- check box cellular data summary [CHAR LIMIT=40]--> + <!-- check box Calls title [CHAR LIMIT=30] --> + <string name="calls_title">Calls</string> + <!-- check box SMS Messges title [CHAR LIMIT=30] --> + <string name="sms_messages_title">SMS Messages</string> + <!-- check box cellular data summary [CHAR LIMIT=40] --> <string name="cellular_data_summary">Allow data usage over cellular network</string> - <!-- check box to allow data usage when roaming [CHAR LIMIT=30]--> + <!-- check box to allow data usage when roaming [CHAR LIMIT=30] --> <string name="allow_data_usage_title">Allow data usage when roaming</string> <!-- mobile network settings screen, setting check box title --> <string name="roaming">Data roaming</string> @@ -1164,6 +1168,8 @@ <string name="bluetooth_preference_paired_dialog_internet_option">Internet connection</string> <!-- Bluetooth settings: Checkbox label for enable/disable keyboard connection. [CHAR LIMIT=40] --> <string name="bluetooth_preference_paired_dialog_keyboard_option">Keyboard</string> + <!-- Bluetooth settings: Checkbox label for enable/disable contacts connection. [CHAR LIMIT=40] --> + <string name="bluetooth_preference_paired_dialog_contacts_option">Contacts and call history</string> <!-- Bluetooth settings: pairing dialog title. [CHAR LIMIT=40] --> <string name="bluetooth_pairing_dialog_title">Pair with this device?</string> <!-- Bluetooth settings: share phone book title. [CHAR LIMIT=40] --> @@ -1171,7 +1177,7 @@ <!-- Bluetooth settings: Message informing user that a bluetooth wants to access contant and call history. [CHAR LIMIT=100] --> <string name="bluetooth_pairing_dialog_contants_request"><xliff:g id="device_name">%1$s</xliff:g> wants to access your contacts and call history.</string> <!-- Bluetooth settings: paring permission message. [CHAR LIMIT=100] --> - <string name="bluetooth_pairing_dialog_paring_request"><xliff:g id="device_name">%1$s</xliff:g> wants to pair with Bluetooth.</string> + <string name="bluetooth_pairing_dialog_paring_request"><xliff:g id="device_name">%1$s</xliff:g> wants to pair with Bluetooth. When connected, it will have access to your contacts and call history.</string> <!-- Bluetooth settings: The sub heading for devices which have already been paired with this device. [CHAR LIMIT=40] --> <string name="bluetooth_preference_paired_devices">Paired devices</string> <!-- Bluetooth settings: The sub heading for messaging accesses. [CHAR LIMIT=50] --> @@ -1288,6 +1294,8 @@ <!-- Bluetooth settings. Dock Setting Dialog - Remember setting and don't ask user again --> <string name="bluetooth_dock_settings_remember">Remember settings</string> + <!-- Wifi Assistant title string. [CHAR LIMIT=20] --> + <string name="wifi_assistant_intro_setup">Introducing\nWi\u2011Fi Assistant</string> <!-- Wifi Assistant title string. [CHAR LIMIT=40] --> <string name="wifi_assistant_title">Wi\u2011Fi Assistant</string> <!-- Wifi Assistant No, thanks string. Text to say no to wifi assistant. [CHAR LIMIT=20] --> @@ -1450,7 +1458,7 @@ <!-- Checkbox title for option to Automatically manage Wi\u2011Fi [CHAR LIMIT=40] --> <string name="wifi_automatically_manage_title">Automatically manage Wi\u2011Fi</string> <!-- Checkbox summary for option to Automatically manage Wi\u2011Fi [CHAR LIMIT=100] --> - <string name="wifi_automatically_manage_summary">Let a Wi\u2011Fi assistant manager your Wi\u2011Fi connection</string> + <string name="wifi_automatically_manage_summary">Let a Wi\u2011Fi assistant manage your Wi\u2011Fi connection</string> <!-- Checkbox title for option for Wi\u2011Fi Assistant [CHAR LIMIT=40] --> <string name="wifi_assistant_setting_title">Wi\u2011Fi assistant</string> <!-- Checkbox summary for option for Wi\u2011Fi Assistant [CHAR LIMIT=40] --> diff --git a/res/values/styles.xml b/res/values/styles.xml index cea615e..32a205d 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -221,7 +221,7 @@ <item name="android:windowIsFloating">true</item> </style> - <style name="CryptKeeperBlankTheme" parent="@android:style/Theme.Material.Light.NoActionBar"> + <style name="CryptKeeperBlankTheme" parent="@android:style/Theme.Material.NoActionBar"> <item name="android:background">#ff000000</item> </style> @@ -262,6 +262,16 @@ <item name="android:textSize">18sp</item> </style> + <style name="WifiAssistantText"> + <item name="android:textAppearance">?android:attr/textAppearanceMedium</item> + <item name="android:textColor">@android:color/white</item> + </style> + + <style name="WifiAssistantButton"> + <item name="android:textAppearance">?android:attr/textAppearanceMedium</item> + <item name="android:textColor">@color/setup_add_wifi_network_text_color</item> + </style> + <!-- Scrollbar style OUTSIDE_OVERLAY --> <integer name="preference_scrollbar_style">33554432</integer> diff --git a/res/values/themes.xml b/res/values/themes.xml index 92bb3b2..4d8862a 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -145,11 +145,11 @@ <item name="dashboardBackgroundColor">@color/dashboard_background_color</item> </style> - <style name="Theme.CryptKeeper" parent="@android:style/Theme.Material.Light.NoActionBar"> + <style name="Theme.CryptKeeper" parent="@android:style/Theme.Material.NoActionBar"> <!-- LockPatternView colors --> - <item name="@*android:regularColor">@color/lock_pattern_view_regular_color</item> - <item name="@*android:successColor">@color/lock_pattern_view_success_color</item> - <item name="@*android:errorColor">@color/lock_pattern_view_error_color</item> + <item name="@*android:regularColor">@color/unlock_pattern_view_regular_color</item> + <item name="@*android:successColor">@color/unlock_pattern_view_success_color</item> + <item name="@*android:errorColor">@color/unlock_pattern_view_error_color</item> </style> <style name="Theme.SubSettingsDialogWhenLarge" parent="Theme.DialogWhenLarge"> |