diff options
| author | Hyunyoung Song <hyunyoungs@google.com> | 2016-05-10 20:49:13 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-05-10 20:49:13 +0000 |
| commit | adb8eb5a34ea3a31e4ac062e18aebb939e1f7567 (patch) | |
| tree | 3d31f243720287f7a92dc3a250182986a35b8e4e | |
| parent | 6b360f684da3bf4d36643a4325dec2d659900da9 (diff) | |
| parent | bc5d623845e8e6e50254064c054c344a7246330b (diff) | |
| download | android_packages_apps_Trebuchet-adb8eb5a34ea3a31e4ac062e18aebb939e1f7567.tar.gz android_packages_apps_Trebuchet-adb8eb5a34ea3a31e4ac062e18aebb939e1f7567.tar.bz2 android_packages_apps_Trebuchet-adb8eb5a34ea3a31e4ac062e18aebb939e1f7567.zip | |
Merge "Widgets tray should preserve scroll position during screen rotation" into ub-launcher3-calgary
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 3 | ||||
| -rw-r--r-- | src/com/android/launcher3/widget/WidgetsRecyclerView.java | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 2a8329934..eacf72aa1 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -1956,9 +1956,6 @@ public class Launcher extends Activity outState.putInt(RUNTIME_STATE_PENDING_ADD_WIDGET_ID, mPendingAddWidgetId); } - // Save the current widgets tray? - // TODO(hyunyoungs) - if (mLauncherCallbacks != null) { mLauncherCallbacks.onSaveInstanceState(outState); } diff --git a/src/com/android/launcher3/widget/WidgetsRecyclerView.java b/src/com/android/launcher3/widget/WidgetsRecyclerView.java index fe9c51c44..9c13b44fc 100644 --- a/src/com/android/launcher3/widget/WidgetsRecyclerView.java +++ b/src/com/android/launcher3/widget/WidgetsRecyclerView.java @@ -23,7 +23,6 @@ import android.support.v7.widget.LinearLayoutManager; import android.util.AttributeSet; import android.view.View; import com.android.launcher3.BaseRecyclerView; -import com.android.launcher3.R; import com.android.launcher3.model.PackageItemInfo; import com.android.launcher3.model.WidgetsModel; @@ -58,6 +57,9 @@ public class WidgetsRecyclerView extends BaseRecyclerView { protected void onFinishInflate() { super.onFinishInflate(); addOnItemTouchListener(this); + // create a layout manager with Launcher's context so that scroll position + // can be preserved during screen rotation. + setLayoutManager(new LinearLayoutManager(getContext())); } public int getFastScrollerTrackColor(int defaultTrackColor) { |