PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix again bug #15940103 ACTION_SYNC_SETTINGS shows the non-functional

Browse Source 
...left arrow button at the top (the back button works)

- the android.settings.DATE_SETTINGS Intent was showing similar issue
so this CL fix it on a more generic basis

Change-Id: I4c26a5a8dc3eb090d26967fa607449a4fe6631c6
This commit is contained in:
Fabrice Di Meglio
2014-07-01 17:18:40 -07:00
parent 5bdf0423f9
commit 5a62d94a2b
1 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/com/android/settings/SettingsActivity.java
View File

@@ -285,6 +285,11 @@ public class SettingsActivity extends Activity
BatterySaverSettings.class.getName(),
};
private static final String[] LIKE_SHORTCUT_INTENT_ACTION_ARRAY = {
"android.settings.APPLICATION_DETAILS_SETTINGS"
};
private SharedPreferences mDevelopmentPreferences;
private SharedPreferences.OnSharedPreferenceChangeListener mDevelopmentPreferencesListener;
@@ -453,9 +458,13 @@ public class SettingsActivity extends Activity
private static boolean isLikeShortCutIntent(final Intent intent) {
String action = intent.getAction();
return (action != null) &&
(action.equals("android.settings.APPLICATION_DETAILS_SETTINGS") ||
action.equals("android.settings.SYNC_SETTINGS")) ;
if (action == null) {
return false;
}
for (int i = 0; i < LIKE_SHORTCUT_INTENT_ACTION_ARRAY.length; i++) {
if (LIKE_SHORTCUT_INTENT_ACTION_ARRAY[i].equals(action)) return true;
}
return false;
}
@Override
@@ -486,14 +495,16 @@ public class SettingsActivity extends Activity
mIsShortcut = isShortCutIntent(intent) || isLikeShortCutIntent(intent) ||
intent.getBooleanExtra(EXTRA_SHOW_FRAGMENT_AS_SHORTCUT, false);
mIsShowingDashboard = (initialFragmentName == null) && !mIsShortcut;
final ComponentName cn = getIntent().getComponent();
final boolean isSubSettings = cn.getClassName().equals(SubSettings.class.getName());
final String className = cn.getClassName();
// If this is a sub settings or not the main Dashboard and not a Shortcut then apply the
// correct theme for the ActionBar content inset
if (isSubSettings || (!mIsShowingDashboard && !mIsShortcut)) {
mIsShowingDashboard = className.equals(Settings.class.getName());
final boolean isSubSettings = className.equals(SubSettings.class.getName());
// If this is a sub settings or not the main Dashboard and not a Shortcut and not initial
// Fragment then apply the correct theme for the ActionBar content inset
if (isSubSettings ||
(!mIsShowingDashboard && !mIsShortcut && (initialFragmentName == null))) {
setTheme(R.style.Theme_SubSettings);
}
@@ -503,9 +514,6 @@ public class SettingsActivity extends Activity
getFragmentManager().addOnBackStackChangedListener(this);
mDisplayHomeAsUpEnabled = true;
mDisplaySearch = true;
if (mIsShowingDashboard) {
Index.getInstance(getApplicationContext()).update();
}
@@ -535,6 +543,9 @@ public class SettingsActivity extends Activity
if (mIsShortcut) {
mDisplayHomeAsUpEnabled = isSubSettings;
mDisplaySearch = false;
} else if (isSubSettings) {
mDisplayHomeAsUpEnabled = true;
mDisplaySearch = true;
}
setTitleFromIntent(intent);
@@ -542,8 +553,10 @@ public class SettingsActivity extends Activity
switchToFragment(initialFragmentName, initialArguments, true, false,
mInitialTitleResId, mInitialTitle, false);
} else {
// No UP if we are displaying the main Dashboard
// No UP affordance if we are displaying the main Dashboard
mDisplayHomeAsUpEnabled = false;
// Show Search affordance
mDisplaySearch = true;
mInitialTitleResId = R.string.dashboard_title;
switchToFragment(DashboardSummary.class.getName(), null, false, false,
mInitialTitleResId, mInitialTitle, false);