From af40f205d7f0c5f73a92ff5d9b8e9602dbde58c0 Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Wed, 18 Sep 2013 18:26:31 -0700 Subject: Initial changes to restore clings. Change-Id: Ie23e6e9f39679e8d35955a4a7db804d03f8b4d3f --- proguard.flags | 1 + res/drawable-hdpi/btn_cling_normal.9.png | Bin 333 -> 0 bytes res/drawable-hdpi/btn_cling_pressed.9.png | Bin 467 -> 0 bytes res/drawable-hdpi/cling.9.png | Bin 0 -> 365 bytes res/drawable-hdpi/cling.png | Bin 57394 -> 0 bytes res/drawable-hdpi/cling_arrow_down.png | Bin 0 -> 521 bytes res/drawable-hdpi/cling_arrow_left.png | Bin 0 -> 493 bytes res/drawable-hdpi/cling_arrow_right.png | Bin 0 -> 540 bytes res/drawable-hdpi/cling_arrow_up.png | Bin 0 -> 512 bytes res/drawable-hdpi/cling_button.9.png | Bin 0 -> 416 bytes res/drawable-hdpi/cling_button_pressed.9.png | Bin 0 -> 407 bytes res/drawable-mdpi/btn_cling_normal.9.png | Bin 245 -> 0 bytes res/drawable-mdpi/btn_cling_pressed.9.png | Bin 370 -> 0 bytes res/drawable-mdpi/cling.9.png | Bin 0 -> 269 bytes res/drawable-mdpi/cling.png | Bin 32299 -> 0 bytes res/drawable-mdpi/cling_arrow_down.png | Bin 0 -> 485 bytes res/drawable-mdpi/cling_arrow_left.png | Bin 0 -> 455 bytes res/drawable-mdpi/cling_arrow_right.png | Bin 0 -> 486 bytes res/drawable-mdpi/cling_arrow_up.png | Bin 0 -> 473 bytes res/drawable-mdpi/cling_button.9.png | Bin 0 -> 355 bytes res/drawable-mdpi/cling_button_pressed.9.png | Bin 0 -> 334 bytes res/drawable-xhdpi/btn_cling_normal.9.png | Bin 400 -> 0 bytes res/drawable-xhdpi/btn_cling_pressed.9.png | Bin 601 -> 0 bytes res/drawable-xhdpi/cling.9.png | Bin 0 -> 406 bytes res/drawable-xhdpi/cling.png | Bin 94777 -> 0 bytes res/drawable-xhdpi/cling_arrow_down.png | Bin 0 -> 602 bytes res/drawable-xhdpi/cling_arrow_left.png | Bin 0 -> 618 bytes res/drawable-xhdpi/cling_arrow_right.png | Bin 0 -> 629 bytes res/drawable-xhdpi/cling_arrow_up.png | Bin 0 -> 602 bytes res/drawable-xhdpi/cling_button.9.png | Bin 0 -> 484 bytes res/drawable-xhdpi/cling_button_pressed.9.png | Bin 0 -> 466 bytes res/drawable-xxhdpi/btn_cling_normal.9.png | Bin 1350 -> 0 bytes res/drawable-xxhdpi/btn_cling_pressed.9.png | Bin 1551 -> 0 bytes res/drawable-xxhdpi/cling.9.png | Bin 0 -> 1242 bytes res/drawable-xxhdpi/cling.png | Bin 133911 -> 0 bytes res/drawable-xxhdpi/cling_arrow_down.png | Bin 0 -> 1168 bytes res/drawable-xxhdpi/cling_arrow_left.png | Bin 0 -> 1141 bytes res/drawable-xxhdpi/cling_arrow_right.png | Bin 0 -> 1127 bytes res/drawable-xxhdpi/cling_arrow_up.png | Bin 0 -> 1138 bytes res/drawable-xxhdpi/cling_button.9.png | Bin 0 -> 1225 bytes res/drawable-xxhdpi/cling_button_pressed.9.png | Bin 0 -> 1225 bytes res/drawable/cling_button_bg.xml | 4 +- res/layout-land/first_run_cling.xml | 84 ++++++ res/layout-land/folder_cling.xml | 41 ++- res/layout-land/launcher.xml | 5 + res/layout-land/workspace_cling.xml | 48 ++-- res/layout-port/first_run_cling.xml | 83 ++++++ res/layout-port/folder_cling.xml | 38 ++- res/layout-port/launcher.xml | 5 + res/layout-port/workspace_cling.xml | 48 ++-- res/layout-sw720dp/folder_cling.xml | 46 ---- res/layout-sw720dp/launcher.xml | 5 + res/layout-sw720dp/workspace_cling.xml | 62 ----- res/values/strings.xml | 22 +- res/values/styles.xml | 35 ++- .../android/launcher3/AppsCustomizePagedView.java | 4 - .../android/launcher3/AppsCustomizeTabHost.java | 5 +- src/com/android/launcher3/Cling.java | 302 ++++++++++++--------- src/com/android/launcher3/DynamicGrid.java | 4 +- src/com/android/launcher3/Folder.java | 12 +- src/com/android/launcher3/Launcher.java | 117 ++++---- 61 files changed, 596 insertions(+), 375 deletions(-) delete mode 100644 res/drawable-hdpi/btn_cling_normal.9.png delete mode 100644 res/drawable-hdpi/btn_cling_pressed.9.png create mode 100644 res/drawable-hdpi/cling.9.png delete mode 100644 res/drawable-hdpi/cling.png create mode 100644 res/drawable-hdpi/cling_arrow_down.png create mode 100644 res/drawable-hdpi/cling_arrow_left.png create mode 100644 res/drawable-hdpi/cling_arrow_right.png create mode 100644 res/drawable-hdpi/cling_arrow_up.png create mode 100644 res/drawable-hdpi/cling_button.9.png create mode 100644 res/drawable-hdpi/cling_button_pressed.9.png delete mode 100644 res/drawable-mdpi/btn_cling_normal.9.png delete mode 100644 res/drawable-mdpi/btn_cling_pressed.9.png create mode 100644 res/drawable-mdpi/cling.9.png delete mode 100644 res/drawable-mdpi/cling.png create mode 100644 res/drawable-mdpi/cling_arrow_down.png create mode 100644 res/drawable-mdpi/cling_arrow_left.png create mode 100644 res/drawable-mdpi/cling_arrow_right.png create mode 100644 res/drawable-mdpi/cling_arrow_up.png create mode 100644 res/drawable-mdpi/cling_button.9.png create mode 100644 res/drawable-mdpi/cling_button_pressed.9.png delete mode 100644 res/drawable-xhdpi/btn_cling_normal.9.png delete mode 100644 res/drawable-xhdpi/btn_cling_pressed.9.png create mode 100644 res/drawable-xhdpi/cling.9.png delete mode 100644 res/drawable-xhdpi/cling.png create mode 100644 res/drawable-xhdpi/cling_arrow_down.png create mode 100644 res/drawable-xhdpi/cling_arrow_left.png create mode 100644 res/drawable-xhdpi/cling_arrow_right.png create mode 100644 res/drawable-xhdpi/cling_arrow_up.png create mode 100644 res/drawable-xhdpi/cling_button.9.png create mode 100644 res/drawable-xhdpi/cling_button_pressed.9.png delete mode 100644 res/drawable-xxhdpi/btn_cling_normal.9.png delete mode 100644 res/drawable-xxhdpi/btn_cling_pressed.9.png create mode 100644 res/drawable-xxhdpi/cling.9.png delete mode 100644 res/drawable-xxhdpi/cling.png create mode 100644 res/drawable-xxhdpi/cling_arrow_down.png create mode 100644 res/drawable-xxhdpi/cling_arrow_left.png create mode 100644 res/drawable-xxhdpi/cling_arrow_right.png create mode 100644 res/drawable-xxhdpi/cling_arrow_up.png create mode 100644 res/drawable-xxhdpi/cling_button.9.png create mode 100644 res/drawable-xxhdpi/cling_button_pressed.9.png create mode 100644 res/layout-land/first_run_cling.xml create mode 100644 res/layout-port/first_run_cling.xml delete mode 100644 res/layout-sw720dp/folder_cling.xml delete mode 100644 res/layout-sw720dp/workspace_cling.xml diff --git a/proguard.flags b/proguard.flags index 806105f3b..9b59b217e 100644 --- a/proguard.flags +++ b/proguard.flags @@ -7,6 +7,7 @@ public void onClickConfigureButton(android.view.View); public void onClickAllAppsButton(android.view.View); public void onClickAppMarketButton(android.view.View); + public void dismissFirstRunCling(android.view.View); public void dismissWorkspaceCling(android.view.View); public void dismissAllAppsCling(android.view.View); } diff --git a/res/drawable-hdpi/btn_cling_normal.9.png b/res/drawable-hdpi/btn_cling_normal.9.png deleted file mode 100644 index aea8beb3e..000000000 Binary files a/res/drawable-hdpi/btn_cling_normal.9.png and /dev/null differ diff --git a/res/drawable-hdpi/btn_cling_pressed.9.png b/res/drawable-hdpi/btn_cling_pressed.9.png deleted file mode 100644 index ebefd20ad..000000000 Binary files a/res/drawable-hdpi/btn_cling_pressed.9.png and /dev/null differ diff --git a/res/drawable-hdpi/cling.9.png b/res/drawable-hdpi/cling.9.png new file mode 100644 index 000000000..42a889fb1 Binary files /dev/null and b/res/drawable-hdpi/cling.9.png differ diff --git a/res/drawable-hdpi/cling.png b/res/drawable-hdpi/cling.png deleted file mode 100644 index d60579940..000000000 Binary files a/res/drawable-hdpi/cling.png and /dev/null differ diff --git a/res/drawable-hdpi/cling_arrow_down.png b/res/drawable-hdpi/cling_arrow_down.png new file mode 100644 index 000000000..4f521eadc Binary files /dev/null and b/res/drawable-hdpi/cling_arrow_down.png differ diff --git a/res/drawable-hdpi/cling_arrow_left.png b/res/drawable-hdpi/cling_arrow_left.png new file mode 100644 index 000000000..13764c9e2 Binary files /dev/null and b/res/drawable-hdpi/cling_arrow_left.png differ diff --git a/res/drawable-hdpi/cling_arrow_right.png b/res/drawable-hdpi/cling_arrow_right.png new file mode 100644 index 000000000..be522441d Binary files /dev/null and b/res/drawable-hdpi/cling_arrow_right.png differ diff --git a/res/drawable-hdpi/cling_arrow_up.png b/res/drawable-hdpi/cling_arrow_up.png new file mode 100644 index 000000000..83b5b3783 Binary files /dev/null and b/res/drawable-hdpi/cling_arrow_up.png differ diff --git a/res/drawable-hdpi/cling_button.9.png b/res/drawable-hdpi/cling_button.9.png new file mode 100644 index 000000000..4dbe56433 Binary files /dev/null and b/res/drawable-hdpi/cling_button.9.png differ diff --git a/res/drawable-hdpi/cling_button_pressed.9.png b/res/drawable-hdpi/cling_button_pressed.9.png new file mode 100644 index 000000000..2a85cabfa Binary files /dev/null and b/res/drawable-hdpi/cling_button_pressed.9.png differ diff --git a/res/drawable-mdpi/btn_cling_normal.9.png b/res/drawable-mdpi/btn_cling_normal.9.png deleted file mode 100644 index 43a407e03..000000000 Binary files a/res/drawable-mdpi/btn_cling_normal.9.png and /dev/null differ diff --git a/res/drawable-mdpi/btn_cling_pressed.9.png b/res/drawable-mdpi/btn_cling_pressed.9.png deleted file mode 100644 index bf0c8cbb4..000000000 Binary files a/res/drawable-mdpi/btn_cling_pressed.9.png and /dev/null differ diff --git a/res/drawable-mdpi/cling.9.png b/res/drawable-mdpi/cling.9.png new file mode 100644 index 000000000..f6f730d86 Binary files /dev/null and b/res/drawable-mdpi/cling.9.png differ diff --git a/res/drawable-mdpi/cling.png b/res/drawable-mdpi/cling.png deleted file mode 100644 index fba3a0787..000000000 Binary files a/res/drawable-mdpi/cling.png and /dev/null differ diff --git a/res/drawable-mdpi/cling_arrow_down.png b/res/drawable-mdpi/cling_arrow_down.png new file mode 100644 index 000000000..58e66fbb2 Binary files /dev/null and b/res/drawable-mdpi/cling_arrow_down.png differ diff --git a/res/drawable-mdpi/cling_arrow_left.png b/res/drawable-mdpi/cling_arrow_left.png new file mode 100644 index 000000000..023c71705 Binary files /dev/null and b/res/drawable-mdpi/cling_arrow_left.png differ diff --git a/res/drawable-mdpi/cling_arrow_right.png b/res/drawable-mdpi/cling_arrow_right.png new file mode 100644 index 000000000..cf0eb1047 Binary files /dev/null and b/res/drawable-mdpi/cling_arrow_right.png differ diff --git a/res/drawable-mdpi/cling_arrow_up.png b/res/drawable-mdpi/cling_arrow_up.png new file mode 100644 index 000000000..9b0e6b7ae Binary files /dev/null and b/res/drawable-mdpi/cling_arrow_up.png differ diff --git a/res/drawable-mdpi/cling_button.9.png b/res/drawable-mdpi/cling_button.9.png new file mode 100644 index 000000000..38de60aee Binary files /dev/null and b/res/drawable-mdpi/cling_button.9.png differ diff --git a/res/drawable-mdpi/cling_button_pressed.9.png b/res/drawable-mdpi/cling_button_pressed.9.png new file mode 100644 index 000000000..c60837d2a Binary files /dev/null and b/res/drawable-mdpi/cling_button_pressed.9.png differ diff --git a/res/drawable-xhdpi/btn_cling_normal.9.png b/res/drawable-xhdpi/btn_cling_normal.9.png deleted file mode 100644 index 35511d6f9..000000000 Binary files a/res/drawable-xhdpi/btn_cling_normal.9.png and /dev/null differ diff --git a/res/drawable-xhdpi/btn_cling_pressed.9.png b/res/drawable-xhdpi/btn_cling_pressed.9.png deleted file mode 100644 index a38b40fa9..000000000 Binary files a/res/drawable-xhdpi/btn_cling_pressed.9.png and /dev/null differ diff --git a/res/drawable-xhdpi/cling.9.png b/res/drawable-xhdpi/cling.9.png new file mode 100644 index 000000000..9cc03c92c Binary files /dev/null and b/res/drawable-xhdpi/cling.9.png differ diff --git a/res/drawable-xhdpi/cling.png b/res/drawable-xhdpi/cling.png deleted file mode 100644 index 1cee1de51..000000000 Binary files a/res/drawable-xhdpi/cling.png and /dev/null differ diff --git a/res/drawable-xhdpi/cling_arrow_down.png b/res/drawable-xhdpi/cling_arrow_down.png new file mode 100644 index 000000000..ee1093340 Binary files /dev/null and b/res/drawable-xhdpi/cling_arrow_down.png differ diff --git a/res/drawable-xhdpi/cling_arrow_left.png b/res/drawable-xhdpi/cling_arrow_left.png new file mode 100644 index 000000000..cffbcf3ce Binary files /dev/null and b/res/drawable-xhdpi/cling_arrow_left.png differ diff --git a/res/drawable-xhdpi/cling_arrow_right.png b/res/drawable-xhdpi/cling_arrow_right.png new file mode 100644 index 000000000..d880d67f0 Binary files /dev/null and b/res/drawable-xhdpi/cling_arrow_right.png differ diff --git a/res/drawable-xhdpi/cling_arrow_up.png b/res/drawable-xhdpi/cling_arrow_up.png new file mode 100644 index 000000000..fd2c60c31 Binary files /dev/null and b/res/drawable-xhdpi/cling_arrow_up.png differ diff --git a/res/drawable-xhdpi/cling_button.9.png b/res/drawable-xhdpi/cling_button.9.png new file mode 100644 index 000000000..1c93bc41f Binary files /dev/null and b/res/drawable-xhdpi/cling_button.9.png differ diff --git a/res/drawable-xhdpi/cling_button_pressed.9.png b/res/drawable-xhdpi/cling_button_pressed.9.png new file mode 100644 index 000000000..b5d4aaea5 Binary files /dev/null and b/res/drawable-xhdpi/cling_button_pressed.9.png differ diff --git a/res/drawable-xxhdpi/btn_cling_normal.9.png b/res/drawable-xxhdpi/btn_cling_normal.9.png deleted file mode 100644 index f5e80326e..000000000 Binary files a/res/drawable-xxhdpi/btn_cling_normal.9.png and /dev/null differ diff --git a/res/drawable-xxhdpi/btn_cling_pressed.9.png b/res/drawable-xxhdpi/btn_cling_pressed.9.png deleted file mode 100644 index c507dd734..000000000 Binary files a/res/drawable-xxhdpi/btn_cling_pressed.9.png and /dev/null differ diff --git a/res/drawable-xxhdpi/cling.9.png b/res/drawable-xxhdpi/cling.9.png new file mode 100644 index 000000000..3dcf12130 Binary files /dev/null and b/res/drawable-xxhdpi/cling.9.png differ diff --git a/res/drawable-xxhdpi/cling.png b/res/drawable-xxhdpi/cling.png deleted file mode 100644 index 9446ea4bd..000000000 Binary files a/res/drawable-xxhdpi/cling.png and /dev/null differ diff --git a/res/drawable-xxhdpi/cling_arrow_down.png b/res/drawable-xxhdpi/cling_arrow_down.png new file mode 100644 index 000000000..48c4f06fa Binary files /dev/null and b/res/drawable-xxhdpi/cling_arrow_down.png differ diff --git a/res/drawable-xxhdpi/cling_arrow_left.png b/res/drawable-xxhdpi/cling_arrow_left.png new file mode 100644 index 000000000..8760d05da Binary files /dev/null and b/res/drawable-xxhdpi/cling_arrow_left.png differ diff --git a/res/drawable-xxhdpi/cling_arrow_right.png b/res/drawable-xxhdpi/cling_arrow_right.png new file mode 100644 index 000000000..356ba178c Binary files /dev/null and b/res/drawable-xxhdpi/cling_arrow_right.png differ diff --git a/res/drawable-xxhdpi/cling_arrow_up.png b/res/drawable-xxhdpi/cling_arrow_up.png new file mode 100644 index 000000000..4cb805f45 Binary files /dev/null and b/res/drawable-xxhdpi/cling_arrow_up.png differ diff --git a/res/drawable-xxhdpi/cling_button.9.png b/res/drawable-xxhdpi/cling_button.9.png new file mode 100644 index 000000000..4f68a03ff Binary files /dev/null and b/res/drawable-xxhdpi/cling_button.9.png differ diff --git a/res/drawable-xxhdpi/cling_button_pressed.9.png b/res/drawable-xxhdpi/cling_button_pressed.9.png new file mode 100644 index 000000000..4bc033764 Binary files /dev/null and b/res/drawable-xxhdpi/cling_button_pressed.9.png differ diff --git a/res/drawable/cling_button_bg.xml b/res/drawable/cling_button_bg.xml index 3809cdecb..7bf6ce79f 100644 --- a/res/drawable/cling_button_bg.xml +++ b/res/drawable/cling_button_bg.xml @@ -15,6 +15,6 @@ --> - - + + diff --git a/res/layout-land/first_run_cling.xml b/res/layout-land/first_run_cling.xml new file mode 100644 index 000000000..f82738096 --- /dev/null +++ b/res/layout-land/first_run_cling.xml @@ -0,0 +1,84 @@ + + + + + + + + + + + + +