Avoid split action bar when it only has one item. DO NOT MERGE.

Bug: 7632944 Change-Id: I055564b4f8d2a3fc97346e13e1d8818196a8f988
2012-11-28 17:09:19 -08:00
parent 0206284a66
commit c2b43dbee8
2 changed files with 13 additions and 4 deletions
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -393,7 +393,11 @@ public class Settings extends PreferenceActivity
                VpnSettings.class.getName().equals(fragmentName) ||
                SecuritySettings.class.getName().equals(fragmentName) ||
                InstalledAppDetails.class.getName().equals(fragmentName) ||
-                ChooseLockGenericFragment.class.getName().equals(fragmentName)) {
+                ChooseLockGenericFragment.class.getName().equals(fragmentName) ||
+                TetherSettings.class.getName().equals(fragmentName) ||
+                ApnSettings.class.getName().equals(fragmentName) ||
+                LocationSettings.class.getName().equals(fragmentName) ||
+                ZonePicker.class.getName().equals(fragmentName)) {
            intent.putExtra(EXTRA_CLEAR_UI_OPTIONS, true);
        }