Steve McKay | d0a2a2c | 2015-03-25 14:35:33 -0700 | [diff] [blame] | 1 | /* |
| 2 | * Copyright (C) 2015 The Android Open Source Project |
| 3 | * |
| 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | * you may not use this file except in compliance with the License. |
| 6 | * You may obtain a copy of the License at |
| 7 | * |
| 8 | * http://www.apache.org/licenses/LICENSE-2.0 |
| 9 | * |
| 10 | * Unless required by applicable law or agreed to in writing, software |
| 11 | * distributed under the License is distributed on an "AS IS" BASIS, |
| 12 | * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| 13 | * See the License for the specific language governing permissions and |
| 14 | * limitations under the License. |
| 15 | */ |
| 16 | |
| 17 | package com.android.documentsui; |
| 18 | |
Steve McKay | d0a2a2c | 2015-03-25 14:35:33 -0700 | [diff] [blame] | 19 | import static com.android.documentsui.DirectoryFragment.ANIM_DOWN; |
| 20 | import static com.android.documentsui.DirectoryFragment.ANIM_NONE; |
Steve McKay | d0a2a2c | 2015-03-25 14:35:33 -0700 | [diff] [blame] | 21 | import static com.android.documentsui.DirectoryFragment.ANIM_UP; |
Ben Kwa | cb4461f | 2015-05-05 11:50:11 -0700 | [diff] [blame^] | 22 | |
Steve McKay | d0a2a2c | 2015-03-25 14:35:33 -0700 | [diff] [blame] | 23 | import android.app.Activity; |
Steve McKay | d0a2a2c | 2015-03-25 14:35:33 -0700 | [diff] [blame] | 24 | import android.app.FragmentManager; |
| 25 | import android.content.ActivityNotFoundException; |
| 26 | import android.content.ClipData; |
Steve McKay | d0a2a2c | 2015-03-25 14:35:33 -0700 | [diff] [blame] | 27 | import android.content.ContentResolver; |
| 28 | import android.content.ContentValues; |
| 29 | import android.content.Context; |
| 30 | import android.content.Intent; |
Steve McKay | d0a2a2c | 2015-03-25 14:35:33 -0700 | [diff] [blame] | 31 | import android.net.Uri; |
Steve McKay | d0a2a2c | 2015-03-25 14:35:33 -0700 | [diff] [blame] | 32 | import android.os.Bundle; |
Steve McKay | d0a2a2c | 2015-03-25 14:35:33 -0700 | [diff] [blame] | 33 | import android.provider.DocumentsContract; |
Steve McKay | b68dd22 | 2015-04-20 17:18:15 -0700 | [diff] [blame] | 34 | import android.provider.DocumentsContract.Root; |
Steve McKay | d0a2a2c | 2015-03-25 14:35:33 -0700 | [diff] [blame] | 35 | import android.util.Log; |
Steve McKay | d0a2a2c | 2015-03-25 14:35:33 -0700 | [diff] [blame] | 36 | import android.view.Menu; |
| 37 | import android.view.MenuItem; |
Steve McKay | d0a2a2c | 2015-03-25 14:35:33 -0700 | [diff] [blame] | 38 | import android.view.View; |
Steve McKay | d0a2a2c | 2015-03-25 14:35:33 -0700 | [diff] [blame] | 39 | import android.widget.BaseAdapter; |
Steve McKay | d0a2a2c | 2015-03-25 14:35:33 -0700 | [diff] [blame] | 40 | import android.widget.Spinner; |
Steve McKay | d0a2a2c | 2015-03-25 14:35:33 -0700 | [diff] [blame] | 41 | import android.widget.Toast; |
| 42 | import android.widget.Toolbar; |
| 43 | |
| 44 | import com.android.documentsui.RecentsProvider.ResumeColumns; |
| 45 | import com.android.documentsui.model.DocumentInfo; |
| 46 | import com.android.documentsui.model.DocumentStack; |
| 47 | import com.android.documentsui.model.DurableUtils; |
| 48 | import com.android.documentsui.model.RootInfo; |
| 49 | |
Tomasz Mikolajewski | 332d819 | 2015-04-13 19:38:43 +0900 | [diff] [blame] | 50 | import java.util.ArrayList; |
Steve McKay | d0a2a2c | 2015-03-25 14:35:33 -0700 | [diff] [blame] | 51 | import java.util.Arrays; |
Steve McKay | d0a2a2c | 2015-03-25 14:35:33 -0700 | [diff] [blame] | 52 | import java.util.List; |
Steve McKay | d0a2a2c | 2015-03-25 14:35:33 -0700 | [diff] [blame] | 53 | |
Steve McKay | b68dd22 | 2015-04-20 17:18:15 -0700 | [diff] [blame] | 54 | /** |
| 55 | * Activity providing a directly launchable file management activity. |
| 56 | */ |
Steve McKay | d0a2a2c | 2015-03-25 14:35:33 -0700 | [diff] [blame] | 57 | public class StandaloneActivity extends BaseActivity { |
| 58 | public static final String TAG = "StandaloneFileManagement"; |
| 59 | |
Steve McKay | d0a2a2c | 2015-03-25 14:35:33 -0700 | [diff] [blame] | 60 | private Toolbar mToolbar; |
| 61 | private Spinner mToolbarStack; |
Steve McKay | d0a2a2c | 2015-03-25 14:35:33 -0700 | [diff] [blame] | 62 | private Toolbar mRootsToolbar; |
Steve McKay | d0a2a2c | 2015-03-25 14:35:33 -0700 | [diff] [blame] | 63 | private DirectoryContainerView mDirectoryContainer; |
Steve McKay | d0a2a2c | 2015-03-25 14:35:33 -0700 | [diff] [blame] | 64 | private State mState; |
Steve McKay | b68dd22 | 2015-04-20 17:18:15 -0700 | [diff] [blame] | 65 | private ItemSelectedListener mStackListener; |
| 66 | private BaseAdapter mStackAdapter; |
| 67 | |
| 68 | public StandaloneActivity() { |
| 69 | super(TAG); |
| 70 | } |
Steve McKay | d0a2a2c | 2015-03-25 14:35:33 -0700 | [diff] [blame] | 71 | |
| 72 | @Override |
| 73 | public void onCreate(Bundle icicle) { |
Steve McKay | d0a2a2c | 2015-03-25 14:35:33 -0700 | [diff] [blame] | 74 | super.onCreate(icicle); |
| 75 | |
Steve McKay | d0a2a2c | 2015-03-25 14:35:33 -0700 | [diff] [blame] | 76 | setResult(Activity.RESULT_CANCELED); |
| 77 | setContentView(R.layout.activity); |
| 78 | |
| 79 | final Context context = this; |
Steve McKay | d0a2a2c | 2015-03-25 14:35:33 -0700 | [diff] [blame] | 80 | |
Steve McKay | d0a2a2c | 2015-03-25 14:35:33 -0700 | [diff] [blame] | 81 | mDirectoryContainer = (DirectoryContainerView) findViewById(R.id.container_directory); |
| 82 | |
Steve McKay | b68dd22 | 2015-04-20 17:18:15 -0700 | [diff] [blame] | 83 | mState = (icicle != null) |
Ben Kwa | cb4461f | 2015-05-05 11:50:11 -0700 | [diff] [blame^] | 84 | ? icicle.<State> getParcelable(EXTRA_STATE) |
| 85 | : buildDefaultState(); |
Steve McKay | d0a2a2c | 2015-03-25 14:35:33 -0700 | [diff] [blame] | 86 | |
| 87 | mToolbar = (Toolbar) findViewById(R.id.toolbar); |
| 88 | mToolbar.setTitleTextAppearance(context, |
| 89 | android.R.style.TextAppearance_DeviceDefault_Widget_ActionBar_Title); |
| 90 | |
Steve McKay | b68dd22 | 2015-04-20 17:18:15 -0700 | [diff] [blame] | 91 | mStackAdapter = new StackAdapter(); |
| 92 | mStackListener = new ItemSelectedListener(); |
Steve McKay | d0a2a2c | 2015-03-25 14:35:33 -0700 | [diff] [blame] | 93 | mToolbarStack = (Spinner) findViewById(R.id.stack); |
| 94 | mToolbarStack.setOnItemSelectedListener(mStackListener); |
| 95 | |
| 96 | mRootsToolbar = (Toolbar) findViewById(R.id.roots_toolbar); |
| 97 | if (mRootsToolbar != null) { |
| 98 | mRootsToolbar.setTitleTextAppearance(context, |
| 99 | android.R.style.TextAppearance_DeviceDefault_Widget_ActionBar_Title); |
| 100 | } |
| 101 | |
| 102 | setActionBar(mToolbar); |
| 103 | |
| 104 | RootsFragment.show(getFragmentManager(), null); |
| 105 | if (!mState.restored) { |
| 106 | new RestoreStackTask().execute(); |
Tomasz Mikolajewski | 9452c44 | 2015-04-14 16:32:41 +0900 | [diff] [blame] | 107 | |
| 108 | // Show a failure dialog if there was a failed operation. |
Tomasz Mikolajewski | 332d819 | 2015-04-13 19:38:43 +0900 | [diff] [blame] | 109 | final Intent intent = getIntent(); |
Tomasz Mikolajewski | 9452c44 | 2015-04-14 16:32:41 +0900 | [diff] [blame] | 110 | final DocumentStack dstStack = intent.getParcelableExtra(CopyService.EXTRA_STACK); |
Tomasz Mikolajewski | 332d819 | 2015-04-13 19:38:43 +0900 | [diff] [blame] | 111 | final int failure = intent.getIntExtra(CopyService.EXTRA_FAILURE, 0); |
Ben Kwa | cb4461f | 2015-05-05 11:50:11 -0700 | [diff] [blame^] | 112 | final int transferMode = intent.getIntExtra(CopyService.EXTRA_TRANSFER_MODE, |
| 113 | CopyService.TRANSFER_MODE_NONE); |
Tomasz Mikolajewski | 332d819 | 2015-04-13 19:38:43 +0900 | [diff] [blame] | 114 | if (failure != 0) { |
Tomasz Mikolajewski | 9452c44 | 2015-04-14 16:32:41 +0900 | [diff] [blame] | 115 | final ArrayList<DocumentInfo> failedSrcList = |
| 116 | intent.getParcelableArrayListExtra(CopyService.EXTRA_SRC_LIST); |
Ben Kwa | cb4461f | 2015-05-05 11:50:11 -0700 | [diff] [blame^] | 117 | FailureDialogFragment.show(getFragmentManager(), failure, failedSrcList, dstStack, |
| 118 | transferMode); |
Tomasz Mikolajewski | 332d819 | 2015-04-13 19:38:43 +0900 | [diff] [blame] | 119 | } |
Steve McKay | d0a2a2c | 2015-03-25 14:35:33 -0700 | [diff] [blame] | 120 | } else { |
| 121 | onCurrentDirectoryChanged(ANIM_NONE); |
| 122 | } |
| 123 | } |
| 124 | |
Steve McKay | b68dd22 | 2015-04-20 17:18:15 -0700 | [diff] [blame] | 125 | private State buildDefaultState() { |
| 126 | State state = new State(); |
Steve McKay | d0a2a2c | 2015-03-25 14:35:33 -0700 | [diff] [blame] | 127 | |
| 128 | final Intent intent = getIntent(); |
Steve McKay | b68dd22 | 2015-04-20 17:18:15 -0700 | [diff] [blame] | 129 | state.action = State.ACTION_BROWSE_ALL; |
| 130 | state.acceptMimes = new String[] { "*/*" }; |
| 131 | state.allowMultiple = true; |
| 132 | state.acceptMimes = new String[] { intent.getType() }; |
| 133 | state.localOnly = intent.getBooleanExtra(Intent.EXTRA_LOCAL_ONLY, false); |
| 134 | state.forceAdvanced = intent.getBooleanExtra(DocumentsContract.EXTRA_SHOW_ADVANCED, false); |
| 135 | state.showAdvanced = state.forceAdvanced |
Steve McKay | d0a2a2c | 2015-03-25 14:35:33 -0700 | [diff] [blame] | 136 | | LocalPreferences.getDisplayAdvancedDevices(this); |
Steve McKay | b68dd22 | 2015-04-20 17:18:15 -0700 | [diff] [blame] | 137 | state.showSize = true; |
Tomasz Mikolajewski | 2023fcf | 2015-04-10 10:30:33 +0900 | [diff] [blame] | 138 | final DocumentStack stack = intent.getParcelableExtra(CopyService.EXTRA_STACK); |
| 139 | if (stack != null) |
Steve McKay | b68dd22 | 2015-04-20 17:18:15 -0700 | [diff] [blame] | 140 | state.stack = stack; |
Steve McKay | d0a2a2c | 2015-03-25 14:35:33 -0700 | [diff] [blame] | 141 | |
Steve McKay | b68dd22 | 2015-04-20 17:18:15 -0700 | [diff] [blame] | 142 | return state; |
Steve McKay | d0a2a2c | 2015-03-25 14:35:33 -0700 | [diff] [blame] | 143 | } |
| 144 | |
| 145 | @Override |
| 146 | protected void onPostCreate(Bundle savedInstanceState) { |
| 147 | super.onPostCreate(savedInstanceState); |
Steve McKay | d0a2a2c | 2015-03-25 14:35:33 -0700 | [diff] [blame] | 148 | updateActionBar(); |
| 149 | } |
| 150 | |
| 151 | @Override |
Steve McKay | d0a2a2c | 2015-03-25 14:35:33 -0700 | [diff] [blame] | 152 | public void updateActionBar() { |
| 153 | final RootInfo root = getCurrentRoot(); |
| 154 | mToolbar.setNavigationIcon( |
| 155 | root != null ? root.loadToolbarIcon(mToolbar.getContext()) : null); |
| 156 | mToolbar.setNavigationContentDescription(R.string.drawer_open); |
| 157 | mToolbar.setNavigationOnClickListener(null); |
| 158 | |
Steve McKay | b68dd22 | 2015-04-20 17:18:15 -0700 | [diff] [blame] | 159 | if (mSearchManager.isExpanded()) { |
Steve McKay | d0a2a2c | 2015-03-25 14:35:33 -0700 | [diff] [blame] | 160 | mToolbar.setTitle(null); |
| 161 | mToolbarStack.setVisibility(View.GONE); |
| 162 | mToolbarStack.setAdapter(null); |
| 163 | } else { |
| 164 | if (mState.stack.size() <= 1) { |
| 165 | mToolbar.setTitle(root.title); |
| 166 | mToolbarStack.setVisibility(View.GONE); |
| 167 | mToolbarStack.setAdapter(null); |
| 168 | } else { |
| 169 | mToolbar.setTitle(null); |
| 170 | mToolbarStack.setVisibility(View.VISIBLE); |
| 171 | mToolbarStack.setAdapter(mStackAdapter); |
| 172 | |
Steve McKay | b68dd22 | 2015-04-20 17:18:15 -0700 | [diff] [blame] | 173 | mStackListener.mIgnoreNextNavigation = true; |
Steve McKay | d0a2a2c | 2015-03-25 14:35:33 -0700 | [diff] [blame] | 174 | mToolbarStack.setSelection(mStackAdapter.getCount() - 1); |
| 175 | } |
| 176 | } |
| 177 | } |
| 178 | |
| 179 | @Override |
| 180 | public boolean onCreateOptionsMenu(Menu menu) { |
Steve McKay | b68dd22 | 2015-04-20 17:18:15 -0700 | [diff] [blame] | 181 | boolean showMenu = super.onCreateOptionsMenu(menu); |
Steve McKay | d0a2a2c | 2015-03-25 14:35:33 -0700 | [diff] [blame] | 182 | |
Steve McKay | b68dd22 | 2015-04-20 17:18:15 -0700 | [diff] [blame] | 183 | expandMenus(menu); |
Steve McKay | b68dd22 | 2015-04-20 17:18:15 -0700 | [diff] [blame] | 184 | return showMenu; |
Steve McKay | d0a2a2c | 2015-03-25 14:35:33 -0700 | [diff] [blame] | 185 | } |
| 186 | |
| 187 | @Override |
| 188 | public boolean onPrepareOptionsMenu(Menu menu) { |
Steve McKay | 7bd32e1 | 2015-04-30 16:12:59 -0700 | [diff] [blame] | 189 | boolean shown = super.onPrepareOptionsMenu(menu); |
Steve McKay | d0a2a2c | 2015-03-25 14:35:33 -0700 | [diff] [blame] | 190 | |
Steve McKay | d0a2a2c | 2015-03-25 14:35:33 -0700 | [diff] [blame] | 191 | final RootInfo root = getCurrentRoot(); |
| 192 | final DocumentInfo cwd = getCurrentDirectory(); |
| 193 | |
| 194 | final MenuItem createDir = menu.findItem(R.id.menu_create_dir); |
Steve McKay | d0a2a2c | 2015-03-25 14:35:33 -0700 | [diff] [blame] | 195 | final MenuItem advanced = menu.findItem(R.id.menu_advanced); |
| 196 | final MenuItem fileSize = menu.findItem(R.id.menu_file_size); |
Steve McKay | b68dd22 | 2015-04-20 17:18:15 -0700 | [diff] [blame] | 197 | final MenuItem settings = menu.findItem(R.id.menu_settings); |
Steve McKay | d0a2a2c | 2015-03-25 14:35:33 -0700 | [diff] [blame] | 198 | |
Steve McKay | b68dd22 | 2015-04-20 17:18:15 -0700 | [diff] [blame] | 199 | createDir.setVisible(cwd != null |
| 200 | && cwd.isCreateSupported() |
| 201 | && !mSearchManager.isSearching() |
| 202 | && !root.isDownloads()); |
| 203 | |
| 204 | fileSize.setVisible(cwd != null); |
| 205 | advanced.setVisible(cwd != null); |
Steve McKay | d0a2a2c | 2015-03-25 14:35:33 -0700 | [diff] [blame] | 206 | |
Steve McKay | b68dd22 | 2015-04-20 17:18:15 -0700 | [diff] [blame] | 207 | settings.setVisible((root.flags & Root.FLAG_HAS_SETTINGS) != 0); |
Steve McKay | d0a2a2c | 2015-03-25 14:35:33 -0700 | [diff] [blame] | 208 | |
Steve McKay | 7bd32e1 | 2015-04-30 16:12:59 -0700 | [diff] [blame] | 209 | return shown; |
Steve McKay | d0a2a2c | 2015-03-25 14:35:33 -0700 | [diff] [blame] | 210 | } |
| 211 | |
| 212 | @Override |
Steve McKay | d0a2a2c | 2015-03-25 14:35:33 -0700 | [diff] [blame] | 213 | public void onBackPressed() { |
| 214 | if (!mState.stackTouched) { |
| 215 | super.onBackPressed(); |
| 216 | return; |
| 217 | } |
| 218 | |
| 219 | final int size = mState.stack.size(); |
| 220 | if (size > 1) { |
| 221 | mState.stack.pop(); |
| 222 | onCurrentDirectoryChanged(ANIM_UP); |
| 223 | } else { |
| 224 | super.onBackPressed(); |
| 225 | } |
| 226 | } |
| 227 | |
| 228 | @Override |
Steve McKay | d0a2a2c | 2015-03-25 14:35:33 -0700 | [diff] [blame] | 229 | public State getDisplayState() { |
| 230 | return mState; |
| 231 | } |
| 232 | |
Steve McKay | b68dd22 | 2015-04-20 17:18:15 -0700 | [diff] [blame] | 233 | @Override |
| 234 | void onDirectoryChanged(int anim) { |
Steve McKay | d0a2a2c | 2015-03-25 14:35:33 -0700 | [diff] [blame] | 235 | final FragmentManager fm = getFragmentManager(); |
| 236 | final RootInfo root = getCurrentRoot(); |
| 237 | final DocumentInfo cwd = getCurrentDirectory(); |
| 238 | |
| 239 | mDirectoryContainer.setDrawDisappearingFirst(anim == ANIM_DOWN); |
| 240 | |
| 241 | if (cwd == null) { |
| 242 | DirectoryFragment.showRecentsOpen(fm, anim); |
| 243 | |
| 244 | // Start recents in grid when requesting visual things |
| 245 | final boolean visualMimes = MimePredicate.mimeMatches( |
| 246 | MimePredicate.VISUAL_MIMES, mState.acceptMimes); |
| 247 | mState.userMode = visualMimes ? State.MODE_GRID : State.MODE_LIST; |
| 248 | mState.derivedMode = mState.userMode; |
| 249 | } else { |
| 250 | if (mState.currentSearch != null) { |
| 251 | // Ongoing search |
| 252 | DirectoryFragment.showSearch(fm, root, mState.currentSearch, anim); |
| 253 | } else { |
| 254 | // Normal boring directory |
| 255 | DirectoryFragment.showNormal(fm, root, cwd, anim); |
| 256 | } |
| 257 | } |
Steve McKay | d0a2a2c | 2015-03-25 14:35:33 -0700 | [diff] [blame] | 258 | } |
| 259 | |
| 260 | @Override |
| 261 | public void onDocumentPicked(DocumentInfo doc) { |
Steve McKay | d0a2a2c | 2015-03-25 14:35:33 -0700 | [diff] [blame] | 262 | if (doc.isDirectory()) { |
| 263 | mState.stack.push(doc); |
| 264 | mState.stackTouched = true; |
| 265 | onCurrentDirectoryChanged(ANIM_DOWN); |
| 266 | } else { |
| 267 | // Fall back to viewing |
| 268 | final Intent view = new Intent(Intent.ACTION_VIEW); |
| 269 | view.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); |
| 270 | view.setData(doc.derivedUri); |
| 271 | |
| 272 | try { |
| 273 | startActivity(view); |
| 274 | } catch (ActivityNotFoundException ex2) { |
| 275 | Toast.makeText(this, R.string.toast_no_application, Toast.LENGTH_SHORT).show(); |
| 276 | } |
| 277 | } |
| 278 | } |
| 279 | |
Ben Kwa | cb4461f | 2015-05-05 11:50:11 -0700 | [diff] [blame^] | 280 | @Override |
Steve McKay | d0a2a2c | 2015-03-25 14:35:33 -0700 | [diff] [blame] | 281 | public void onDocumentsPicked(List<DocumentInfo> docs) { |
| 282 | // TODO |
| 283 | } |
| 284 | |
| 285 | @Override |
Steve McKay | b68dd22 | 2015-04-20 17:18:15 -0700 | [diff] [blame] | 286 | void saveStackBlocking() { |
Steve McKay | d0a2a2c | 2015-03-25 14:35:33 -0700 | [diff] [blame] | 287 | final ContentResolver resolver = getContentResolver(); |
| 288 | final ContentValues values = new ContentValues(); |
| 289 | |
Steve McKay | b68dd22 | 2015-04-20 17:18:15 -0700 | [diff] [blame] | 290 | final byte[] rawStack = DurableUtils.writeToArrayOrNull( |
| 291 | getDisplayState().stack); |
Steve McKay | d0a2a2c | 2015-03-25 14:35:33 -0700 | [diff] [blame] | 292 | |
| 293 | // Remember location for next app launch |
| 294 | final String packageName = getCallingPackageMaybeExtra(); |
| 295 | values.clear(); |
| 296 | values.put(ResumeColumns.STACK, rawStack); |
| 297 | values.put(ResumeColumns.EXTERNAL, 0); |
| 298 | resolver.insert(RecentsProvider.buildResume(packageName), values); |
| 299 | } |
| 300 | |
Steve McKay | b68dd22 | 2015-04-20 17:18:15 -0700 | [diff] [blame] | 301 | @Override |
| 302 | void onTaskFinished(Uri... uris) { |
Steve McKay | d0a2a2c | 2015-03-25 14:35:33 -0700 | [diff] [blame] | 303 | Log.d(TAG, "onFinished() " + Arrays.toString(uris)); |
| 304 | |
| 305 | final Intent intent = new Intent(); |
| 306 | if (uris.length == 1) { |
| 307 | intent.setData(uris[0]); |
| 308 | } else if (uris.length > 1) { |
| 309 | final ClipData clipData = new ClipData( |
| 310 | null, mState.acceptMimes, new ClipData.Item(uris[0])); |
| 311 | for (int i = 1; i < uris.length; i++) { |
| 312 | clipData.addItem(new ClipData.Item(uris[i])); |
| 313 | } |
| 314 | intent.setClipData(clipData); |
| 315 | } |
| 316 | |
| 317 | intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION |
| 318 | | Intent.FLAG_GRANT_WRITE_URI_PERMISSION |
| 319 | | Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION); |
| 320 | |
| 321 | setResult(Activity.RESULT_OK, intent); |
| 322 | finish(); |
| 323 | } |
Steve McKay | d0a2a2c | 2015-03-25 14:35:33 -0700 | [diff] [blame] | 324 | } |