Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b3c3c00 authored by Fabrice Di Meglio's avatar Fabrice Di Meglio
Browse files

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
parent 66445565

src/com/android/settings/SettingsActivity.java

+5 −3
Original line number Diff line number Diff line
@@ -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;