summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2012-04-05 16:24:19 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-04-05 16:24:19 -0700
commitc48bf55b286824b5d2d44507c432aff3bbc13c1a (patch)
tree6f84b279a491669770536321053413f3ec0a02d0 /src
parentf35dd41da256b37a7ffbedab672160fe78eae77a (diff)
parentfaba7e4d9f132b399e49f2bb20679b1568eb617b (diff)
downloadpackages_apps_settings-c48bf55b286824b5d2d44507c432aff3bbc13c1a.zip
packages_apps_settings-c48bf55b286824b5d2d44507c432aff3bbc13c1a.tar.gz
packages_apps_settings-c48bf55b286824b5d2d44507c432aff3bbc13c1a.tar.bz2
Merge "Specify up navigation behavior"
Diffstat (limited to 'src')
-rw-r--r--src/com/android/settings/Settings.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 264ce63..1922100 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -18,6 +18,7 @@ package com.android.settings;
import com.android.internal.util.ArrayUtils;
import com.android.settings.accounts.AccountSyncSettings;
+import com.android.settings.applications.ManageApplications;
import com.android.settings.bluetooth.BluetoothEnabler;
import com.android.settings.deviceinfo.Memory;
import com.android.settings.fuelgauge.PowerUsageSummary;
@@ -316,7 +317,8 @@ public class Settings extends PreferenceActivity implements ButtonBarHandler {
PowerUsageSummary.class.getName().equals(fragmentName) ||
AccountSyncSettings.class.getName().equals(fragmentName) ||
UserDictionarySettings.class.getName().equals(fragmentName) ||
- Memory.class.getName().equals(fragmentName)) {
+ Memory.class.getName().equals(fragmentName) ||
+ ManageApplications.class.getName().equals(fragmentName)) {
intent.putExtra(EXTRA_CLEAR_UI_OPTIONS, true);
}