diff options
author | Michael Jurka <mikejurka@google.com> | 2013-09-04 14:42:52 +0200 |
---|---|---|
committer | Michael Jurka <mikejurka@google.com> | 2013-09-05 20:37:56 +0200 |
commit | 2d8de5845be5f49d3767b8354f0d5479a0715abe (patch) | |
tree | 590be85280f29f7ea42a2bf4b0dccd4d87b0b6fd /res | |
parent | c0e8b6880ae75c1f5811146ded4b060f8f1a6f84 (diff) | |
download | android_packages_apps_Trebuchet-2d8de5845be5f49d3767b8354f0d5479a0715abe.tar.gz android_packages_apps_Trebuchet-2d8de5845be5f49d3767b8354f0d5479a0715abe.tar.bz2 android_packages_apps_Trebuchet-2d8de5845be5f49d3767b8354f0d5479a0715abe.zip |
Create a separate wallpaper crop activity
Change-Id: Ifb0a7dcb5a6e9ddd4f4bbccc793d9b4db1256cf2
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/wallpaper_cropper.xml | 39 | ||||
-rw-r--r-- | res/values/strings.xml | 23 |
2 files changed, 39 insertions, 23 deletions
diff --git a/res/layout/wallpaper_cropper.xml b/res/layout/wallpaper_cropper.xml new file mode 100644 index 000000000..768500c0a --- /dev/null +++ b/res/layout/wallpaper_cropper.xml @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2013, 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. +*/ +--> + +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/wallpaper_cropper" + android:layout_width="match_parent" + android:layout_height="match_parent"> + <com.android.launcher3.CropView + android:id="@+id/cropView" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + <ProgressBar + android:id="@+id/loading" + style="@android:style/Widget.Holo.ProgressBar.Large" + android:visibility="invisible" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:indeterminate="true" + android:indeterminateOnly="true" + android:background="@android:color/transparent" /> +</RelativeLayout> diff --git a/res/values/strings.xml b/res/values/strings.xml index b860d42aa..b43f51b6c 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -28,14 +28,10 @@ <string name="uid_name">Android Core Apps</string> <!-- Default folder name --> <string name="folder_name"></string> - <!-- Title of dialog that appears after user selects Wallpaper from menu --> - <string name="chooser_wallpaper">Choose wallpaper from</string> <!-- Button label on Wallpaper picker screen; user selects this button to set a specific wallpaper --> <string name="wallpaper_instructions">Set wallpaper</string> <!-- Label on button in Wallpaper Picker that launches Gallery app --> <string name="gallery">Gallery</string> - <!-- Option in "Select wallpaper from" dialog box --> - <string name="pick_wallpaper">Wallpapers</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> <!-- Labels for the tabs in the customize drawer --> @@ -88,8 +84,6 @@ 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> - <!-- Options in "Add to Home" dialog box; Title of the group containing the list of apps that can set the wallpaper--> - <string name="group_wallpapers">Wallpapers</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 --> @@ -142,23 +136,6 @@ s --> be uninstalled. [CHAR_LIMIT=30] --> <string name="delete_zone_label_all_apps_system_app">Uninstall update</string> - <!-- Menus items: --> - <skip /> - <!-- Verb, menu item used to add an item on the desktop --> - <string name="menu_add">Add</string> - <!-- Menu item used to manage installed applications --> - <string name="menu_manage_apps">Manage apps</string> - <!-- Noun, menu item used to set the desktop's wallpaper --> - <string name="menu_wallpaper">Wallpaper</string> - <!-- Verb, menu item used to initiate global search --> - <string name="menu_search">Search</string> - <!-- Noun, menu item used to bring down the notifications shade --> - <string name="menu_notifications">Notifications</string> - <!-- Noun, menu item used to show the system settings --> - <string name="menu_settings">System settings</string> - <!-- Noun, menu item used to show help. [CHAR_LIMIT=none] --> - <string name="menu_help">Help</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> |