diff options
Diffstat (limited to 'res')
20 files changed, 317 insertions, 6 deletions
diff --git a/res/drawable-hdpi/ic_empty.png b/res/drawable-hdpi/ic_empty.png Binary files differnew file mode 100644 index 000000000..a45c6cfca --- /dev/null +++ b/res/drawable-hdpi/ic_empty.png diff --git a/res/drawable-hdpi/ic_menu_save.png b/res/drawable-hdpi/ic_menu_save.png Binary files differnew file mode 100644 index 000000000..2b29557ab --- /dev/null +++ b/res/drawable-hdpi/ic_menu_save.png diff --git a/res/drawable-hdpi/ic_settings_lockscreen.png b/res/drawable-hdpi/ic_settings_lockscreen.png Binary files differnew file mode 100644 index 000000000..a08d51336 --- /dev/null +++ b/res/drawable-hdpi/ic_settings_lockscreen.png diff --git a/res/drawable-mdpi/ic_empty.png b/res/drawable-mdpi/ic_empty.png Binary files differnew file mode 100644 index 000000000..ede2c834a --- /dev/null +++ b/res/drawable-mdpi/ic_empty.png diff --git a/res/drawable-mdpi/ic_menu_save.png b/res/drawable-mdpi/ic_menu_save.png Binary files differnew file mode 100644 index 000000000..283be30ac --- /dev/null +++ b/res/drawable-mdpi/ic_menu_save.png diff --git a/res/drawable-mdpi/ic_settings_lockscreen.png b/res/drawable-mdpi/ic_settings_lockscreen.png Binary files differnew file mode 100644 index 000000000..ac18347a0 --- /dev/null +++ b/res/drawable-mdpi/ic_settings_lockscreen.png diff --git a/res/drawable-xhdpi/ic_empty.png b/res/drawable-xhdpi/ic_empty.png Binary files differnew file mode 100644 index 000000000..5742d1391 --- /dev/null +++ b/res/drawable-xhdpi/ic_empty.png diff --git a/res/drawable-xhdpi/ic_menu_save.png b/res/drawable-xhdpi/ic_menu_save.png Binary files differnew file mode 100644 index 000000000..c403206a1 --- /dev/null +++ b/res/drawable-xhdpi/ic_menu_save.png diff --git a/res/drawable-xhdpi/ic_settings_lockscreen.png b/res/drawable-xhdpi/ic_settings_lockscreen.png Binary files differnew file mode 100644 index 000000000..f669da190 --- /dev/null +++ b/res/drawable-xhdpi/ic_settings_lockscreen.png diff --git a/res/drawable/activities_icon.png b/res/drawable/activities_icon.png Binary files differnew file mode 100644 index 000000000..abd62e251 --- /dev/null +++ b/res/drawable/activities_icon.png diff --git a/res/layout-land/lockscreen_targets.xml b/res/layout-land/lockscreen_targets.xml new file mode 100644 index 000000000..22f0d4a62 --- /dev/null +++ b/res/layout-land/lockscreen_targets.xml @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:prvandroid="http://schemas.android.com/apk/prv/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@android:color/holo_blue_light" + android:layout_marginRight="8dip" + android:layout_marginLeft="8dip" + android:padding="4dip" + android:gravity="center_horizontal" + android:textColor="#FFFFFF" + android:textAppearance="?android:attr/textAppearanceSmall" + android:text="@string/lockscreen_target_info" /> + + <View + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1" /> + + <com.android.internal.widget.multiwaveview.GlowPadView + android:id="@+id/lock_target" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:orientation="horizontal" + android:gravity="@*android:integer/kg_selector_gravity" + android:contentDescription="@*android:string/keyguard_accessibility_slide_area" + prvandroid:targetDrawables="@*android:array/lockscreen_targets_unlock_only" + prvandroid:targetDescriptions="@*android:array/lockscreen_target_descriptions_unlock_only" + prvandroid:directionDescriptions="@*android:array/lockscreen_direction_descriptions" + prvandroid:handleDrawable="@*android:drawable/ic_lockscreen_handle" + prvandroid:outerRingDrawable="@*android:drawable/ic_lockscreen_outerring" + prvandroid:outerRadius="@*android:dimen/glowpadview_target_placement_radius" + prvandroid:innerRadius="@*android:dimen/glowpadview_inner_radius" + prvandroid:snapMargin="@*android:dimen/glowpadview_snap_margin" + prvandroid:firstItemOffset="@*android:integer/kg_glowpad_rotation_offset" + prvandroid:magneticTargets="false" + prvandroid:feedbackCount="1" + prvandroid:vibrationDuration="20" + prvandroid:glowRadius="@*android:dimen/glowpadview_glow_radius" + prvandroid:pointDrawable="@*android:drawable/ic_lockscreen_glowdot" + prvandroid:allowScaling="true" /> + +</LinearLayout> diff --git a/res/layout-sw600dp/lockscreen_targets.xml b/res/layout-sw600dp/lockscreen_targets.xml new file mode 100644 index 000000000..22f0d4a62 --- /dev/null +++ b/res/layout-sw600dp/lockscreen_targets.xml @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:prvandroid="http://schemas.android.com/apk/prv/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@android:color/holo_blue_light" + android:layout_marginRight="8dip" + android:layout_marginLeft="8dip" + android:padding="4dip" + android:gravity="center_horizontal" + android:textColor="#FFFFFF" + android:textAppearance="?android:attr/textAppearanceSmall" + android:text="@string/lockscreen_target_info" /> + + <View + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1" /> + + <com.android.internal.widget.multiwaveview.GlowPadView + android:id="@+id/lock_target" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:orientation="horizontal" + android:gravity="@*android:integer/kg_selector_gravity" + android:contentDescription="@*android:string/keyguard_accessibility_slide_area" + prvandroid:targetDrawables="@*android:array/lockscreen_targets_unlock_only" + prvandroid:targetDescriptions="@*android:array/lockscreen_target_descriptions_unlock_only" + prvandroid:directionDescriptions="@*android:array/lockscreen_direction_descriptions" + prvandroid:handleDrawable="@*android:drawable/ic_lockscreen_handle" + prvandroid:outerRingDrawable="@*android:drawable/ic_lockscreen_outerring" + prvandroid:outerRadius="@*android:dimen/glowpadview_target_placement_radius" + prvandroid:innerRadius="@*android:dimen/glowpadview_inner_radius" + prvandroid:snapMargin="@*android:dimen/glowpadview_snap_margin" + prvandroid:firstItemOffset="@*android:integer/kg_glowpad_rotation_offset" + prvandroid:magneticTargets="false" + prvandroid:feedbackCount="1" + prvandroid:vibrationDuration="20" + prvandroid:glowRadius="@*android:dimen/glowpadview_glow_radius" + prvandroid:pointDrawable="@*android:drawable/ic_lockscreen_glowdot" + prvandroid:allowScaling="true" /> + +</LinearLayout> diff --git a/res/layout/lockscreen_shortcut_dialog.xml b/res/layout/lockscreen_shortcut_dialog.xml new file mode 100644 index 000000000..638af0f80 --- /dev/null +++ b/res/layout/lockscreen_shortcut_dialog.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:minHeight="?android:attr/listPreferredItemHeight" + android:layout_height="wrap_content" + android:paddingBottom="5dp" + android:paddingLeft="8dp" + android:gravity="center_vertical" + android:orientation="horizontal"> + <ImageButton + android:padding="5dp" + android:layout_width="@android:dimen/app_icon_size" + style="?android:attr/borderlessButtonStyle" + android:id="@+id/icon" + android:layout_height="@android:dimen/app_icon_size" /> + <View + android:layout_width="2dp" + android:layout_height="match_parent" + android:layout_marginTop="5dp" + android:layout_marginBottom="5dp" + android:layout_marginRight="5dp" + android:layout_marginLeft="5dp" + android:background="@android:drawable/divider_horizontal_dark" /> + <Button + android:layout_width="match_parent" + style="?android:attr/borderlessButtonStyle" + android:gravity="left|center_vertical" + android:paddingLeft="5dp" + android:layout_height="wrap_content" + android:id="@+id/label" /> +</LinearLayout>
\ No newline at end of file diff --git a/res/layout/lockscreen_targets.xml b/res/layout/lockscreen_targets.xml new file mode 100644 index 000000000..cff327cbe --- /dev/null +++ b/res/layout/lockscreen_targets.xml @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:prvandroid="http://schemas.android.com/apk/prv/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@android:color/holo_blue_light" + android:layout_marginRight="8dip" + android:layout_marginLeft="8dip" + android:padding="4dip" + android:gravity="center_horizontal" + android:textColor="#FFFFFF" + android:textAppearance="?android:attr/textAppearanceSmall" + android:text="@string/lockscreen_target_info" /> + + <View + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="0.4" /> + + <com.android.internal.widget.multiwaveview.GlowPadView + android:id="@+id/lock_target" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="0.6" + android:orientation="horizontal" + android:gravity="top" + android:contentDescription="@*android:string/keyguard_accessibility_slide_area" + prvandroid:targetDrawables="@*android:array/lockscreen_targets_unlock_only" + prvandroid:targetDescriptions="@*android:array/lockscreen_target_descriptions_unlock_only" + prvandroid:directionDescriptions="@*android:array/lockscreen_direction_descriptions" + prvandroid:handleDrawable="@*android:drawable/ic_lockscreen_handle" + prvandroid:outerRingDrawable="@*android:drawable/ic_lockscreen_outerring" + prvandroid:outerRadius="@*android:dimen/glowpadview_target_placement_radius" + prvandroid:innerRadius="@*android:dimen/glowpadview_inner_radius" + prvandroid:snapMargin="@*android:dimen/glowpadview_snap_margin" + prvandroid:firstItemOffset="@*android:integer/kg_glowpad_rotation_offset" + prvandroid:magneticTargets="false" + prvandroid:feedbackCount="1" + prvandroid:vibrationDuration="20" + prvandroid:glowRadius="@*android:dimen/glowpadview_glow_radius" + prvandroid:pointDrawable="@*android:drawable/ic_lockscreen_glowdot" + prvandroid:allowScaling="true" /> + +</LinearLayout> diff --git a/res/layout/pick_item.xml b/res/layout/pick_item.xml index d85edc459..e937d7bc1 100755 --- a/res/layout/pick_item.xml +++ b/res/layout/pick_item.xml @@ -17,9 +17,9 @@ <TextView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" - android:minHeight="?android:attr/listPreferredItemHeightSmall" - android:textAppearance="?android:attr/textAppearanceMedium" + android:minHeight="?android:attr/listPreferredItemHeight" + android:textAppearance="?android:attr/textAppearanceLarge" android:gravity="center_vertical" - android:drawablePadding="8dip" - android:paddingStart="11dip" - android:paddingEnd="11dip" /> + android:drawablePadding="14dip" + android:paddingLeft="15dip" + android:paddingRight="15dip" /> diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 2935cbffa..bc222ad21 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -847,6 +847,56 @@ <item>2</item> </string-array> + <string-array name="lockscreen_icon_picker_labels" translatable="false"> + <item>@string/icon_picker_alarm</item> + <item>@string/icon_picker_browser</item> + <item>@string/icon_picker_calendar</item> + <item>@string/icon_picker_camera</item> + <item>@string/icon_picker_chrome</item> + <item>@string/icon_picker_email</item> + <item>@string/icon_picker_email2</item> + <item>@string/icon_picker_facebook</item> + <item>@string/icon_picker_gallery</item> + <item>@string/icon_picker_google_small</item> + <item>@string/icon_picker_googleplus</item> + <item>@string/icon_picker_googletalk</item> + <item>@string/icon_picker_maps</item> + <item>@string/icon_picker_sms</item> + <item>@string/icon_picker_movie</item> + <item>@string/icon_picker_music</item> + <item>@string/icon_picker_nav_normal</item> + <item>@string/icon_picker_phone</item> + <item>@string/icon_picker_podcast</item> + <item>@string/icon_picker_rss</item> + <item>@string/icon_picker_search</item> + <item>@string/icon_picker_twitter</item> + </string-array> + + <string-array name="lockscreen_icon_picker_icons" translatable="false"> + <item>@*android:drawable/ic_lockscreen_alarm_normal</item> + <item>@*android:drawable/ic_lockscreen_browser_normal</item> + <item>@*android:drawable/ic_lockscreen_calendar_normal</item> + <item>@*android:drawable/ic_lockscreen_camera_normal</item> + <item>@*android:drawable/ic_lockscreen_chrome_normal</item> + <item>@*android:drawable/ic_lockscreen_email_normal</item> + <item>@*android:drawable/ic_lockscreen_email2_normal</item> + <item>@*android:drawable/ic_lockscreen_facebook_normal</item> + <item>@*android:drawable/ic_lockscreen_gallery_normal</item> + <item>@*android:drawable/ic_lockscreen_google_small_normal</item> + <item>@*android:drawable/ic_lockscreen_gplus_normal</item> + <item>@*android:drawable/ic_lockscreen_gtalk_normal</item> + <item>@*android:drawable/ic_lockscreen_maps_normal</item> + <item>@*android:drawable/ic_lockscreen_sms_normal</item> + <item>@*android:drawable/ic_lockscreen_movie_normal</item> + <item>@*android:drawable/ic_lockscreen_music_normal</item> + <item>@*android:drawable/ic_lockscreen_nav_normal</item> + <item>@*android:drawable/ic_lockscreen_phone_normal</item> + <item>@*android:drawable/ic_lockscreen_podcast_normal</item> + <item>@*android:drawable/ic_lockscreen_rss_normal</item> + <item>@*android:drawable/ic_lockscreen_google_normal</item> + <item>@*android:drawable/ic_lockscreen_twitter_normal</item> + </string-array> + <!-- Profile mode options. --> <string-array name="profile_entries"> <item>On</item> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index cbc9b6d38..2f0f859ed 100755 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -31,7 +31,7 @@ <dimen name="data_usage_chart_height">252dip</dimen> <dimen name="data_usage_chart_optimalWidth">440dip</dimen> - + <dimen name="shortcut_picker_left_padding">70dip</dimen> <dimen name="volume_seekbar_side_margin">8dip</dimen> <dimen name="crypt_clock_size">100sp</dimen> diff --git a/res/values/strings.xml b/res/values/strings.xml index 24af23971..0179aafd9 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -4496,6 +4496,18 @@ <string name="lock_screen_title">Lock screen</string> + <!-- Lock Screen Shortcuts --> + <string name="lockscreen_target_info">Drag the slider to targets to assign shortcuts</string> + <string name="lockscreen_target_title">Slider shortcuts</string> + <string name="lockscreen_target_summary">View or change custom lock screen shortcuts</string> + <string name="lockscreen_target_reset">Lock screen shortcuts reset to default</string> + <string name="lockscreen_target_save">Lock screen shortcuts saved</string> + <string name="lockscreen_target_reset_title">Reset</string> + <string name="lockscreen_target_reset_message">Delete all user created lock screen shortcuts and restore to default?</string> + <string name="lockscreen_target_empty">Empty</string> + <string name="lockscreen_target_edit_title">Edit shortcut and icon</string> + <string name="lockscreen_target_edit_msg">Select or change the desired application or activity and the associated icon</string> + <!-- Profiles settings --> <string name="profiles_settings_title">Profiles</string> <string name="profiles_general_title">General</string> @@ -4684,6 +4696,40 @@ <string name="display_rotation_180_title">180 degrees</string> <string name="display_rotation_270_title">270 degrees</string> + <!-- Lock screen shortcuts --> + <string name="picker_activities">Activities</string> + <string name="select_custom_app_title">Select custom application</string> + <string name="select_custom_activity_title">Select custom activity</string> + <string name="icon_picker_choose_icon_title">Choose icon</string> + <string name="icon_picker_alarm">Alarm</string> + <string name="icon_picker_browser">Browser</string> + <string name="icon_picker_calendar">Calendar</string> + <string name="icon_picker_camera">Camera</string> + <string name="icon_picker_chrome">Chrome</string> + <string name="icon_picker_email">Email</string> + <string name="icon_picker_email2">Email Holo</string> + <string name="icon_picker_facebook">Facebook</string> + <string name="icon_picker_gallery">Gallery</string> + <string name="icon_picker_google_small">Google (small)</string> + <string name="icon_picker_googleplus">Google Plus</string> + <string name="icon_picker_googletalk">Google Talk</string> + <string name="icon_picker_maps">Maps</string> + <string name="icon_picker_movie">Movie</string> + <string name="icon_picker_music">Music</string> + <string name="icon_picker_nav_normal">Navigation</string> + <string name="icon_picker_phone">Phone</string> + <string name="icon_picker_podcast">Podcast</string> + <string name="icon_picker_rss">Rss</string> + <string name="icon_picker_search">Search</string> + <string name="icon_picker_sms">Messaging</string> + <string name="icon_picker_twitter">Twitter</string> + + <!-- String for IconPicker --> + <string name="icon_picker_title">Choose icon source</string> + <string name="icon_picker_system_icons_title">System icons</string> + <string name="icon_picker_gallery_title">Gallery</string> + <string name="icon_picker_pack_title">Icon pack</string> + <string name="increasing_ring_title">Ascending ringtone</string> <!-- Sound settings screen, the caption of the checkbox for making incoming calls increase in volume --> <string name="checkbox_increasing_ring">Enable</string> diff --git a/res/xml/lockscreen_interface_settings.xml b/res/xml/lockscreen_interface_settings.xml new file mode 100644 index 000000000..1142264dc --- /dev/null +++ b/res/xml/lockscreen_interface_settings.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2012 The CyanogenMod 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. +--> +<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:settings="http://schemas.android.com/apk/res/com.android.settings" + android:title="@string/themes_settings_title" > + + <Preference + android:fragment="com.android.settings.cyanogenmod.LockscreenTargets" + android:key="lockscreen_targets" + android:summary="@string/lockscreen_target_summary" + android:title="@string/lockscreen_target_title" /> + +</PreferenceScreen> diff --git a/res/xml/settings_headers.xml b/res/xml/settings_headers.xml index 05cc2bedb..5f1fd5449 100644 --- a/res/xml/settings_headers.xml +++ b/res/xml/settings_headers.xml @@ -67,6 +67,13 @@ android:title="@string/launcher_settings_title" android:icon="@drawable/ic_settings_cmlauncher" /> + <!-- Lock screen --> + <header + android:id="@+id/lock_screen_settings" + android:fragment="com.android.settings.cyanogenmod.LockscreenInterface" + android:title="@string/lock_screen_title" + android:icon="@drawable/ic_settings_lockscreen" /> + <!-- Themes --> <header android:id="@+id/themes_settings" |
