diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2016-08-22 16:00:03 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2016-09-06 15:24:36 -0700 |
commit | 2100c78bd903456a11a0ed03602419b21f6a2766 (patch) | |
tree | 371efdeab60e16b9510003d7f6479c3c147b78bb /src/com/android/launcher3/util/ActivityResultInfo.java | |
parent | 45b9fd280a6b74dd96c4d1d3cf635a47e1215eae (diff) | |
download | android_packages_apps_Trebuchet-2100c78bd903456a11a0ed03602419b21f6a2766.tar.gz android_packages_apps_Trebuchet-2100c78bd903456a11a0ed03602419b21f6a2766.tar.bz2 android_packages_apps_Trebuchet-2100c78bd903456a11a0ed03602419b21f6a2766.zip |
Launcher restore state fixes:
> Creating PendingRequestArgs to store generic request info across
activity instances
> Storing the CALL_PHONE request in PendingRequestArgs
> Handling onActivityResult only after the workspace has loaded.
onActivityResult sometimes modifies launcher db when removing empty
screens, and any add action is also deferred until bindComplete.
This simplifies this logic.
> Always binding the restored page irrespective of pending result.
Before starting a request activity (bind widget permission, or
widget config activity or shortcut picker), workspace commits the
pending screen id to the DB. Hence the restore page is valid when
restore is called (onResume loads with currentPage instead of
restored page)
Bug: 28573143
Change-Id: I34be603cbeb2145f5caf0d18e016f50029e07df8
Diffstat (limited to 'src/com/android/launcher3/util/ActivityResultInfo.java')
-rw-r--r-- | src/com/android/launcher3/util/ActivityResultInfo.java | 70 |
1 files changed, 70 insertions, 0 deletions
diff --git a/src/com/android/launcher3/util/ActivityResultInfo.java b/src/com/android/launcher3/util/ActivityResultInfo.java new file mode 100644 index 000000000..2261bee8c --- /dev/null +++ b/src/com/android/launcher3/util/ActivityResultInfo.java @@ -0,0 +1,70 @@ +/* + * Copyright (C) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.launcher3.util; + +import android.content.Intent; +import android.os.Parcel; +import android.os.Parcelable; + +/** + * Utility class which stores information from onActivityResult + */ +public class ActivityResultInfo implements Parcelable { + + public final int requestCode; + public final int resultCode; + public final Intent data; + + public ActivityResultInfo(int requestCode, int resultCode, Intent data) { + this.requestCode = requestCode; + this.resultCode = resultCode; + this.data = data; + } + + private ActivityResultInfo(Parcel parcel) { + requestCode = parcel.readInt(); + resultCode = parcel.readInt(); + data = parcel.readInt() != 0 ? Intent.CREATOR.createFromParcel(parcel) : null; + } + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + dest.writeInt(requestCode); + dest.writeInt(resultCode); + if (data != null) { + dest.writeInt(1); + data.writeToParcel(dest, flags); + } else { + dest.writeInt(0); + } + } + + public static final Parcelable.Creator<ActivityResultInfo> CREATOR = + new Parcelable.Creator<ActivityResultInfo>() { + public ActivityResultInfo createFromParcel(Parcel source) { + return new ActivityResultInfo(source); + } + + public ActivityResultInfo[] newArray(int size) { + return new ActivityResultInfo[size]; + } + }; +} |