diff options
author | Raj Yengisetty <rajesh@cyngn.com> | 2015-08-04 21:39:05 -0700 |
---|---|---|
committer | Steve Kondik <steve@cyngn.com> | 2016-11-02 20:40:48 -0700 |
commit | fd77582d34b8ddd0cff1f7bde979be9e65eedcf9 (patch) | |
tree | 80c5fe24754f3652323d0570a9f9c5b27c441298 /src/com | |
parent | de19841a712d22b076716ff5743969e47b94986a (diff) | |
download | android_packages_apps_CMFileManager-fd77582d34b8ddd0cff1f7bde979be9e65eedcf9.tar.gz android_packages_apps_CMFileManager-fd77582d34b8ddd0cff1f7bde979be9e65eedcf9.tar.bz2 android_packages_apps_CMFileManager-fd77582d34b8ddd0cff1f7bde979be9e65eedcf9.zip |
Fix launcher shortcuts
Change-Id: I239088c4dbac612f5bcd22d160b461caded59801
Diffstat (limited to 'src/com')
-rwxr-xr-x | src/com/cyanogenmod/filemanager/activities/MainActivity.java | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/src/com/cyanogenmod/filemanager/activities/MainActivity.java b/src/com/cyanogenmod/filemanager/activities/MainActivity.java index 3448aa26..a565b3a4 100755 --- a/src/com/cyanogenmod/filemanager/activities/MainActivity.java +++ b/src/com/cyanogenmod/filemanager/activities/MainActivity.java @@ -320,6 +320,8 @@ public class MainActivity extends ActionBarActivity } }, this); } + + handleNavigateIntent(getIntent()); } /** @@ -364,7 +366,7 @@ public class MainActivity extends ActionBarActivity .replace(R.id.navigation_fragment_container, currentFragment, fragmentTag) .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE) .addToBackStack(fragmentTag) - .commit(); + .commitAllowingStateLoss(); } private void updateCurrentFragment() { @@ -404,7 +406,20 @@ public class MainActivity extends ActionBarActivity */ @Override protected void onNewIntent(Intent intent) { - handleSearchIntent(intent); + if (!handleNavigateIntent(intent)) { + handleSearchIntent(intent); + } + } + + private boolean handleNavigateIntent(Intent intent) { + if (intent != null) { + String path = intent.getStringExtra(EXTRA_NAVIGATE_TO); + if (!TextUtils.isEmpty(path)) { + navigateToPath(path); + return true; + } + } + return false; } public void handleSearchIntent(Intent intent) { |