diff options
| author | Raj Yengisetty <rajesh@cyngn.com> | 2014-11-10 10:35:01 -0800 |
|---|---|---|
| committer | Adnan <adnan@cyngn.com> | 2014-11-19 15:53:57 -0800 |
| commit | ec033982ef151a1e226ce452f64518879bd5a696 (patch) | |
| tree | 89386ed54a7c65946afdf31abb9a98f3fb2549b6 /src/com/android/launcher3/list | |
| parent | ae6b7551e4c92fa942b11788f401842aedc24d91 (diff) | |
| download | android_packages_apps_Trebuchet-ec033982ef151a1e226ce452f64518879bd5a696.tar.gz android_packages_apps_Trebuchet-ec033982ef151a1e226ce452f64518879bd5a696.tar.bz2 android_packages_apps_Trebuchet-ec033982ef151a1e226ce452f64518879bd5a696.zip | |
Re-add Fade side pages and Page outline options.
Conflicts:
res/layout/settings_transitions_screen.xml
src/com/android/launcher3/TransitionEffectsFragment.java
Change-Id: Iaab1dbd980d065e631d8f3cfe363f3a0b5897f86
Diffstat (limited to 'src/com/android/launcher3/list')
| -rw-r--r-- | src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java b/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java index 8399db6dd..5fcba7a4f 100644 --- a/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java +++ b/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java @@ -283,7 +283,7 @@ public class SettingsPinnedHeaderAdapter extends PinnedHeaderListAdapter { mLauncher.onClickTransitionEffectButton(v, true); break; case 1: - onClickTransitionEffectButton(); + onClickSortButton(); break; case 2: onIconLabelsBooleanChanged(v, @@ -351,7 +351,7 @@ public class SettingsPinnedHeaderAdapter extends PinnedHeaderListAdapter { ((TextView) v.findViewById(R.id.item_state)).setText(state); } - private void onClickTransitionEffectButton() { + private void onClickSortButton() { int sort = SettingsProvider.getIntCustomDefault(mLauncher, SettingsProvider.SETTINGS_UI_DRAWER_SORT_MODE, 0); |