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
This commit is contained in:
Fabrice Di Meglio
2014-06-30 15:18:08 -07:00
parent 66445565ee
commit 5b3c3c00b0

View File

@@ -451,9 +451,11 @@ public class SettingsActivity extends Activity
return (categories != null) && categories.contains("com.android.settings.SHORTCUT"); 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(); 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 @Override
@@ -481,7 +483,7 @@ public class SettingsActivity extends Activity
// Getting Intent properties can only be done after the super.onCreate(...) // Getting Intent properties can only be done after the super.onCreate(...)
final String initialFragmentName = intent.getStringExtra(EXTRA_SHOW_FRAGMENT); 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); intent.getBooleanExtra(EXTRA_SHOW_FRAGMENT_AS_SHORTCUT, false);
mIsShowingDashboard = (initialFragmentName == null) && !mIsShortcut; mIsShowingDashboard = (initialFragmentName == null) && !mIsShortcut;