summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/DynamicGrid.java
diff options
context:
space:
mode:
authorRaj Yengisetty <rajesh@cyngn.com>2014-05-13 23:19:54 -0700
committerfuzz <fuzzzzzzzzzzzzzzzzzz@gmail.com>2014-05-24 12:26:03 +0900
commit82196ead569c25dae76a70be6b2bc147666ea24d (patch)
tree252a9885b63068b590921cab270a6d93cf09bc4f /src/com/android/launcher3/DynamicGrid.java
parent0b4362157fdc930f0eb342194dfb553c80a238bd (diff)
downloadandroid_packages_apps_Trebuchet-82196ead569c25dae76a70be6b2bc147666ea24d.tar.gz
android_packages_apps_Trebuchet-82196ead569c25dae76a70be6b2bc147666ea24d.tar.bz2
android_packages_apps_Trebuchet-82196ead569c25dae76a70be6b2bc147666ea24d.zip
Trebuchet Settings UI Refresh
- Overview Panel contains all Launcher Settings - Accessible through long press on Workspace or HW Menu button - Settings are held in a SlidingPanel in the Overview Panel - Replace the Settings shortcut in Overview Panel with Themes shortcut - Replace widgets icon with new widgets icon from Launcher3 - Trebuchet Settings changes no longer require restarting Process - Transition Effects have PNG Sequence to show animation sequence - Remove PageIndicator click event to open Overview Panel in AppTray Contributors: Adrian Foulk - UX Lead Abishek Devkota - Project Manager Hayden Schoen - UX Designer Change-Id: I2186213960cf12e840e814757894fe104551856b
Diffstat (limited to 'src/com/android/launcher3/DynamicGrid.java')
-rw-r--r--src/com/android/launcher3/DynamicGrid.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/launcher3/DynamicGrid.java b/src/com/android/launcher3/DynamicGrid.java
index 6457fdc31..574e9e566 100644
--- a/src/com/android/launcher3/DynamicGrid.java
+++ b/src/com/android/launcher3/DynamicGrid.java
@@ -377,6 +377,11 @@ class DeviceProfile {
}
public void layout(Launcher launcher) {
+ // Update search bar for live settings
+ searchBarVisible = SettingsProvider.getBoolean(launcher, SettingsProvider.SETTINGS_UI_HOMESCREEN_SEARCH,
+ R.bool.preferences_interface_homescreen_search_default);
+ searchBarSpaceHeightPx = searchBarHeightPx + (searchBarVisible ? 2 * edgeMarginPx : 0);
+
FrameLayout.LayoutParams lp;
Resources res = launcher.getResources();
boolean hasVerticalBarLayout = isVerticalBarLayout();
@@ -493,7 +498,7 @@ class DeviceProfile {
lp.gravity = Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM;
lp.width = LayoutParams.WRAP_CONTENT;
lp.height = LayoutParams.WRAP_CONTENT;
- lp.bottomMargin = hotseatBarHeightPx;
+ lp.bottomMargin = Math.max(hotseatBarHeightPx, lp.bottomMargin);
pageIndicator.setLayoutParams(lp);
}
}