From 5b3c3c00b0a280e29f3767878913f80274bd4993 Mon Sep 17 00:00:00 2001 From: Fabrice Di Meglio Date: Mon, 30 Jun 2014 15:18:08 -0700 Subject: [PATCH] Fix bug #15940103 ACTION_SYNC_SETTINGS shows the non-functional left arrow button at the top - make android.settings.SYNC_SETTINGS Intent behave like a Shortcut (no Up affordance nor Search) Change-Id: I573feaedeb062757fb893417e8746d17a09e66f4 --- src/com/android/settings/SettingsActivity.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index f98669f558b..cdcc11699d8 100644 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -451,9 +451,11 @@ public class SettingsActivity extends Activity return (categories != null) && categories.contains("com.android.settings.SHORTCUT"); } - private static boolean isAppInfoIntent(final Intent intent) { + private static boolean isLikeShortCutIntent(final Intent intent) { String action = intent.getAction(); - return (action != null) && action.equals("android.settings.APPLICATION_DETAILS_SETTINGS"); + return (action != null) && + (action.equals("android.settings.APPLICATION_DETAILS_SETTINGS") || + action.equals("android.settings.SYNC_SETTINGS")) ; } @Override @@ -481,7 +483,7 @@ public class SettingsActivity extends Activity // Getting Intent properties can only be done after the super.onCreate(...) final String initialFragmentName = intent.getStringExtra(EXTRA_SHOW_FRAGMENT); - mIsShortcut = isShortCutIntent(intent) || isAppInfoIntent(intent) || + mIsShortcut = isShortCutIntent(intent) || isLikeShortCutIntent(intent) || intent.getBooleanExtra(EXTRA_SHOW_FRAGMENT_AS_SHORTCUT, false); mIsShowingDashboard = (initialFragmentName == null) && !mIsShortcut;