From b3de38c976eeb5a8c4b5c1b0d68d9c84253d3187 Mon Sep 17 00:00:00 2001 From: Yvonne Wong Date: Fri, 20 Nov 2015 10:49:59 -0800 Subject: Reimplement CM Settings Overview Panel in the new Launcher Part 1 - Adds vertical sliding panel and animations associated with opening and closing the panel - Adds the views for settings and animation for the drawer arrow - Enables hiding workspace icon labels, hiding drawer icon labels, scrolling wallpaper, and larger icons - Changes how ragged grid custom icon sizes gets defined Change-Id: I1a82215a09486b4770494e665e598efdbabd1d3e --- res/drawable-hdpi/ic_default_screen.png | Bin 0 -> 2046 bytes res/drawable-hdpi/ic_default_screen_pressed.png | Bin 0 -> 1993 bytes res/drawable-mdpi/ic_default_screen.png | Bin 0 -> 1597 bytes res/drawable-mdpi/ic_default_screen_pressed.png | Bin 0 -> 1626 bytes res/drawable-xhdpi/ic_default_screen.png | Bin 0 -> 2323 bytes res/drawable-xhdpi/ic_default_screen_pressed.png | Bin 0 -> 2385 bytes res/drawable-xxhdpi/ic_default_screen.png | Bin 0 -> 3187 bytes res/drawable-xxhdpi/ic_default_screen_pressed.png | Bin 0 -> 3237 bytes res/drawable/above_shadow.xml | 8 + res/drawable/below_shadow.xml | 8 + res/drawable/default_screen_button.xml | 19 +++ res/drawable/launcheranimatedarrow_00000.png | Bin 0 -> 661 bytes res/drawable/launcheranimatedarrow_00001.png | Bin 0 -> 749 bytes res/drawable/launcheranimatedarrow_00002.png | Bin 0 -> 705 bytes res/drawable/launcheranimatedarrow_00003.png | Bin 0 -> 746 bytes res/drawable/launcheranimatedarrow_00004.png | Bin 0 -> 747 bytes res/drawable/launcheranimatedarrow_00005.png | Bin 0 -> 664 bytes res/drawable/launcheranimatedarrow_00006.png | Bin 0 -> 1007 bytes res/drawable/launcheranimatedarrow_00007.png | Bin 0 -> 999 bytes res/drawable/launcheranimatedarrow_00008.png | Bin 0 -> 710 bytes res/drawable/launcheranimatedarrow_00009.png | Bin 0 -> 968 bytes res/drawable/launcheranimatedarrow_00010.png | Bin 0 -> 990 bytes res/drawable/launcheranimatedarrow_00011.png | Bin 0 -> 671 bytes res/drawable/launcheranimatedarrow_00012.png | Bin 0 -> 744 bytes res/drawable/launcheranimatedarrow_00013.png | Bin 0 -> 750 bytes res/drawable/launcheranimatedarrow_00014.png | Bin 0 -> 747 bytes res/drawable/launcheranimatedarrow_00015.png | Bin 0 -> 736 bytes res/drawable/launcheranimatedarrow_00016.png | Bin 0 -> 668 bytes res/drawable/listitem_bg.xml | 6 + res/drawable/listitem_text.xml | 6 + res/drawable/transition_arrow.xml | 21 +++ res/drawable/transition_arrow_reverse.xml | 21 +++ res/layout/overview_panel.xml | 175 ++++++++++++++++------ res/layout/settings_pane_list_header.xml | 19 +++ res/layout/settings_pane_list_item.xml | 38 +++++ res/values/attrs.xml | 10 ++ res/values/cm_strings.xml | 36 +++++ res/values/colors.xml | 4 + res/values/dimens.xml | 11 +- res/values/preferences_defaults.xml | 9 ++ 40 files changed, 341 insertions(+), 50 deletions(-) create mode 100644 res/drawable-hdpi/ic_default_screen.png create mode 100644 res/drawable-hdpi/ic_default_screen_pressed.png create mode 100644 res/drawable-mdpi/ic_default_screen.png create mode 100644 res/drawable-mdpi/ic_default_screen_pressed.png create mode 100644 res/drawable-xhdpi/ic_default_screen.png create mode 100644 res/drawable-xhdpi/ic_default_screen_pressed.png create mode 100644 res/drawable-xxhdpi/ic_default_screen.png create mode 100644 res/drawable-xxhdpi/ic_default_screen_pressed.png create mode 100644 res/drawable/above_shadow.xml create mode 100644 res/drawable/below_shadow.xml create mode 100644 res/drawable/default_screen_button.xml create mode 100644 res/drawable/launcheranimatedarrow_00000.png create mode 100644 res/drawable/launcheranimatedarrow_00001.png create mode 100644 res/drawable/launcheranimatedarrow_00002.png create mode 100644 res/drawable/launcheranimatedarrow_00003.png create mode 100644 res/drawable/launcheranimatedarrow_00004.png create mode 100644 res/drawable/launcheranimatedarrow_00005.png create mode 100644 res/drawable/launcheranimatedarrow_00006.png create mode 100644 res/drawable/launcheranimatedarrow_00007.png create mode 100644 res/drawable/launcheranimatedarrow_00008.png create mode 100644 res/drawable/launcheranimatedarrow_00009.png create mode 100644 res/drawable/launcheranimatedarrow_00010.png create mode 100644 res/drawable/launcheranimatedarrow_00011.png create mode 100644 res/drawable/launcheranimatedarrow_00012.png create mode 100644 res/drawable/launcheranimatedarrow_00013.png create mode 100644 res/drawable/launcheranimatedarrow_00014.png create mode 100644 res/drawable/launcheranimatedarrow_00015.png create mode 100644 res/drawable/launcheranimatedarrow_00016.png create mode 100644 res/drawable/listitem_bg.xml create mode 100644 res/drawable/listitem_text.xml create mode 100644 res/drawable/transition_arrow.xml create mode 100644 res/drawable/transition_arrow_reverse.xml create mode 100644 res/layout/settings_pane_list_header.xml create mode 100644 res/layout/settings_pane_list_item.xml create mode 100644 res/values/preferences_defaults.xml (limited to 'res') diff --git a/res/drawable-hdpi/ic_default_screen.png b/res/drawable-hdpi/ic_default_screen.png new file mode 100644 index 000000000..41dcf8f6e Binary files /dev/null and b/res/drawable-hdpi/ic_default_screen.png differ diff --git a/res/drawable-hdpi/ic_default_screen_pressed.png b/res/drawable-hdpi/ic_default_screen_pressed.png new file mode 100644 index 000000000..7779058c5 Binary files /dev/null and b/res/drawable-hdpi/ic_default_screen_pressed.png differ diff --git a/res/drawable-mdpi/ic_default_screen.png b/res/drawable-mdpi/ic_default_screen.png new file mode 100644 index 000000000..8a2c1e1c0 Binary files /dev/null and b/res/drawable-mdpi/ic_default_screen.png differ diff --git a/res/drawable-mdpi/ic_default_screen_pressed.png b/res/drawable-mdpi/ic_default_screen_pressed.png new file mode 100644 index 000000000..20606ce62 Binary files /dev/null and b/res/drawable-mdpi/ic_default_screen_pressed.png differ diff --git a/res/drawable-xhdpi/ic_default_screen.png b/res/drawable-xhdpi/ic_default_screen.png new file mode 100644 index 000000000..735332ae5 Binary files /dev/null and b/res/drawable-xhdpi/ic_default_screen.png differ diff --git a/res/drawable-xhdpi/ic_default_screen_pressed.png b/res/drawable-xhdpi/ic_default_screen_pressed.png new file mode 100644 index 000000000..11dede0a0 Binary files /dev/null and b/res/drawable-xhdpi/ic_default_screen_pressed.png differ diff --git a/res/drawable-xxhdpi/ic_default_screen.png b/res/drawable-xxhdpi/ic_default_screen.png new file mode 100644 index 000000000..253bd2d4d Binary files /dev/null and b/res/drawable-xxhdpi/ic_default_screen.png differ diff --git a/res/drawable-xxhdpi/ic_default_screen_pressed.png b/res/drawable-xxhdpi/ic_default_screen_pressed.png new file mode 100644 index 000000000..5367b7abd Binary files /dev/null and b/res/drawable-xxhdpi/ic_default_screen_pressed.png differ diff --git a/res/drawable/above_shadow.xml b/res/drawable/above_shadow.xml new file mode 100644 index 000000000..99db324ab --- /dev/null +++ b/res/drawable/above_shadow.xml @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/res/drawable/below_shadow.xml b/res/drawable/below_shadow.xml new file mode 100644 index 000000000..fc70073a9 --- /dev/null +++ b/res/drawable/below_shadow.xml @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/res/drawable/default_screen_button.xml b/res/drawable/default_screen_button.xml new file mode 100644 index 000000000..ad66137b0 --- /dev/null +++ b/res/drawable/default_screen_button.xml @@ -0,0 +1,19 @@ + + + + + + + + + \ No newline at end of file diff --git a/res/drawable/launcheranimatedarrow_00000.png b/res/drawable/launcheranimatedarrow_00000.png new file mode 100644 index 000000000..2ed7fe9a7 Binary files /dev/null and b/res/drawable/launcheranimatedarrow_00000.png differ diff --git a/res/drawable/launcheranimatedarrow_00001.png b/res/drawable/launcheranimatedarrow_00001.png new file mode 100644 index 000000000..f3707e07c Binary files /dev/null and b/res/drawable/launcheranimatedarrow_00001.png differ diff --git a/res/drawable/launcheranimatedarrow_00002.png b/res/drawable/launcheranimatedarrow_00002.png new file mode 100644 index 000000000..3549389d0 Binary files /dev/null and b/res/drawable/launcheranimatedarrow_00002.png differ diff --git a/res/drawable/launcheranimatedarrow_00003.png b/res/drawable/launcheranimatedarrow_00003.png new file mode 100644 index 000000000..891e86c42 Binary files /dev/null and b/res/drawable/launcheranimatedarrow_00003.png differ diff --git a/res/drawable/launcheranimatedarrow_00004.png b/res/drawable/launcheranimatedarrow_00004.png new file mode 100644 index 000000000..7cfb1ef8c Binary files /dev/null and b/res/drawable/launcheranimatedarrow_00004.png differ diff --git a/res/drawable/launcheranimatedarrow_00005.png b/res/drawable/launcheranimatedarrow_00005.png new file mode 100644 index 000000000..121f4d516 Binary files /dev/null and b/res/drawable/launcheranimatedarrow_00005.png differ diff --git a/res/drawable/launcheranimatedarrow_00006.png b/res/drawable/launcheranimatedarrow_00006.png new file mode 100644 index 000000000..3a38e71f7 Binary files /dev/null and b/res/drawable/launcheranimatedarrow_00006.png differ diff --git a/res/drawable/launcheranimatedarrow_00007.png b/res/drawable/launcheranimatedarrow_00007.png new file mode 100644 index 000000000..e81a719fd Binary files /dev/null and b/res/drawable/launcheranimatedarrow_00007.png differ diff --git a/res/drawable/launcheranimatedarrow_00008.png b/res/drawable/launcheranimatedarrow_00008.png new file mode 100644 index 000000000..bd6f40981 Binary files /dev/null and b/res/drawable/launcheranimatedarrow_00008.png differ diff --git a/res/drawable/launcheranimatedarrow_00009.png b/res/drawable/launcheranimatedarrow_00009.png new file mode 100644 index 000000000..c7cb60daf Binary files /dev/null and b/res/drawable/launcheranimatedarrow_00009.png differ diff --git a/res/drawable/launcheranimatedarrow_00010.png b/res/drawable/launcheranimatedarrow_00010.png new file mode 100644 index 000000000..1bf30dcc3 Binary files /dev/null and b/res/drawable/launcheranimatedarrow_00010.png differ diff --git a/res/drawable/launcheranimatedarrow_00011.png b/res/drawable/launcheranimatedarrow_00011.png new file mode 100644 index 000000000..3cb598806 Binary files /dev/null and b/res/drawable/launcheranimatedarrow_00011.png differ diff --git a/res/drawable/launcheranimatedarrow_00012.png b/res/drawable/launcheranimatedarrow_00012.png new file mode 100644 index 000000000..58070de06 Binary files /dev/null and b/res/drawable/launcheranimatedarrow_00012.png differ diff --git a/res/drawable/launcheranimatedarrow_00013.png b/res/drawable/launcheranimatedarrow_00013.png new file mode 100644 index 000000000..810d0a229 Binary files /dev/null and b/res/drawable/launcheranimatedarrow_00013.png differ diff --git a/res/drawable/launcheranimatedarrow_00014.png b/res/drawable/launcheranimatedarrow_00014.png new file mode 100644 index 000000000..3f9e51861 Binary files /dev/null and b/res/drawable/launcheranimatedarrow_00014.png differ diff --git a/res/drawable/launcheranimatedarrow_00015.png b/res/drawable/launcheranimatedarrow_00015.png new file mode 100644 index 000000000..348bfbbc6 Binary files /dev/null and b/res/drawable/launcheranimatedarrow_00015.png differ diff --git a/res/drawable/launcheranimatedarrow_00016.png b/res/drawable/launcheranimatedarrow_00016.png new file mode 100644 index 000000000..5b0b28649 Binary files /dev/null and b/res/drawable/launcheranimatedarrow_00016.png differ diff --git a/res/drawable/listitem_bg.xml b/res/drawable/listitem_bg.xml new file mode 100644 index 000000000..be1fedbe5 --- /dev/null +++ b/res/drawable/listitem_bg.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/res/drawable/listitem_text.xml b/res/drawable/listitem_text.xml new file mode 100644 index 000000000..9637fd308 --- /dev/null +++ b/res/drawable/listitem_text.xml @@ -0,0 +1,6 @@ + + + + + diff --git a/res/drawable/transition_arrow.xml b/res/drawable/transition_arrow.xml new file mode 100644 index 000000000..540db93d8 --- /dev/null +++ b/res/drawable/transition_arrow.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + diff --git a/res/drawable/transition_arrow_reverse.xml b/res/drawable/transition_arrow_reverse.xml new file mode 100644 index 000000000..855f08fb4 --- /dev/null +++ b/res/drawable/transition_arrow_reverse.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + diff --git a/res/layout/overview_panel.xml b/res/layout/overview_panel.xml index 1f02dce3c..5698c86a9 100644 --- a/res/layout/overview_panel.xml +++ b/res/layout/overview_panel.xml @@ -14,53 +14,130 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - - - - - + + - - \ No newline at end of file + android:layout_gravity="center_horizontal" + android:background="@color/slideup_panel_bg_color" + android:paddingTop="@dimen/overview_panel_top_padding" > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/layout/settings_pane_list_header.xml b/res/layout/settings_pane_list_header.xml new file mode 100644 index 000000000..2429b9b81 --- /dev/null +++ b/res/layout/settings_pane_list_header.xml @@ -0,0 +1,19 @@ + + + + \ No newline at end of file diff --git a/res/layout/settings_pane_list_item.xml b/res/layout/settings_pane_list_item.xml new file mode 100644 index 000000000..58b2de862 --- /dev/null +++ b/res/layout/settings_pane_list_item.xml @@ -0,0 +1,38 @@ + + + + + + \ No newline at end of file diff --git a/res/values/attrs.xml b/res/values/attrs.xml index d7f9ef4fa..787e5ca23 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -134,4 +134,14 @@ + + + + + + + + + + diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml index 4ec60147f..e31fed119 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -18,9 +18,45 @@ Trebuchet + HOME SCREEN SETTINGS + DRAWER SETTINGS + APP SETTINGS + + + ON + OFF + DISABLED + Google Play + + Scroll wallpaper + + + Grid size + Comfortable + Cozy + Condensed + Custom (%1$d \u00d7 %2$d) + Select custom size + + + Search bar + + + Larger icons + + + Icon labels + Show + Hide + + + Protected apps + + + A search activity could not be found! diff --git a/res/values/colors.xml b/res/values/colors.xml index b70e1f895..0cad1cefc 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -36,6 +36,7 @@ #FFF #FFF5F5F5 #76000000 + #FF374248 #FFFFFFFF @@ -53,6 +54,9 @@ #C4C4C4 #263238 + + #FF6cd2ea + @android:color/white @android:color/darker_gray #CC14191E diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 799ea9803..8c64ef0c5 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -145,7 +145,7 @@ 4dp 2dp - 20dp + 8dp 2dp @@ -158,4 +158,13 @@ 300 100 + + 175dp + 20dp + 50dp + 30dp + 16dp + 60dp + 50dp + diff --git a/res/values/preferences_defaults.xml b/res/values/preferences_defaults.xml new file mode 100644 index 000000000..9eb5ca58f --- /dev/null +++ b/res/values/preferences_defaults.xml @@ -0,0 +1,9 @@ + + + true + true + false + false + false + false + -- cgit v1.2.3