diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-07-24 03:11:18 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-07-24 03:11:18 +0000 |
| commit | b57fdd8c1f1432ca9fac6341d31e4f6480f81fe9 (patch) | |
| tree | e2003e2c725af3ad315785900612547489670586 /src/com/android/launcher3/BaseActivity.java | |
| parent | 05bf5b98860c5fe90f0c01813078f619a82e107a (diff) | |
| parent | 64a75aa305bdd1ca8f22d2b48dedc5cada8fabc5 (diff) | |
| download | android_packages_apps_Trebuchet-b57fdd8c1f1432ca9fac6341d31e4f6480f81fe9.tar.gz android_packages_apps_Trebuchet-b57fdd8c1f1432ca9fac6341d31e4f6480f81fe9.tar.bz2 android_packages_apps_Trebuchet-b57fdd8c1f1432ca9fac6341d31e4f6480f81fe9.zip | |
Merge "Adding A feature flag to disable widgets and a corresponding build target Launcher3Go without widgets support" into ub-launcher3-dorval-polish2
Diffstat (limited to 'src/com/android/launcher3/BaseActivity.java')
| -rw-r--r-- | src/com/android/launcher3/BaseActivity.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/launcher3/BaseActivity.java b/src/com/android/launcher3/BaseActivity.java index 2b59ede47..e49649502 100644 --- a/src/com/android/launcher3/BaseActivity.java +++ b/src/com/android/launcher3/BaseActivity.java @@ -19,6 +19,7 @@ package com.android.launcher3; import android.app.Activity; import android.content.Context; import android.content.ContextWrapper; +import android.content.Intent; import android.view.View.AccessibilityDelegate; import com.android.launcher3.logging.UserEventDispatcher; @@ -63,4 +64,9 @@ public abstract class BaseActivity extends Activity { } return mSystemUiController; } + + @Override + public void onActivityResult(int requestCode, int resultCode, Intent data) { + super.onActivityResult(requestCode, resultCode, data); + } } |