diff options
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 21 | ||||
| -rw-r--r-- | src/com/android/launcher3/TransitionEffectsFragment.java | 1 |
2 files changed, 9 insertions, 13 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 42eb26b2a..a9ea9c75f 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -1425,17 +1425,11 @@ public class Launcher extends Activity pageOutlines.setVisible(!drawer); pageOutlines.setChecked(SettingsProvider.getBoolean(this, SettingsProvider.SETTINGS_UI_HOMESCREEN_SCROLLING_PAGE_OUTLINES, - R.bool.preferences_interface_homescreen_scrolling_page_outlines_default - )); + R.bool.preferences_interface_homescreen_scrolling_page_outlines_default)); fadeAdjacent.setChecked(SettingsProvider.getBoolean(this, - !drawer ? - SettingsProvider.SETTINGS_UI_HOMESCREEN_SCROLLING_FADE_ADJACENT : - SettingsProvider.SETTINGS_UI_DRAWER_SCROLLING_FADE_ADJACENT, - !drawer ? - R.bool.preferences_interface_homescreen_scrolling_fade_adjacent_default : - R.bool.preferences_interface_drawer_scrolling_fade_adjacent_default - )); + SettingsProvider.SETTINGS_UI_HOMESCREEN_SCROLLING_FADE_ADJACENT, + R.bool.preferences_interface_homescreen_scrolling_fade_adjacent_default)); final PagedView pagedView = !drawer ? mWorkspace : mAppsCustomizeContent; @@ -1445,14 +1439,15 @@ public class Launcher extends Activity switch (item.getItemId()) { case R.id.scrolling_page_outlines: SettingsProvider.get(Launcher.this).edit() - .putBoolean(SettingsProvider.SETTINGS_UI_HOMESCREEN_SCROLLING_PAGE_OUTLINES, !item.isChecked()).commit(); + .putBoolean(SettingsProvider.SETTINGS_UI_HOMESCREEN_SCROLLING_PAGE_OUTLINES, + !item.isChecked()).commit(); mWorkspace.setShowOutlines(!item.isChecked()); break; case R.id.scrolling_fade_adjacent: SettingsProvider.get(Launcher.this).edit() - .putBoolean(!drawer ? - SettingsProvider.SETTINGS_UI_HOMESCREEN_SCROLLING_FADE_ADJACENT : - SettingsProvider.SETTINGS_UI_DRAWER_SCROLLING_FADE_ADJACENT, !item.isChecked()).commit(); + .putBoolean( + SettingsProvider.SETTINGS_UI_HOMESCREEN_SCROLLING_FADE_ADJACENT, + !item.isChecked()).commit(); pagedView.setFadeInAdjacentScreens(!item.isChecked()); break; default: diff --git a/src/com/android/launcher3/TransitionEffectsFragment.java b/src/com/android/launcher3/TransitionEffectsFragment.java index 5fb5d22b7..22b6df735 100644 --- a/src/com/android/launcher3/TransitionEffectsFragment.java +++ b/src/com/android/launcher3/TransitionEffectsFragment.java @@ -99,6 +99,7 @@ public class TransitionEffectsFragment extends Fragment { } }); View options = v.findViewById(R.id.transition_options_menu); + options.setVisibility(mIsDrawer ? View.GONE : View.VISIBLE); options.setOnClickListener(new OnClickListener() { @Override public void onClick(View view) { |