diff options
| author | Raj Yengisetty <rajesh@cyngn.com> | 2015-07-09 16:06:11 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2015-07-13 12:13:00 -0700 |
| commit | 16570fb9d49f31991f38e7eeda7ed7a15178ff5d (patch) | |
| tree | 371da6d60bf14ef51dfa02a6c1fd88e85c337c84 | |
| parent | 926df567b6599397ec834dfc6efa2a98f5b9226c (diff) | |
| download | android_packages_apps_Trebuchet-16570fb9d49f31991f38e7eeda7ed7a15178ff5d.tar.gz android_packages_apps_Trebuchet-16570fb9d49f31991f38e7eeda7ed7a15178ff5d.tar.bz2 android_packages_apps_Trebuchet-16570fb9d49f31991f38e7eeda7ed7a15178ff5d.zip | |
Fade Adjacent Screens: disable this feature for App Drawer (paged)
If enabled on App Drawer it causes some jank when opening the App Drawer
because of the circular reveal anim (the apps flash visible and then go
invisible at the start of the anim).
Also if toggled on and then toggled off, some screens in the App Drawer
become invisible.
Change-Id: Ib7031e9626ce3be56fa0e06ac6394c8e8430ab99
| -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) { |