summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/drawable-hdpi/ic_widget_resize_handle.pngbin0 -> 1492 bytes
-rw-r--r--res/drawable-hdpi/widget_resize_frame.9.pngbin0 -> 522 bytes
-rw-r--r--res/drawable-hdpi/widget_resize_frame_holo.9.pngbin880 -> 0 bytes
-rw-r--r--res/drawable-hdpi/widget_resize_handle_bottom.pngbin1080 -> 0 bytes
-rw-r--r--res/drawable-hdpi/widget_resize_handle_left.pngbin1097 -> 0 bytes
-rw-r--r--res/drawable-hdpi/widget_resize_handle_right.pngbin1085 -> 0 bytes
-rw-r--r--res/drawable-hdpi/widget_resize_handle_top.pngbin1085 -> 0 bytes
-rw-r--r--res/drawable-hdpi/widget_resize_shadow.9.pngbin0 -> 681 bytes
-rw-r--r--res/drawable-mdpi/ic_widget_resize_handle.pngbin0 -> 896 bytes
-rw-r--r--res/drawable-mdpi/widget_resize_frame.9.pngbin0 -> 444 bytes
-rw-r--r--res/drawable-mdpi/widget_resize_frame_holo.9.pngbin619 -> 0 bytes
-rw-r--r--res/drawable-mdpi/widget_resize_handle_bottom.pngbin745 -> 0 bytes
-rw-r--r--res/drawable-mdpi/widget_resize_handle_left.pngbin762 -> 0 bytes
-rw-r--r--res/drawable-mdpi/widget_resize_handle_right.pngbin772 -> 0 bytes
-rw-r--r--res/drawable-mdpi/widget_resize_handle_top.pngbin750 -> 0 bytes
-rw-r--r--res/drawable-mdpi/widget_resize_shadow.9.pngbin0 -> 486 bytes
-rw-r--r--res/drawable-xhdpi/ic_widget_resize_handle.pngbin0 -> 2144 bytes
-rw-r--r--res/drawable-xhdpi/widget_resize_frame.9.pngbin0 -> 670 bytes
-rw-r--r--res/drawable-xhdpi/widget_resize_frame_holo.9.pngbin1323 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/widget_resize_handle_bottom.pngbin1434 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/widget_resize_handle_left.pngbin1467 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/widget_resize_handle_right.pngbin1483 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/widget_resize_handle_top.pngbin1463 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/widget_resize_shadow.9.pngbin0 -> 918 bytes
-rw-r--r--res/drawable-xxhdpi/ic_widget_resize_handle.pngbin0 -> 2928 bytes
-rw-r--r--res/drawable-xxhdpi/widget_resize_frame.9.pngbin0 -> 953 bytes
-rw-r--r--res/drawable-xxhdpi/widget_resize_frame_holo.9.pngbin4396 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/widget_resize_handle_bottom.pngbin4470 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/widget_resize_handle_left.pngbin4428 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/widget_resize_handle_right.pngbin4438 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/widget_resize_handle_top.pngbin4473 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/widget_resize_shadow.9.pngbin0 -> 1320 bytes
-rw-r--r--res/drawable-xxxhdpi/ic_widget_resize_handle.pngbin0 -> 2930 bytes
-rw-r--r--res/drawable-xxxhdpi/widget_resize_frame.9.pngbin0 -> 2052 bytes
-rw-r--r--res/drawable-xxxhdpi/widget_resize_shadow.9.pngbin0 -> 2512 bytes
-rw-r--r--res/layout/apps_grid_icon_view.xml1
-rw-r--r--res/layout/apps_list_view.xml5
-rw-r--r--res/layout/apps_prediction_bar_icon_view.xml1
-rw-r--r--res/values/dimens.xml3
-rw-r--r--res/values/strings.xml56
40 files changed, 34 insertions, 32 deletions
diff --git a/res/drawable-hdpi/ic_widget_resize_handle.png b/res/drawable-hdpi/ic_widget_resize_handle.png
new file mode 100644
index 000000000..844f3cf09
--- /dev/null
+++ b/res/drawable-hdpi/ic_widget_resize_handle.png
Binary files differ
diff --git a/res/drawable-hdpi/widget_resize_frame.9.png b/res/drawable-hdpi/widget_resize_frame.9.png
new file mode 100644
index 000000000..5772672b1
--- /dev/null
+++ b/res/drawable-hdpi/widget_resize_frame.9.png
Binary files differ
diff --git a/res/drawable-hdpi/widget_resize_frame_holo.9.png b/res/drawable-hdpi/widget_resize_frame_holo.9.png
deleted file mode 100644
index 2d6fcf51f..000000000
--- a/res/drawable-hdpi/widget_resize_frame_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/widget_resize_handle_bottom.png b/res/drawable-hdpi/widget_resize_handle_bottom.png
deleted file mode 100644
index f0afd6172..000000000
--- a/res/drawable-hdpi/widget_resize_handle_bottom.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/widget_resize_handle_left.png b/res/drawable-hdpi/widget_resize_handle_left.png
deleted file mode 100644
index 47613b29f..000000000
--- a/res/drawable-hdpi/widget_resize_handle_left.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/widget_resize_handle_right.png b/res/drawable-hdpi/widget_resize_handle_right.png
deleted file mode 100644
index acc28be83..000000000
--- a/res/drawable-hdpi/widget_resize_handle_right.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/widget_resize_handle_top.png b/res/drawable-hdpi/widget_resize_handle_top.png
deleted file mode 100644
index 2c60be00c..000000000
--- a/res/drawable-hdpi/widget_resize_handle_top.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/widget_resize_shadow.9.png b/res/drawable-hdpi/widget_resize_shadow.9.png
new file mode 100644
index 000000000..a67da6e04
--- /dev/null
+++ b/res/drawable-hdpi/widget_resize_shadow.9.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_widget_resize_handle.png b/res/drawable-mdpi/ic_widget_resize_handle.png
new file mode 100644
index 000000000..c3b287ff0
--- /dev/null
+++ b/res/drawable-mdpi/ic_widget_resize_handle.png
Binary files differ
diff --git a/res/drawable-mdpi/widget_resize_frame.9.png b/res/drawable-mdpi/widget_resize_frame.9.png
new file mode 100644
index 000000000..8bc8a5c12
--- /dev/null
+++ b/res/drawable-mdpi/widget_resize_frame.9.png
Binary files differ
diff --git a/res/drawable-mdpi/widget_resize_frame_holo.9.png b/res/drawable-mdpi/widget_resize_frame_holo.9.png
deleted file mode 100644
index 028bd6248..000000000
--- a/res/drawable-mdpi/widget_resize_frame_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/widget_resize_handle_bottom.png b/res/drawable-mdpi/widget_resize_handle_bottom.png
deleted file mode 100644
index c838bf405..000000000
--- a/res/drawable-mdpi/widget_resize_handle_bottom.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/widget_resize_handle_left.png b/res/drawable-mdpi/widget_resize_handle_left.png
deleted file mode 100644
index ff0b0d357..000000000
--- a/res/drawable-mdpi/widget_resize_handle_left.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/widget_resize_handle_right.png b/res/drawable-mdpi/widget_resize_handle_right.png
deleted file mode 100644
index fc4808e3a..000000000
--- a/res/drawable-mdpi/widget_resize_handle_right.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/widget_resize_handle_top.png b/res/drawable-mdpi/widget_resize_handle_top.png
deleted file mode 100644
index 3b1df0170..000000000
--- a/res/drawable-mdpi/widget_resize_handle_top.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/widget_resize_shadow.9.png b/res/drawable-mdpi/widget_resize_shadow.9.png
new file mode 100644
index 000000000..2bae2b603
--- /dev/null
+++ b/res/drawable-mdpi/widget_resize_shadow.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_widget_resize_handle.png b/res/drawable-xhdpi/ic_widget_resize_handle.png
new file mode 100644
index 000000000..f445a1c08
--- /dev/null
+++ b/res/drawable-xhdpi/ic_widget_resize_handle.png
Binary files differ
diff --git a/res/drawable-xhdpi/widget_resize_frame.9.png b/res/drawable-xhdpi/widget_resize_frame.9.png
new file mode 100644
index 000000000..e6cf0afde
--- /dev/null
+++ b/res/drawable-xhdpi/widget_resize_frame.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/widget_resize_frame_holo.9.png b/res/drawable-xhdpi/widget_resize_frame_holo.9.png
deleted file mode 100644
index 76cec606d..000000000
--- a/res/drawable-xhdpi/widget_resize_frame_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/widget_resize_handle_bottom.png b/res/drawable-xhdpi/widget_resize_handle_bottom.png
deleted file mode 100644
index 19437d7dc..000000000
--- a/res/drawable-xhdpi/widget_resize_handle_bottom.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/widget_resize_handle_left.png b/res/drawable-xhdpi/widget_resize_handle_left.png
deleted file mode 100644
index 28c5487ec..000000000
--- a/res/drawable-xhdpi/widget_resize_handle_left.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/widget_resize_handle_right.png b/res/drawable-xhdpi/widget_resize_handle_right.png
deleted file mode 100644
index 4f672a602..000000000
--- a/res/drawable-xhdpi/widget_resize_handle_right.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/widget_resize_handle_top.png b/res/drawable-xhdpi/widget_resize_handle_top.png
deleted file mode 100644
index e866c008c..000000000
--- a/res/drawable-xhdpi/widget_resize_handle_top.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/widget_resize_shadow.9.png b/res/drawable-xhdpi/widget_resize_shadow.9.png
new file mode 100644
index 000000000..99e9e78cd
--- /dev/null
+++ b/res/drawable-xhdpi/widget_resize_shadow.9.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_widget_resize_handle.png b/res/drawable-xxhdpi/ic_widget_resize_handle.png
new file mode 100644
index 000000000..144cac996
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_widget_resize_handle.png
Binary files differ
diff --git a/res/drawable-xxhdpi/widget_resize_frame.9.png b/res/drawable-xxhdpi/widget_resize_frame.9.png
new file mode 100644
index 000000000..7a49d01da
--- /dev/null
+++ b/res/drawable-xxhdpi/widget_resize_frame.9.png
Binary files differ
diff --git a/res/drawable-xxhdpi/widget_resize_frame_holo.9.png b/res/drawable-xxhdpi/widget_resize_frame_holo.9.png
deleted file mode 100644
index 1681387a1..000000000
--- a/res/drawable-xxhdpi/widget_resize_frame_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/widget_resize_handle_bottom.png b/res/drawable-xxhdpi/widget_resize_handle_bottom.png
deleted file mode 100644
index d549fcd91..000000000
--- a/res/drawable-xxhdpi/widget_resize_handle_bottom.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/widget_resize_handle_left.png b/res/drawable-xxhdpi/widget_resize_handle_left.png
deleted file mode 100644
index dd56dad15..000000000
--- a/res/drawable-xxhdpi/widget_resize_handle_left.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/widget_resize_handle_right.png b/res/drawable-xxhdpi/widget_resize_handle_right.png
deleted file mode 100644
index 296a1c166..000000000
--- a/res/drawable-xxhdpi/widget_resize_handle_right.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/widget_resize_handle_top.png b/res/drawable-xxhdpi/widget_resize_handle_top.png
deleted file mode 100644
index e86270ad1..000000000
--- a/res/drawable-xxhdpi/widget_resize_handle_top.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/widget_resize_shadow.9.png b/res/drawable-xxhdpi/widget_resize_shadow.9.png
new file mode 100644
index 000000000..ae0f564dd
--- /dev/null
+++ b/res/drawable-xxhdpi/widget_resize_shadow.9.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_widget_resize_handle.png b/res/drawable-xxxhdpi/ic_widget_resize_handle.png
new file mode 100644
index 000000000..4bde6b9a6
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_widget_resize_handle.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/widget_resize_frame.9.png b/res/drawable-xxxhdpi/widget_resize_frame.9.png
new file mode 100644
index 000000000..9b711f2c5
--- /dev/null
+++ b/res/drawable-xxxhdpi/widget_resize_frame.9.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/widget_resize_shadow.9.png b/res/drawable-xxxhdpi/widget_resize_shadow.9.png
new file mode 100644
index 000000000..defb311ca
--- /dev/null
+++ b/res/drawable-xxxhdpi/widget_resize_shadow.9.png
Binary files differ
diff --git a/res/layout/apps_grid_icon_view.xml b/res/layout/apps_grid_icon_view.xml
index 67d7d50e7..7165f383d 100644
--- a/res/layout/apps_grid_icon_view.xml
+++ b/res/layout/apps_grid_icon_view.xml
@@ -25,6 +25,5 @@
android:paddingBottom="@dimen/apps_icon_top_bottom_padding"
android:focusable="true"
android:background="@drawable/focusable_view_bg"
- launcher:deferShadowGeneration="true"
launcher:iconDisplay="all_apps" />
diff --git a/res/layout/apps_list_view.xml b/res/layout/apps_list_view.xml
index 03ba646ee..6f9be05af 100644
--- a/res/layout/apps_list_view.xml
+++ b/res/layout/apps_list_view.xml
@@ -14,7 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.launcher3.AppsRecyclerViewContainer
+ xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/apps_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -101,4 +102,4 @@
android:src="@drawable/ic_search_grey" />
</FrameLayout>
-</FrameLayout> \ No newline at end of file
+</com.android.launcher3.AppsRecyclerViewContainer> \ No newline at end of file
diff --git a/res/layout/apps_prediction_bar_icon_view.xml b/res/layout/apps_prediction_bar_icon_view.xml
index 4a6f1574b..1e75d14b6 100644
--- a/res/layout/apps_prediction_bar_icon_view.xml
+++ b/res/layout/apps_prediction_bar_icon_view.xml
@@ -24,6 +24,5 @@
android:layout_weight="1"
android:focusable="true"
android:background="@drawable/focusable_view_bg"
- launcher:deferShadowGeneration="true"
launcher:iconDisplay="all_apps" />
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index d2f6237a8..60591e14a 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -28,7 +28,10 @@
<dimen name="dynamic_grid_overview_bar_item_width">80dp</dimen>
<dimen name="dynamic_grid_overview_bar_spacer_width">20dp</dimen>
+<!-- App Widget resize frame -->
<dimen name="default_widget_padding">8dp</dimen>
+ <dimen name="widget_handle_margin">13dp</dimen>
+ <dimen name="resize_frame_background_padding">24dp</dimen>
<!-- Cling -->
<dimen name="cling_migration_logo_height">240dp</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 51ad51f12..18f97c84d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -182,76 +182,76 @@
</string>
<!-- Strings for accessibility actions -->
- <!-- Accessibility action to add an app to workspace. [CHAR_LIMIT=30] [DO NOT TRANSLATE] -->
- <string name="action_add_to_workspace">Add to home screen</string>
+ <!-- Accessibility action to add an app to workspace. [CHAR_LIMIT=30] -->
+ <string name="action_add_to_workspace">Add to Home screen</string>
- <!-- Accessibility action to move item to the current location. [CHAR_LIMIT=30] [DO NOT TRANSLATE] -->
- <string name="action_move_here">Move here</string>
+ <!-- Accessibility action to move item to the current location. [CHAR_LIMIT=30] -->
+ <string name="action_move_here">Move item here</string>
- <!-- Accessibility confirmation for item added to workspace [DO NOT TRANSLATE] -->
+ <!-- Accessibility confirmation for item added to workspace. -->
<string name="item_added_to_workspace">Item added to home screen</string>
- <!-- Accessibility confirmation for item removed [DO NOT TRANSLATE] -->
+ <!-- Accessibility confirmation for item removed. -->
<string name="item_removed">Item removed</string>
- <!-- Accessibility action to move an item on the workspace. [CHAR_LIMIT=30] [DO NOT TRANSLATE] -->
- <string name="action_move">Move Item</string>
+ <!-- Accessibility action to move an item on the workspace. [CHAR_LIMIT=30] -->
+ <string name="action_move">Move item</string>
- <!-- Accessibility description to move item to empty cell. [DO NOT TRANSLATE] -->
+ <!-- Accessibility description to move item to empty cell. -->
<string name="move_to_empty_cell">Move to row <xliff:g id="number" example="1">%1$s</xliff:g> column <xliff:g id="number" example="1">%2$s</xliff:g></string>
- <!-- Accessibility description to move item inside a folder. [DO NOT TRANSLATE] -->
+ <!-- Accessibility description to move item inside a folder. -->
<string name="move_to_position">Move to position <xliff:g id="number" example="1">%1$s</xliff:g></string>
- <!-- Accessibility description to move item to the hotseat. [DO NOT TRANSLATE] -->
+ <!-- Accessibility description to move item to the hotseat. -->
<string name="move_to_hotseat_position">Move to favorites position <xliff:g id="number" example="1">%1$s</xliff:g></string>
- <!-- Accessibility confirmation for item move [DO NOT TRANSLATE]-->
+ <!-- Accessibility confirmation for item move. -->
<string name="item_moved">Item moved</string>
- <!-- Accessibility description to move item into an existing folder. [DO NOT TRANSLATE]-->
+ <!-- Accessibility description to move item into an existing folder. -->
<string name="add_to_folder">Add to folder: <xliff:g id="name" example="Games">%1$s</xliff:g></string>
- <!-- Accessibility description to move item into an existing folder containing an app. [DO NOT TRANSLATE]-->
+ <!-- Accessibility description to move item into an existing folder containing an app. -->
<string name="add_to_folder_with_app">Add to folder with <xliff:g id="name" example="Messenger">%1$s</xliff:g></string>
- <!-- Accessibility confirmation for item added to folder [DO NOT TRANSLATE] -->
+ <!-- Accessibility confirmation for item added to folder. -->
<string name="added_to_folder">Item added to folder</string>
- <!-- Accessibility description to create folder with another item. [DO NOT TRANSLATE] -->
+ <!-- Accessibility description to create folder with another item. -->
<string name="create_folder_with">Create folder with: <xliff:g id="name" example="Game">%1$s</xliff:g></string>
- <!-- Accessibility confirmation for folder created [DO NOT TRANSLATE] -->
+ <!-- Accessibility confirmation for folder created. -->
<string name="folder_created">Folder created</string>
- <!-- Accessibility action to move an item from folder to workspace. [CHAR_LIMIT=30] [DO NOT TRANSLATE] -->
- <string name="action_move_to_workspace">Move to home screen</string>
+ <!-- Accessibility action to move an item from folder to workspace. [CHAR_LIMIT=30] -->
+ <string name="action_move_to_workspace">Move to Home screen</string>
- <!-- Accessibility action to move an homescreen to the left. [CHAR_LIMIT=30] [DO NOT TRANSLATE] -->
+ <!-- Accessibility action to move an homescreen to the left. [CHAR_LIMIT=30] -->
<string name="action_move_screen_left">Move screen to left</string>
- <!-- Accessibility action to move an homescreen to the right. [CHAR_LIMIT=30] [DO NOT TRANSLATE] -->
+ <!-- Accessibility action to move an homescreen to the right. [CHAR_LIMIT=30] -->
<string name="action_move_screen_right">Move screen to right</string>
- <!-- Accessibility confirmation when a screen was moved [DO NOT TRANSLATE] -->
+ <!-- Accessibility confirmation when a screen was moved. -->
<string name="screen_moved">Screen moved</string>
- <!-- Accessibility action to resize a widget [DO NOT TRANSLATE] -->
+ <!-- Accessibility action to resize a widget. [CHAR_LIMIT=30] -->
<string name="action_resize">Resize</string>
- <!-- Accessibility action to increase width of a widget [DO NOT TRANSLATE] -->
+ <!-- Accessibility action to increase width of a widget. [CHAR_LIMIT=30] -->
<string name="action_increase_width">Increase width</string>
- <!-- Accessibility action to increase height of a widget [DO NOT TRANSLATE] -->
+ <!-- Accessibility action to increase height of a widget. [CHAR_LIMIT=30] -->
<string name="action_increase_height">Increase height</string>
- <!-- Accessibility action to decrease width of a widget [DO NOT TRANSLATE] -->
+ <!-- Accessibility action to decrease width of a widget. [CHAR_LIMIT=30] -->
<string name="action_decrease_width">Decrease width</string>
- <!-- Accessibility action to decrease height of a widget [DO NOT TRANSLATE] -->
+ <!-- Accessibility action to decrease height of a widget. [CHAR_LIMIT=30] -->
<string name="action_decrease_height">Decrease height</string>
- <!-- Accessibility confirmation for widget resize [DO NOT TRANSLATE]-->
+ <!-- Accessibility confirmation for widget resize. -->
<string name="widget_resized">Widget resized to width <xliff:g id="number" example="2">%1$s</xliff:g> height <xliff:g id="number" example="1">%2$s</xliff:g></string>
</resources>