diff options
author | Winson Chung <winsonc@google.com> | 2013-11-06 13:23:29 -0800 |
---|---|---|
committer | Danesh M <daneshm90@gmail.com> | 2014-06-06 00:26:02 -0700 |
commit | ce6ccc71c3a537e5affd54b3047e944e8d0388cc (patch) | |
tree | e39c510e24131593999d63b3375314b20a658b6b /res | |
parent | 22d41d5089cd720dd0d53c24ee06341bb8e6108f (diff) | |
download | android_packages_apps_Trebuchet-ce6ccc71c3a537e5affd54b3047e944e8d0388cc.tar.gz android_packages_apps_Trebuchet-ce6ccc71c3a537e5affd54b3047e944e8d0388cc.tar.bz2 android_packages_apps_Trebuchet-ce6ccc71c3a537e5affd54b3047e944e8d0388cc.zip |
Dyanmically lay out overview mode across all orientations and form factors.
Change-Id: I788bbf289717b30b19afc9ad9d611c85715bc623
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable-mdpi/ic_setting.png | bin | 1669 -> 0 bytes | |||
-rw-r--r-- | res/drawable-mdpi/ic_setting_pressed.png | bin | 1868 -> 0 bytes | |||
-rw-r--r-- | res/drawable/setting_button.xml | 21 | ||||
-rw-r--r-- | res/layout-land/launcher.xml | 13 | ||||
-rw-r--r-- | res/values/config.xml | 5 | ||||
-rw-r--r-- | res/values/dimens.xml | 3 |
6 files changed, 8 insertions, 34 deletions
diff --git a/res/drawable-mdpi/ic_setting.png b/res/drawable-mdpi/ic_setting.png Binary files differdeleted file mode 100644 index 0c8ae9d65..000000000 --- a/res/drawable-mdpi/ic_setting.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_setting_pressed.png b/res/drawable-mdpi/ic_setting_pressed.png Binary files differdeleted file mode 100644 index 846091f58..000000000 --- a/res/drawable-mdpi/ic_setting_pressed.png +++ /dev/null diff --git a/res/drawable/setting_button.xml b/res/drawable/setting_button.xml deleted file mode 100644 index 4d66a1ac7..000000000 --- a/res/drawable/setting_button.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 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. ---> - -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_focused="true" android:drawable="@drawable/ic_setting_pressed" /> - <item android:state_pressed="true" android:drawable="@drawable/ic_setting_pressed" /> - <item android:drawable="@drawable/ic_setting" /> -</selector> diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml index a50fc5d67..ab7cdeeda 100644 --- a/res/layout-land/launcher.xml +++ b/res/layout-land/launcher.xml @@ -73,19 +73,6 @@ android:layout_height="match_parent" android:visibility="gone" /> - <!-- TODO: Fix - <com.android.launcher3.DrawableStateProxyView - android:id="@+id/voice_button_proxy" - android:layout_width="0dp" - android:layout_height="0dp" - android:layout_gravity="top|start" - android:layout_marginTop="64dp" - android:clickable="true" - android:onClick="onClickVoiceButton" - android:importantForAccessibility="no" - launcher:sourceViewId="@+id/voice_button" /> - --> - <include layout="@layout/apps_customize_pane" android:id="@+id/apps_customize_pane" android:layout_width="match_parent" diff --git a/res/values/config.xml b/res/values/config.xml index c4bec6040..c960f321d 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -3,6 +3,10 @@ <integer name="config_dynamic_grid_max_long_edge_cell_count">6</integer> <integer name="config_dynamic_grid_max_short_edge_cell_count">5</integer> <integer name="config_dynamic_grid_min_edge_cell_count">3</integer> + <!-- Out of 100, the percent of space the overview bar should try and take vertically. --> + <integer name="config_dynamic_grid_overview_icon_zone_percentage">20</integer> + <!-- Out of 100, the percent to shrink the workspace during overview mode. --> + <integer name="config_dynamic_grid_overview_scale_percentage">80</integer> <!-- Miscellaneous --> <bool name="config_largeHeap">false</bool> @@ -25,6 +29,7 @@ <!-- Out of 100, the percent to shrink the workspace during spring loaded mode. --> <integer name="config_workspaceSpringLoadShrinkPercentage">80</integer> + <!-- Out of 100, the percent to shrink the workspace during overview mode. --> <integer name="config_workspaceOverviewShrinkPercentage">90</integer> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index c1adc736e..a550110a3 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -23,6 +23,9 @@ <dimen name="dynamic_grid_icon_drawable_padding">4dp</dimen> <dimen name="dynamic_grid_all_apps_cell_padding">18dp</dimen> <dimen name="dynamic_grid_workspace_page_spacing">8dp</dimen> + <dimen name="dynamic_grid_overview_min_icon_zone_height">80dp</dimen> + <dimen name="dynamic_grid_overview_max_icon_zone_height">120dp</dimen> + <dimen name="dynamic_grid_overview_bar_max_width">280dp</dimen> <!-- Wallpaper picker --> <dimen name="wallpaperThumbnailWidth">106.5dp</dimen> |