summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/Launcher.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/launcher3/Launcher.java')
-rw-r--r--src/com/android/launcher3/Launcher.java34
1 files changed, 28 insertions, 6 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 56a757b60..e36ec9387 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -395,6 +395,7 @@ public class Launcher extends Activity
// Preferences
private boolean mHideIconLabels;
+ private AppDrawerListAdapter.DrawerType mDrawerType;
private Runnable mBuildLayersRunnable = new Runnable() {
public void run() {
@@ -569,6 +570,10 @@ public class Launcher extends Activity
mHideIconLabels = SettingsProvider.getBoolean(this,
SettingsProvider.SETTINGS_UI_HOMESCREEN_HIDE_ICON_LABELS,
R.bool.preferences_interface_homescreen_hide_icon_labels_default);
+ mDrawerType = AppDrawerListAdapter.DrawerType.getModeForValue(
+ SettingsProvider.getInt(this,
+ SettingsProvider.SETTINGS_UI_DRAWER_TYPE,
+ R.integer.preferences_interface_drawer_type_default));
// Determine the dynamic grid properties
Point smallestSize = new Point();
@@ -1263,6 +1268,13 @@ public class Launcher extends Activity
return false;
}
+ public void updateDrawerType() {
+ mDrawerType = AppDrawerListAdapter.DrawerType.getModeForValue(
+ SettingsProvider.getInt(this,
+ SettingsProvider.SETTINGS_UI_DRAWER_TYPE,
+ R.integer.preferences_interface_drawer_type_default));
+ }
+
public void onClickSortModeButton(View v) {
final PopupMenu popupMenu = new PopupMenu(this, v);
final Menu menu = popupMenu.getMenu();
@@ -3626,7 +3638,7 @@ public class Launcher extends Activity
}
boolean material = Utilities.isLmpOrAbove();
-
+ boolean drawer = mDrawerType == AppDrawerListAdapter.DrawerType.Drawer;
final Resources res = getResources();
final int duration = res.getInteger(R.integer.config_appsCustomizeZoomInTime);
@@ -3639,7 +3651,7 @@ public class Launcher extends Activity
final View fromView = mWorkspace;
final View toView;
- if (contentType == AppsCustomizePagedView.ContentType.Applications) {
+ if (drawer && contentType == AppsCustomizePagedView.ContentType.Applications) {
toView = findViewById(R.id.app_drawer_container);
} else {
toView = mAppsCustomizeTabHost;
@@ -3675,7 +3687,11 @@ public class Launcher extends Activity
if (isWidgetTray) {
revealView.setBackground(res.getDrawable(R.drawable.quantum_panel_dark));
} else {
- revealView.setBackgroundColor(res.getColor(R.color.app_drawer_background));
+ if (drawer) {
+ revealView.setBackgroundColor(res.getColor(R.color.app_drawer_background));
+ } else {
+ revealView.setBackground(res.getDrawable(R.drawable.quantum_panel));
+ }
}
// Hide the real page background, and swap in the fake one
@@ -3901,6 +3917,7 @@ public class Launcher extends Activity
}
boolean material = Utilities.isLmpOrAbove();
+ boolean drawer = mDrawerType == AppDrawerListAdapter.DrawerType.Drawer;
final Resources res = getResources();
final int duration = res.getInteger(R.integer.config_appsCustomizeZoomOutTime);
@@ -3913,7 +3930,8 @@ public class Launcher extends Activity
res.getInteger(R.integer.config_appsCustomizeZoomScaleFactor);
final View fromView;
- if (mAppsCustomizeContent.getContentType() != AppsCustomizePagedView.ContentType.Widgets) {
+ if (drawer && mAppsCustomizeContent.getContentType()
+ != AppsCustomizePagedView.ContentType.Widgets) {
fromView = (FrameLayout) findViewById(R.id.app_drawer_container);
} else {
fromView = mAppsCustomizeTabHost;
@@ -3969,8 +3987,12 @@ public class Launcher extends Activity
if (isWidgetTray) {
revealView.setBackground(res.getDrawable(R.drawable.quantum_panel_dark));
} else {
- revealView.setBackgroundColor(res.getColor(
- R.color.app_drawer_background));
+ if (drawer) {
+ revealView.setBackgroundColor(res.getColor(
+ R.color.app_drawer_background));
+ } else {
+ revealView.setBackground(res.getDrawable(R.drawable.quantum_panel));
+ }
}
int width = revealView.getMeasuredWidth();